diff options
| author | root <root@rshg054.dnsready.net> | 2013-02-07 00:08:35 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-02-07 00:08:35 -0800 |
| commit | 8e5a0a990a12a59cadb687cae22a1960fce1660b (patch) | |
| tree | 3a0fe8ce858eb0c6350bd2bcfaf7673f3b490f73 /extra/xf86-video-sisimedia | |
| parent | a110e74fe4a31aebb09e0da6e407af69ed996837 (diff) | |
Thu Feb 7 00:08:35 PST 2013
Diffstat (limited to 'extra/xf86-video-sisimedia')
| -rw-r--r-- | extra/xf86-video-sisimedia/PKGBUILD | 9 | ||||
| -rw-r--r-- | extra/xf86-video-sisimedia/disable-UploadToScreen-DownloadFromScreen.patch | 64 |
2 files changed, 71 insertions, 2 deletions
diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD index cc18267a8..3c7340046 100644 --- a/extra/xf86-video-sisimedia/PKGBUILD +++ b/extra/xf86-video-sisimedia/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170686 2012-11-09 14:38:32Z jgc $ +# $Id: PKGBUILD 177523 2013-02-06 18:40:48Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> 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 @@ source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia- sisimedia-no-xaa.patch sisimedia-xorg-1.13.patch deprecated-sym2.patch + disable-UploadToScreen-DownloadFromScreen.patch COPYING) sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' '61715bb86180decde55a56fad9a12d841c89fbb2' @@ -65,6 +66,7 @@ sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' '370af234867df98206a98c8cd0a6c89323593f6b' '4ea333d659abe2b78f07511467c5356f39bf8695' '9bef0b61c0505cc64464073d73684e6933d3f84c' + 'ff95fd41be43560245caa40adc6b481f2dafca7d' 'a64e244f274bcb155f892d0488a1a4b1b2f7d70d') build() { @@ -95,11 +97,14 @@ build() { 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 sed -i -e 's,sisModuleData,sisimediaModuleData,g' src/sis_driver.c + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + autoreconf -fi ./configure --prefix=/usr --disable-dri diff --git a/extra/xf86-video-sisimedia/disable-UploadToScreen-DownloadFromScreen.patch b/extra/xf86-video-sisimedia/disable-UploadToScreen-DownloadFromScreen.patch new file mode 100644 index 000000000..4cc75989f --- /dev/null +++ b/extra/xf86-video-sisimedia/disable-UploadToScreen-DownloadFromScreen.patch @@ -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*/ + } |