From 6f5ac18e8b5dbc0e13c640298c568f0f432719da Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 6 Jan 2019 18:30:08 +0000
Subject: user/xf86-video-r128: fix runtime linker failure (and leave null
 deref)

---
 user/xf86-video-r128/APKBUILD  |  7 +++++--
 user/xf86-video-r128/xaa.patch | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 user/xf86-video-r128/xaa.patch

(limited to 'user/xf86-video-r128')

diff --git a/user/xf86-video-r128/APKBUILD b/user/xf86-video-r128/APKBUILD
index 0dd94af4e..094b11633 100644
--- a/user/xf86-video-r128/APKBUILD
+++ b/user/xf86-video-r128/APKBUILD
@@ -10,7 +10,9 @@ license="X11 AND MIT"
 depends=""
 makedepends="util-macros xorgproto-dev xorg-server-dev"
 subpackages="$pkgname-doc"
-source="https://www.x.org/releases/individual/driver/xf86-video-r128-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/driver/xf86-video-r128-$pkgver.tar.bz2
+	xaa.patch
+	"
 
 build() {
 	cd "$builddir"
@@ -34,4 +36,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38  xf86-video-r128-6.12.0.tar.bz2"
+sha512sums="0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38  xf86-video-r128-6.12.0.tar.bz2
+45104ea2da49933f6d40834badb58c4db8706a9bf3080df7b2538f4cb1e7964b900c10b47386b9502bb4abee796b5f40f30252d1526e26d860b833c4dabca8ba  xaa.patch"
diff --git a/user/xf86-video-r128/xaa.patch b/user/xf86-video-r128/xaa.patch
new file mode 100644
index 000000000..3ede81203
--- /dev/null
+++ b/user/xf86-video-r128/xaa.patch
@@ -0,0 +1,21 @@
+--- xf86-video-r128-6.12.0/src/r128_driver.c.old	2019-01-05 15:59:11.340000000 +0000
++++ xf86-video-r128-6.12.0/src/r128_driver.c	2019-01-05 16:16:10.810000000 +0000
+@@ -1887,14 +1887,16 @@
+ 	        }
+ 
+             if (!info->noAccel) {
++#ifdef HAVE_XAA_H
+                 if (R128XAAAccelInit(pScreen)) {
+                     info->accelOn = TRUE;
+                     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                                 "XAA acceleration enabled.\n");
+-                } else {
++                } else 
++#endif
+                     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                                 "Acceleration disabled.\n");
+-                }
++                
+             }
+         }
+     }
-- 
cgit v1.2.3-60-g2f50