From 4124f0600d37687de425edc8c00a4a424bd69618 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 29 Apr 2018 18:59:26 +0100 Subject: [PATCH] Add sys/sysmacros.h include fix patch --- v4l-utils-sysmacros.patch | 22 ++++++++++++++++++++++ v4l-utils.spec | 7 +++++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 v4l-utils-sysmacros.patch diff --git a/v4l-utils-sysmacros.patch b/v4l-utils-sysmacros.patch new file mode 100644 index 0000000..1ff5504 --- /dev/null +++ b/v4l-utils-sysmacros.patch @@ -0,0 +1,22 @@ +--- v4l-utils-1.14.2/lib/libv4lconvert/control/libv4lcontrol.c.orig 2018-04-29 18:42:05.534170391 +0100 ++++ v4l-utils-1.14.2/lib/libv4lconvert/control/libv4lcontrol.c 2018-04-29 18:42:17.765044988 +0100 +@@ -20,9 +20,7 @@ + */ + + #include +-#if defined(MAJOR_IN_SYSMACROS) + #include +-#endif + #include + #include + #include +--- v4l-utils-1.14.2/utils/v4l2-ctl/v4l2-ctl.cpp.orig 2018-04-29 18:49:34.091977421 +0100 ++++ v4l-utils-1.14.2/utils/v4l2-ctl/v4l2-ctl.cpp 2018-04-29 18:50:11.588702105 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/v4l-utils.spec b/v4l-utils.spec index 29f8c6d..ffa7c21 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -1,12 +1,13 @@ Name: v4l-utils Version: 1.14.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utilities for video4linux and DVB devices # libdvbv5, dvbv5 utils, ir-keytable and v4l2-sysfs-path are GPLv2 only License: GPLv2+ and GPLv2 URL: http://www.linuxtv.org/downloads/v4l-utils/ Source0: http://linuxtv.org/downloads/v4l-utils/v4l-utils-%{version}.tar.bz2 +Patch0: v4l-utils-sysmacros.patch BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -101,7 +102,6 @@ files for developing applications that use libdvbv5. %prep %autosetup -p1 - %build %configure --disable-static --enable-libdvbv5 --enable-doxygen-man # Don't use rpath! @@ -191,6 +191,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qv4l2.desktop %changelog +* Sun Apr 29 2018 Peter Robinson 1.14.2-2 +- Add sys/sysmacros.h include fix patch + * Sun Apr 29 2018 Peter Robinson 1.14.2-1 - New upstream release 1.14.2