[arch-commits] Commit in xf86-video-s3/trunk (PKGBUILD git-fixes.patch)

[Jan de Groot]

    Date: Tuesday, April 3, 2012 @ 07:23:32
  Author: jgc
Revision: 155416

upgpkg: xf86-video-s3 0.6.3-8

Update to current git

Modified:
  xf86-video-s3/trunk/PKGBUILD
  xf86-video-s3/trunk/git-fixes.patch

-----------------+
 PKGBUILD        |    8 ++++----
 git-fixes.patch |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 50 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-03 11:11:30 UTC (rev 155415)
+++ PKGBUILD	2012-04-03 11:23:32 UTC (rev 155416)
@@ -3,20 +3,20 @@
 
 pkgname=xf86-video-s3
 pkgver=0.6.3
-pkgrel=7
+pkgrel=8
 pkgdesc="X.org S3 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
+makedepends=('xorg-server-devel>=1.12.0')
+conflicts=('xorg-server<1.12.0')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         git-fixes.patch)
 md5sums=('5eb06d88533fb327d067928faeb20860'
-         '77a455ce7e254c73b1cbd408c7f4ecf4')
+         '8b3033b16ee826a9e0870dd80717eafd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: git-fixes.patch
===================================================================
--- git-fixes.patch	2012-04-03 11:11:30 UTC (rev 155415)
+++ git-fixes.patch	2012-04-03 11:23:32 UTC (rev 155416)
@@ -435,7 +435,7 @@
          S3PortPrivPtr           portPrivate;
  
 diff --git a/src/s3_driver.c b/src/s3_driver.c
-index 29e343d..4519b33 100644
+index 29e343d..2011dfc 100644
 --- a/src/s3_driver.c
 +++ b/src/s3_driver.c
 @@ -309,6 +309,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
@@ -446,7 +446,15 @@
  	rgb zeros = {0, 0, 0};
  	Gamma gzeros = {0.0, 0.0, 0.0};
  	int i, vgaCRIndex, vgaCRReg;
-@@ -436,7 +437,8 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
+@@ -325,6 +326,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
+                 return FALSE;
+         
+         hwp = VGAHWPTR(pScrn);
++	vgaHWSetStdFuncs(hwp);
+         vgaHWGetIOBase(hwp);
+         
+         pScrn->monitor = pScrn->confScreen->monitor;
+@@ -436,9 +438,19 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
  	}
  
  	if (xf86LoadSubModule(pScrn, "vbe")) {
@@ -455,4 +463,40 @@
 +		vbeFree(pVBE);
  	}
  	
++	xf86LoadSubModule(pScrn, "fb");
++
++	if (!xf86LoadSubModule(pScrn, "xaa")) {
++		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
++			   "Falling back to shadowfb\n");
++		pS3->NoAccel = TRUE;
++		pS3->shadowFB = TRUE;
++	}
++
  	if (pS3->shadowFB) {
+ 		if (!xf86LoadSubModule(pScrn, "shadowfb")) {
+ 			S3FreeRec(pScrn);
+@@ -726,11 +738,6 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
+         xf86PrintModes(pScrn);
+         xf86SetDpi(pScrn, 0, 0);
+  
+-        xf86LoadSubModule(pScrn, "fb");
+-
+-	if (!xf86LoadSubModule(pScrn, "xaa"))
+-		return FALSE;
+-
+ 	return TRUE;
+ }
+ 
+diff --git a/src/s3_video.c b/src/s3_video.c
+index 3e88889..9a2d458 100644
+--- a/src/s3_video.c
++++ b/src/s3_video.c
+@@ -244,6 +244,8 @@ static XF86VideoAdaptorPtr S3SetupImageVideoOverlay(ScreenPtr pScreen)
+ 	XF86VideoAdaptorPtr adapt;
+ 
+ 	adapt = S3AllocAdaptor(pScrn);
++	if (adapt == NULL)
++		return NULL;
+ 
+     	adapt->type = XvWindowMask | XvInputMask | XvImageMask;
+     	adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;