gentoo resync : 25.03.2022

11 files changed, 147 insertions, 37 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 201a2a2d1055..6094f7755f38 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-libnice/Manifest b/media-plugins/gst-plugins-libnice/Manifest
index 5952bd6bade0..4c5381ab7890 100644
--- a/media-plugins/gst-plugins-libnice/Manifest
+++ b/media-plugins/gst-plugins-libnice/Manifest
@@ -1,3 +1,6 @@
+AUX gst-plugins-libnice-0.1.18-use-installed-libnice.patch 1778 BLAKE2B 24fe51b4f66c667dacf64b79bf5136fa7a041ec0249dee3f1a2a690acd2dba6eff19868c27f2d096a2aa70ac28989783006e015e07297654864020b8dae15138 SHA512 903b92865e060a67b301897a40c24b3861d57b7a66049c9d85427d99c1a0b726fb80b5f83363670c3f41c14004685be7cad662fcf95b7bb790a741e03ac2c30d
 DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
+DIST libnice-0.1.18.tar.gz 439791 BLAKE2B 6bb68bb1484b4a622a580bc9c66b8be260d2615b211cf7991cb50a9f692df525cd0c3c9fc54ef86534426f396f8d2201966cdacfd3f69ff27193971f95886540 SHA512 08bac05874708f7e7a669d28727d8951a10c464b22dd6fada1a4644850bcf5c4cc022cce46bb24c806086a7869b274c4c7d3d6ddaa9ed0ce0bc2c47f72933227
 EBUILD gst-plugins-libnice-0.1.15-r100.ebuild 1663 BLAKE2B 1d76f0223d291e6be4bb2b94e8c34539f78a3fae8eef212c76884e59abfbd970ba3f8127ca13ed6ef1e5895ae7911403ae11f3be16683b50a045da73a86b3e2c SHA512 28f23f8bb2f117e9f52c3d2e90d15e6300150676edb2db33942c74ca94eb35940f30e4a99df91440930e091f1d9f89b8db93d9894fa508c083e3dd3c30ccdc03
+EBUILD gst-plugins-libnice-0.1.18.ebuild 1236 BLAKE2B 0b838016fa8f83e5c136f85266729af551b1bab083292c88c3b26875ce6f2b8457bd6aedbb13f9da990cf84db08db673ecfea2cfbfa7b834f3dee38a433f1fa7 SHA512 66da3b6c3844e5515a355e30ea5db1e01792d9b974b322245225661cb3864243ed40f4107c62ab78e22f7cab31fb35a89c0f5225f16d20a49fe07e4b4f6fdd8c
 MISC metadata.xml 373 BLAKE2B 440aa17e59153e87321e231c92b943329e7726c23255fe76ba8934b34e8a636adda880e90bc3ac285609cfccf6449dbff02dfe0ec6b2318ef039df4f1e780c8c SHA512 a92cce75c15b414f1821cfe274c78717f68c1b44254d9028934abc652ccacd8ff2261105aaf0b5c688e58c787d434b1358c0a5c239ad2ec7625d91de63dba0b1
diff --git a/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.18-use-installed-libnice.patch b/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.18-use-installed-libnice.patch
new file mode 100644
index 000000000000..1b0782e00d6e
--- /dev/null
+++ b/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.18-use-installed-libnice.patch
@@ -0,0 +1,59 @@
+Carve out everything but gstreamer plugin part, libnice-0.1.18
+
+Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+
+diff -udBbr libnice-0.1.18-original/gst/meson.build libnice-0.1.18/gst/meson.build
+--- libnice-0.1.18-original/gst/meson.build	2020-10-21 04:03:07.271845300 +0300
++++ libnice-0.1.18/gst/meson.build	2022-03-20 23:38:28.826178730 +0300
+@@ -12,8 +12,7 @@
+   gst_nice_sources,
+   c_args : gst_nice_args,
+   include_directories: nice_incs,
+-  dependencies: [nice_deps, gst_dep],
+-  link_with: libnice,
++  dependencies: [libnice_dep, gst_dep],
+   install_dir: gst_plugins_install_dir,
+   install: true)
+ 
+diff -udBbr libnice-0.1.18-original/meson.build libnice-0.1.18/meson.build
+--- libnice-0.1.18-original/meson.build	2020-10-21 04:03:07.272845300 +0300
++++ libnice-0.1.18/meson.build	2022-03-20 23:38:05.116302874 +0300
+@@ -263,9 +263,7 @@
+ 
+ libm = cc.find_library('m', required: false)
+ 
+-nice_incs = include_directories('.', 'agent', 'random', 'socket', 'stun')
+-
+-nice_deps = gio_deps + [gthread_dep, crypto_dep, gupnp_igd_dep] + syslibs
++nice_incs = include_directories('.')
+ 
+ ignored_iface_prefix = get_option('ignored-network-interface-prefix')
+ if ignored_iface_prefix != []
+@@ -278,11 +276,7 @@
+ 
+ gir = find_program('g-ir-scanner', required : get_option('introspection'))
+ 
+-subdir('agent')
+-subdir('stun')
+-subdir('socket')
+-subdir('random')
+-subdir('nice')
++libnice_dep = dependency('nice', version: nice_version, required: true)
+ 
+ if gst_dep.found()
+   subdir('gst')
+@@ -298,14 +292,6 @@
+   endif
+ endif
+ 
+-if not get_option('tests').disabled()
+-  subdir('tests')
+-endif
+-
+-if not get_option('examples').disabled()
+-  subdir('examples')
+-endif
+-
+ add_test_setup('valgrind',
+ 	       exe_wrapper: ['valgrind',
+ 			     '--leak-check=full',
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.18.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.18.ebuild
new file mode 100644
index 000000000000..99b81c3f7797
--- /dev/null
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.18.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson-multilib
+
+DESCRIPTION="GStreamer plugin for ICE (RFC 5245) support"
+HOMEPAGE="https://nice.freedesktop.org/wiki/"
+MY_P=libnice-${PV}
+SRC_URI="https://nice.freedesktop.org/releases/${MY_P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="
+	~net-libs/libnice-${PV}[${MULTILIB_USEDEP}]
+	media-libs/gstreamer:${SLOT}[${MULTILIB_USEDEP}]
+	media-libs/gst-plugins-base:${SLOT}[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/gst-plugins-libnice-${PV}-use-installed-libnice.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+multilib_src_configure() {
+	# gnutls vs openssl left intentionally automagic here - the chosen USE flag configuration of libnice will ensure
+	# one of them is present, configure will be happy, but gstreamer bits don't use it, so it doesn't matter.
+	# gupnp is not used in the gst plugin.
+	local emesonargs=(
+		-Dgstreamer=enabled
+		-Dcrypto-library=auto
+		-Dintrospection=disabled
+		-Dgupnp=disabled
+	)
+
+	meson_src_configure
+}
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/Manifest b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
index b39fb92ff4ba..8e810ea024e6 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/Manifest
+++ b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
@@ -1,5 +1,7 @@
+DIST kodi-pvr-vdr-vnsi-19.0.3.tar.gz 183828 BLAKE2B 69b14fe2b8af4c03725e300ea21ed189e0df174cbde1fbd7c020aca279b6af5884c7cc5b4cd90dc220fa20744d409f1b59b4e84fa0e11ddd1bf76ac494709ce2 SHA512 eb27dc9fc868a016d39718f1a6f3c719808231cfd092dcc0ed5b85ba017ad8f93e4c562c1475ff3c7e88bbb08ae33aba14cdea7eb4b1ebcd7b64da42bd7f1673
 DIST kodi-pvr-vdr-vnsi-8.2.2.tar.gz 167074 BLAKE2B fe6cafacb16b31456f3d6f103a836a20cb2fac9d55aad56df858975ba23b9e5de4d29bebc97e276028289a98b196f96f0c30135f94d8316ea6da1c7154a16775 SHA512 e5ad58926058473feb089ad96acb4b348c674fc77ec412449cde36d508c75409bc6bfb24bd804b5f50a202e83a8a01b6fd823a1667de368c1f4b768512d519d8
 DIST kodi-pvr-vdr-vnsi-8.2.3.tar.gz 171586 BLAKE2B e7b9beed693c84f7a94657eed297a1d76669c2ffcee5be5604d1dc239b9de0811848aaafa87396125f5eacdb28ea7db0e8d3d52f7d4c63e46e0c830aadc8f4d0 SHA512 9fbb3e988fe6352fde230ce072b35e591d69015bbfd93a4e61b2719a1f36ef495d23db30d44a6c611dcc1b4e36339b454138902c3f815940c5a77ff2b3d9c62a
+EBUILD kodi-pvr-vdr-vnsi-19.0.3.ebuild 661 BLAKE2B cebf81e18dbc468efa5259e3442217fa144ffabda8edb5782125b6276e42cac46895650eb9bce7832f639c1dc8541f9b6b8b36290d634535e84efabaa1057019 SHA512 e734ad50f2d766580e9d0921e56304e4fb345872ea39c298eed95c784424ebe4504788adf29040f26dff22b2e70d518d02c528e02cff9976a382c7d9176df574
 EBUILD kodi-pvr-vdr-vnsi-8.2.2.ebuild 661 BLAKE2B 6f60f4bb43efc2b2e8bbba4b7e2f24d9c874482e3155cfc7d03f16cd0175c23ff6b0a9dc1213f198b834ad66025f2e5bfbd46be235149ff5121c141739f6cd8f SHA512 0d09ac8c609e093d6c257058d4c3c5a4cd886930eea51d29c215f0d17f5471a14079f02c69cc9604718338cf11c54a7a31576f6f27192edb85e584cd8b9f57f1
 EBUILD kodi-pvr-vdr-vnsi-8.2.3.ebuild 661 BLAKE2B 6f60f4bb43efc2b2e8bbba4b7e2f24d9c874482e3155cfc7d03f16cd0175c23ff6b0a9dc1213f198b834ad66025f2e5bfbd46be235149ff5121c141739f6cd8f SHA512 0d09ac8c609e093d6c257058d4c3c5a4cd886930eea51d29c215f0d17f5471a14079f02c69cc9604718338cf11c54a7a31576f6f27192edb85e584cd8b9f57f1
 EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 662 BLAKE2B 384eeccddd28b9d8d779d82a84b5682f0e20360532c8ab2cb4afd727e3ea557c95d264640834d792d82a975665dfd769e82513f0bf5d689891930a373274e441 SHA512 bb86dda212c0ec83c1b8aae29698bcfd0109b426a718ef5e4c801fc598e050c3272fc0569c0603f21eadd146ca0d6687f16fa5d73752aba1dc2f9270eae6826c
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-19.0.3.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-19.0.3.ebuild
new file mode 100644
index 000000000000..fc0fe6a6a3c9
--- /dev/null
+++ b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-19.0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi PVR addon VNSI"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vdr.vnsi-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/swh-lv2/Manifest b/media-plugins/swh-lv2/Manifest
index 16cfcb3d776e..39ddbd78e787 100644
--- a/media-plugins/swh-lv2/Manifest
+++ b/media-plugins/swh-lv2/Manifest
@@ -1,3 +1,3 @@
 DIST swh-lv2-1.0.16.tar.gz 159206 BLAKE2B d8a3e46debebad758e6300203f8cedf71c47799a85b1e95b11c258e464e73fdafd69f5bc80f419bab4f1b6541bd2038d75f5ff9ddc0088829a9a690fa24483e5 SHA512 1ded2c570b7f8385bb702539f5e1573fa23c6ddfb2b763af149b4ef1a32e394590b0b4fffcd006fca362b51318c1ff5cfbaeb40e4341cc07d5241aca1ac2eba0
-EBUILD swh-lv2-1.0.16.ebuild 736 BLAKE2B c0c5afa1e1f5208be2fa0af3c334435edca28795d76eff99dddb7137711a353ae8ccb933dc7a962c9c73dd1ac7268ecd71381b65974058d6576bdf6f9c084759 SHA512 f88a85e250705464f13871be7cf85b30cad70a4082771cc54b13cbd75bccaf3809b4c3785e6d47c903a428144b2cb91b9585206b61ffb46ae1f6245ef454f814
+EBUILD swh-lv2-1.0.16-r1.ebuild 736 BLAKE2B c0c5afa1e1f5208be2fa0af3c334435edca28795d76eff99dddb7137711a353ae8ccb933dc7a962c9c73dd1ac7268ecd71381b65974058d6576bdf6f9c084759 SHA512 f88a85e250705464f13871be7cf85b30cad70a4082771cc54b13cbd75bccaf3809b4c3785e6d47c903a428144b2cb91b9585206b61ffb46ae1f6245ef454f814
 MISC metadata.xml 332 BLAKE2B 118349270b78e334313851560443a727e828b4c05fcdf13940a5e73316a338fec5df9a0ec60746acfd880b51ef4dd150876927f597ed83567a8f9b46a848be4c SHA512 a8d2101998000ea33afafa866e72a7f2bae0ccba2232100f1e73d69bbe1a433b62e19f99d9e0b5ec39ce2624baa563830c5366a39b77b864cb978ed723ee8593
diff --git a/media-plugins/swh-lv2/swh-lv2-1.0.16.ebuild b/media-plugins/swh-lv2/swh-lv2-1.0.16-r1.ebuild
index ba17914fd5c8..ba17914fd5c8 100644
--- a/media-plugins/swh-lv2/swh-lv2-1.0.16.ebuild
+++ b/media-plugins/swh-lv2/swh-lv2-1.0.16-r1.ebuild
diff --git a/media-plugins/vamp-aubio-plugins/Manifest b/media-plugins/vamp-aubio-plugins/Manifest
index 7cb6cc559254..150ff914201b 100644
--- a/media-plugins/vamp-aubio-plugins/Manifest
+++ b/media-plugins/vamp-aubio-plugins/Manifest
@@ -1,6 +1,4 @@
-DIST vamp-aubio-plugins-0.5.0.tar.bz2 26253 BLAKE2B dc05ef4d642fee389e60dee5ab46ad9679e641060a47cd084d5328067e88c325d007f9b317b9d46d0600c7cddb82ea7af156ab67330b23746dee6fa78adce2eb SHA512 7b1c13a91cb12b9e5f25a78ed31ccb4b5cfdabc8b3ac546dee776de1786008e6bb4471aa242bb4b128d202ea523e15efa4889e4f1c4189583b6d20d8b0dba675
 DIST vamp-aubio-plugins-0.5.1.tar.bz2 234156 BLAKE2B 99b064a2d2372a6c42e1251ac5d29d0cc607543b4e651c3b006106bad888c9ab22fcc2a907acde135d7e663187388a52c2513f8845501908318ff9d1c0b5df9b SHA512 ebbd8466ec3907d55e24824d7a725586df38212994f1398b75974dfac8e282dd8b2cb2a9381ad7e3da1a130b77936f109b36909b23591cc58ff176d6eb22625e
 DIST waf-2.0.20 104725 BLAKE2B c9467b5205f596cd1b5d4b6ccb97806e9fa1f4d4eb9109d378a0978179ab49a029926cb86876ca2088878378f88eb292d899840b4a072e62fc6542b93bc2d894 SHA512 72de1c5a78eb353da4b4a6ea4fbf52d232ed6dd08e972872744e3727b952f813f44e47f0b47106bd6f05ce7fa137c4685ac313fb0b0d70e5fc85dc34918e66f0
-EBUILD vamp-aubio-plugins-0.5.0.ebuild 756 BLAKE2B 123f6f62e769e34ac45c5ac28827604c6d3b221bb9fd318c737b05069768765e404589f3488db0789b394daaf3fa1757fefa61b0437614d57d926ce7d97821aa SHA512 986d46424b3fffdc5692a4d96b339cdf3bda66e8569afb30ba47346aedfdb6bce36663cf51a1b4ff83c71d78f5d249bae15ebbb36f217a1847ca3e055239e49d
-EBUILD vamp-aubio-plugins-0.5.1-r1.ebuild 826 BLAKE2B 515ca7815fc3e0025cc6571348fea5bc0d3b6e454f8c813880f27b227b8fca1d7cea43a61ace81d786efa3041e0d8ec785ba4072c05a906a62b549e87918af00 SHA512 d8aa448340e27cfdd615338587206ecb578488a2ce66e2f9c35dfb79588419654a0bc661d7e6fb35c471871cd360bfe2fde887fe9a063e2f0473b9a4f67d4f68
+EBUILD vamp-aubio-plugins-0.5.1-r1.ebuild 826 BLAKE2B 3c5191fbb29b400bacbb6c40edf2859d35cbbe102386ad99b890f4d416f33b2a8ec5ddf9565649b389fd68f0ffca5bdf5d84b128ad6d87cd30cf53011c6c34aa SHA512 18143852d7e24b4759e1b61c56857d3e3dd2617e16acf352d6315c411e6255bd37bfd31dc789d3f10b1e1bbab1e46023e37017c339e41c74cb5b507b9e8d4d59
 MISC metadata.xml 334 BLAKE2B d904d322833f47e53941fda75965e482e966ac307e36ecdb25c978a606ac67637eab921f4bcfab88f6158973862a5fa4135faaaf079be0bda417625288251df3 SHA512 79e29b069ce335b9c9504fcc2638eae16a24427552cb5203c77d5fb0aa07a9a3f49a3842994b92b656d502e8899c9b8e54ff7e1de3a3e5d818837d27042747ad
diff --git a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.ebuild b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.ebuild
deleted file mode 100644
index a5a85f54cff6..000000000000
--- a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="Onset detection, pitch tracking, note tracking and tempo tracking plugins"
-HOMEPAGE="https://www.vamp-plugins.org/"
-SRC_URI="https://aubio.org/pub/vamp-aubio-plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-# bug #748057, configure script only allows amd64/x86
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-DEPEND=">=media-libs/aubio-0.4.1
-	media-libs/vamp-plugin-sdk
-	=sci-libs/fftw-3*"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	tc-export CXX
-	emake CFLAGS="${CFLAGS} -fPIC" -f Makefile.linux
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/vamp
-	doins vamp-aubio.so vamp-aubio.cat
-	dodoc README.md
-}
diff --git a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild
index 6a4cdd2a4cef..45636dad6da1 100644
--- a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild
+++ b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://aubio.org/pub/vamp-aubio-plugins/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 # bug #748057, configure script only allows amd64/x86
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 -x86"
 IUSE=""
 
 DEPEND=">=media-libs/aubio-0.4.1