[arch-commits] Commit in xf86-video-vesa/repos (4 files)
Jan de Groot
jgc at archlinux.org
Fri Jul 18 19:13:28 UTC 2008
Date: Friday, July 18, 2008 @ 15:13:28
Author: jgc
Revision: 5551
Merged revisions 4382-5550 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/xf86-video-vesa/trunk
........
r4388 | jgc | 2008-07-06 20:05:56 +0000 (Sun, 06 Jul 2008) | 1 line
upgpkg: xf86-video-vesa 2.0.0-1
........
r5550 | jgc | 2008-07-18 19:13:14 +0000 (Fri, 18 Jul 2008) | 2 lines
upgpkg: xf86-video-vesa 1.3.0-6
Revert to 1.3.0
........
Added:
xf86-video-vesa/repos/extra-x86_64/COPYING
(from rev 5550, xf86-video-vesa/trunk/COPYING)
Modified:
xf86-video-vesa/repos/extra-x86_64/ (properties)
xf86-video-vesa/repos/extra-x86_64/PKGBUILD
Deleted:
xf86-video-vesa/repos/extra-x86_64/vesa-1.2.1-fix-shadowfb.patch
-------------------------------+
COPYING | 24 +++++++
PKGBUILD | 14 ++--
vesa-1.2.1-fix-shadowfb.patch | 124 ----------------------------------------
3 files changed, 32 insertions(+), 130 deletions(-)
Property changes on: xf86-video-vesa/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /xf86-video-vesa/trunk:1-4381
+ /xf86-video-vesa/trunk:1-5550
Copied: xf86-video-vesa/repos/extra-x86_64/COPYING (from rev 5550, xf86-video-vesa/trunk/COPYING)
===================================================================
--- extra-x86_64/COPYING (rev 0)
+++ extra-x86_64/COPYING 2008-07-18 19:13:28 UTC (rev 5551)
@@ -0,0 +1,24 @@
+Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Except as contained in this notice, the name of Conectiva Linux shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from
+Conectiva Linux.
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-07-18 19:13:14 UTC (rev 5550)
+++ extra-x86_64/PKGBUILD 2008-07-18 19:13:28 UTC (rev 5551)
@@ -2,8 +2,8 @@
# Maintainer: Alexander Baldeck <alexander at archlinux.org>
# Contributor: Jan de Groot <jgc at archlinux.org>
pkgname=xf86-video-vesa
-pkgver=2.0.0
-pkgrel=1
+pkgver=1.3.0
+pkgrel=6
pkgdesc="X.org vesa video driver"
arch=(i686 x86_64)
license=('custom')
@@ -11,9 +11,11 @@
depends=('glibc')
makedepends=('pkgconfig' 'xorg-server>=1.4.2')
groups=('xorg' 'xorg-video-drivers')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('433cf6f961eb4a2ab6fcb086def0b2b4')
+options=('!libtool' 'force')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ COPYING)
+md5sums=('4a307852f3b4850e436a41dab2a73676'
+ 'e5418e7a75e21268637984e70265e146')
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
@@ -21,5 +23,5 @@
make || return 1
make DESTDIR=${startdir}/pkg install || return 1
install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}
- install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
+ install -m644 ${srcdir}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
}
Deleted: extra-x86_64/vesa-1.2.1-fix-shadowfb.patch
===================================================================
--- extra-x86_64/vesa-1.2.1-fix-shadowfb.patch 2008-07-18 19:13:14 UTC (rev 5550)
+++ extra-x86_64/vesa-1.2.1-fix-shadowfb.patch 2008-07-18 19:13:28 UTC (rev 5551)
@@ -1,124 +0,0 @@
---- xf86-video-vesa-1.2.1/src/vesa.c.shadowfb 2006-09-19 15:22:36.000000000 -0400
-+++ xf86-video-vesa-1.2.1/src/vesa.c 2006-09-19 15:25:02.000000000 -0400
-@@ -747,6 +747,23 @@
- }
-
- static Bool
-+vesaCreateScreenResources(ScreenPtr pScreen)
-+{
-+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+ VESAPtr pVesa = VESAGetRec(pScrn);
-+ Bool ret;
-+
-+ pScreen->CreateScreenResources = pVesa->CreateScreenResources;
-+ ret = pScreen->CreateScreenResources(pScreen);
-+ pScreen->CreateScreenResources = vesaCreateScreenResources;
-+
-+ shadowAdd(pScreen, pScreen->GetScreenPixmap(pScreen), pVesa->update,
-+ pVesa->window, 0, 0);
-+
-+ return ret;
-+}
-+
-+static Bool
- VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- {
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-@@ -788,6 +805,16 @@
- if (pVesa->shadowFB && pScrn->bitsPerPixel == 4)
- pScrn->bitsPerPixel = 8;
-
-+ if (pVesa->shadowFB) {
-+ pVesa->shadow = xcalloc(1, pScrn->displayWidth * pScrn->virtualY *
-+ ((pScrn->bitsPerPixel + 7) / 8));
-+ if (!pVesa->shadow) {
-+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+ "Failed to allocate shadow buffer\n");
-+ return FALSE;
-+ }
-+ }
-+
- /* save current video state */
- VESASaveRestore(pScrn, MODE_SAVE);
- pVesa->savedPal = VBESetGetPaletteData(pVesa->pVbe, FALSE, 0, 256,
-@@ -865,7 +892,7 @@
- case 24:
- case 32:
- if (!fbScreenInit(pScreen,
-- pVesa->base,
-+ pVesa->shadowFB ? pVesa->shadow : pVesa->base,
- pScrn->virtualX, pScrn->virtualY,
- pScrn->xDpi, pScrn->yDpi,
- pScrn->displayWidth, pScrn->bitsPerPixel))
-@@ -901,27 +928,26 @@
- fbPictureInit(pScreen, 0, 0);
-
- if (pVesa->shadowFB) {
-- ShadowUpdateProc update;
-- ShadowWindowProc window;
--
- if (mode->MemoryModel == 3) { /* Planar */
- if (pScrn->bitsPerPixel == 8)
-- update = shadowUpdatePlanar4x8Weak();
-+ pVesa->update = shadowUpdatePlanar4x8Weak();
- else
-- update = shadowUpdatePlanar4Weak();
-- window = VESAWindowPlanar;
-+ pVesa->update = shadowUpdatePlanar4Weak();
-+ pVesa->window = VESAWindowPlanar;
- }
- else if (pVesa->mapPhys == 0xa0000) { /* Windowed */
-- update = shadowUpdatePackedWeak();
-- window = VESAWindowWindowed;
-+ pVesa->update = shadowUpdatePackedWeak();
-+ pVesa->window = VESAWindowWindowed;
- }
- else { /* Linear */
-- update = shadowUpdatePackedWeak();
-- window = VESAWindowLinear;
-+ pVesa->update = shadowUpdatePackedWeak();
-+ pVesa->window = VESAWindowLinear;
- }
-
-- if (!shadowInit(pScreen, update, window))
-- return (FALSE);
-+ if (!shadowSetup(pScreen))
-+ return FALSE;
-+ pVesa->CreateScreenResources = pScreen->CreateScreenResources;
-+ pScreen->CreateScreenResources = vesaCreateScreenResources;
- }
- else if (pVesa->mapPhys == 0xa0000 && mode->MemoryModel != 0x3) {
- unsigned int bankShift = 0;
-@@ -1005,6 +1031,8 @@
- pVesa->savedPal, FALSE, TRUE);
- VESAUnmapVidMem(pScrn);
- }
-+ if (pVesa->shadowFB && pVesa->shadow)
-+ xfree(pVesa->shadow);
- if (pVesa->pDGAMode) {
- xfree(pVesa->pDGAMode);
- pVesa->pDGAMode = NULL;
-@@ -1012,6 +1040,7 @@
- }
- pScrn->vtSema = FALSE;
-
-+ pScreen->CreateScreenResources = pVesa->CreateScreenResources;
- pScreen->CloseScreen = pVesa->CloseScreen;
- return pScreen->CloseScreen(scrnIndex, pScreen);
- }
---- xf86-video-vesa-1.2.1/src/vesa.h.shadowfb 2006-06-03 05:46:00.000000000 -0400
-+++ xf86-video-vesa-1.2.1/src/vesa.h 2006-09-19 15:25:03.000000000 -0400
-@@ -116,9 +116,13 @@
- DGAModePtr pDGAMode;
- int nDGAMode;
- CloseScreenProcPtr CloseScreen;
-+ CreateScreenResourcesProcPtr CreateScreenResources;
- OptionInfoPtr Options;
- IOADDRESS ioBase;
- Bool ModeSetClearScreen;
-+ void *shadow;
-+ ShadowUpdateProc update;
-+ ShadowWindowProc window;
- } VESARec, *VESAPtr;
-
-
More information about the arch-commits
mailing list