gentoo auto-resync : 15:02:2023 - 08:00:21

8 files changed, 22 insertions, 12 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 3d153ae5241a..c6a1fc89f91d 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 56fb023308af..e8ecd3220945 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -4,6 +4,6 @@ DIST MPlayer-1.5.tar.xz 15379972 BLAKE2B 33c09025a9c521e1bc09a50fabb04e89493cbc4
 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
-EBUILD mplayer-1.5.ebuild 17006 BLAKE2B cee611cf3be0f7b33ae8ac5cb86197f9c97a853338b73151ab21cac294046fd42b2a400f5ef515a60ac4dfb963a0e1d5aa829ad66e4e673c4ac76c2f2a8eaa92 SHA512 a4b7ef32381ffd5ad0115f10ea016ca62ba134d2577ed8abb24b00a7626d4152ee0ff9c1b0866272e4f50bc924bd217ab33589d3b0ff8356f91d3a90879d4508
+EBUILD mplayer-1.5.ebuild 17073 BLAKE2B 2c0f9851af9f297da34cfc1ed9e8aac631d8c370c0a7645dcd856617fcea640b80781c1c1791a2676447f00fb45ba0acfde37628066a6e2dde4eecea120a6bcc SHA512 1c508343584789db2399c189bd74757739c2ad1c4b04ad3f630c7e8d69666a68e56ee4a7ce7d7204315a0e5945a61b5d53fca05e569019ed19fce6f43488d50e
 EBUILD mplayer-9999.ebuild 17011 BLAKE2B 7dccd4963657bfbf14fa81f68b7ecdba466509c7949098cc56cd7465e3dcb30262708e8bda48696cd33f93ae97b815dfa19f9223d0cc6177d335804a763c8ef2 SHA512 a3001945b7a7f633e2a6088d1c742c6e2c015f229636f51b4b974d5f52e70c66f0aa85483515808b98bf2c9191be331049ead89aa73709374c5d4ba98a6c0f74
 MISC metadata.xml 2475 BLAKE2B 5a083ce5b8ed729245ec9eaf544be95f6cbdb9fcb5b80d3a21195557c3aede46d09bd93a0d1acd3830fc796f90dd5f15a17a3d3c69ba2a1a54a0676264dd02de SHA512 f04082ffd63adf9102dd82eb5b4c628fbf912701c7dae69f0b00bbad4e0957355e43369912e9422acc087200de982920c212efb60ba9c26675f74fd5f37fd739
diff --git a/media-video/mplayer/mplayer-1.5.ebuild b/media-video/mplayer/mplayer-1.5.ebuild
index 372909e99730..4f171b4f094c 100644
--- a/media-video/mplayer/mplayer-1.5.ebuild
+++ b/media-video/mplayer/mplayer-1.5.ebuild
@@ -66,9 +66,10 @@ X_RDEPS="
 #	nemesi? ( net-libs/libnemesi )
 # - mplayer relies on private APIs in giflib that have been removed:
 #   https://sourceforge.net/p/giflib/bugs/132/
+# - depends on <ffmpeg-5 for bug #876760, a snapshot may help though.
 RDEPEND="
 	app-arch/bzip2
-	>=media-video/ffmpeg-4.0:=[vdpau?]
+	<media-video/ffmpeg-5:=[vdpau?]
 	sys-libs/ncurses:=
 	sys-libs/zlib
 	a52? ( media-libs/a52dec )
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index d84a4779cf95..c48469fbf5f4 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -4,5 +4,5 @@ AUX pre-shutdown-15-noad.sh 771 BLAKE2B ce0053c6fb813c28d0c653ba0ba68819f03532c8
 AUX reccmds.noad.conf 61 BLAKE2B 4600a5a2fc948b0695c487e87013b1207873b2f1f70e30604cb20288bbf7f107b2fbdb9a63d7f7eb2a8612569bb4975756109c804eb351635582f87e68eda8e5 SHA512 953af51444af1e4a853e2a501fe0fb31ef0b982795e8a7b350cf0851f6f572884de87d74b71ce0630fcd59082290ce8b9730e343032fea6512da96f1a934fddb
 AUX record-50-noad.sh 1443 BLAKE2B 98cba3a0024bc8c4426d2cd5d1e0d5b9d2e2ead2c50f9f8186a6567d01f656adb4b5385bb29bf8ce3a68a747a973f9bb00f64a65b21e1c7d43b7f60e2f54c55a SHA512 6ef839ad9c4d7b238e9e02dfdca486623902a5e9f3de722f18b9f50eff03888d58d03f8a17448903bbec2f04d1abcee22d6672798dd23eee024339a6474b98c9
 DIST noad-0.8.7.tar.gz 144339 BLAKE2B e7492f63e7326cdced041332e05051a6bda2e92798f4b694ff626e65306d6ebe606f871eabc37df1613677c2f739b3caed033b443cbe7edce913b83a0365e3e5 SHA512 fa1d0226144175de586f938a594fe0a3c0b8a924a258f1406cf52078d5e6d84f46ae685ee3c9f3ce28e62f9eee719d6a938504e39a6b3b9c96043f4bd4aaf69d
-EBUILD noad-0.8.7.ebuild 1699 BLAKE2B 864a1b6b29519e830d973a7366cca1c06e9aa351d5164aba611eb0ba6cc3c91f16490576b59cc269a2db0262dbe7405a3b178dc7217ae73b62cce5ba1516017f SHA512 d25a0810d608d8f37ce04a1c39dfeb294d15b4ba50e8281894d16ef94a2bfc0d516bbec84b31d2202379d6f0c5660e8c101623febdc146d54fbe7f7b16389293
+EBUILD noad-0.8.7-r1.ebuild 1785 BLAKE2B 885167f40149dc0f9c6d920b176226f2301ea3483afe7ab93f3e1ec22878e012206f2ba5393b3a7b972ba3f06d7010abfc16623e3348f437859f497f31793c1e SHA512 b95b3122dc4a1f79e65fe8a74521e6b83947cf67cabe1bfc5d072c32e1e74001399081df259e2a96f885808d598eb589fc42f2e9051de5af2ea42f0d574b7126
 MISC metadata.xml 864 BLAKE2B 2978ee81c7da71ad061ad74b4e54b58f9432039cadb5958b39a10377c46aa8d501a50b5add07ece74c015a026b0452cd30d9f7725df5f490092ee711257320b0 SHA512 b02e2e8f4554019cbef42cc43a3af3ee3119dbeef0c05d8bd929215b131aeb7e0dffd2fb5d7d110bfc9af3e96c0ab73d2e94949e5ba4e8bc9f96298cb889d8e3
diff --git a/media-video/noad/noad-0.8.7.ebuild b/media-video/noad/noad-0.8.7-r1.ebuild
index f89605e63649..25ba24135bd4 100644
--- a/media-video/noad/noad-0.8.7.ebuild
+++ b/media-video/noad/noad-0.8.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,9 +15,10 @@ KEYWORDS="amd64 x86"
 IUSE="+ffmpeg imagemagick libmpeg2"
 
 BDEPEND="virtual/pkgconfig"
+# <ffmpeg-5 dep for bug #834408, https://github.com/madmartin/noad/issues/2
 DEPEND="
 	libmpeg2? ( media-libs/libmpeg2:= )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( <media-video/ffmpeg-5:= )
 	imagemagick? ( media-gfx/imagemagick )"
 RDEPEND="${DEPEND}"
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 6c872bb4ed24..99b9574f8fd9 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,7 +9,7 @@ AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 AUX vlc-configure_lua_version.patch 2057 BLAKE2B 995291bab038c912b5d76982da803da34afd4ddce4e21f2aeff8ebe2be760857d169f904a0ce96658b6810e1030031f0a33d0c57f7bc514b1bbdc17e0d67157c SHA512 119f2fff52b334cb073c73979a6bec8710695c67e5ab3ff80d846ede52e922138ac77f8f3f9cccb6f750c74a00baf1529e27c683f0b93a6698436bdcdd930e99
 DIST vlc-3.0.18.tar.xz 26631372 BLAKE2B 73d80615d5b4789ca980bd631db248e74de13d466e5f19b66a170ca785b46f281a1a242c6fdf14686cfb224aba3ddfeda16ffce11edbef3255c4bbdff36c517d SHA512 6fc8fdaa7e8862ad7133d69b3dab99ab9cd3945846a6ce5e2379b7f68ee9accd385c53b8573fc7c82f732c24678b4932b1154d2ad8accf06305f2f578d6fcd8e
-EBUILD vlc-3.0.18.ebuild 13462 BLAKE2B 79f43d9ce3d0350c9846d1d55859a7c655a3dadb491794bfc4f8c7357c3c9933da830094de1e29d39b3d370cbdbeaa84336f1e348e95afc7f8b29e3c7e96018b SHA512 1bd7908f7db3e0d97c56351db58394b2a9bf4dda0e89a648295c477c516e519b592942a15cf338ad2df3f87f980e7e8ac40844d367f2e73019b492d74ee34b53
-EBUILD vlc-3.0.9999.ebuild 13460 BLAKE2B d22acd93a5454be55ac2fbbe85adce8cf1b9105badeb062d03a608afd5a94f4d571374dbe503d1c3592a423702f074917760897c55b1dce82586d4ff79f659bd SHA512 8212b47b6726bca0110b53db38ea7c538112a8eb4243e8ad69ae3780498bfb52d61af4ddccb2995cfb57bc4303c93240fcb38513bacd1bcfeaf02b9f5ef75043
+EBUILD vlc-3.0.18.ebuild 13544 BLAKE2B e66e9619238f3e06b915aa4dc85dcce7fc077ba8105485025cfacc263c4aa065a9fc4b31647f62c2bf27ecea5725a9c6a3a4b4085c02f985266ea3d3e7224a23 SHA512 a9c865dfb1af5a1479d44aaf5be0003d830b5baeb3ee23ef8c5cef9360400dfa32c5432c4e502b74caf0515272d2affa9ae8829111db8d2a9286f874c1d097d7
+EBUILD vlc-3.0.9999.ebuild 13549 BLAKE2B 89c7c631dde054eca7311860930205ab8fbe28081f34b1b97d36493aeea9a53e9672c6eb07abdff7c85c8d4efcc7b93148fe39bd263007942e53d4752a3e5097 SHA512 96e9f1d2d07a20d5f0fd84bc7f5a26f922a52d7cbb1ce8a2950e0b6513d475a53e8b6834f6b863ad403e866fe9e27d9ff03e76cb7a96b4af528e114282bab7ef
 EBUILD vlc-9999.ebuild 13510 BLAKE2B 4469d35b248303fe06842de7d15fe8fddb0092c81f786883fb3561cbe9a8ea6d80bd20e3d6605764168d68b6478666e003e0d0839773f2deef8f6c4344f7b76c SHA512 4acfbc0cee4d3c884aefe1f3b9cd193b765f925f3d0a368c20d7ebea08c25125ecea2be91ef489c9a506d534b1693e44f4893b86c42630a5a74de706c2b80b5a
 MISC metadata.xml 4923 BLAKE2B b115bd6bc666f1da6a0ba4d5b6237fedfff4baada406e56eff9c0f9574968177490c456e2d8f0ad07cf73b8e52bcc122931ae9f800d6a29e41cbfdd4ed6780fe SHA512 4b953a8662e31a66af1fb710e166316106b393d136fca7c1c5b61e78bd285bc578037fc11b7ae07202a6fae2a4a6e43f7f6560400bab8d92457012a4fa7e3045
diff --git a/media-video/vlc/vlc-3.0.18.ebuild b/media-video/vlc/vlc-3.0.18.ebuild
index e67e949893de..b0c2b68f0ae4 100644
--- a/media-video/vlc/vlc-3.0.18.ebuild
+++ b/media-video/vlc/vlc-3.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2022 Gentoo Authors
+# Copyright 2000-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -60,6 +60,7 @@ BDEPEND="
 	amd64? ( dev-lang/yasm )
 	x86? ( dev-lang/yasm )
 "
+# <ffmpeg-5 dep for USE="ffmpeg vaapi" for bug #864721
 RDEPEND="
 	media-libs/libvorbis
 	net-dns/libidn:=
@@ -201,7 +202,10 @@ RDEPEND="
 	udev? ( virtual/udev )
 	upnp? ( net-libs/libupnp:=[ipv6(+)] )
 	v4l? ( media-libs/libv4l:= )
-	vaapi? ( media-libs/libva:=[drm(+),wayland?,X?] )
+	vaapi? (
+		<media-video/ffmpeg-5
+		media-libs/libva:=[drm(+),wayland?,X?]
+	)
 	vdpau? ( x11-libs/libvdpau )
 	vnc? ( net-libs/libvncserver )
 	vpx? ( media-libs/libvpx:= )
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index ceca1a3dae1d..1172500d37ef 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2022 Gentoo Authors
+# Copyright 2000-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 -sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86"
 fi
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
 
@@ -60,6 +60,7 @@ BDEPEND="
 	amd64? ( dev-lang/yasm )
 	x86? ( dev-lang/yasm )
 "
+# <ffmpeg-5 dep for USE="ffmpeg vaapi" for bug #864721
 RDEPEND="
 	media-libs/libvorbis
 	net-dns/libidn:=
@@ -201,7 +202,10 @@ RDEPEND="
 	udev? ( virtual/udev )
 	upnp? ( net-libs/libupnp:=[ipv6(+)] )
 	v4l? ( media-libs/libv4l:= )
-	vaapi? ( media-libs/libva:=[drm(+),wayland?,X?] )
+	vaapi? (
+		<media-video/ffmpeg-5
+		media-libs/libva:=[drm(+),wayland?,X?]
+	)
 	vdpau? ( x11-libs/libvdpau )
 	vnc? ( net-libs/libvncserver )
 	vpx? ( media-libs/libvpx:= )