commit a147b1377ffd4d738a18c0a0851b62f3787dc9cb
Author: Jan Palus <[email protected]>
Date: Sun Oct 24 00:58:43 2021 +0200
up to 1.22.1
- link and glibc patches do not seem necessary anymore
v4l-utils-glibc.patch | 24 ------------------------
v4l-utils-link.patch | 11 -----------
v4l-utils.spec | 9 +++------
3 files changed, 3 insertions(+), 41 deletions(-)
---
diff --git a/v4l-utils.spec b/v4l-utils.spec
index 3097fde..86e07eb 100644
--- a/v4l-utils.spec
+++ b/v4l-utils.spec
@@ -6,14 +6,12 @@
Summary: Collection of Video4Linux utilities
Summary(pl.UTF-8): Zbiór narzędzi do urządzeń Video4Linux
Name: v4l-utils
-Version: 1.20.0
+Version: 1.22.1
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: 46f9e2c0b2fdccd009da2f7e1aa87894
-Patch0: %{name}-link.patch
-Patch1: %{name}-glibc.patch
+# Source0-md5: 8aa73287320a49e9170a8255d7b2c7e6
URL: https://linuxtv.org/wiki/index.php/V4l-utils
BuildRequires: OpenGL-devel
BuildRequires: OpenGL-GLU-devel
@@ -33,6 +31,7 @@ BuildRequires: automake >= 1:1.9
BuildRequires: clang
BuildRequires: elfutils-devel
BuildRequires: gettext-tools >= 0.19.8
+BuildRequires: libbpf-devel
BuildRequires: libjpeg-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool
@@ -142,8 +141,6 @@ Statyczne biblioteki libv4l.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
%{__libtoolize}
diff --git a/v4l-utils-glibc.patch b/v4l-utils-glibc.patch
deleted file mode 100644
index 35ada0b..0000000
--- a/v4l-utils-glibc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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-link.patch b/v4l-utils-link.patch
deleted file mode 100644
index c3b137a..0000000
--- a/v4l-utils-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- v4l-utils-1.12.5/lib/libdvbv5/Makefile.am.orig 2017-01-22
21:41:07.000000000 +0100
-+++ v4l-utils-1.12.5/lib/libdvbv5/Makefile.am 2017-05-13 23:16:03.448581132
+0200
-@@ -119,7 +119,7 @@
-
- libdvbv5_la_CPPFLAGS = -I../.. $(ENFORCE_LIBDVBV5_STATIC) $(LIBUDEV_CFLAGS)
- libdvbv5_la_LDFLAGS = $(LIBDVBV5_VERSION) $(ENFORCE_LIBDVBV5_STATIC)
$(LIBUDEV_LIBS) -lm -lrt
--libdvbv5_la_LIBADD = $(LTLIBICONV)
-+libdvbv5_la_LIBADD = $(LTLIBICONV) -lpthread
-
- EXTRA_DIST = README gen_dvb_structs.pl
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/v4l-utils.git/commitdiff/a147b1377ffd4d738a18c0a0851b62f3787dc9cb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
