- updated to 1.14.2

- added glibc patch (fix incomplete sys/sysmacros.h handling)

diff --git a/v4l-utils-glibc.patch b/v4l-utils-glibc.patch
new file mode 100644 (file)
index 0000000..35ada0b
--- /dev/null
+++ b/v4l-utils-glibc.patch
@@ -0,0 +1,24 @@
+MAJOR_IN_SYSMACROS, required to include <sys/sysmacros.h>, is defined in config.h
+
+--- v4l-utils-1.14.2/lib/libv4lconvert/control/libv4lcontrol.c.orig    2017-12-27 15:33:07.000000000 +0100
++++ v4l-utils-1.14.2/lib/libv4lconvert/control/libv4lcontrol.c 2018-09-01 20:17:14.554222613 +0200
+@@ -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>
+--- v4l-utils-1.14.2/utils/v4l2-ctl/v4l2-ctl.cpp.orig  2017-12-27 14:50:55.000000000 +0100
++++ v4l-utils-1.14.2/utils/v4l2-ctl/v4l2-ctl.cpp       2018-09-01 20:20:28.890887051 +0200
+@@ -41,6 +41,9 @@
+ #ifdef HAVE_SYS_KLOG_H
+ #include <sys/klog.h>
+ #endif
++#if defined(MAJOR_IN_SYSMACROS)
++#include <sys/sysmacros.h>
++#endif
+ 
+ #include <list>
+ #include <vector>

diff --git a/v4l-utils.spec b/v4l-utils.spec
index d256a93987d301dbaf9ee0690fb2a81920d0ef55..062d3b2e19cc369a0896c30ba6e31d8271fd70dd 100644 (file)
--- a/v4l-utils.spec
+++ b/v4l-utils.spec
@@ -5,13 +5,14 @@
 Summary:       Collection of Video4Linux utilities
 Summary(pl.UTF-8):     Zbiór narzędzi do urządzeń Video4Linux
 Name:          v4l-utils
-Version:       1.12.6
+Version:       1.14.2
 Release:       1
 License:       GPL v2+ (utilities), LGPL v2.1+ (libraries)
 Group:         Applications/System
 Source0:       https://linuxtv.org/downloads/v4l-utils/%{name}-%{version}.tar.bz2
-# Source0-md5: 9805ff48a4d470669b707731386b67c9
+# Source0-md5: 330f265c49122042b2340e4257a5c753
 Patch0:                %{name}-link.patch
+Patch1:                %{name}-glibc.patch
 URL:           https://linuxtv.org/wiki/index.php/V4l-utils
 BuildRequires: OpenGL-devel
 BuildRequires: OpenGL-GLU-devel
@@ -106,6 +107,7 @@ Summary(pl.UTF-8):  Pliki nagłówkowe bibliotek libv4l
 License:       LGPL v2.1+
 Group:         Development/Libraries
 Requires:      libv4l = %{version}-%{release}
+%{?with_udev:Requires: udev-devel}
 
 %description -n libv4l-devel
 Header files for libv4l libraries.
@@ -129,6 +131,7 @@ Statyczne biblioteki libv4l.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -148,8 +151,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install utils/rds/rds-saa6588 $RPM_BUILD_ROOT%{_bindir}
-install utils/xc3028-firmware/firmware-tool $RPM_BUILD_ROOT%{_bindir}/xc3028-firmware
+install contrib/rds-saa6588/rds-saa6588 $RPM_BUILD_ROOT%{_bindir}
+install contrib/xc3028-firmware/firmware-tool $RPM_BUILD_ROOT%{_bindir}/xc3028-firmware
 
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la