aboutsummaryrefslogtreecommitdiffstats
path: root/main/xf86-video-s3virge
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-03-17 10:40:13 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-03-17 11:01:25 +0000
commit545c13e97e6e4a4115bc4791f5688b0b5943d652 (patch)
treeb6ed4da1797e83b40b8e61158c8bbb11ff580467 /main/xf86-video-s3virge
parentb1f13ec4d63aeb4148cbf0eb855d90907594811d (diff)
downloadaports-545c13e97e6e4a4115bc4791f5688b0b5943d652.tar.bz2
aports-545c13e97e6e4a4115bc4791f5688b0b5943d652.tar.xz
main/xf86-video-s3virge: rebuild against xorg-server 1.17
Diffstat (limited to 'main/xf86-video-s3virge')
-rw-r--r--main/xf86-video-s3virge/APKBUILD13
-rw-r--r--main/xf86-video-s3virge/git-fixes.patch90
2 files changed, 100 insertions, 3 deletions
diff --git a/main/xf86-video-s3virge/APKBUILD b/main/xf86-video-s3virge/APKBUILD
index 02b61eccb0..4b3a8fbef4 100644
--- a/main/xf86-video-s3virge/APKBUILD
+++ b/main/xf86-video-s3virge/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-s3virge
pkgver=1.10.6
-pkgrel=4
+pkgrel=5
pkgdesc="S3 ViRGE video driver"
url="http://xorg.freedesktop.org/"
arch="all"
@@ -11,7 +11,9 @@ depends=
makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
videoproto renderproto"
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+ git-fixes.patch
+ "
prepare() {
cd "$srcdir"/$pkgname-$pkgver
@@ -39,4 +41,9 @@ package() {
rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-md5sums="70956a12113b72e4f6d770e32b2ac4b9 xf86-video-s3virge-1.10.6.tar.bz2"
+md5sums="70956a12113b72e4f6d770e32b2ac4b9 xf86-video-s3virge-1.10.6.tar.bz2
+07b8f81c373dbe3545268f0b8457db4a git-fixes.patch"
+sha256sums="85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e xf86-video-s3virge-1.10.6.tar.bz2
+8215be38309ad51d262c72775f8d0aff02c67a351e4ed17395faa6fb42dbf518 git-fixes.patch"
+sha512sums="3de4806c42ec07767459e5ea703fd6106e4c8a90f67636f2d58d3a5745ae4beeafb51e1c8e09a74694dc246db4c7dd1c119c91d92b101be4db7b9c59d7f9e0ab xf86-video-s3virge-1.10.6.tar.bz2
+fa2917a000e7d6c39fadb804cc5f617d57b5d1b3ca46eefe4415d214fada025630b9674df3a3b6fabfebb3370e2c2cd8eb46048483fc3d4964852122a3105697 git-fixes.patch"
diff --git a/main/xf86-video-s3virge/git-fixes.patch b/main/xf86-video-s3virge/git-fixes.patch
new file mode 100644
index 0000000000..f093d1cc98
--- /dev/null
+++ b/main/xf86-video-s3virge/git-fixes.patch
@@ -0,0 +1,90 @@
+From d74238ca2faddb2e1c0b48333664688a5079a856 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 21 May 2014 14:10:11 -0400
+Subject: Use own thunk function instead of vgaHW*Weak
+
+I plan to remove the Weak functions from a future server.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+diff --git a/src/s3v_driver.c b/src/s3v_driver.c
+index 654884c..937717e 100644
+--- a/src/s3v_driver.c
++++ b/src/s3v_driver.c
+@@ -3760,6 +3760,12 @@ S3Vddc1Read(ScrnInfoPtr pScrn)
+ return ((unsigned int) (tmp & 0x08));
+ }
+
++static void
++S3Vddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
++{
++ vgaHWddc1SetSpeed(pScrn, speed);
++}
++
+ static Bool
+ S3Vddc1(ScrnInfoPtr pScrn)
+ {
+@@ -3773,7 +3779,7 @@ S3Vddc1(ScrnInfoPtr pScrn)
+ OUTREG(DDC_REG,(tmp | 0x12));
+
+ if ((pMon = xf86PrintEDID(
+- xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(),
++ xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), S3Vddc1SetSpeed,
+ S3Vddc1Read))) != NULL)
+ success = TRUE;
+ xf86SetDDCproperties(pScrn,pMon);
+--
+cgit v0.10.2
+From 69b9adea709922e53ba422dd7f00aa4ac90d232e Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 30 Sep 2014 10:26:17 -0400
+Subject: Fix build against xserver 1.17
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+diff --git a/src/s3v_driver.c b/src/s3v_driver.c
+index 937717e..e81ab72 100644
+--- a/src/s3v_driver.c
++++ b/src/s3v_driver.c
+@@ -3515,7 +3515,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
+ {
+ vgaHWPtr hwp;
+ S3VPtr ps3v;
+- IOADDRESS vgaCRIndex, vgaCRReg;
++ unsigned int vgaCRIndex, vgaCRReg;
+ unsigned char val;
+ unsigned int PIOOffset = 0;
+
+@@ -3584,7 +3584,7 @@ S3VDisableMmio(ScrnInfoPtr pScrn)
+ {
+ vgaHWPtr hwp;
+ S3VPtr ps3v;
+- IOADDRESS vgaCRIndex, vgaCRReg;
++ unsigned int vgaCRIndex, vgaCRReg;
+
+ PVERB5(" S3VDisableMmio\n");
+
+--
+cgit v0.10.2
+From 211e2831dcf13c6e5847f6caf894f559d9104c3d Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 30 Sep 2014 10:27:13 -0400
+Subject: Remove call to miInitializeBackingStore
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+diff --git a/src/s3v_driver.c b/src/s3v_driver.c
+index e81ab72..d519dc8 100644
+--- a/src/s3v_driver.c
++++ b/src/s3v_driver.c
+@@ -2420,7 +2420,6 @@ S3VScreenInit(SCREEN_INIT_ARGS_DECL)
+ return FALSE;
+ }
+
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ /* hardware cursor needs to wrap this layer */
+--
+cgit v0.10.2
+