From 2399df4354a638a1f7b484c98a6b3baf536b01616d91007091b37c81fb925c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 8 Jan 2020 09:03:39 +0000 Subject: [PATCH] - Refresh patch sysmacros.patch - Update to 1.18.0: * Various fixes all around OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/v4l-utils?expand=0&rev=65 --- sysmacros.patch | 16 ++++++------- v4l-utils-1.14.2.tar.bz2 | 3 --- v4l-utils-1.14.2.tar.bz2.asc | 16 ------------- v4l-utils-1.18.0.tar.bz2 | 3 +++ v4l-utils-1.18.0.tar.bz2.asc | 16 +++++++++++++ v4l-utils.changes | 7 ++++++ v4l-utils.spec | 45 +++++++++++++++--------------------- 7 files changed, 52 insertions(+), 54 deletions(-) delete mode 100644 v4l-utils-1.14.2.tar.bz2 delete mode 100644 v4l-utils-1.14.2.tar.bz2.asc create mode 100644 v4l-utils-1.18.0.tar.bz2 create mode 100644 v4l-utils-1.18.0.tar.bz2.asc diff --git a/sysmacros.patch b/sysmacros.patch index 232c4a2..5a4602d 100644 --- a/sysmacros.patch +++ b/sysmacros.patch @@ -1,19 +1,19 @@ -Index: v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c +Index: v4l-utils-1.18.0/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 +--- v4l-utils-1.18.0.orig/lib/libv4lconvert/control/libv4lcontrol.c ++++ v4l-utils-1.18.0/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) + #ifndef __OpenBSD__ #include -Index: v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp +Index: v4l-utils-1.18.0/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 +--- v4l-utils-1.18.0.orig/utils/v4l2-ctl/v4l2-ctl.cpp ++++ v4l-utils-1.18.0/utils/v4l2-ctl/v4l2-ctl.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ @@ -30,5 +30,5 @@ Index: v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp +#include +#endif #include + #include #include - #include diff --git a/v4l-utils-1.14.2.tar.bz2 b/v4l-utils-1.14.2.tar.bz2 deleted file mode 100644 index ea8781d..0000000 --- a/v4l-utils-1.14.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6b962c4b1253cf852c31da13fd6b5bb7cbe5aa9e182881aec55123bae680692 -size 1672765 diff --git a/v4l-utils-1.14.2.tar.bz2.asc b/v4l-utils-1.14.2.tar.bz2.asc deleted file mode 100644 index eb6c973..0000000 --- a/v4l-utils-1.14.2.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEBdAWnCbkFZNBgSnfGZpk+t+1AP8FAlp+5bEACgkQGZpk+t+1 -AP+9ow/7BHieZyypFGJrgewpy+Dw5kW0N2CyFELa7562gtu62D1FeA0Uzd760neZ -yc1Cf+sUvtq0MgTfi0IjTKQkEAfi9D+no6GD3tX6f9OOdJ4QmYQGNCl4x6QIRoa2 -ZC2f9eVw2geQQ/GAT7pvucGlMfBP3kVR6yjBLiUZk6uAI5F4/jWAuvV43ZPa5eBo -aVVB7FNGuv1/OBu1fYCBS/H0vbVlXpZaRSaiNyLD9J3m2uQyZkXqbN5jDrlhtprM -m6/utdfggmCz9P68XlhnUGJ/tWeGMd2fHgYgBMEuAOGpz8/ZSVi3rRXo1OX1slVf -71+7NJMM11UjN8A6dChsFQBc9A0/+VACe4VtDb39SjXT515Oa+IwpAw3BIOVqqTk -Vo+/mnEFzRutCA78SikCpr4MCYtOnVvhVJQEcMvlb5mqMRRN8cOj+yaM8Et2KazT -8/C25IoqsE/tPAzaL4ZSbeP7+u2LwE8K9s72RGcNgaqsffyBy+l/+x3leh1/+6QX -VOARiccH6ExVMpd1xD4P7LwPYfh/hCTDyyAZIgTuimxvYLgjZIhKJREzxB4IQGnv -r0F07PsJaLpBA2jzczfo824BPEiarCtTbMJ6u6LBXNfjv81RLq872hN02fvdWDDJ -DgMcmFUPC80t1oDsoOanbieQgqjdZs9NeBhsyVOPp2aEINO0dRE= -=Ok+L ------END PGP SIGNATURE----- diff --git a/v4l-utils-1.18.0.tar.bz2 b/v4l-utils-1.18.0.tar.bz2 new file mode 100644 index 0000000..d085b0b --- /dev/null +++ b/v4l-utils-1.18.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cb60d822eeed20486a03cc23e0fc65956fbc1e85e0c1a7477f68bbd9802880d +size 1995506 diff --git a/v4l-utils-1.18.0.tar.bz2.asc b/v4l-utils-1.18.0.tar.bz2.asc new file mode 100644 index 0000000..3dc70ee --- /dev/null +++ b/v4l-utils-1.18.0.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEBdAWnCbkFZNBgSnfGZpk+t+1AP8FAl2HSR8ACgkQGZpk+t+1 +AP8OuhAAnRbUDDeR7YV1n/6j9idQliifv7ELfbjk5ZZfIFjIExFwd2mIK2SpcS9u +6hNG3TbQo6y0AUHLFlryhSgdyzckGIL6/DYGn6/44ghRm3yQ9Y4XgBk5Nb7xyvlO +X389Dzri+rT5k1zyfI6nIsGqmEIdPvezME/9C0E2O1XxHlMnLcvfjnAPYPK5kriG +FyeYSwLEFlvOQ4ZamANfL9f07fDBFghzl62qWjbsbM0e3SqP0NhgzpCpwX3y9CgT +CbMEed72fv6MdIrpkRMkcsKGjqsvabTO6pWBjjAstEhTyw4XkZBOAzlj9QB69qjb +pYHZHHP2goYwuBMQiYqA6qyivZNsAmW5ZAq4NR6GJ/Dmm1JAQSfy7SbIkiEQBJ2D +hpuz1w6XkkG6sY0kexndITyZu0jA1tw9SeBNL+JOieCDHzdAkEIzuGDzABbrbfCQ +I6wwDkF+Pw+szlp7SYBMIytYmKpgLgY6sqABBZafwQj6v0/ncuyh/QhqWhKc2Cko +zjDaAUZFvrOMt1tlZM70fJJJBiB6URYayaRZLE2X9NHOgrEZcHZUvh4FtbWWORlk +vS2ThhkvvcKiqJmPKKfr8wPyafwGCG1g82RDEr6xYc6TliXMo/R4Byrq7IQCjsnb +9MkhTc8RdR2ckiinNM0il9Lmjoi4DI39X3mKbdSmVpmI6E4dS7w= +=/63M +-----END PGP SIGNATURE----- diff --git a/v4l-utils.changes b/v4l-utils.changes index 4ab173b..de27a5b 100644 --- a/v4l-utils.changes +++ b/v4l-utils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 8 09:02:26 UTC 2020 - Tomáš Chvátal + +- Refresh patch sysmacros.patch +- Update to 1.18.0: + * Various fixes all around + ------------------------------------------------------------------- Mon Nov 4 13:37:03 UTC 2019 - Stefan Seyfried diff --git a/v4l-utils.spec b/v4l-utils.spec index cab631c..dab891d 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -1,7 +1,7 @@ # # spec file for package v4l # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,11 @@ %if "%{flavor}" == "qv4l2" %global psuffix -%{flavor} %endif - %define _udevdir %(pkg-config --variable udevdir udev) %define so_ver 0 %define sname v4l-utils Name: v4l-utils%{?psuffix} -Version: 1.14.2 +Version: 1.18.0 Release: 0 Summary: Utilities for video4linux License: LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-2.0-only @@ -38,19 +37,21 @@ Source100: baselibs.conf Patch0: sysmacros.patch Patch1: use_system_v4l_for_qv4l.patch Patch2: v4l-utils-32bitfix.patch +BuildRequires: alsa-devel +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libjpeg-devel +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(udev) +Requires: libv4l = %{version} %if "%{flavor}" == "" BuildRequires: doxygen BuildRequires: kernel-headers %endif %if "%{flavor}" == "qv4l2" -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) @@ -60,7 +61,6 @@ BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libv4lconvert) %endif -Requires: libv4l = %{version} %description v4l-utils is a collection of various video4linux (V4L) utilities. @@ -96,8 +96,6 @@ talk with media hardware. This package contains shared lib for packages that use libdvbv5. -%lang_package -n libdvbv5-%{so_ver} - %package -n libdvbv5-devel Summary: Development files for libdvbv5 License: GPL-2.0-only @@ -194,7 +192,6 @@ Requires(postun): update-desktop-files %description -n qv4l2 qv4l2 is a test control and streaming test application for video4linux. - %prep %setup -q -n %{sname}-%{version} %patch0 -p1 @@ -202,17 +199,13 @@ qv4l2 is a test control and streaming test application for video4linux. %patch2 -p1 %build -%if "%{flavor}" == "qv4l2" autoreconf -vfi -%endif %configure \ --disable-static \ --disable-silent-rules \ %if "%{flavor}" == "qv4l2" --disable-libdvb5 \ - --enable-qv4l2 \ %else - --enable-libdvb5 \ --disable-qv4l2 \ %endif --with-udevdir=%{_udevdir} @@ -233,7 +226,6 @@ autoreconf -vfi %else %make_install %find_lang "%{name}" -%find_lang "libdvbv5" libdvbv5.lang # Not needed (links to plugins in libv4l subdir) rm %{buildroot}%{_libdir}/{v4l1compat.so,v4l2convert.so} @@ -273,12 +265,13 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_bindir}/rds-ctl %{_bindir}/v4l2-ctl %{_bindir}/v4l2-sysfs-path -%{_mandir}/man1/ir-keytable.1%{ext_man} -%{_mandir}/man1/v4l2-ctl.1%{ext_man} -%{_mandir}/man1/cec-compliance.1%{ext_man} -%{_mandir}/man1/cec-ctl.1%{ext_man} -%{_mandir}/man1/cec-follower.1%{ext_man} -%{_mandir}/man1/ir-ctl.1%{ext_man} +%{_mandir}/man5/rc_keymap.5%{?ext_man} +%{_mandir}/man1/ir-keytable.1%{?ext_man} +%{_mandir}/man1/v4l2-ctl.1%{?ext_man} +%{_mandir}/man1/cec-compliance.1%{?ext_man} +%{_mandir}/man1/cec-ctl.1%{?ext_man} +%{_mandir}/man1/cec-follower.1%{?ext_man} +%{_mandir}/man1/ir-ctl.1%{?ext_man} %files lang -f "%{name}.lang" @@ -288,21 +281,19 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_bindir}/decode_tm6000 %{_bindir}/v4l2-compliance %{_sbindir}/v4l2-dbg -%{_mandir}/man1/v4l2-compliance.1%{ext_man} +%{_mandir}/man1/v4l2-compliance.1%{?ext_man} %files -n dvb-utils %license COPYING %doc ChangeLog README TODO %{_bindir}/dvb-* %{_bindir}/dvbv5-* -%{_mandir}/man1/dvb-*1%{ext_man} -%{_mandir}/man1/dvbv5-*1%{ext_man} +%{_mandir}/man1/dvb-*1%{?ext_man} +%{_mandir}/man1/dvbv5-*1%{?ext_man} %files -n libdvbv5-%{so_ver} %{_libdir}/libdvbv5.so.%{so_ver}* -%files -n libdvbv5-%{so_ver}-lang -f "libdvbv5.lang" - %files -n libdvbv5-devel %license COPYING.libdvbv5 %doc TODO.libdvbv5 @@ -347,7 +338,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %dir %{_datadir}/icons/hicolor/scalable %dir %{_datadir}/icons/hicolor/scalable/apps %{_datadir}/icons/hicolor/*/apps/qv4l2.* -%{_mandir}/man1/qv4l2.1%{ext_man} +%{_mandir}/man1/qv4l2.1%{?ext_man} %endif %changelog