gentoo auto-resync : 13:02:2024 - 23:36:16

9 files changed, 30 insertions, 15 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 959803225ccc..9ab92fd4c79a 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 431e154d35c6..8633057b5b61 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -33,5 +33,5 @@ EBUILD ffmpeg-6.0-r11.ebuild 20020 BLAKE2B a40a46d38cf91778bac13235c227dcb6c9b2d
 EBUILD ffmpeg-6.0.1-r2.ebuild 19932 BLAKE2B a061f4479a123e5718eddb266099c3026092e566b3de0f1402f5ea06bf0138d2996c15f71679e44ca28cc48c87506b98cd46c4ee1ef8b230260a4d45e8b61955 SHA512 eba2afb8851ed6ead9db8443d80b6b782139a0f02e33a64371442f7c02d1b901885c34116923e029091e4caa67f57ee2179a21908c0da98454586935fa73920b
 EBUILD ffmpeg-6.1.1-r2.ebuild 19557 BLAKE2B 37f2d46bce4dbbd0fdc1be54c718075da95fadfc6caa28fd4391960af022a2cac54374708a7e8f57455e66fdacaf69b580faaa2a532729c694c5e01faff3da4b SHA512 f04da11f41143394565733af05667e504a5d012c7b4ad669e8be46896f33f71caa3f8fc3b9fd7751667b92b40e412cb15c700423efbb1db5f7c3308fca07e288
 EBUILD ffmpeg-6.1.1-r3.ebuild 19857 BLAKE2B 257b08c1ea37d39019cbc08d392d83d8f0146bb3ba42a22f3f06bb5a7e812a64e62fc64fc554e1e444f99f288d045c89c7cd666d524d02306eac44455acf56cf SHA512 49f3eb157089ec6aa2f462ce351d3ca9d89d356ef8357e6dd48ba2f1e25f84356f86bd042f2d9fd7b8e9cd68ac10532dbd88dbca28ea6af54d7389d2e2a044dd
-EBUILD ffmpeg-9999.ebuild 19361 BLAKE2B d681d6f92adc37dd1a69e2a39ce9419c167d7d7ea1e30fd4254f524d89feb37225e6b2e940e0b8ec1618d6f05cc142f3012101a3921175560d82c377373c49f4 SHA512 036078ad30d19e833fae749c4525a70b9ae208fbaefaf8ba8f27f86327be5fce3f48e5a2e044ebdf1d57f0785c6d0fab6fab424bbcbe833bc579ab5765163675
+EBUILD ffmpeg-9999.ebuild 19709 BLAKE2B 3d940c36823d190c3450bf1087d80df700d5ad621633c19d65da5f95c1c50686698557194436164ede74da258a6b9496c094f1da03de12596a39508a2ca8aeb1 SHA512 b9839d4c6b24ba8cfc4c719d535177f0f920d9fcb026ad6ddbdf5c779f61896a622908e63b703351a61e2df1b26e81e63c1b0fa13067288290aab8abdd572973
 MISC metadata.xml 7897 BLAKE2B 911f673353c480db243c202046f876840849cb27155fb109ee365e009d20af086fe188d91c7d33d509a7362330cea853a808c8e0a463aca8de3c304a3ed52ed0 SHA512 bdf26ee26d65a5ce58bc958eaad682cf4b5101100566cd4a4adf0b671418a2a7958a54baa2abff480f17bfcfe2d33aae20ba7d37f0d7b116f210d40796483da1
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index e79ef6ab48eb..b5e32f2c8f88 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -14,6 +14,10 @@ EAPI=8
 # doing so since such a case is unlikely.
 FFMPEG_SUBSLOT=58.60.60
 
+SOC_PATCHES=(
+	ffmpeg-rpi-6.1.patch
+)
+
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SCM="git-r3"
@@ -25,14 +29,15 @@ inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
 HOMEPAGE="https://ffmpeg.org/"
+SRC_URI="soc? ( "${SOC_PATCHES[@]/#/https://dev.gentoo.org/~chewi/distfiles/}" )"
 if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
+	:
 elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	SRC_URI+=" mirror://gentoo/${P}.tar.xz"
 else # Release
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc
 	inherit verify-sig
-	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz"
+	SRC_URI+=" https://ffmpeg.org/releases/${P/_/-}.tar.xz"
 	SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )"
 
 	BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )"
@@ -108,7 +113,7 @@ FFMPEG_ENCODER_FLAG_MAP=(
 )
 
 IUSE="
-	alsa chromium doc +encode oss +pic sndio static-libs test v4l
+	alsa chromium doc +encode oss +pic sndio static-libs test v4l soc
 	${FFMPEG_FLAG_MAP[@]%:*}
 	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
 "
@@ -263,6 +268,7 @@ RDEPEND="
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] )
 	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
+	soc? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.6.0:=[sftp,${MULTILIB_USEDEP}] )
@@ -341,6 +347,7 @@ REQUIRED_USE="
 	glslang? ( vulkan !shaderc )
 	libv4l? ( v4l )
 	shaderc? ( vulkan !glslang )
+	soc? ( libdrm )
 	test? ( encode )
 	${GPL_REQUIRED_USE}
 	${CPU_REQUIRED_USE}"
@@ -379,6 +386,9 @@ src_prepare() {
 		export revision=git-N-${FFMPEG_REVISION}
 	fi
 
+	use soc &&
+		eapply "${SOC_PATCHES[@]/#/${DISTDIR}/}"
+
 	default
 
 	# -fdiagnostics-color=auto gets appended after user flags which
@@ -392,6 +402,9 @@ src_prepare() {
 multilib_src_configure() {
 	local myconf=( )
 
+	# Conditional patch options
+	use soc && myconf+=( --enable-v4l2-request --enable-libudev --enable-sand )
+
 	# bug 842201
 	use ia64 && tc-is-gcc && append-flags \
 		-fno-tree-ccp \
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 5665952d4d7e..94c36f743282 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -4,7 +4,7 @@ AUX mpv-0.37.0-drm-fix.patch 1444 BLAKE2B e0645e9b12ebbd0088b10aed34cabadbdb1b06
 DIST mpv-0.36.0.tar.gz 3409178 BLAKE2B 7260c265f02918d4caf72d8d8ecc9d4ab9783d66d675bd683a2f9c228404ad978c6fe0aa50f486b5257740176bc26f8abde7eff20d89019d5f701ec78c7743e1 SHA512 51f455a425ea5aac47acb3582d0f958a34248a2290a8d6887d22bcb9385fe8d1ab5d7f09d5408cfecfb73c1ec85d1b8ec8958e45a4941d3f711a2e580187472f
 DIST mpv-0.37.0.tar.gz 3384190 BLAKE2B 31d8d47ed7ae94540189fe05b7ea63f5b0d5c987a22191f931e4bd90664d05dca4c7e0bd0e05fcdf48b977e38e5f8eec0d2572265f2cf4a969a8a9a9dbf83d68 SHA512 a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257
 EBUILD mpv-0.36.0-r1.ebuild 7509 BLAKE2B b019ec3c189c4f1499506c44d71a5c460ace26b8de690b5ff16ecece67ba3749224690fafec149a68785cc02324ee2c7b291a323f17c5c31653423f9ec6b445a SHA512 ca82b7f1eb70e684e24abcafa8c93f25a2541b0c178c8b7bd299cc599946e115722f2234ff2a460dead755f8586523277331ccc17800383ffb5c81c5a9faddae
-EBUILD mpv-0.37.0-r1.ebuild 6983 BLAKE2B 37e21bd359e729a582201bd4b1a933946372af03c2a8ff169b117994093ae0d72d1a9b833884d06be514a6b28c4904af62c61a23b5f99b74ea01962f00edffd6 SHA512 9b61d359c3aa388409e5642f3ed40c228a92da32749594bfbf683ee129129f504c3fc15ce97602c4732ef83c36f81797e49a5f9d25bc958cac360b32b9a93a3c
+EBUILD mpv-0.37.0-r1.ebuild 6995 BLAKE2B a4a45da1baa5d2157a9727e8e41d94ada7cb15e0052970a758f93a35de2f5f50159a7fd35f344641dba5049986bd849a92505943a21b57b5e661c3aeb81bb94b SHA512 84c5e2e834728e470af2b221cfb87d9824defa069da231b2ea9fcc88871396562c0e01fed72b2924b68a5c1d94a268186aaa5fcfb3efd922506aad75aa1cd1c0
 EBUILD mpv-0.37.0.ebuild 7090 BLAKE2B 4c1e7df2155e0efa7bedb2b86d37644763a47cb4ad7f086adee9348a01ac5cea3e4ec13ac7191cb5d7784c24af3e3b1443a8be228e2c10e7660c22664c144e6a SHA512 a48defc31dbead64f4beabcce63db757d2ad3a03e18b55e37135ffc25c744c0829184155b75d8dd78f56bd6d83cacb96139f67f635e6857bc12d0ebae2831272
-EBUILD mpv-9999.ebuild 6872 BLAKE2B cf2e906387de3cca22fea72682033a561a9174b8c3749e5f4a56c667270a52244dc5ad33d239f9decf12e518a98b2c3f57442a2ab2adb8d6448717c476b0dd5a SHA512 87fc53958b43aa4381c8bde73c950442ae1d33b2a72ea965df1e96479b9b06422b5398269a8083763d51a98fe03ed24b3dcaffaa778a5803638c04b27e211e65
-MISC metadata.xml 2236 BLAKE2B 438015f84e6619d0e668c32ccc5ab271c108dbe3a0d25faae977c914ca5f5440106f892114e2ef486fe09709300aa8830bc40a2723247b242baad031efe0df9e SHA512 73a70af5a34b7881b004a9391a57d4358ac1217c250071cf1893624471389f63f9af4a0953e59655040bd815916601daeddebc73b69018e5ca7f563a5491a329
+EBUILD mpv-9999.ebuild 6884 BLAKE2B d8c7ee354ba8a03ff08742fe12584614cbbc59877ef5e4ab70b37ed40a53271e6d0cce78169d52210621307757b0b14901cac0081e63691180e0b2d2664e4226 SHA512 9108731725f0c5bc38eebe3728c94d834337ac7602b62fc64a1b32e3d36b98ad9a2f4ff85d5419d272f9b95a0c2175d9cbcfa9d5297e5e82a436d990187360f6
+MISC metadata.xml 2370 BLAKE2B d55cd3de4d841ef0e6f5494327e11b1633fe9982192371a07c7ece63795b77023dc5019fe15fca9757508b473a0bdc1dbdab92a26c7911366cb2a5aa71a1f497 SHA512 1e44ba602e743e166abbc23aa438b31e704650e3df2bc1d0df47cb2fda2c8dabd6307d8b61517104c26a149f6cb43558c0c3ff883b1708869309f70d184d2fa2
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index e6f3a0a8f95c..560695642b8f 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -24,6 +24,7 @@
 			(Note: these outputs exist for compatibility reasons only, avoid if possible)</flag>
 		<flag name="sixel">Enable support for the sixel video backend using <pkg>media-libs/libsixel</pkg></flag>
 		<flag name="sndio">Enable sound support via <pkg>media-sound/sndio</pkg></flag>
+		<flag name="soc">Use additional <pkg>media-video/ffmpeg</pkg> patches for efficient playback on some SoCs (e.g. ARM, RISC-V)</flag>
 		<flag name="tools">Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv</flag>
 		<flag name="uchardet">Enable subtitles charset discovery via <pkg>app-i18n/uchardet</pkg></flag>
 		<flag name="zimg">Enable libzimg support (for vf_fingerprint)</flag>
diff --git a/media-video/mpv/mpv-0.37.0-r1.ebuild b/media-video/mpv/mpv-0.37.0-r1.ebuild
index 731cc45c2106..df733bafe674 100644
--- a/media-video/mpv/mpv-0.37.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.37.0-r1.ebuild
@@ -24,8 +24,8 @@ IUSE="
 	+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
 	dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
 	+lua nvenc openal opengl pipewire pulseaudio rubberband sdl selinux
-	sixel sndio test tools +uchardet vaapi vdpau vulkan wayland xv zimg
-	zlib
+	sixel sndio soc test tools +uchardet vaapi vdpau vulkan wayland xv
+	zimg zlib
 "
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -47,7 +47,7 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="
 	media-libs/libass:=[fontconfig]
 	>=media-libs/libplacebo-6.338:=[opengl?,vulkan?]
-	>=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?]
+	>=media-video/ffmpeg-4.4:=[encode,soc(-)?,threads,vaapi?,vdpau?]
 	X? (
 		x11-libs/libX11
 		x11-libs/libXScrnSaver
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 6c05026b003d..c10b20b3c11a 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -24,8 +24,8 @@ IUSE="
 	+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
 	dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
 	+lua nvenc openal opengl pipewire pulseaudio rubberband sdl selinux
-	sixel sndio test tools +uchardet vaapi vdpau vulkan wayland xv zimg
-	zlib
+	sixel sndio soc test tools +uchardet vaapi vdpau vulkan wayland xv
+	zimg zlib
 "
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -47,7 +47,7 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="
 	media-libs/libass:=[fontconfig]
 	>=media-libs/libplacebo-6.338.2:=[opengl?,vulkan?]
-	>=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?]
+	>=media-video/ffmpeg-4.4:=[encode,soc(-)?,threads,vaapi?,vdpau?]
 	X? (
 		x11-libs/libX11
 		x11-libs/libXScrnSaver
diff --git a/media-video/popcorntime-bin/Manifest b/media-video/popcorntime-bin/Manifest
index 67af28db092e..4953cafb328c 100644
--- a/media-video/popcorntime-bin/Manifest
+++ b/media-video/popcorntime-bin/Manifest
@@ -6,5 +6,5 @@ DIST Popcorn-Time-0.5.0-amd64.deb 154055688 BLAKE2B e099038e6cd6f3a214209243c0ab
 DIST Popcorn-Time-0.5.0-i386.deb 159146908 BLAKE2B 2eebf6bd8c473b68dbd8019ae85155b85f249d9b2e5ec74d467606dc6b455b5e03413d6394d2b220eb70326a6b45bd25386a04fc8de546256b49af6b4774cdcd SHA512 6a45fe9c977fbadeb21133a67fb16fa0795b2e7d7af24e5a0e72c57963d11674de03fec89880d61cd7a2f218efc6db8666a1878e12628b346e4f5b6afc03bfa5
 EBUILD popcorntime-bin-0.4.8.ebuild 2125 BLAKE2B 9cf5b628d2bc3b70562ac4b7fc9a311cd0c626426f462dd578f9d405b4e2cee74df56d5891827ab06b3ecbfd15aabcd50e047224c0f706c6d0b6ecba08044714 SHA512 629058224e66dccb5201b2b9f9b32c5f1e1858ea4fd7904da1fc23203f8f2d60ad8d8d46751cad4d9bb3bca876797a05219bacb5f9ed02790a7d1cf2419e3f46
 EBUILD popcorntime-bin-0.4.9.ebuild 2125 BLAKE2B 9cf5b628d2bc3b70562ac4b7fc9a311cd0c626426f462dd578f9d405b4e2cee74df56d5891827ab06b3ecbfd15aabcd50e047224c0f706c6d0b6ecba08044714 SHA512 629058224e66dccb5201b2b9f9b32c5f1e1858ea4fd7904da1fc23203f8f2d60ad8d8d46751cad4d9bb3bca876797a05219bacb5f9ed02790a7d1cf2419e3f46
-EBUILD popcorntime-bin-0.5.0.ebuild 2414 BLAKE2B 0e882abc728d1b9f3a69823eb08607102c183703bb75409db23e3a3a3e458c2fc9ca48c3b5f21d9db57aee0b040c21b0357a692f5178ea7bed2449e21ba2103f SHA512 a58c4af5574b9d9ccabfdbac8a90d642ee224f093eae98197713adf2887f0a957bc9c93549a9dd82834182d08fca910543b9a6440eb7d96449c39bff60916906
+EBUILD popcorntime-bin-0.5.0-r1.ebuild 2437 BLAKE2B 416ffbc51bfe9f98460a17e6c468292f9d4236da3bd3b21718de46a4321106da8c2fbc0d2d7334e984beba06b419cec00377fb6247fb7924ca931c9e6f99736c SHA512 92c365bb534c1db9575196320d98f3f55dead82132c7acfa43d86b15d875543f73cc90b9d9df8b1b56db6ae84befefd977ecfc480fba6da4e32eeb2878e2a822
 MISC metadata.xml 436 BLAKE2B da1f7867d1f3a3b6a04a0975899b592976adb0299e2c370fa613d025993aeed81f719d1bde50565f3e8da15cfdd4ed6cd7f1bf4abb77c3d9371fdcfe7f4e9d13 SHA512 fec3c45b96ed58c61fb5454edc2351384b67bb52e156542bd0d71ce51f36b5943c1bee083a05c5c99917630da6ca5ffe0b87cfacde3a07d521a3c2032e42985e
diff --git a/media-video/popcorntime-bin/popcorntime-bin-0.5.0.ebuild b/media-video/popcorntime-bin/popcorntime-bin-0.5.0-r1.ebuild
index 48b1c44232a1..4d14332ff5f3 100644
--- a/media-video/popcorntime-bin/popcorntime-bin-0.5.0.ebuild
+++ b/media-video/popcorntime-bin/popcorntime-bin-0.5.0-r1.ebuild
@@ -42,6 +42,7 @@ RDEPEND="
 	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libxcb
+	x11-libs/libxkbcommon
 	x11-libs/libXcomposite
 	x11-libs/libXcursor
 	x11-libs/libXdamage