summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-01-06 18:30:08 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-01-06 18:30:08 +0000
commit6f5ac18e8b5dbc0e13c640298c568f0f432719da (patch)
tree6db3dce28b7db7d729bd27ceeb3670b34ae9fcda
parent6c9721136977ab20ddc576bc400eab4067391dcb (diff)
downloadpackages-6f5ac18e8b5dbc0e13c640298c568f0f432719da.tar.gz
packages-6f5ac18e8b5dbc0e13c640298c568f0f432719da.tar.bz2
packages-6f5ac18e8b5dbc0e13c640298c568f0f432719da.tar.xz
packages-6f5ac18e8b5dbc0e13c640298c568f0f432719da.zip
user/xf86-video-r128: fix runtime linker failure (and leave null deref)
-rw-r--r--user/xf86-video-r128/APKBUILD7
-rw-r--r--user/xf86-video-r128/xaa.patch21
2 files changed, 26 insertions, 2 deletions
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");
+- }
++
+ }
+ }
+ }