user/xf86-video-geode: fix build, mark 32-bit only

3 files changed, 87 insertions, 4 deletions

diff --git a/user/xf86-video-geode/APKBUILD b/user/xf86-video-geode/APKBUILD
index d8dccbb1e..0ba4f2954 100644
--- a/user/xf86-video-geode/APKBUILD
+++ b/user/xf86-video-geode/APKBUILD
@@ -5,12 +5,15 @@ pkgver=2.11.19
 pkgrel=0
 pkgdesc="AMD Geode video driver for X11"
 url="https://www.X.Org/"
-arch="pmmx x86_64"
+arch="pmmx"
 license="X11"
 depends=""
 makedepends="util-macros xorgproto-dev xorg-server-dev"
-subpackages="$pkgname-doc"
-source="https://www.x.org/releases/individual/driver/xf86-video-geode-$pkgver.tar.bz2"
+subpackages=""
+source="https://www.x.org/releases/individual/driver/xf86-video-geode-$pkgver.tar.bz2
+	loader.patch
+	randr.patch
+	"
 
 build() {
 	cd "$builddir"
@@ -34,4 +37,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f0b1c5edf1c226a4379aa9a4983e69cbaced0618868a7902de41a7754c148324c2a4ea73704aefd96f48d36f035fb2c8063604c26e21e986e4f90c3716578d41  xf86-video-geode-2.11.19.tar.bz2"
+sha512sums="f0b1c5edf1c226a4379aa9a4983e69cbaced0618868a7902de41a7754c148324c2a4ea73704aefd96f48d36f035fb2c8063604c26e21e986e4f90c3716578d41  xf86-video-geode-2.11.19.tar.bz2
+a6703c78f2790ff67eb812de3afcdff0a86b6dee8469318ed21e8a50af0a286a087739917e7559d920085563b62eaf9874d54397e88bc810e65bd6ffa7d0830f  loader.patch
+c4b1d09b17e84a3aa842e37f6710fcfe420c2cd9a3efeac5ea50c0d3eb7ebbdb370536a86e1741c89fe50ae38b22d9aecf1d6919077a1579209f2f70c2e0b099  randr.patch"
diff --git a/user/xf86-video-geode/loader.patch b/user/xf86-video-geode/loader.patch
new file mode 100644
index 000000000..f318fbb17
--- /dev/null
+++ b/user/xf86-video-geode/loader.patch
@@ -0,0 +1,48 @@
+From 09aaa3d1fae4aeb099b16e7a046151761bcdea95 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 24 Jan 2017 09:53:06 -0500
+Subject: Remove call to LoaderGetOS
+
+On OSes that don't have a /dev/videox we'll just fail the open() and not
+initialize the Xv adaptor.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/z4l.c | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/src/z4l.c b/src/z4l.c
+index eccefe8..be0d345 100644
+--- a/src/z4l.c
++++ b/src/z4l.c
+@@ -1709,7 +1709,6 @@ _X_EXPORT XF86ModuleData ztvModuleData = { &z4lVersionRec, z4lSetup, NULL };
+ static pointer
+ z4lSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+ {
+-    const char *osname;
+     static Bool setupDone = FALSE;
+ 
+     if (setupDone != FALSE) {
+@@ -1719,19 +1718,7 @@ z4lSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+     }
+ 
+     setupDone = TRUE;
+-    LoaderGetOS(&osname, NULL, NULL, NULL);
+-
+-    if (osname == NULL || strcmp(osname, "linux") != 0) {
+-        if (errmaj)
+-            *errmaj = LDR_BADOS;
+-        if (errmin)
+-            *errmin = 0;
+-
+-        return NULL;
+-    }
+-
+     xf86AddDriver(&Z4l, module, 0);
+-
+     return (pointer) 1;
+ }
+ 
+-- 
+cgit v1.1
+
diff --git a/user/xf86-video-geode/randr.patch b/user/xf86-video-geode/randr.patch
new file mode 100644
index 000000000..9c2b34ac9
--- /dev/null
+++ b/user/xf86-video-geode/randr.patch
@@ -0,0 +1,30 @@
+From 8382e6bb0c76a8029493eae3f2d7a3dbfd0cfc12 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 5 Mar 2018 10:28:15 -0500
+Subject: gx: Fix RANDR initialization for xserver 1.20
+
+xf86DisableRandR() doesn't exist anymore, and we don't need it anyway,
+the core code will notice that we set up RANDR ourselves.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/gx_driver.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/gx_driver.c b/src/gx_driver.c
+index ab57df1..4de336e 100644
+--- a/src/gx_driver.c
++++ b/src/gx_driver.c
+@@ -1426,7 +1426,9 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL)
+ 
+     /* Set up RandR */
+ 
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
+     xf86DisableRandR();         /* We provide our own RandR goodness */
++#endif
+ 
+     /* Try to set up the shadow FB for rotation */
+ 
+-- 
+cgit v1.1
+