diff --git a/sysmacros.patch b/sysmacros.patch new file mode 100644 index 0000000..232c4a2 --- /dev/null +++ b/sysmacros.patch @@ -0,0 +1,34 @@ +Index: v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c +=================================================================== +--- v4l-utils-1.14.1.orig/lib/libv4lconvert/control/libv4lcontrol.c ++++ v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c +@@ -19,6 +19,7 @@ + # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA + */ + ++#include "config.h" + #include + #if defined(MAJOR_IN_SYSMACROS) + #include +Index: v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp +=================================================================== +--- v4l-utils-1.14.1.orig/utils/v4l2-ctl/v4l2-ctl.cpp ++++ v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp +@@ -20,6 +20,7 @@ + Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA + */ + ++#include "config.h" + #include + #include + #include +@@ -27,6 +28,9 @@ + #include + #include + #include ++#if defined(MAJOR_IN_SYSMACROS) ++#include ++#endif + #include + #include + #include diff --git a/v4l-utils.changes b/v4l-utils.changes index 80efdb6..1c554f8 100644 --- a/v4l-utils.changes +++ b/v4l-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 1 10:35:11 UTC 2018 - schwab@suse.de + +- sysmacros.patch: include for minor + ------------------------------------------------------------------- Mon Jun 4 15:25:59 UTC 2018 - mpluskal@suse.com diff --git a/v4l-utils.spec b/v4l-utils.spec index a3a4ba8..01a7e96 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -35,6 +35,7 @@ Source0: https://linuxtv.org/downloads/v4l-utils/%{name}-%{version}.tar.b Source1: https://linuxtv.org/downloads/v4l-utils/%{name}-%{version}.tar.bz2.asc Source2: %{name}.keyring Source100: baselibs.conf +Patch0: sysmacros.patch BuildRequires: doxygen BuildRequires: kernel-headers BuildRequires: libjpeg-devel @@ -184,6 +185,7 @@ qv4l2 is a test control and streaming test application for video4linux. %prep %setup -q +%patch0 -p1 %build %configure \