Accepting request 799704 from home:StefanBruens:branches:devel:libraries:c_c++

- Update to 1.18.1:
  Fix GCC 10 / -fno-common
- Drop upstream gcc10.patch
- Avoid symbol name clash causing qv4l2 crash - v4l2_open is defined
  by the public libv4l2 and private libv4l2utils
  * Update use_system_v4l_for_qv4l.patch

OBS-URL: https://build.opensuse.org/request/show/799704
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/v4l-utils?expand=0&rev=69

gcc10.patch

@@ -1,68 +0,0 @@
-From afb123618b087f3ca2305b84fb004624662e52f0 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Wed, 26 Feb 2020 11:07:29 +0100
-Subject: Fix GCC 10 / -fno-common
-
-* GCC 10 switches its default symbol emission mode
-  to cause linker errors when an object is defined
-  more than once.
-
-Bug: https://bugs.gentoo.org/706756
-Signed-off-by: David Seifert <soap@gentoo.org>
-Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
----
- lib/include/libdvbv5/desc_t2_delivery.h |  2 +-
- lib/libdvbv5/dvb-v5.h                   | 26 +++++++++++++-------------
- 2 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/lib/include/libdvbv5/desc_t2_delivery.h b/lib/include/libdvbv5/desc_t2_delivery.h
-index 93594b76..8c11fa9a 100644
---- a/lib/include/libdvbv5/desc_t2_delivery.h
-+++ b/lib/include/libdvbv5/desc_t2_delivery.h
-@@ -215,7 +215,7 @@ extern const unsigned dvbt2_transmission_mode[];
-  * @brief converts from internal representation to string the SISO_MISO
-  *	  field of dvb_desc_t2_delivery:SISO_MISO field.
-  */
--const char *siso_miso[4];
-+extern const char *siso_miso[4];
- 
- #ifdef __cplusplus
- }
-diff --git a/lib/libdvbv5/dvb-v5.h b/lib/libdvbv5/dvb-v5.h
-index 45aaddda..3540bac1 100644
---- a/lib/libdvbv5/dvb-v5.h
-+++ b/lib/libdvbv5/dvb-v5.h
-@@ -14,17 +14,17 @@ struct fe_status_name {
- 	char *name;
- };
- extern struct fe_status_name fe_status_name[8];
--const char *fe_code_rate_name[14];
--const char *fe_modulation_name[15];
--const char *fe_transmission_mode_name[10];
--const unsigned fe_bandwidth_name[8];
--const char *fe_guard_interval_name[12];
--const char *fe_hierarchy_name[6];
--const char *fe_voltage_name[4];
--const char *fe_tone_name[3];
--const char *fe_inversion_name[4];
--const char *fe_pilot_name[4];
--const char *fe_rolloff_name[5];
--const char *dvb_v5_name[72];
--const char *delivery_system_name[20];
-+extern const char *fe_code_rate_name[14];
-+extern const char *fe_modulation_name[15];
-+extern const char *fe_transmission_mode_name[10];
-+extern const unsigned fe_bandwidth_name[8];
-+extern const char *fe_guard_interval_name[12];
-+extern const char *fe_hierarchy_name[6];
-+extern const char *fe_voltage_name[4];
-+extern const char *fe_tone_name[3];
-+extern const char *fe_inversion_name[4];
-+extern const char *fe_pilot_name[4];
-+extern const char *fe_rolloff_name[5];
-+extern const char *dvb_v5_name[72];
-+extern const char *delivery_system_name[20];
- #endif
--- 
-cgit v1.2.1
-

use_system_v4l_for_qv4l.patch

@@ -2,13 +2,14 @@ diff --git a/utils/qv4l2/Makefile.am b/utils/qv4l2/Makefile.am
 index ccd1a2a..6978cf3 100644
 --- a/utils/qv4l2/Makefile.am
 +++ b/utils/qv4l2/Makefile.am
-@@ -6,8 +6,7 @@ qv4l2_SOURCES = qv4l2.cpp general-tab.cpp ctrl-tab.cpp vbi-tab.cpp capture-win.c
+@@ -6,8 +6,8 @@ qv4l2_SOURCES = qv4l2.cpp general-tab.cpp ctrl-tab.cpp vbi-tab.cpp capture-win.c
    raw2sliced.cpp qv4l2.h capture-win.h general-tab.h vbi-tab.h raw2sliced.h \
    v4l2-tpg-core.c v4l2-tpg-colors.c
  nodist_qv4l2_SOURCES = moc_qv4l2.cpp moc_general-tab.cpp moc_capture-win.cpp moc_vbi-tab.cpp qrc_qv4l2.cpp
 -qv4l2_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la \
 -  ../libv4l2util/libv4l2util.la ../libmedia_dev/libmedia_dev.la
-+qv4l2_LDADD = ../libv4l2util/libv4l2util.la ../libmedia_dev/libmedia_dev.la
++qv4l2_LDADD = ../libmedia_dev/libmedia_dev.la
++qv4l2_SOURCES +=- ../libv4l2util/frequencies.c
  qv4l2_CPPFLAGS = -I$(top_srcdir)/utils/common
  
  if WITH_QTGL

v4l-utils-1.18.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6cb60d822eeed20486a03cc23e0fc65956fbc1e85e0c1a7477f68bbd9802880d
-size 1995506

v4l-utils-1.18.0.tar.bz2.asc

@@ -1,16 +0,0 @@
------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-----

v4l-utils-1.18.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25fc42253722401f8742f04dc50a444dfa9b75378e7d09b55035bcbb44c5f342
+size 1995211

v4l-utils-1.18.1.tar.bz2.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEBdAWnCbkFZNBgSnfGZpk+t+1AP8FAl6tZsMACgkQGZpk+t+1
+AP9pgg//dnw/hBn9YzjqydvYHBUyMgUdADNomwnrop4Xruzc/L1GkX5uqrNKQb8B
+sIQ6/NXTkODecK5OsH8Ygq4fKsI96zkQWjSRtjr5pAj+bayFKr1t8yxDOc5rR1iw
++v4MggOjzBcEYy6Mf/YrMN0WzpiGy6XZSSLNK/fS9t/paCbmabCYqMnECJdPF7+d
+Kgh5JC2nhVW/2HoJAze4Z350hRy7b5k/kfC0JYBfvsN/x8EOkX8bPzfA9rNh4Zk6
+GNf1v5bnG7o0V1Ige00ZlGZcbUXpGN8pkR7OQsdvvRcRByN5GWfPAQkr+lKcfnOd
+JBrf0MPLiLhBoHb4QNC56Gk5HwexC70lag04cztk9JAmxE3e3GVizFvtkac3gTPz
+P/UQlBtH290CW6V6qbUrdKyCynQq4cAWYN4XA1Wl0ak5YUxfpYPzRUjHLnCgSzUZ
+hd91ZiKOKm/a9w5slbMMWgiCblYdfHHc3WIGAYGBh968MW7MJ7TLIEijx/8/juzC
+1P/xF0hL4W1TGSgaDK+PKmwLl9YMi/t2c7sl3DsNFkM3HRB1soNynz5I57wEju14
+4ov3AUQ6DAhofR1ewKxwjfN6CnLrHek14gz1tO59i3/qPjvJyFvxB4g+f5evSQ+s
+jVbRDln8pc0HmAaET1tc5173dN1Z7ty78fLzYvz8w6Wil3iIMTI=
+=XUdV
+-----END PGP SIGNATURE-----

v4l-utils.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat May  2 15:30:43 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Update to 1.18.1:
+  Fix GCC 10 / -fno-common
+- Drop upstream gcc10.patch
+
+-------------------------------------------------------------------
+Sat May  2 15:21:47 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Avoid symbol name clash causing qv4l2 crash - v4l2_open is defined
+  by the public libv4l2 and private libv4l2utils
+  * Update use_system_v4l_for_qv4l.patch
+
 -------------------------------------------------------------------
 Mon Mar  2 12:14:12 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
 

v4l-utils.spec

@@ -24,7 +24,7 @@
 %define so_ver 0
 %define sname v4l-utils
 Name:           v4l-utils%{?psuffix}
-Version:        1.18.0
+Version:        1.18.1
 Release:        0
 Summary:        Utilities for video4linux
 License:        LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-2.0-only
@@ -36,7 +36,6 @@ Source100:      baselibs.conf
 Patch0:         sysmacros.patch
 Patch1:         use_system_v4l_for_qv4l.patch
 Patch2:         v4l-utils-32bitfix.patch
-Patch3:         gcc10.patch
 BuildRequires:  alsa-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -186,7 +185,6 @@ qv4l2 is a test control and streaming test application for video4linux.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 autoreconf -vfi