Date: Monday, November 26, 2012 @ 06:40:21 Author: jgc Revision: 172004
Fix crashes with recent xorg Added: xf86-video-sisimedia/trunk/disable-UploadToScreen-DownloadFromScreen.patch Modified: xf86-video-sisimedia/trunk/PKGBUILD -------------------------------------------------+ PKGBUILD | 5 + disable-UploadToScreen-DownloadFromScreen.patch | 64 ++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-11-26 03:59:42 UTC (rev 172003) +++ PKGBUILD 2012-11-26 11:40:21 UTC (rev 172004) @@ -3,7 +3,7 @@ pkgname=xf86-video-sisimedia pkgver=0.9.1 -pkgrel=5 +pkgrel=6 pkgdesc="X.org SiS 671 video driver" arch=(i686 x86_64) url="http://www.linuxconsulting.ro/xorg-drivers/"; @@ -38,6 +38,7 @@ sisimedia-no-xaa.patch sisimedia-xorg-1.13.patch deprecated-sym2.patch + disable-UploadToScreen-DownloadFromScreen.patch COPYING) sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' '61715bb86180decde55a56fad9a12d841c89fbb2' @@ -65,6 +66,7 @@ '370af234867df98206a98c8cd0a6c89323593f6b' '4ea333d659abe2b78f07511467c5356f39bf8695' '9bef0b61c0505cc64464073d73684e6933d3f84c' + 'ff95fd41be43560245caa40adc6b481f2dafca7d' 'a64e244f274bcb155f892d0488a1a4b1b2f7d70d') build() { @@ -95,6 +97,7 @@ patch -Np1 -i "${srcdir}/sisimedia-xorg-1.13.patch" patch -Np1 -i "${srcdir}/deprecated-sym2.patch" + patch -Np1 -i "${srcdir}/disable-UploadToScreen-DownloadFromScreen.patch" sed -i -e 's,sis_drv,sisimedia_drv,g' src/Makefile.am sed -i -e 's,\"sis\",\"sisimedia\",g' src/sis.h Added: disable-UploadToScreen-DownloadFromScreen.patch =================================================================== --- disable-UploadToScreen-DownloadFromScreen.patch (rev 0) +++ disable-UploadToScreen-DownloadFromScreen.patch 2012-11-26 11:40:21 UTC (rev 172004) @@ -0,0 +1,64 @@ +diff -ruN xf86-video-sis-0.9.1.orig/src/sis300_accel.c xf86-video-sis-0.9.1/src/sis300_accel.c +--- xf86-video-sis-0.9.1.orig/src/sis300_accel.c 2012-11-26 12:27:14.151119857 +0100 ++++ xf86-video-sis-0.9.1/src/sis300_accel.c 2012-11-26 12:36:19.227926454 +0100 +@@ -1284,8 +1284,8 @@ + /* Composite not supported */ + + /* Upload, download to/from Screen */ +- pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen; +- pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen; ++ //pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen; ++ //pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen; + } + #else /*xorg>7.0*/ + +@@ -1332,8 +1332,8 @@ + /* Composite not supported */ + + /* Upload, download to/from Screen */ +- pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen; +- pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen; ++ //pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen; ++ //pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen; + + } + #endif +diff -ruN xf86-video-sis-0.9.1.orig/src/sis310_accel.c xf86-video-sis-0.9.1/src/sis310_accel.c +--- xf86-video-sis-0.9.1.orig/src/sis310_accel.c 2012-11-26 12:27:14.151119857 +0100 ++++ xf86-video-sis-0.9.1/src/sis310_accel.c 2012-11-26 12:35:58.597921440 +0100 +@@ -1819,8 +1819,8 @@ + #endif + + /* Upload, download to/from Screen */ +- pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen; +- pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen; ++ //pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen; ++ //pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen; + + #else /*Xorg>= 7.0*/ + +@@ -1869,8 +1869,8 @@ + #endif + + /* Upload, download to/from Screen */ +- pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen; +- pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen; ++ //pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen; ++ //pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen; + #endif /*end of Xorg>=7.0*/ + + } +diff -ruN xf86-video-sis-0.9.1.orig/src/sis_accel.c xf86-video-sis-0.9.1/src/sis_accel.c +--- xf86-video-sis-0.9.1.orig/src/sis_accel.c 2012-11-26 12:27:14.154453191 +0100 ++++ xf86-video-sis-0.9.1/src/sis_accel.c 2012-11-26 12:36:44.464598873 +0100 +@@ -862,8 +862,8 @@ + /* Composite not supported */ + + /* Upload, download to/from Screen */ +- pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen; +- pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen; ++ //pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen; ++ //pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen; + + #endif /*end of Xorg>=7.0 EXA Setting*/ + }
