Accepting request 639364 from home:Andreas_Schwab:Factory

- sysmacros.patch: include <sys/sysmacros.h> for minor

OBS-URL: https://build.opensuse.org/request/show/639364
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/v4l-utils?expand=0&rev=59
This commit is contained in:
Ismail Dönmez 2018-10-01 10:51:43 +00:00 committed by Git OBS Bridge
parent 9584abeab2
commit 067631b809
3 changed files with 42 additions and 1 deletions

34
sysmacros.patch Normal file
View File

@ -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 <sys/types.h>
#if defined(MAJOR_IN_SYSMACROS)
#include <sys/sysmacros.h>
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 <unistd.h>
#include <stdlib.h>
#include <stdio.h>
@@ -27,6 +28,9 @@
#include <inttypes.h>
#include <getopt.h>
#include <sys/types.h>
+#if defined(MAJOR_IN_SYSMACROS)
+#include <sys/sysmacros.h>
+#endif
#include <sys/stat.h>
#include <fcntl.h>
#include <ctype.h>

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 1 10:35:11 UTC 2018 - schwab@suse.de
- sysmacros.patch: include <sys/sysmacros.h> for minor
-------------------------------------------------------------------
Mon Jun 4 15:25:59 UTC 2018 - mpluskal@suse.com

View File

@ -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 \