gentoo Easter resync : 12.04.2020

7 files changed, 153 insertions, 9 deletions

diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 2a91466475a2..fff83025addc 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,9 +1,12 @@
+AUX v4l-utils-1.16.6-gcc10-fno-common.patch 2423 BLAKE2B 6938e2b75b01e3bc3a1cfa03e2e95591848697e60742c4f65f342fa3ddfe5bddebba8d3bb17ab1de7d870592501f897c4e0aa5a6b2c8754bb0ae3c111df8942c SHA512 7b9fad4f640f14484cd0ab42812fb19392e0959a28511fc4343aff7185e181daf0f32c3460ba398dcd703c5ede9bdc00f1765ffb083cc34fdd8649801eec871f
 AUX v4l-utils-1.6.2-sysmacros.patch 1853 BLAKE2B ed1f474be9650b0b4e5812746499935ac8a483ea71b335183c1648f97309d1d01209df1dbaf70f4e5b8e0d838ca97750bc37b4943dbeadbcac7c31ed9077969f SHA512 ea3e4a19c8b57833519b6356e647572021ac2a6a00942394a89949ff02aa3e0f70a72b0ef0f025615a7c81c0c79f1cacaa01a82161a05d806e3c8c792995353d
 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
 DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B f31cf794f6949fa2c1f45db8bae99a10a5fbc67af356889f636ab03cfd04011a82939a10f01145c56001b91655664530cfbda7d64c523752b8bb77159a1c80ab SHA512 f011218591e32b0ca3239373d9ea4739d7cfe3a6bef5f8a996253cea9b9d836ba488132e2a1b8f6f61cd69f1bcecc20e4b5c26f9c95a2a912e17c400b9fa9b58
-EBUILD v4l-utils-1.10.1.ebuild 1676 BLAKE2B 30166273ce20e91439667f57cda52bb7cf1a13e9627c6e223656685b1fe607028e208b4496b43db4dbb2c8bd75dab990fe84c29c792609b581210be494946a64 SHA512 c81e3cedfda2a94661431379cf5e56237ac0d876a29139f37725341ffeed2e5056d1540544e89b382ac4b09c2b3a45f8c6dcf5b8f98e3379ea433abd5a193575
-EBUILD v4l-utils-1.16.3-r1.ebuild 1843 BLAKE2B 46f25960bd80a69c923cfa3ea1a62bd2eed6a2c20d5ad61164dec5ce0dbd6da656e526cbcd094b3bb40e77d6a0ba24f61f6c904887ab70fd1ca949af531fdd12 SHA512 9ea267b9ed6d2abe7d04e6a53df4a1337dcebf133f42783b7fc5ef853f26e560bf10f94965e203e14e56f8da46357275b23eed59c243823dd9dfcb2091377c42
-EBUILD v4l-utils-1.16.3.ebuild 1768 BLAKE2B ed5b2f5884fa03440735d060ad8fac1931bafafb53eb14aaa68ff68a163c038592d7d099c00c0886050b7a751a1d163d09613886bd72f57e4003d55733af840b SHA512 9063665b2994026a6087f80630fc5d351f93be02d87afa69a7ddd72832185e1d06cd1163a3c2e636409845770e1cb8caf52da6cc5af4274912d2f0c38fcc3b0e
-EBUILD v4l-utils-1.16.6.ebuild 1842 BLAKE2B e451ebba2c6b61568944c482bd0a5631ce59db238b6ba56fd84b529cfea66b7f2594cda88395146aabe85efe6b119633ee0453debf29c204e3ccd2203b665812 SHA512 faafb1198ce491cdd892e5839d5a2d8844023fac82373969ebd16241514ea3a5f45e6e4374b3e4509971b33177d82334ab0dccb8cd76f19e984bfcdc0e3681ed
+DIST v4l-utils-1.18.0.tar.bz2 1995506 BLAKE2B 35cd138c88960e5b02431c408a43905a73ea6a7650a939abc2250e1f219bda1437262a7083d90d8b4d39c5bd2cce5f6fc590b8dc09a8738fb5baf55266256b94 SHA512 749c804671f039d907bf782cba5d1c23fff48066f3b6d4a0249fb9b65c493ee3945b544ee2a306dda79973da04f0301278ee88775f798aba590e5d0f15226d49
+EBUILD v4l-utils-1.10.1.ebuild 1670 BLAKE2B 1d9d03cd1cbb0a59a570d42984155db7e6e9b9d59edb7fddaa644fd773150443b5ae7192def7368ef0cfe912470d3defbf5184e609df3dc4156186a5602f7385 SHA512 b8994091122f8498fa8ec7a0fa4a95b9ee7b49ad446facbdba4eb0abee8fc213364fd145bf87799e7a3b6484deae26b0f2ef9e08f4d7fdb9228dc63ac23b52d0
+EBUILD v4l-utils-1.16.3-r1.ebuild 1837 BLAKE2B 5838a1e2be624961876c860029faa70986959e52ac2b8eca6cce56284560bc348f8720d7d713c35d1f27a410c1fc3bd91c4f1730cab3abd3776e34317e655b79 SHA512 d3b974c7539aa85464cd0919207ae4ab1381897d3bd17b8a5edcba0064a3d383ff29cccad450592f3f294e4346fed70e7eb27b29db0dc050474ca17f89b01c47
+EBUILD v4l-utils-1.16.3.ebuild 1762 BLAKE2B f062ceff94129dd768586fb70dcb0fd230c203b7a202ca1fdecf51c3c1839458b89a1e8565a9d597b247cb1024fdb6e81ad907a585111f599b4d91f48c830f61 SHA512 aa3caad85a32fdba87258b96fff41afb4a75de9e8c7acb974d31823e591654d203a76b0949d4228656c89fb1376bc3becb7c0f7c6fb36e9d92c65ddaa8dbdf0f
+EBUILD v4l-utils-1.16.6.ebuild 1899 BLAKE2B ee9875b6515d18728bbde8a5e1d8babe9c49403c9388286a2d746ad36d7f24900ff72c17b1a601cc07a11c3ae024e6c1c19b6125a84930c7952eb734dbf30d29 SHA512 e88848d6b0849f4049e71c968baf876046ed47d5673d08f4a6f020f04c9633bda772d918fabdfe37a07d354da8c4672080a3b95ce018982e95ed22661789b38e
+EBUILD v4l-utils-1.18.0.ebuild 1914 BLAKE2B 75e91df19524f3f63871b53362af72c4c3af91bb8089eb703d62bf8c51e1cebb0bb585673ca687683a09b302c08525e9eaa2758b1dedab441712d86016401a14 SHA512 4dad3bd400dd66fb2b6ee0c3cf199c8477a018f56abfcbfa53de3f50095f0fcc0e5a9613f4ba24640a165830b77d96963d7aba4ca313b575e7d84f25f0e6db17
 MISC metadata.xml 326 BLAKE2B b2b3aecf2ef313c08d06033344cc470302df8031246a7a919d01419f6d40f5a708ea6cfc222a0b7b2ac442f761f90b49fb414ffe6342a500cb446cdf0c562d70 SHA512 2f4cabeecc98ba82d51fe56871e3b950be0baa58a73c11067f91a0b5dce02bde063d32617ed68ee68d4c2a0af92e6d80a306e3b95548aad6d9734d4577cfafab
diff --git a/media-tv/v4l-utils/files/v4l-utils-1.16.6-gcc10-fno-common.patch b/media-tv/v4l-utils/files/v4l-utils-1.16.6-gcc10-fno-common.patch
new file mode 100644
index 000000000000..33855c682b63
--- /dev/null
+++ b/media-tv/v4l-utils/files/v4l-utils-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-tv/v4l-utils/v4l-utils-1.10.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
index 3baefa7a4edc..e18fe0d18460 100644
--- a/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 ~sparc x86"
 IUSE="qt5 udev"
 
 RDEPEND=">=media-libs/libv4l-${PV}
diff --git a/media-tv/v4l-utils/v4l-utils-1.16.3-r1.ebuild b/media-tv/v4l-utils/v4l-utils-1.16.3-r1.ebuild
index b1b0a9cc7938..0a929df32fb6 100644
--- a/media-tv/v4l-utils/v4l-utils-1.16.3-r1.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.16.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
 IUSE="+bpf opengl qt5"
 
 RDEPEND=">=media-libs/libv4l-${PV}[jpeg]
diff --git a/media-tv/v4l-utils/v4l-utils-1.16.3.ebuild b/media-tv/v4l-utils/v4l-utils-1.16.3.ebuild
index 2c205e2624a8..c17b61ef7427 100644
--- a/media-tv/v4l-utils/v4l-utils-1.16.3.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.16.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="opengl qt5"
 
 RDEPEND=">=media-libs/libv4l-${PV}[jpeg]
diff --git a/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild b/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
index b756dca8b45e..5b1881372f23 100644
--- a/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-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
@@ -10,7 +10,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
 IUSE="+bpf opengl qt5"
 
 RDEPEND=">=media-libs/libv4l-${PV}[jpeg]
@@ -31,6 +31,8 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.16.6-gcc10-fno-common.patch )
+
 src_configure() {
 	if use qt5; then
 		append-cxxflags -std=c++11
diff --git a/media-tv/v4l-utils/v4l-utils-1.18.0.ebuild b/media-tv/v4l-utils/v4l-utils-1.18.0.ebuild
new file mode 100644
index 000000000000..777a22b6a552
--- /dev/null
+++ b/media-tv/v4l-utils/v4l-utils-1.18.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic udev xdg-utils
+
+DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
+HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
+SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+bpf opengl qt5"
+
+RDEPEND=">=media-libs/libv4l-${PV}[jpeg]
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		opengl? ( dev-qt/qtopengl:5[-gles2(-)] virtual/opengl )
+		media-libs/alsa-lib
+	)
+	virtual/libudev
+	>=virtual/jpeg-0-r2:0=
+	bpf? ( virtual/libelf:= )
+	!media-tv/v4l2-ctl
+	!<media-tv/ivtv-utils-1.4.0-r2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	bpf? ( sys-devel/clang:*[llvm_targets_BPF] )
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.16.6-gcc10-fno-common.patch )
+
+src_configure() {
+	if use qt5; then
+		append-cxxflags -std=c++11
+		local qt5_paths=( \
+			MOC="$(pkg-config --variable=host_bins Qt5Core)/moc" \
+			UIC="$(pkg-config --variable=host_bins Qt5Core)/uic" \
+			RCC="$(pkg-config --variable=host_bins Qt5Core)/rcc" \
+		)
+		if use !opengl; then
+			sed -e 's/Qt5OpenGL/DiSaBlEd/g' -i configure || die
+		fi
+	fi
+	# Hard disable the flags that apply only to the libs.
+	econf \
+		--disable-static \
+		$(use_enable qt5 qv4l2) \
+		$(use_enable qt5 qvidcap) \
+		$(use_enable bpf) \
+		--with-udevdir="$(get_udevdir)" \
+		--with-jpeg \
+		"${qt5_paths[@]}"
+}
+
+src_install() {
+	emake -C utils DESTDIR="${D}" install
+	emake -C contrib DESTDIR="${D}" install
+
+	dodoc README
+	newdoc utils/libv4l2util/TODO TODO.libv4l2util
+	newdoc utils/libmedia_dev/README README.libmedia_dev
+	newdoc utils/dvb/README README.dvb
+	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
+}
+
+pkg_postinst() { xdg_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }