[arch-commits] Commit in xf86-video-vesa/repos (3 files)

Jan de Groot jgc at archlinux.org
Sun Jul 6 16:06:14 EDT 2008


    Date: Sunday, July 6, 2008 @ 16:06:14
  Author: jgc
Revision: 4389

Merged revisions 2-4388 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xf86-video-vesa/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r4381 | jgc | 2008-07-06 19:48:09 +0000 (Sun, 06 Jul 2008) | 1 line
  
  upgpkg: xf86-video-vesa 2.0.0-1
........
  r4388 | jgc | 2008-07-06 20:05:56 +0000 (Sun, 06 Jul 2008) | 1 line
  
  upgpkg: xf86-video-vesa 2.0.0-1
........

Modified:
  xf86-video-vesa/repos/extra-i686/	(properties)
  xf86-video-vesa/repos/extra-i686/PKGBUILD
Deleted:
  xf86-video-vesa/repos/extra-i686/vesa-1.2.1-fix-shadowfb.patch

-------------------------------+
 PKGBUILD                      |   14 ++--
 vesa-1.2.1-fix-shadowfb.patch |  124 ----------------------------------------
 2 files changed, 8 insertions(+), 130 deletions(-)


Property changes on: xf86-video-vesa/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xf86-video-vesa/trunk:1
   + /xf86-video-vesa/trunk:1-4388

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-07-06 20:05:56 UTC (rev 4388)
+++ extra-i686/PKGBUILD	2008-07-06 20:06:14 UTC (rev 4389)
@@ -2,22 +2,24 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-vesa
-pkgver=1.3.0
-pkgrel=5
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="X.org vesa video driver"
 arch=(i686 x86_64)
+license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server>=1.4')
+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')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-              --build=${CHOST} --host=${CHOST}
+  ./configure --prefix=/usr || return 1
   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
 }
-md5sums=('4a307852f3b4850e436a41dab2a73676')

Deleted: extra-i686/vesa-1.2.1-fix-shadowfb.patch
===================================================================
--- extra-i686/vesa-1.2.1-fix-shadowfb.patch	2008-07-06 20:05:56 UTC (rev 4388)
+++ extra-i686/vesa-1.2.1-fix-shadowfb.patch	2008-07-06 20:06:14 UTC (rev 4389)
@@ -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