summaryrefslogtreecommitdiff
path: root/user/xf86-video-geode/loader.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-02-16 14:02:17 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-02-16 14:02:17 +0000
commit01418e651696b712189d4a623ab2587a6a0c1703 (patch)
treea7b59f5e900caa4be494da29f1c3d088f298e088 /user/xf86-video-geode/loader.patch
parentaf2c0befda3dc433e066f251758d5e2d36513e24 (diff)
downloadpackages-01418e651696b712189d4a623ab2587a6a0c1703.tar.gz
packages-01418e651696b712189d4a623ab2587a6a0c1703.tar.bz2
packages-01418e651696b712189d4a623ab2587a6a0c1703.tar.xz
packages-01418e651696b712189d4a623ab2587a6a0c1703.zip
user/xf86-video-geode: fix build, mark 32-bit only
Diffstat (limited to 'user/xf86-video-geode/loader.patch')
-rw-r--r--user/xf86-video-geode/loader.patch48
1 files changed, 48 insertions, 0 deletions
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
+