gentoo (leap year) resync : 29.02.2020

3 files changed, 73 insertions, 2 deletions

diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 13097df08d02..8cbc55b0a496 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,3 +1,4 @@
+AUX libv4l-1.16.6-gcc10-fno-common.patch 2423 BLAKE2B 6938e2b75b01e3bc3a1cfa03e2e95591848697e60742c4f65f342fa3ddfe5bddebba8d3bb17ab1de7d870592501f897c4e0aa5a6b2c8754bb0ae3c111df8942c SHA512 7b9fad4f640f14484cd0ab42812fb19392e0959a28511fc4343aff7185e181daf0f32c3460ba398dcd703c5ede9bdc00f1765ffb083cc34fdd8649801eec871f
 AUX libv4l-1.6.2-sysmacros.patch 1821 BLAKE2B 9242ec9dccf2b14ab4d3ebc1246035ec3a1816d0b0389577638949cf8e493074132b7c13db6c1ca360ad5e2a2de271166126110d2f237d068185aeb2c3293c4b SHA512 ff6addf5d8e8da4f8502f1af8f21de60c9579da11b3aa3145d42030387bdcdd7c6263d5b6cdcba302ea8b8b3a578dbd17d75e11250d4074df2b6ca59d6de1d55
 DIST v4l-utils-1.10.1.tar.bz2 1352235 BLAKE2B 7ececae8ad5ebd999070b0c3626fdf5b0a4bc81562d2c2a712ff9625025d3e6c4ff664ba85998dedaa1ee77295d3cea39306305c20573c07156a07ec0ac8d10a SHA512 524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d
 DIST v4l-utils-1.16.3.tar.bz2 1894961 BLAKE2B 71c674abbb3415e592354998e1baa3eedbb4be21757bef80b463ea987e9fc231789e6b333b37d0d9916cb30729e04951dc9f1755ab00a82502fdc415b00cb9a2 SHA512 404672d18d94861c6957ea3a15a6a48f238d3859940810952a5a8cc33b57f1a360d1a19af28405c01b073c0ece90c5995a71dbe6544b30bdb8eace7daeb4bc0b
@@ -5,6 +6,6 @@ DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B f31cf794f6949fa2c1f45db8bae99a10a5
 DIST v4l-utils-1.6.2.tar.bz2 1148309 BLAKE2B 8153a1e3803b9e59eae064f2c88e4b865a56193788a8cb204dc34e9ae50e66794ba7f020ad4b0ff9af995f57d9b9a9e0225e0f8a09eeefae42d063131d7e549a SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2
 EBUILD libv4l-1.10.1.ebuild 1401 BLAKE2B 1bb1b9e0b6bcbc9b0dedb3d05bae4786ea90f8c5661430ddeb73d9ac96ccc613702a711e5950c54416e6c7beae4d75a24488755e3ea09a69e2c05211b4d08535 SHA512 075f00639bf2810d43676df986eb00f48b4f5220882d4b0a592bbec196213fa58dee4379c87b261669088b69d64ea4b9f41a60dad4107bd5abf5b245376f4761
 EBUILD libv4l-1.16.3.ebuild 1360 BLAKE2B 6a8cba7641759011fba00aa6e7d9ea052b33e4537008dec7f6616ddcddceee9040047225dc0ab470c6033f140787b1a4c3ef30c30466b55d0532bc7049480048 SHA512 d3e79e71b17e3d5f020a92962f18446a907acb1e8e19fb87d5b7e076104629c32707bea9afe5b61667f9985ac090c4f0279c39f7cf681081bfa6d1d7edb95400
-EBUILD libv4l-1.16.6.ebuild 1403 BLAKE2B 4f8976c580c1f6ae3058de20eddf1762d3179e4457a5ad17a65ff105cb9f79051a802ceaa08ac0f951bc5c693ffef1d5622f313e8ff52c8392a5e5bf9260d4e2 SHA512 81a1fdc1d60a5e7324717901d9cc5442b1a126c88528b3cea23bd8b0d8b1a2971723d873af415b74d750e532948c99e6a773271d50b6eac8c931ba7a8daf0c3d
+EBUILD libv4l-1.16.6.ebuild 1466 BLAKE2B 7cbf3ff6cffa297172aaf4b0363000e255638f1a0c51f294048f3d2fe61078cf880500125d19fe574eca78bd2a395cb5c8bd818023aebaadf930f9677b8fe1ca SHA512 db2dcb05f28096ac3365253b78038d5270d0f6ea9e6445d766da1eebbe68925f075805346918ebf75aefacefea3a845fdd994e907a36d01b525d23b50a1b35dd
 EBUILD libv4l-1.6.2.ebuild 1372 BLAKE2B d764d9dff3df7d7c38da4769dc10adbd3f5df9f7c54c0d61fa37c00bab87b36c333a5c65a07712db4f23a08d56de17cfbf4fbcc45cee402b66ec26afa21d8da7 SHA512 435700a890ee255890252c7d1e6ff7985cfa4bf403c6e8bc58a9739e90eb7d7534ea72ad035c70d18acf4b238c0506a189cfd384d01036f2befb819a9d15e11e
 MISC metadata.xml 1120 BLAKE2B b8854ccbfdb3674f5dd2657270945dcea8f9b48e501a07e8589bb04e0b99f927b8499afb979cb34a8d79a04e9813335188853db768dfe774fc5ab2919e9a34ee SHA512 09c21dcc53a675a4e04506dcf8b14b81947806dc761346a4bcb6a6ffdda7b60fb1adf0a778d7e4f060327aea55ec92b7fb700af7a874355d86b64a96541c8c5e
diff --git a/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch b/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch
new file mode 100644
index 000000000000..33855c682b63
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch
@@ -0,0 +1,68 @@
+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
+
diff --git a/media-libs/libv4l/libv4l-1.16.6.ebuild b/media-libs/libv4l/libv4l-1.16.6.ebuild
index 3fafe417aecc..b518b7a92192 100644
--- a/media-libs/libv4l/libv4l-1.16.6.ebuild
+++ b/media-libs/libv4l/libv4l-1.16.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -29,6 +29,8 @@ BDEPEND="virtual/pkgconfig
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${PN}-1.16.6-gcc10-fno-common.patch )
+
 pkg_setup() {
 	CONFIG_CHECK="~SHMEM"
 	linux-info_pkg_setup