From 0a28fccd9d95302956498df6ba27bf69858287f1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Nov 19 2018 18:56:23 +0000 Subject: drop upstreamed patch --- diff --git a/v4l-utils-sysmacros.patch b/v4l-utils-sysmacros.patch deleted file mode 100644 index 1ff5504..0000000 --- a/v4l-utils-sysmacros.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 dbb70ca..c4375b8 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -7,7 +7,6 @@ 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