diff --git a/SOURCES/0001-Remove-call-to-LoaderGetOS.patch b/SOURCES/0001-Remove-call-to-LoaderGetOS.patch new file mode 100644 index 0000000..f9a1328 --- /dev/null +++ b/SOURCES/0001-Remove-call-to-LoaderGetOS.patch @@ -0,0 +1,46 @@ +From 74d39213b4cf89fdaa6f14913d0150852a1090f2 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 24 Jan 2017 09:43:43 -0500 +Subject: [PATCH] Remove call to LoaderGetOS + +If you're not using Linux, this isn't likely to build let alone run. And +if it _does_ build on non-Linux, it's probably because someone went out +of their way to try to make it work. + +Signed-off-by: Adam Jackson +--- + src/v4l.c | 18 ++---------------- + 1 file changed, 2 insertions(+), 16 deletions(-) + +diff --git a/src/v4l.c b/src/v4l.c +index 10e782b..f4b2b4b 100644 +--- a/src/v4l.c ++++ b/src/v4l.c +@@ -92,22 +92,8 @@ v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin) + } + + setupDone = TRUE; +- +- /* Check that we're being loaded on a Linux system */ +- LoaderGetOS(&osname, NULL, NULL, NULL); +- if (!osname || strcmp(osname, "linux") != 0) { +- if (errmaj) +- *errmaj = LDR_BADOS; +- if (errmin) +- *errmin = 0; +- return NULL; +- } else { +- /* OK */ +- +- xf86AddDriver (&V4L, module, 0); +- +- return (pointer)1; +- } ++ xf86AddDriver (&V4L, module, 0); ++ return (pointer)1; + } + + #else +-- +2.17.1 + diff --git a/SPECS/xorg-x11-drv-v4l.spec b/SPECS/xorg-x11-drv-v4l.spec index 2e61c4a..f8c8e94 100644 --- a/SPECS/xorg-x11-drv-v4l.spec +++ b/SPECS/xorg-x11-drv-v4l.spec @@ -7,7 +7,7 @@ Summary: Xorg X11 v4l video driver Name: xorg-x11-drv-v4l Version: 0.2.0 -Release: 47%{?dist} +Release: 49%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -15,6 +15,7 @@ Group: User Interface/X Hardware Support Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 Patch0: xorg-x11-drv-v4l-support_v4l2_only_drivers.patch Patch1: xf86-video-v4l-0.2.0-build-fix.patch +Patch2: 0001-Remove-call-to-LoaderGetOS.patch ExcludeArch: s390 s390x @@ -31,6 +32,7 @@ X.Org X11 v4l video driver. %setup -q -n %{tarball}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build autoreconf -vif @@ -54,6 +56,15 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/v4l.4* %changelog +* Tue Jul 17 2018 Olivier Fourdan - 0.2.0-49 +- Remove call to LoaderGetOS - Patch wasn't applied (#1601960) + +* Tue Jul 17 2018 Olivier Fourdan - 0.2.0-48 +- Remove call to LoaderGetOS (#1601960) + +* Wed May 30 2018 Adam Jackson - 0.2.0-47.1 +- Rebuild for xserver 1.20 + * Thu Sep 29 2016 Hans de Goede - 0.2.0-47 - Rebuild against xserver-1.19