summaryrefslogtreecommitdiff
path: root/extra/xf86-video-sisimedia
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2011-11-08 23:14:49 +0000
committerroot <root@rshg054.dnsready.net>2011-11-08 23:14:49 +0000
commitddba9670c1518d9b420db6a6dca01a4a4a4136c7 (patch)
tree8b5ba5ea49ecb6848eba27d2eb609100de5e760a /extra/xf86-video-sisimedia
parenteffb26c3b1f00bf8bea4e2562f07f9a06eb67606 (diff)
Tue Nov 8 23:14:49 UTC 2011
Diffstat (limited to 'extra/xf86-video-sisimedia')
-rw-r--r--extra/xf86-video-sisimedia/PKGBUILD7
-rw-r--r--extra/xf86-video-sisimedia/fix-xv-crash.patch11
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 */