diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-09-19 11:59:33 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-09-19 11:59:33 -0500 |
| commit | e40531aab32ff93b1f9da20d8a43a440d8dffaca (patch) | |
| tree | 837260c74cb8eef56e640ee52b2e329e13719276 /extra/xf86-video-sisimedia | |
| parent | 6fab33c9210eaa90d0a0179f7e49c339ea88990f (diff) | |
| parent | 171f25215eee368fe64f1eed02ce49de090f4b0d (diff) | |
Merge branch 'master' of gitpar:abslibre-mips64el
Diffstat (limited to 'extra/xf86-video-sisimedia')
| -rw-r--r-- | extra/xf86-video-sisimedia/PKGBUILD | 7 | ||||
| -rw-r--r-- | extra/xf86-video-sisimedia/fix-xv-crash.patch | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD index edf4ef0bb..b1d9e01d6 100644 --- a/extra/xf86-video-sisimedia/PKGBUILD +++ b/extra/xf86-video-sisimedia/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140378 2011-10-11 21:33:02Z jgc $ +# $Id: PKGBUILD 142261 2011-11-07 13:08:57Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-sisimedia pkgver=0.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.org SiS 671 video driver" arch=(i686 x86_64) url="http://www.linuxconsulting.ro/xorg-drivers/" @@ -28,6 +28,7 @@ source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia- 0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch 0005-Correct-bounds-check-of-blitClip-array-access.patch xserver19.patch + fix-xv-crash.patch COPYING) sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' '61715bb86180decde55a56fad9a12d841c89fbb2' @@ -45,6 +46,7 @@ sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' '5e288526bfa2c534f1feabdb571da16da8a1c7a6' 'e86d702cb0b5e9bf43ff732696229965e176db7c' 'b5f260bed7e705808ec05620316e503ed5d52ee5' + '1fdd74a2aef9455ac5c37d1fe0146d81aa905d2d' 'a64e244f274bcb155f892d0488a1a4b1b2f7d70d') build() { @@ -64,6 +66,7 @@ build() { patch -Np1 -i "${srcdir}/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch" patch -Np1 -i "${srcdir}/0005-Correct-bounds-check-of-blitClip-array-access.patch" patch -Np1 -i "${srcdir}/xserver19.patch" + patch -Np0 -i "${srcdir}/fix-xv-crash.patch" sed -i -e 's,sis_drv,sisimedia_drv,g' src/Makefile.am sed -i -e 's,\"sis\",\"sisimedia\",g' src/sis.h diff --git a/extra/xf86-video-sisimedia/fix-xv-crash.patch b/extra/xf86-video-sisimedia/fix-xv-crash.patch new file mode 100644 index 000000000..57e6adec5 --- /dev/null +++ b/extra/xf86-video-sisimedia/fix-xv-crash.patch @@ -0,0 +1,11 @@ +--- src/sis_video.c 2008-10-01 09:44:01.000000000 +0200 ++++ src/sis_video.c.new 2011-10-17 14:23:07.000000000 +0200 +@@ -1121,7 +1121,7 @@ + adapt->GetPortAttribute = SISGetPortAttribute; + adapt->QueryBestSize = SISQueryBestSize; + adapt->PutImage = SISPutImage; +- adapt->ReputImage = SISReputImage; ++ adapt->ReputImage = NULL; + adapt->QueryImageAttributes = SISQueryImageAttributes; + + /* gotta uninit this someplace */ |