summaryrefslogtreecommitdiff
path: root/media-video
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/Manifest.gzbin24358 -> 24026 bytes
-rw-r--r--media-video/baka-mplayer/Manifest2
-rw-r--r--media-video/baka-mplayer/metadata.xml4
-rw-r--r--media-video/celluloid/Manifest4
-rw-r--r--media-video/celluloid/celluloid-0.26.ebuild36
-rw-r--r--media-video/celluloid/metadata.xml3
-rw-r--r--media-video/ffmpeg-chromium/Manifest4
-rw-r--r--media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild2
-rw-r--r--media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild248
-rw-r--r--media-video/ffmpeg/Manifest2
-rw-r--r--media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild616
-rw-r--r--media-video/ffmpeg/files/ffmpeg-6.1.1-memory-leak.patch129
-rw-r--r--media-video/jellyfin-media-player/Manifest2
-rw-r--r--media-video/jellyfin-media-player/jellyfin-media-player-1.9.1.ebuild4
-rw-r--r--media-video/makemkv/Manifest6
-rw-r--r--media-video/makemkv/makemkv-1.17.7.ebuild (renamed from media-video/makemkv/makemkv-1.17.6.ebuild)3
-rw-r--r--media-video/movit/Manifest4
-rw-r--r--media-video/movit/movit-1.7.1.ebuild (renamed from media-video/movit/movit-1.6.3-r1.ebuild)4
-rw-r--r--media-video/mpv/Manifest4
-rw-r--r--media-video/mpv/mpv-0.38.0.ebuild7
-rw-r--r--media-video/mpv/mpv-9999.ebuild5
-rw-r--r--media-video/openshot/Manifest5
-rw-r--r--media-video/openshot/metadata.xml16
-rw-r--r--media-video/openshot/openshot-2.6.1.ebuild55
-rw-r--r--media-video/openshot/openshot-3.1.1.ebuild55
-rw-r--r--media-video/pipewire/Manifest13
-rw-r--r--media-video/pipewire/files/1.0.0/0001-fix-compile-with-no-examples.patch59
-rw-r--r--media-video/pipewire/files/1.0.0/0002-fix-x11-bell-segfault.patch29
-rw-r--r--media-video/pipewire/pipewire-1.0.5-r1.ebuild (renamed from media-video/pipewire/pipewire-1.0.3.ebuild)14
-rw-r--r--media-video/pipewire/pipewire-1.0.5.ebuild2
-rw-r--r--media-video/pipewire/pipewire-1.0.6.ebuild (renamed from media-video/pipewire/pipewire-1.0.0-r1.ebuild)21
-rw-r--r--media-video/pipewire/pipewire-9999.ebuild16
-rw-r--r--media-video/popcorntime-bin/Manifest6
-rw-r--r--media-video/popcorntime-bin/popcorntime-bin-0.4.9.ebuild4
-rw-r--r--media-video/popcorntime-bin/popcorntime-bin-0.5.0-r2.ebuild (renamed from media-video/popcorntime-bin/popcorntime-bin-0.5.0-r1.ebuild)2
-rw-r--r--media-video/popcorntime-bin/popcorntime-bin-0.5.1-r1.ebuild (renamed from media-video/popcorntime-bin/popcorntime-bin-0.5.1.ebuild)2
-rw-r--r--media-video/projectx/Manifest3
-rw-r--r--media-video/projectx/projectx-0.91.0.10-r4.ebuild4
-rw-r--r--media-video/projectx/projectx-0.91.0.10-r5.ebuild123
-rw-r--r--media-video/smplayer/Manifest2
-rw-r--r--media-video/smplayer/metadata.xml4
-rw-r--r--media-video/totem/Manifest2
-rw-r--r--media-video/totem/totem-43.0-r1.ebuild4
-rw-r--r--media-video/ttcut/Manifest2
-rw-r--r--media-video/ttcut/ttcut-0.19.6_p1-r1.ebuild4
-rw-r--r--media-video/unifi-video/Manifest6
-rw-r--r--media-video/unifi-video/files/commons-daemon-move.patch12
-rw-r--r--media-video/unifi-video/files/unifi-video.initd20
-rw-r--r--media-video/unifi-video/files/unifi-video.service11
-rw-r--r--media-video/unifi-video/metadata.xml8
-rw-r--r--media-video/unifi-video/unifi-video-3.10.13-r5.ebuild92
-rw-r--r--media-video/vlc/Manifest7
-rw-r--r--media-video/vlc/vlc-3.0.20-r11.ebuild (renamed from media-video/vlc/vlc-3.0.20-r10.ebuild)2
-rw-r--r--media-video/vlc/vlc-3.0.20-r5.ebuild518
-rw-r--r--media-video/vlc/vlc-3.0.9999.ebuild2
-rw-r--r--media-video/vlc/vlc-9999.ebuild2
-rw-r--r--media-video/wireplumber/Manifest4
-rw-r--r--media-video/wireplumber/wireplumber-0.5.2.ebuild123
-rw-r--r--media-video/wireplumber/wireplumber-9999.ebuild33
-rw-r--r--media-video/yle-dl/Manifest2
-rw-r--r--media-video/yle-dl/yle-dl-20240429.ebuild2
61 files changed, 1375 insertions, 1005 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 845de6d7c4ce..34c74a730a26 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
diff --git a/media-video/baka-mplayer/Manifest b/media-video/baka-mplayer/Manifest
index 27c6cee1004c..4a9cdb459c98 100644
--- a/media-video/baka-mplayer/Manifest
+++ b/media-video/baka-mplayer/Manifest
@@ -5,4 +5,4 @@ AUX baka-mplayer-2.0.4-playlist-regression.patch 886 BLAKE2B b2c0edba4a2a0da8949
DIST baka-mplayer-2.0.4.tar.gz 988060 BLAKE2B 4d73e6626bab90b2ac818fdc1b0d8ab7758a924805ca8356c6fa94d25df9acbfd53d7e997b58e5c85b68e033f83ce89d6e3b0c3e30ecc23d7d75b4bf74ae0911 SHA512 7898d65e87540bcb528d429dc70daefc7d4c0711b2983326cf6fa3a14e566c2742334378befdb710b8cc59452f960bc17b290058ba9e6878e830de6dbafce55a
EBUILD baka-mplayer-2.0.4-r2.ebuild 1439 BLAKE2B 0a8478f820bb52f33bf824346f137c99d19302eecdb5bb79463562ff09ecb1f5b2f2ec7b91c0f95c4d08a1563c592b85d14f6be078a07063fc8e95e0fdf2c8b2 SHA512 3798c2c15155770be723b080bc6dfde04f52d1abe155df23777563c4b1b7f12de6509ae98acc799cab247b618cd9b9cf29844a82844c84b39e6aba23c364157a
EBUILD baka-mplayer-9999.ebuild 1189 BLAKE2B dc54a8dbb9a74fa208db31fd88afd8dae75db62875942e5e5509e63e5a31983c15240b81db5fefd0ebe46871867894db733427d1a125e89605d8b3a2a4566217 SHA512 255abc810d517ae7f1165c7a1989098c1315e3cb3b0384d78c8044c5064bb7163115d1ce04c5be39bf8d1d183a8ab31328d344bba140f63f26a09347c3bc08a7
-MISC metadata.xml 741 BLAKE2B 5fea8a8b3fd803742c6f71acc12e35fddee71fe7deddd35c87bfa0a5bef853833ee19864f69986c141a573cbc65cb2ac8b4aa191a8eeb6b28acd05592200956e SHA512 03f290ffac4d0aa5a978d9fe5e7e7a76e83de243c73e920c045a43b333bdc039a2e09f8f65c56dbc77ef7865b2360fc6bb34eaaf64f4a2df992d30dafafb8331
+MISC metadata.xml 627 BLAKE2B 034570185f1a37040bd07dd4162c04eeb2b6946d1553d76131a3ce15d2bb87365417962fcfcf28c962b8c2a39a44c589858ee2157c229f8c9dfcd85511cd45d5 SHA512 44b96150d37579f0df89576895e5d56aa9e5e82798c9620980bfc9a20c527b5c002d178d2675233d2ccba4ad59a5fd681469ed712147f8dd841bc8dad2bf01e6
diff --git a/media-video/baka-mplayer/metadata.xml b/media-video/baka-mplayer/metadata.xml
index 1218cd535346..870fb167b531 100644
--- a/media-video/baka-mplayer/metadata.xml
+++ b/media-video/baka-mplayer/metadata.xml
@@ -6,10 +6,6 @@
<name>Christopher Steward</name>
</maintainer>
<maintainer type="project">
- <email>qt@gentoo.org</email>
- <name>Gentoo Qt Project</name>
- </maintainer>
- <maintainer type="project">
<email>media-video@gentoo.org</email>
<name>Gentoo Video project</name>
</maintainer>
diff --git a/media-video/celluloid/Manifest b/media-video/celluloid/Manifest
index 1c19e86e8622..9c7a1403e274 100644
--- a/media-video/celluloid/Manifest
+++ b/media-video/celluloid/Manifest
@@ -1,3 +1,5 @@
DIST celluloid-0.21.tar.xz 413072 BLAKE2B 726eb035f15c24333151833ded843be611b6d6340d77de13f38d29f92307da1e30c63c657e654327f10b617987f8800e59b72e28bcc65cdcad4ef9ab002214c4 SHA512 6e48d982be127c21cc6afeec8e94ae5c78c667f865690f8fad6db2f0b8290922682334c4d905827e99765dc2084c1b8a36927ff3de485a7a456f4a2fb7058ae6
+DIST celluloid-0.26.tar.xz 305420 BLAKE2B d74f5be26427ac0798f67e37066f0840d6af1a5a43e4bf714d02519e57231c57c34e191a678d11ebdca0ccbfd8f40eed4a23410f054394cc9f42559c6bbc934c SHA512 bcbb970b8ce512d4d7e64833a309a2e32631b262989ee7f9e1ec4b7f0015387b3978c8cbc0206a5aa86bd9e74fae3b7d38776e71be8c16996444d234bc37d42f
EBUILD celluloid-0.21-r1.ebuild 717 BLAKE2B 3b4e362fb63f14a372a61e5c960270763d57399f60df5f1e266c8422380355fe78374ecb8b376f670d7eaecbffd2840b22f335eca7329425a972b78687be9720 SHA512 8e4cecfff17f61f1b4c0b8b3dc635bd7b8dce22801ea9638961e56d2b836b6f5cc0e2c4e8edcbb9d14394aa7d6a3ae2249e073e12e72395b46cb90d3d0cbaa9e
-MISC metadata.xml 241 BLAKE2B 976bb17a5de85e86e06973e02e7dfe782e7b4c2942907deaa9ec15a2d9a47d7eec5ff256069f78e789b7059a061c98641aaff1d21618b68c27fdccdc9474b08d SHA512 6a57f01af8ea264571202d1dcce35b702a444fb9da3e3fdc3930a349b19f9edac50fc04fa4facea682e9584c585c145aec629b2845a4c344332d7dac7d7005e3
+EBUILD celluloid-0.26.ebuild 795 BLAKE2B 269a2ced7d76a7851c02d52bbe1722b91db747065caa79c14b9b0c848d14f16fca12a7d84657d4be27cc363c347244585cfb75c6f87f3ce540bb088a3d214567 SHA512 f441d151ac503fc666fa4396d1445c588303f164a5899ce8a5d50e4dd6851af0cde95d479e641852ea83941ee96c6187049ca4b7fe84342b55a25fb60b321e72
+MISC metadata.xml 329 BLAKE2B 7434173a6d1de1bb8f30af8945b50699bd2fde6229cef9e094a3c3d2505a726ff273af4f8ecf34b91abb4277b28293af20129c6c2f14724a1fc30921f64bc8d3 SHA512 95c3095211a04591b7bfc01da5d9027a47b94d802d89713cd2df54f5f9bf0d676fa5af63ecd4217d8a8c077a81b6201b3c6948cc7e04faff01f148a2c1d63db9
diff --git a/media-video/celluloid/celluloid-0.26.ebuild b/media-video/celluloid/celluloid-0.26.ebuild
new file mode 100644
index 000000000000..00062ed05b0b
--- /dev/null
+++ b/media-video/celluloid/celluloid-0.26.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson xdg
+
+DESCRIPTION="Simple GTK+ frontend for mpv"
+HOMEPAGE="https://celluloid-player.github.io/"
+SRC_URI="https://github.com/celluloid-player/celluloid/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+RDEPEND=">=dev-libs/glib-2.66:2
+ >=gui-libs/gtk-4.6.1:4
+ >=gui-libs/libadwaita-1.2.0:1
+ >=media-video/mpv-0.32:=[libmpv]
+ media-libs/libepoxy"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-libs/appstream-glib
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig"
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/media-video/celluloid/metadata.xml b/media-video/celluloid/metadata.xml
index 68bfde632f76..a6bfe1cb747e 100644
--- a/media-video/celluloid/metadata.xml
+++ b/media-video/celluloid/metadata.xml
@@ -5,4 +5,7 @@
<email>leio@gentoo.org</email>
<name>Mart Raudsepp</name>
</maintainer>
+<upstream>
+ <remote-id type="github">celluloid-player/celluloid</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index a263cac959e0..763dbb349279 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -5,9 +5,11 @@ DIST ffmpeg-chromium-121.tar.xz 10128048 BLAKE2B ba8e25356b7e0820dffea1b919288dd
DIST ffmpeg-chromium-123.tar.xz 10323756 BLAKE2B b56afd5946513511938feeea4fd60e22fcf241a2380b36990eadf812b3517d6941156de73135efdc873704d27bc3329c71193be5132e462caaf7f2dc29e8a058 SHA512 635e1c5496d6f41fa5dd69efbe6dd335a15705dce8544fc45df440b19965caa130646d16b7c22b2b7cc0809979d28f39245fc5c208637e445b1fc1eb384da418
DIST ffmpeg-chromium-124.tar.xz 10378648 BLAKE2B 3cb79d356e84d76a241ad81491d22d42b7a768e348d245bda00101e3967c0864e95a1dd83372e6aaf3a9130ff5ae38610fe2bd4ee8e21fc8247af4172af0683a SHA512 627d1ba81c50300e7188e8a2cc5f76ea9e81e817209631f2eecb81b7b9a0be60a12290eba16240dd0b0dce3d59550a8246be54df2035bd75a9e95ae77d67467b
DIST ffmpeg-chromium-125.tar.xz 10372892 BLAKE2B 53b805354b55f1dfbe2341b767aaccca7efea4cced02db9090be88e89a4d2d688904ffc996c206d92a99d4eb93733b7f8cb47fd80dc43019c3bb6690903a1140 SHA512 c1b68b16a3dbd6f96e52c313b9ddf1c193ef302e5cbe7e127c511e54a4453c32c84b3df954e397d7ba834ef17fe1cba6efabfde855d3bb9e497bcde1b66c3d8d
+DIST ffmpeg-chromium-126.tar.xz 10402160 BLAKE2B 96a92ff2a5ece8668693f5ef7ed5da3e61a523b98a91d00316494df91edfc42c1622663719a3c192de2a4ebf7a6258f08c53393201ee3fc3261f162e1b529dcd SHA512 8fc10b1d5fe159a1dd718229bf8ec50ed0bea1fedd917859b3a0703f15e94809087e67ccf2031eb14ae8b06ad32d958ed71ff54621fd667f5507abd9738a6f0c
EBUILD ffmpeg-chromium-120.ebuild 6692 BLAKE2B db110de522d1885bcf2f5d3c45ca3b343943ecdbe594610a427baeae6e5e6521ee9abfebc6126b543da4c35b7715f464916e65a6c44205c69612a68fd7692317 SHA512 fd3b1ded196a4af08742723ab1ca36dda21e13c2899718e64b5ca3046474bb97042402b3870c2b9edeee3027a0f1eaba1f960bd4208c465651ad741ec8c361c8
EBUILD ffmpeg-chromium-121.ebuild 6692 BLAKE2B 36aafbff5f4c4a7bf81d9fe1293a1962a8632f9df49012f08e7130e6050a2a026ee3b4394eca6456200ba30a2661a7fe7d1b4a3c5c95602d7865802d65587247 SHA512 a47296b03217d345a6465321ed51ae11a0a61991ea6b8790571e7c0754d1a0c9d91f7944f255dd6a05e255d863523b4637e0e9c21cc644541c04fd5abbd3a43d
EBUILD ffmpeg-chromium-123.ebuild 6629 BLAKE2B ccf9f2604c0440214a1a3670208d192b237be824bfb70294aaf594c0a3f7241c16b1443806b0aa5e78e184c24ad6978f2d588b0953fcd1478f7699d279e7922c SHA512 aa35b07def61daa2b1c4ac575e8c7b9db019dc2be1dd284b20f43e76cb2dd72e8d47d7e5429f9e703de46439a310de4a20d2973fe219de8af1142ec5178430c7
EBUILD ffmpeg-chromium-124.ebuild 6631 BLAKE2B 5f190273d57e0a20c90d042a231bff16dae975c6153145c74218245b5cd4207fc56033620590fd5e79370ca0e295d1e1075e6113b896e2b43b7af8b6b699977a SHA512 2f69214111249dda6e01535d402d8fc457bcb220e5ae8360f08b686ec2a96a4c78a36e2dd7205b6fffe5b3f9aa0282154c844dae0d59a2edb2e6f183fce5687d
-EBUILD ffmpeg-chromium-125.ebuild 6652 BLAKE2B a747d58bee00928121acf21a257efe26afa101f8cae207756a4e7ea5aa6153748a5245487266102cd90d2d125d766a576820604720cd6439628565160b497bc4 SHA512 ade2685e1bf4291f766d1ff990052ee5db0765b0e9725ca68667d770a01e1f3789d7c92801d2ec575bd6e5b8d800e8c6385e7c700cf4468d6fc7ed81a305359c
+EBUILD ffmpeg-chromium-125.ebuild 6659 BLAKE2B b44f7455538d182e18bc391ef6a4e2559e4f3d0eb72712ef7f059df02fbba4245be24e4132b501faba015f1330c88d16d48bc515b031489b8d3815dc5dfb481f SHA512 b5eb72335bdaf723ea49febc0a47bdf8fbf81fceb7fddcbfe15d9e9885598c15dc53ddf23df90eab7e7725c69b68ec760a12917c2907e723c17c6c731c7852f8
+EBUILD ffmpeg-chromium-126.ebuild 6659 BLAKE2B 75ca109e9e966b86635a2227e2322548c84c05c665a5c9247797cd87c118c6068eb9477bde71c1ef6522ec304d6a43726c4cad58658208b13720db5807b24d44 SHA512 a4ee20256d01e025e702a406b5e4c697c3fc3a256825c5ad2e0da57043085ce73343eb079d5fddf935ca463cbdcad3f7361f5cd99426e47d1ef55cd98d995020
MISC metadata.xml 820 BLAKE2B 666416ef717f7990f3e90e644b82c2833adb4942676f74eac6f15841d0f2a3a841b72906a7079321fb2101ffd672308892f90f536fcefa3837fb49344aeff3e9 SHA512 ffd36a905e6891f5d2134f159e6cb6707d4b37b2c5398474983ffa314fa9c5c140a5b8297de43827dd8108b7b4bcda7859158d2947e5b48730b820660a06962e
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
index 2b5c1d96a3ca..31ce26ab8f8a 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
@@ -16,7 +16,7 @@ LICENSE="
"
SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64"
# Options to use as use_enable in the foo[:bar] form.
# This will feed configure with $(use_enable foo bar)
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild
new file mode 100644
index 000000000000..75e65da60e4e
--- /dev/null
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+COMMIT=092f84b6141055bfab609b6b2666b724eee2e130
+DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers"
+HOMEPAGE="https://ffmpeg.org/"
+SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz"
+
+LICENSE="
+ !gpl? ( LGPL-2.1 )
+ gpl? ( GPL-2 )
+"
+SLOT="${PV}"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64"
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+ cpudetection:runtime-cpudetect debug
+ +gpl
+ vaapi vdpau vulkan
+ nvenc:ffnvcodec
+ # Threads; we only support pthread for now but ffmpeg supports more
+ +threads:pthreads
+)
+
+IUSE="
+ ${FFMPEG_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_thumb:armv5te
+ cpu_flags_arm_v6:armv6
+ cpu_flags_arm_thumb2:armv6t2
+ cpu_flags_arm_neon:neon
+ cpu_flags_arm_vfp:vfp
+ cpu_flags_arm_vfpv3:vfpv3
+ cpu_flags_arm_v8:armv8
+ cpu_flags_arm_asimddp:dotprod
+ cpu_flags_arm_i8mm:i8mm
+)
+ARM_CPU_REQUIRED_USE="
+ arm64? ( cpu_flags_arm_v8 )
+ cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+ cpu_flags_arm_neon? (
+ cpu_flags_arm_vfp
+ arm? ( cpu_flags_arm_thumb2 )
+ )
+ cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+ cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+ cpu_flags_arm_v6? (
+ arm? ( cpu_flags_arm_thumb )
+ )
+"
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx
+ mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+ cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+ cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+ cpu_flags_x86_xop? ( cpu_flags_x86_avx )
+ cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 )
+ cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+ cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 )
+ cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 )
+ cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 )
+ cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
+ cpu_flags_x86_sse2? ( cpu_flags_x86_sse )
+ cpu_flags_x86_sse? ( cpu_flags_x86_mmxext )
+ cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx )
+ cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow )
+ cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+ ${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+ ${ARM_CPU_REQUIRED_USE}
+ ${X86_CPU_REQUIRED_USE}
+"
+
+RDEPEND="
+ >=media-libs/opus-1.0.2-r2
+ vaapi? ( >=media-libs/libva-1.2.1-r1:0= )
+ nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 )
+ vdpau? ( >=x11-libs/libvdpau-0.7 )
+ vulkan? ( >=media-libs/vulkan-loader-1.3.277:= )
+"
+
+DEPEND="${RDEPEND}
+ vulkan? ( >=dev-util/vulkan-headers-1.3.277 )
+"
+BDEPEND="
+ >=dev-build/make-3.81
+ virtual/pkgconfig
+ cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+"
+
+REQUIRED_USE="
+ vulkan? ( threads )
+ ${CPU_REQUIRED_USE}"
+RESTRICT="
+ test
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-120.patch
+ "${FILESDIR}"/chromium.patch
+)
+
+src_prepare() {
+ export revision=git-N-g${COMMIT:0:10}
+ default
+
+ # -fdiagnostics-color=auto gets appended after user flags which
+ # will ignore user's preference.
+ sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
+
+ echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+src_configure() {
+ local myconf=( )
+
+ # Bug #918997. Will probably be fixed upstream in the next release.
+ use vulkan && append-ldflags -Wl,-z,muldefs
+
+ # bug 842201
+ use ia64 && tc-is-gcc && append-flags \
+ -fno-tree-ccp \
+ -fno-tree-dominator-opts \
+ -fno-tree-fre \
+ -fno-code-hoisting \
+ -fno-tree-pre \
+ -fno-tree-vrp
+
+ local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+
+ for i in "${ffuse[@]#+}" ; do
+ myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+ done
+
+ # CPU features
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ use ${i%:*} || myconf+=( --disable-${i#*:} )
+ done
+
+ # Try to get cpu type based on CFLAGS.
+ # Bug #172723
+ # We need to do this so that features of that CPU will be better used
+ # If they contain an unknown CPU it will not hurt since ffmpeg's configure
+ # will just ignore it.
+ for i in $(get-flag mcpu) $(get-flag march) ; do
+ [[ ${i} = native ]] && i="host" # bug #273421
+ myconf+=( --cpu=${i} )
+ break
+ done
+
+ # LTO support, bug #566282, bug #754654, bug #772854
+ if [[ ${ABI} != x86 ]] && tc-is-lto; then
+ # Respect -flto value, e.g -flto=thin
+ local v="$(get-flag flto)"
+ [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" )
+ fi
+ filter-lto
+
+ # Mandatory configuration
+ myconf=(
+ --disable-stripping
+ # This is only for hardcoded cflags; those are used in configure checks that may
+ # interfere with proper detections, bug #671746 and bug #645778
+ # We use optflags, so that overrides them anyway.
+ --disable-optimizations
+ --disable-libcelt # bug #664158
+ "${myconf[@]}"
+ )
+
+ # cross compile support
+ if tc-is-cross-compiler ; then
+ myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+ case ${CHOST} in
+ *mingw32*)
+ myconf+=( --target-os=mingw32 )
+ ;;
+ *linux*)
+ myconf+=( --target-os=linux )
+ ;;
+ esac
+ fi
+
+ # Use --extra-libs if needed for LIBS
+ set -- "${S}/configure" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+ --cc="$(tc-getCC)" \
+ --cxx="$(tc-getCXX)" \
+ --ar="$(tc-getAR)" \
+ --nm="$(tc-getNM)" \
+ --strip="$(tc-getSTRIP)" \
+ --ranlib="$(tc-getRANLIB)" \
+ --pkg-config="$(tc-getPKG_CONFIG)" \
+ --optflags="${CFLAGS}" \
+ --disable-all \
+ --disable-autodetect \
+ --disable-error-resilience \
+ --disable-everything \
+ --disable-faan \
+ --disable-iconv \
+ --disable-network \
+ --enable-avcodec \
+ --enable-avformat \
+ --enable-avutil \
+ --enable-libopus \
+ --enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \
+ --enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \
+ --enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \
+ --enable-pic \
+ --enable-static \
+ "${myconf[@]}" \
+ ${EXTRA_FFMPEG_CONF}
+
+ echo "${@}"
+ "${@}" || die
+}
+
+src_compile() {
+ emake V=1 libffmpeg
+}
+
+src_install() {
+ emake V=1 DESTDIR="${D}" install-libffmpeg
+}
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 78dbab71070d..1c58550008f9 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -21,6 +21,7 @@ AUX ffmpeg-6.0.1-libjxl-0.9.patch 5209 BLAKE2B 52c393c8e9b15382dbaf06f0c4651927f
AUX ffmpeg-6.1-gcc-14.patch 523 BLAKE2B b82fc06a7eee0c7ab68ef78f3ac205f45a68a7799dc241f0a574afa48e4dbd477c0d67f7c5a7ff46971adc821ef1507f4957156200167a2c59f8c7f7867ac048 SHA512 092cd9bad652ab82c3b160a37c0c92b561577d56b33776e30b79b7abf487fffeb1ef1273b950c4d4eff62d3cd7fec2a6dc2c294285b0b32eda364e47834a4ff9
AUX ffmpeg-6.1-opencl-parallel-gmake-fix.patch 370 BLAKE2B 46afba747d26105e5520389016aa8cc73ebc1425095e7818e0c2e23ff66b822a5428fec8253a6b545456bd94d0e746ed24bc014a7fa25d97b6fc4acf753341d4 SHA512 82b16798e63736dc67ad03e62eb31c7d3653d2e53a775a0a4456e01985da2336ebde587d3acd2272065c5ce82be528ebc051cd6c121832829d7cd0ed2aba3fdd
AUX ffmpeg-6.1-wint-conversion.patch 3514 BLAKE2B fcb65b882af964a8f45f71ea3f885fc016e3f89c3d6f0bd6d661d489715c0f746e763a86c6ade1515e212b01559d90ea9c2a97c965e0c0f9087b8396cdd58414 SHA512 7e09fc1a811a21aee9eef0370e57a37817652229a6b0e58cd2e8723e8336124396fe40f6a7c6c5f860046410596027d27d900371ff86609b86ef94dd0633977f
+AUX ffmpeg-6.1.1-memory-leak.patch 4184 BLAKE2B 93499876d5bab3dede021f646146f449d209f520ace803d9d46b0132d32aaea2bf6047c67f8804545a8eb90530c8884f5c687836cff2af111baeb52bbf1884ba SHA512 926c662c27f379c9f91ee48eb23090ba7d0c429a0e00a1ebc0fcba75657c0091da1a1b11441a61cfa77e6ba659906127bf3a51ad17d9ff921455d5495381b658
AUX ffmpeg-6.1.1-vulkan-rename.patch 5784 BLAKE2B 25e85dc0e5d3915a709d86be60a938f4669d87a370c98bd5d17b94fd3e1fec4ae78a6fc696dd862ce5c932987aac601dfcf8f8c8a6a2acd8adf6166a4368b11d SHA512 f7d2a10b1c143d9ddbc08f0faa96ccabbbadb7ab2e293cef53f77f93b44560bf099b4a40e434295925683963887afaf34ee28052737b4207ca531d399e0243f5
AUX vmaf-models-default-path.patch 1126 BLAKE2B 71f83765dc89b85e929af393f9d1415d119e71a91aaf45e8a32fd4fff270a129ca797c3b383a6074bea32fb582816660022a59d33bb6f557514df038baaf0271 SHA512 4d21f4b1622d8e47d2821ecac6b893847ada74d75db7d8aaac70efc7e6e7a6607c011b6fb2d015cb0c5e05f6a56e4feed43eca7d35b0f686a68261e6d9981b6a
DIST ffmpeg-4.4.4-texinfo.patch.xz 19136 BLAKE2B 591b46180fccdb58c5b6b102c5e12075ff4388dc6bc0ab1752531d4f9f2802c1fd09ed1353ed70a539fdc5c2298f9cfc84ec24e3a04d371ef0d9f3f30d8e8f38 SHA512 f86a324efe261801a5192d4f204f48de581466550cca49b54432fdf5430f1b3bc9a9d31b9b52e2f23481def67ad55b5ad315752c482709aa67b1f3a3e6c17a4f
@@ -38,5 +39,6 @@ EBUILD ffmpeg-4.4.4-r9.ebuild 20312 BLAKE2B 50dd3e95cf6277261dc983dc3d807a4a5ed1
EBUILD ffmpeg-6.0-r12.ebuild 20022 BLAKE2B 1d27958625368f9748d5a2a4a06bad7042795fd7cc0080285ee07ec98bef187ede3f0a327ce442a2c61d2f60adf84de014a916acd405ae4455ab2acfcf25cb6b SHA512 9469da9701053831748314d4a3ef750e260106113197384ecabca51cdfbacab79018e26096b3b5ea96080f849de9ec032462f093bd41eb57e73064185e40df06
EBUILD ffmpeg-6.0.1-r4.ebuild 20020 BLAKE2B c19d2af1c04d2c202fc84efda51da246f265b472ab414a3f613542cbc845e8d6e3e78d02ea4ef448866d6a711534ef181c4850bb75fc04c6c499755c0c4046ca SHA512 2f7e5866ce0f1d47332a1d8233b436a6d3680a75e5e406519387f177e3574cb9b7181169d8eb51273cf5fc5695f410ad12e1062ed3fc2d05fbdfa80c37d0a15e
EBUILD ffmpeg-6.1.1-r5.ebuild 20314 BLAKE2B 7f7024133e2855fe5686d6d8c45374cd1fb2caebfe5eb0b89bab75d46c78d86c793a639df2b5bfd9749897263ccfc9fbf1285df002f09dd31e8d183da8450ae1 SHA512 b87fa32674fec46d064f7e5a191d9b68bb1ef9ebcc3da62e185b43398520dc3a3c864fd112e10ee521858f0a981c6dc514129b27802448fc59720cba3875a47a
+EBUILD ffmpeg-6.1.1-r6.ebuild 20359 BLAKE2B 8df188ef17fd791580f8b99260d9df5d5292756a3a1391d6f856c3ead1e0005d4a6db3522a144720aec1ee4f0034255fe6bebe4334727ee07be2ce79879ec19d SHA512 242dbdda98204543379bf6bf3786b3143330a33010389cc4758a30b33f5821c0669ab577e80b72a56d286d5e0437fe6676b16d51c9c62adf2ff84133da9ac96b
EBUILD ffmpeg-9999.ebuild 20059 BLAKE2B 10591fc6ed5448828a2208c6e3950aecd007c901844fd7b6b7894c51ec301adcd07935617eba3f975dc9397d226303ccd761b1a0c40edf068cf8729ed10c5981 SHA512 44694bb25edc1fa33657d3da3affa04e682a5336d399d93585c27ae63ac33c26dc0f102e29151621de07727478b836667b8b12e4921ffc4a53a2cc65e141623a
MISC metadata.xml 7897 BLAKE2B 3ca144eac26a80cd6bd85c51c72e65a879e50ef810bcfc926dabacbcf1e1b217973934488c75f32b9e2a872f3a9f2a1c5e075d01fe048d1076997792fab383a9 SHA512 aa06791277e42ada2f1c3af3f360939f289012f7a1283471b4490c584f88f3f82eb6552218c4bead5d3c85b4514536dd63860fff57f635b189bc78d22a84c43a
diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild
new file mode 100644
index 000000000000..9f5bd8424035
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild
@@ -0,0 +1,616 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=58.60.60
+
+SOC_PATCH="ffmpeg-rpi-6.1-r3.patch"
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SCM="git-r3"
+ EGIT_MIN_CLONE_TYPE="single"
+ EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
+fi
+
+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? ( https://dev.gentoo.org/~chewi/distfiles/${SOC_PATCH} )"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ :
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+ SRC_URI+=" mirror://gentoo/${P}.tar.xz"
+else # Release
+ inherit verify-sig
+
+ SRC_URI+="
+ https://ffmpeg.org/releases/${P/_/-}.tar.xz
+ verify-sig? (
+ https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc
+ soc? ( https://dev.gentoo.org/~chewi/distfiles/${SOC_PATCH}.asc )
+ )
+ "
+
+ BDEPEND="
+ verify-sig? (
+ sec-keys/openpgp-keys-ffmpeg
+ soc? ( sec-keys/openpgp-keys-gentoo-developers )
+ )
+ "
+
+ src_unpack() {
+ if use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc} /usr/share/openpgp-keys/ffmpeg.asc
+ use soc && verify-sig_verify_detached "${DISTDIR}"/${SOC_PATCH}{,.asc} /usr/share/openpgp-keys/gentoo-developers.asc
+ fi
+ default
+ }
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+ !gpl? ( LGPL-2.1 )
+ gpl? ( GPL-2 )
+ amr? (
+ gpl? ( GPL-3 )
+ !gpl? ( LGPL-3 )
+ )
+ gmp? (
+ gpl? ( GPL-3 )
+ !gpl? ( LGPL-3 )
+ )
+ libaribb24? (
+ gpl? ( GPL-3 )
+ !gpl? ( LGPL-3 )
+ )
+ encode? (
+ amrenc? (
+ gpl? ( GPL-3 )
+ !gpl? ( LGPL-3 )
+ )
+ )
+ samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+ +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp
+ +gpl hardcoded-tables +iconv libxml2 lzma +network opencl
+ openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan
+ X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
+ # libavdevice options
+ cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+ opengl
+ # indevs
+ libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
+ # decoders
+ amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac
+ jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm
+ libaribb24 modplug:libmodplug opus:libopus qsv:libvpl libilbc librtmp ssh:libssh
+ speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec
+ vorbis:libvorbis vpx:libvpx zvbi:libzvbi
+ # libavfilter options
+ appkit
+ bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite fontconfig frei0r
+ fribidi:libfribidi glslang:libglslang ladspa lcms:lcms2 libass libplacebo
+ libtesseract lv2 rubberband:librubberband shaderc:libshaderc truetype:libfreetype
+ truetype:libharfbuzz vidstab:libvidstab vmaf:libvmaf zeromq:libzmq zimg:libzimg
+ # libswresample options
+ libsoxr
+ # Threads; we only support pthread for now but ffmpeg supports more
+ +threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+ amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame
+ openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1
+ theora:libtheora twolame:libtwolame webp:libwebp x264:libx264
+ x265:libx265 xvid:libxvid
+)
+
+IUSE="
+ alsa chromium doc +encode oss +pic sndio static-libs test v4l soc
+ ${FFMPEG_FLAG_MAP[@]%:*}
+ ${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+ cpu_flags_arm_thumb:armv5te
+ cpu_flags_arm_v6:armv6
+ cpu_flags_arm_thumb2:armv6t2
+ cpu_flags_arm_neon:neon
+ cpu_flags_arm_vfp:vfp
+ cpu_flags_arm_vfpv3:vfpv3
+ cpu_flags_arm_v8:armv8
+ cpu_flags_arm_asimddp:dotprod
+ cpu_flags_arm_i8mm:i8mm
+)
+ARM_CPU_REQUIRED_USE="
+ arm64? ( cpu_flags_arm_v8 )
+ cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+ cpu_flags_arm_neon? (
+ cpu_flags_arm_vfp
+ arm? ( cpu_flags_arm_thumb2 )
+ )
+ cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+ cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+ cpu_flags_arm_v6? (
+ arm? ( cpu_flags_arm_thumb )
+ )
+"
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 )
+PPC_CPU_REQUIRED_USE="
+ cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec )
+ cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx )
+"
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx
+ mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+ cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+ cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+ cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+ cpu_flags_x86_xop? ( cpu_flags_x86_avx )
+ cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 )
+ cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+ cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 )
+ cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 )
+ cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 )
+ cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
+ cpu_flags_x86_sse2? ( cpu_flags_x86_sse )
+ cpu_flags_x86_sse? ( cpu_flags_x86_mmxext )
+ cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx )
+ cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow )
+ cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+ ${ARM_CPU_FEATURES[@]}
+ ${MIPS_CPU_FEATURES[@]}
+ ${PPC_CPU_FEATURES[@]}
+ ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+ ${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+ ${ARM_CPU_REQUIRED_USE}
+ ${PPC_CPU_REQUIRED_USE}
+ ${X86_CPU_REQUIRED_USE}
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt
+ graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+ alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ amf? ( media-video/amdgpu-pro-amf:= )
+ amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+ bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+ bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+ bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+ cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+ chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+ codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
+ dav1d? ( >=media-libs/dav1d-0.5.0:0=[${MULTILIB_USEDEP}] )
+ encode? (
+ amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+ kvazaar? ( >=media-libs/kvazaar-2.0.0[${MULTILIB_USEDEP}] )
+ mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+ openh264? ( >=media-libs/openh264-1.4.0-r1:=[${MULTILIB_USEDEP}] )
+ rav1e? ( >=media-video/rav1e-0.5:=[capi] )
+ snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
+ theora? (
+ >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+ >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+ )
+ twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+ webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+ x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+ x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+ xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+ )
+ fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+ flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+ fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+ frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )
+ fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+ gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+ glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
+ gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+ gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+ gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+ iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+ iec61883? (
+ >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+ >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+ >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+ )
+ ieee1394? (
+ >=media-libs/libdc1394-2.2.1:2=[${MULTILIB_USEDEP}]
+ >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+ )
+ jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+ jpeg2k? ( >=media-libs/openjpeg-2.1:2=[${MULTILIB_USEDEP}] )
+ jpegxl? ( >=media-libs/libjxl-0.7.0:=[$MULTILIB_USEDEP] )
+ lcms? ( >=media-libs/lcms-2.13:2[$MULTILIB_USEDEP] )
+ libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
+ libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
+ libass? ( >=media-libs/libass-0.11.0:=[${MULTILIB_USEDEP}] )
+ libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+ libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+ libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+ libplacebo? ( >=media-libs/libplacebo-4.192.0:=[$MULTILIB_USEDEP] )
+ librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+ libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+ libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] )
+ libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+ libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
+ lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+ modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+ openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
+ opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+ pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+ qsv? ( media-libs/libvpl[${MULTILIB_USEDEP}] )
+ rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+ samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
+ 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}] )
+ svg? (
+ gnome-base/librsvg:2=[${MULTILIB_USEDEP}]
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ )
+ nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 )
+ svt-av1? ( >=media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] )
+ truetype? (
+ >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
+ vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
+ vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+ vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
+ vmaf? ( >=media-libs/libvmaf-2.0.0:=[${MULTILIB_USEDEP}] )
+ vorbis? (
+ >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+ >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+ )
+ vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+ vulkan? ( >=media-libs/vulkan-loader-1.3.255:=[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}]
+ )
+ zeromq? ( >=net-libs/zeromq-4.2.1:= )
+ zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+"
+
+RDEPEND="${RDEPEND}
+ openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
+"
+
+DEPEND="${RDEPEND}
+ amf? ( media-libs/amf-headers )
+ ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+ v4l? ( sys-kernel/linux-headers )
+ vulkan? ( >=dev-util/vulkan-headers-1.3.255 )
+"
+
+# += for verify-sig above
+BDEPEND+="
+ >=dev-build/make-3.81
+ virtual/pkgconfig
+ cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+ cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
+ doc? ( sys-apps/texinfo )
+ test? ( net-misc/wget app-alternatives/bc )
+"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+ postproc? ( gpl )
+ frei0r? ( gpl )
+ cdio? ( gpl )
+ rubberband? ( gpl )
+ vidstab? ( gpl )
+ samba? ( gpl )
+ encode? (
+ x264? ( gpl )
+ x265? ( gpl )
+ xvid? ( gpl )
+ )
+"
+REQUIRED_USE="
+ chromium? ( opus )
+ cuda? ( nvenc )
+ fftools_cws2fws? ( zlib )
+ glslang? ( vulkan !shaderc )
+ libv4l? ( v4l )
+ shaderc? ( vulkan !glslang )
+ soc? ( libdrm )
+ test? ( encode )
+ ${GPL_REQUIRED_USE}
+ ${CPU_REQUIRED_USE}"
+RESTRICT="
+ !test? ( test )
+ gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+PATCHES=(
+ "${FILESDIR}"/chromium-r2.patch
+ "${FILESDIR}"/${PN}-6.1-wint-conversion.patch
+ "${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch
+ "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch
+ "${FILESDIR}"/${PN}-6.1-gcc-14.patch
+ "${FILESDIR}"/${PN}-6.0.1-alignment.patch
+ "${FILESDIR}"/${PN}-6.1.1-vulkan-rename.patch
+ "${FILESDIR}"/${PN}-6.1.1-memory-leak.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/libavutil/avconfig.h
+)
+
+pkg_setup() {
+ # ffmpeg[chromaprint] depends on chromaprint, and chromaprint[tools] depends on ffmpeg.
+ # May cause breakage while updating, #862996, #625210, #833821.
+ if has_version media-libs/chromaprint[tools] && use chromaprint; then
+ ewarn "You have media-libs/chromaprint installed with 'tools' USE flag, which "
+ ewarn "links to ffmpeg, and you have enabled 'chromaprint' USE flag for ffmpeg, "
+ ewarn "which links to chromaprint. This may cause issues while rebuilding ffmpeg."
+ ewarn ""
+ ewarn "If your build fails to 'ERROR: chromaprint not found', rebuild chromaprint "
+ ewarn "without the 'tools' use flag first, then rebuild ffmpeg, and then finally enable "
+ ewarn "'tools' USE flag for chromaprint. See #862996."
+ fi
+}
+
+src_prepare() {
+ if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+ export revision=git-N-${FFMPEG_REVISION}
+ fi
+
+ use soc &&
+ eapply "${DISTDIR}"/${SOC_PATCH}
+
+ default
+
+ # -fdiagnostics-color=auto gets appended after user flags which
+ # will ignore user's preference.
+ sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
+
+ ln -snf "${FILESDIR}"/chromium.c chromium.c || die
+ echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+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 \
+ -fno-tree-dominator-opts \
+ -fno-tree-fre \
+ -fno-code-hoisting \
+ -fno-tree-pre \
+ -fno-tree-vrp
+
+ local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+ use openssl && myconf+=( --enable-nonfree )
+ use samba && myconf+=( --enable-version3 )
+
+ # Encoders
+ if use encode ; then
+ ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+ # Licensing.
+ if use amrenc ; then
+ myconf+=( --enable-version3 )
+ fi
+ else
+ myconf+=( --disable-encoders )
+ fi
+
+ # Indevs
+ use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+ for i in alsa oss jack sndio ; do
+ use ${i} || myconf+=( --disable-indev=${i} )
+ done
+
+ # Outdevs
+ for i in alsa oss sndio ; do
+ use ${i} || myconf+=( --disable-outdev=${i} )
+ done
+
+ # Decoders
+ use amr && myconf+=( --enable-version3 )
+ use gmp && myconf+=( --enable-version3 )
+ use libaribb24 && myconf+=( --enable-version3 )
+ use fdk && use gpl && myconf+=( --enable-nonfree )
+
+ for i in "${ffuse[@]#+}" ; do
+ myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+ done
+
+ if use openssl ; then
+ myconf+=( --disable-gnutls )
+ has_version dev-libs/openssl:0/3 && myconf+=( --enable-version3 )
+ fi
+
+ # (temporarily) disable non-multilib deps
+ if ! multilib_is_native_abi; then
+ for i in librav1e libzmq ; do
+ myconf+=( --disable-${i} )
+ done
+ fi
+
+ # CPU features
+ for i in "${CPU_FEATURES_MAP[@]}" ; do
+ use ${i%:*} || myconf+=( --disable-${i#*:} )
+ done
+
+ if use pic ; then
+ myconf+=( --enable-pic )
+ # disable asm code if PIC is required
+ # as the provided asm decidedly is not PIC for x86.
+ [[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+ fi
+ [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+ # Try to get cpu type based on CFLAGS.
+ # Bug #172723
+ # We need to do this so that features of that CPU will be better used
+ # If they contain an unknown CPU it will not hurt since ffmpeg's configure
+ # will just ignore it.
+ for i in $(get-flag mcpu) $(get-flag march) ; do
+ [[ ${i} = native ]] && i="host" # bug #273421
+ myconf+=( --cpu=${i} )
+ break
+ done
+
+ # LTO support, bug #566282, bug #754654, bug #772854
+ if [[ ${ABI} != x86 ]] && tc-is-lto; then
+ # Respect -flto value, e.g -flto=thin
+ local v="$(get-flag flto)"
+ [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" )
+ fi
+ filter-lto
+
+ # Mandatory configuration
+ myconf=(
+ --disable-libaribcaption # libaribcaption is not packaged (yet?)
+ --enable-avfilter
+ --disable-stripping
+ # This is only for hardcoded cflags; those are used in configure checks that may
+ # interfere with proper detections, bug #671746 and bug #645778
+ # We use optflags, so that overrides them anyway.
+ --disable-optimizations
+ --disable-libcelt # bug #664158
+ "${myconf[@]}"
+ )
+
+ # cross compile support
+ if tc-is-cross-compiler ; then
+ myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+ case ${CHOST} in
+ *mingw32*)
+ myconf+=( --target-os=mingw32 )
+ ;;
+ *linux*)
+ myconf+=( --target-os=linux )
+ ;;
+ esac
+ fi
+
+ # doc
+ myconf+=(
+ $(multilib_native_use_enable doc)
+ $(multilib_native_use_enable doc htmlpages)
+ $(multilib_native_enable manpages)
+ )
+
+ # Use --extra-libs if needed for LIBS
+ set -- "${S}/configure" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --mandir="${EPREFIX}/usr/share/man" \
+ --enable-shared \
+ --cc="$(tc-getCC)" \
+ --cxx="$(tc-getCXX)" \
+ --ar="$(tc-getAR)" \
+ --nm="$(tc-getNM)" \
+ --strip="$(tc-getSTRIP)" \
+ --ranlib="$(tc-getRANLIB)" \
+ --pkg-config="$(tc-getPKG_CONFIG)" \
+ --optflags="${CFLAGS}" \
+ $(use_enable static-libs static) \
+ "${myconf[@]}" \
+ ${EXTRA_FFMPEG_CONF}
+ echo "${@}"
+ "${@}" || die
+}
+
+multilib_src_compile() {
+ emake V=1
+
+ if multilib_is_native_abi; then
+ for i in "${FFTOOLS[@]}" ; do
+ if use fftools_${i} ; then
+ emake V=1 tools/${i}$(get_exeext)
+ fi
+ done
+
+ use chromium &&
+ emake V=1 libffmpeg
+ fi
+}
+
+multilib_src_test() {
+ LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \
+ emake V=1 fate -k
+}
+
+multilib_src_install() {
+ emake V=1 DESTDIR="${D}" install install-doc
+
+ if multilib_is_native_abi; then
+ for i in "${FFTOOLS[@]}" ; do
+ if use fftools_${i} ; then
+ dobin tools/${i}$(get_exeext)
+ fi
+ done
+
+ use chromium &&
+ emake V=1 DESTDIR="${D}" install-libffmpeg
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+ [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+
+ use amf && elog "To use AMF, prefix the ffmpeg call with the 'vk_pro' wrapper script, e.g. `vk_pro ffmpeg -vcodec h264_amf [...]`"
+}
diff --git a/media-video/ffmpeg/files/ffmpeg-6.1.1-memory-leak.patch b/media-video/ffmpeg/files/ffmpeg-6.1.1-memory-leak.patch
new file mode 100644
index 000000000000..d02522b3a3a4
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-6.1.1-memory-leak.patch
@@ -0,0 +1,129 @@
+https://bugs.gentoo.org/931059
+https://ffmpeg.org//pipermail/ffmpeg-devel/2024-May/326569.html
+https://git.videolan.org/?p=ffmpeg.git;a=commit;h=670c823406612697b394d4933e03d3e1a176474f
+https://git.videolan.org/?p=ffmpeg.git;a=commit;h=1606aab99bd84f0040fb0fa6ccccb092941f01ec
+
+From 670c823406612697b394d4933e03d3e1a176474f Mon Sep 17 00:00:00 2001
+From: Paul B Mahol <onemda@gmail.com>
+Date: Fri, 27 Oct 2023 14:26:50 +0200
+Subject: [PATCH] avfilter/buffersrc: switch to activate
+
+Fixes OOM when caller keeps adding frames into filtergraph
+that reached EOF by other means, for example EOF is signalled
+by other filter in filtergraph or by buffersink.
+
+(cherry picked from commit 84e400ae37b1e2849a3ead399ef86c808356cdd6)
+--- a/libavfilter/buffersrc.c
++++ b/libavfilter/buffersrc.c
+@@ -36,6 +36,7 @@
+ #include "audio.h"
+ #include "avfilter.h"
+ #include "buffersrc.h"
++#include "filters.h"
+ #include "formats.h"
+ #include "internal.h"
+ #include "video.h"
+@@ -194,7 +195,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
+ if (!frame)
+ return av_buffersrc_close(ctx, s->last_pts, flags);
+ if (s->eof)
+- return AVERROR(EINVAL);
++ return AVERROR_EOF;
+
+ s->last_pts = frame->pts + frame->duration;
+
+@@ -484,21 +485,28 @@ static int config_props(AVFilterLink *link)
+ return 0;
+ }
+
+-static int request_frame(AVFilterLink *link)
++static int activate(AVFilterContext *ctx)
+ {
+- BufferSourceContext *c = link->src->priv;
++ AVFilterLink *outlink = ctx->outputs[0];
++ BufferSourceContext *c = ctx->priv;
+
+- if (c->eof)
+- return AVERROR_EOF;
++ if (!c->eof && ff_outlink_get_status(outlink)) {
++ c->eof = 1;
++ return 0;
++ }
++
++ if (c->eof) {
++ ff_outlink_set_status(outlink, AVERROR_EOF, c->last_pts);
++ return 0;
++ }
+ c->nb_failed_requests++;
+- return AVERROR(EAGAIN);
++ return FFERROR_NOT_READY;
+ }
+
+ static const AVFilterPad avfilter_vsrc_buffer_outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+- .request_frame = request_frame,
+ .config_props = config_props,
+ },
+ };
+@@ -507,7 +515,7 @@ const AVFilter ff_vsrc_buffer = {
+ .name = "buffer",
+ .description = NULL_IF_CONFIG_SMALL("Buffer video frames, and make them accessible to the filterchain."),
+ .priv_size = sizeof(BufferSourceContext),
+-
++ .activate = activate,
+ .init = init_video,
+ .uninit = uninit,
+
+@@ -521,7 +529,6 @@ static const AVFilterPad avfilter_asrc_abuffer_outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_AUDIO,
+- .request_frame = request_frame,
+ .config_props = config_props,
+ },
+ };
+@@ -530,7 +537,7 @@ const AVFilter ff_asrc_abuffer = {
+ .name = "abuffer",
+ .description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them accessible to the filterchain."),
+ .priv_size = sizeof(BufferSourceContext),
+-
++ .activate = activate,
+ .init = init_audio,
+ .uninit = uninit,
+
+--
+2.30.2
+
+From 1606aab99bd84f0040fb0fa6ccccb092941f01ec Mon Sep 17 00:00:00 2001
+From: Paul B Mahol <onemda@gmail.com>
+Date: Fri, 1 Dec 2023 16:59:07 +0100
+Subject: [PATCH] avfilter/avfilter: fix OOM case for default activate
+
+Fixes OOM when caller keeps adding frames into filtergraph
+that reached EOF by other means, for example EOF is signalled
+by other filter in filtergraph or by buffersink.
+
+(cherry picked from commit d9e41ead82263e96ebd14d4d88d6e7f858dd944c)
+--- a/libavfilter/avfilter.c
++++ b/libavfilter/avfilter.c
+@@ -1167,6 +1167,16 @@ static int ff_filter_activate_default(AVFilterContext *filter)
+ {
+ unsigned i;
+
++ for (i = 0; i < filter->nb_outputs; i++) {
++ int ret = filter->outputs[i]->status_in;
++
++ if (ret) {
++ for (int j = 0; j < filter->nb_inputs; j++)
++ ff_inlink_set_status(filter->inputs[j], ret);
++ return 0;
++ }
++ }
++
+ for (i = 0; i < filter->nb_inputs; i++) {
+ if (samples_ready(filter->inputs[i], filter->inputs[i]->min_samples)) {
+ return ff_filter_frame_to_filter(filter->inputs[i]);
+--
+2.30.2
diff --git a/media-video/jellyfin-media-player/Manifest b/media-video/jellyfin-media-player/Manifest
index 1d192a643eab..9a241aa0dea3 100644
--- a/media-video/jellyfin-media-player/Manifest
+++ b/media-video/jellyfin-media-player/Manifest
@@ -5,5 +5,5 @@ DIST jellyfin-media-player-1.9.1.tar.gz 519515 BLAKE2B 0240d4f964a48e476531e0e60
EBUILD jellyfin-media-player-1.7.1-r1.ebuild 1751 BLAKE2B 6e08d01764a9543746cf1ac0ad154a37f915ef7a69ed9e2b09527dc7d3359e6a2d2246028ecb962e5e76347fd324992442041038852cf8697c5c69b433260dc1 SHA512 0b6824cd08a9619653ae3d153b674aa303be0bd50178ff3a1f1f7607f16c7ba5d2be8678502cd572e63cb80ca95278a82ec1d44267cb705a28f8c39c4994f6e3
EBUILD jellyfin-media-player-1.8.1.ebuild 1751 BLAKE2B 907c787b1386bdfe8743a692e18dc7b17b7491d545e2faf8f1c1b0a6a106a313eddf703d4d4236fae24cecb24116cbece8268819b22774c5b4754afcaae5ff6f SHA512 e09325b4bd3711c3d4fc312b90ccf765cf01a36d6bad44b1c479b95317dfea9f410ae39b18ab52aee87752e511d47e1fd988c6ccbf2dfee19e943386c7115117
EBUILD jellyfin-media-player-1.9.0.ebuild 1451 BLAKE2B acac909fefaf2258f9dbc6fca1c5ed98305488e2296e3f01fd454413652111b0dcfcdd9b31c1213ff142aa9f2a73994d79311af83d31f96c93ad69725f85bf55 SHA512 3b63895ecac4235327602d28492075d11ee42a3fb4069020ffef3200824abba78a11332c716c8b88c84d54095ba1987bc2b46fea49dbcb156e0c248a86208973
-EBUILD jellyfin-media-player-1.9.1.ebuild 1460 BLAKE2B 3b38fe8a29d36e20ba3a94ee675eb0809452bd30f488760bcd9be3dbcd287cc812240d5b7de81e6e3c65b711fbc7bd9d9acdc434f7a3da6e4b70fd553e17c721 SHA512 30f33a20cdc3644fa339120c0c6a66324dbc528d782dacd1b1b0c94e4ce9e8b830beabe5557432bcdb0e684ecbe038f9f368135a33e820ad105d909a1f2983be
+EBUILD jellyfin-media-player-1.9.1.ebuild 1461 BLAKE2B 4b4c19197e60a92fe7cb8ecc085a4fb0d74d251ed9031a3878bdfdcca7beae2428f6fface8911932431173889dce4fa89af332712ddb69837ed92c758f60833a SHA512 9f9a2052bac5831138bc5cc3813996a3f1404b055790d8b7631d05138cddac4b61613b5d04edb76f39dcd59f1c9030a38ee25dbeedde8b88abb184336b99ff9c
MISC metadata.xml 345 BLAKE2B a9ec81e0d74197dbed1799e626d0c35998516812649bf412707743cb4d09c465ebf8bfaf10ae01ecaa162935ecc9e6ffd77fd402001aa5fe1e1190b9e96fb84e SHA512 954bbb33b9de8a7dc5d08e5ab8a197209b9c68f064beeafd050b54905e886960ac64d63cdc5e3d975fbe4fbf94a9f70c7c7818f55558f53a666df8f8c244f25e
diff --git a/media-video/jellyfin-media-player/jellyfin-media-player-1.9.1.ebuild b/media-video/jellyfin-media-player/jellyfin-media-player-1.9.1.ebuild
index 23b1b45d7776..7b889604399f 100644
--- a/media-video/jellyfin-media-player/jellyfin-media-player-1.9.1.ebuild
+++ b/media-video/jellyfin-media-player/jellyfin-media-player-1.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit cmake python-any-r1
DESCRIPTION="Jellyfin Desktop Client based on Plex Media Player"
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 57cfd02fa1b6..709647459c45 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,6 +1,6 @@
AUX makemkv-path.patch 1579 BLAKE2B 6ca7ed6c854c0357fea864bedc3f65a1051a466a52db1380bf1904c97bfa2b455beeb7ff9852fe57f6d224ed659df63d02db96a281be7a14f0587bece9aff75b SHA512 9294d3645b953fdb7ca24e83066becfbf07e03cab01d0aaf4527cf2d54fb0990649da1f766836a0f3efea9c363c8f00116b4624c49fd7bcfa197cae2ef17e6ed
AUX makemkvcon.1 6118 BLAKE2B bf8f7665d7b367e4dc5cfb12136cb91271087991d86bb0c2bfe6fe41def407539276114f95548cd867c49bc10bed25cec51ac00dbd6defe5df7fd82f2fe29b25 SHA512 a9334a96fcc90932a109c2d74b1769ab60e652a1e860399d8a486bd36ba02fbdabf55816059e0c51e3e4826824b7798f86b85cb5e22a4d13c2e18a2944522ac4
-DIST makemkv-bin-1.17.6.tar.gz 16423034 BLAKE2B 01c6cc439f618f722ef7f4d44c67d5f5d8c37c786bbdcb6ab7d628c6b87b8e08a50c9d4ea434d541c0a5d922c64e8ee6dcc5b100fb50f4cdfd963326490da2cf SHA512 9c3f90b23e837251f79e1fd3d1dc27b9de35efd678d40411d530657a766e03a611d09003db473a46436e0fea650f3c96fb2e0f84dc71b69f2d031bea7d3a695e
-DIST makemkv-oss-1.17.6.tar.gz 6618067 BLAKE2B c29966cfd24b97bf7d42ebab41b28357313364b4191922f06a668b43b67072c7bc09e8df50356349cc2f3267b3d8593abba5dbed2e7b083adb4f38c362efe5a3 SHA512 0fb9ee23372f74bad8c3fbbef7c8977d6eeaea73fba85759ecefc60ec9ef6c82fd537c917a9f8000ee8e98f5a225d2e650fac2abb8a6921be96ba590ed5b0dbb
-EBUILD makemkv-1.17.6.ebuild 3089 BLAKE2B b6a5381244c0a6ff65862a39f26d9239e8d2d235e16a07c9ee65bc524c523199e707a02b9ab0de40e8673af4958dfd3d10f13955418cf485d5299fe25637cbac SHA512 3e14439280402174c80c786a09f6003d5654e452be17fd0c28796544a79d7501fe15249d44dea4922c5dd2d68d4d1b65f0bfbf667610063d99bdeb23262f8261
+DIST makemkv-bin-1.17.7.tar.gz 16420879 BLAKE2B adc54191fd445832b9c4805400746e42d1b3261d076299b5e34beb1f13d80bf7bcbd113699f3d28fce5e21bb8f810a40927924b3d9c7250467d1979b1bf4f72b SHA512 2c93dd6e63c5e59415ad8a9a1370f7a1eddda2b643fa4dcde6383abb6065b84a77b03b977bf2ade50bc2d3560bb245ad2e1e79bab21629f7fc5816598738a5d9
+DIST makemkv-oss-1.17.7.tar.gz 6618248 BLAKE2B 18652db1d72ea7287e7e38706afc589e6fe8fb1fbf9d4e24770b9a2bfe670a464b2c21b7c543b23d3c6234f40048358d944b123897c4f569beb31faac8ef3eb7 SHA512 e21bc293133d7f999b3ea4258f01f0b88c5a58610da0185d8f74b724d61578211d35d5d44fae1610887e98f3ff36b2f0df33068d8647ad8983020be49adde037
+EBUILD makemkv-1.17.7.ebuild 3088 BLAKE2B e194e111640c35eb9859d16bfc4f73bd2c7da8d9e2c5d6ff304e853781ebf8067dce7e7a8d150d7478ebf943d1274b7423d9af19fd4064689941004e96542b01 SHA512 99fd71a43d8f14bee088ab65a5452bee9417534c69f019676d7f033142975cd44924f65e6d9aeac326d7bea95dd19d88554abd527ec7e109e759a2bd518c5b20
MISC metadata.xml 1272 BLAKE2B 7c02bfcb2638d2f33c6fbee2d0e79b6d7d270b8209f7ec82ec51d7cf0e19b94936ee599b618f9a6b9df280fc403b0890b2c8e2323525f6d50b79fc19d26c8756 SHA512 8de92a5802b26a98984be7b5e3c0868b249c14a77a690a186dc4361db1508b79c7ebccd261e7fe9251b2d4abbbe2b93aec8a91efeafc00baada2839020a9207f
diff --git a/media-video/makemkv/makemkv-1.17.6.ebuild b/media-video/makemkv/makemkv-1.17.7.ebuild
index f5c346192737..c8dd8c6309b2 100644
--- a/media-video/makemkv/makemkv-1.17.6.ebuild
+++ b/media-video/makemkv/makemkv-1.17.7.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
HOMEPAGE="http://www.makemkv.com/"
SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
http://www.makemkv.com/download/${MY_PB}.tar.gz"
-
+S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
@@ -44,7 +44,6 @@ BDEPEND="
"
CONFIG_CHECK="~CHR_DEV_SG"
-S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-path.patch
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index f34a9d8a7f8b..53214118eec9 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -1,5 +1,5 @@
AUX movit-1.6.3-gcc12.patch 251 BLAKE2B db889ad6ee9116749edd64152dd1cfca59c00d11407902402f8d04d353e53f3a429aad42c7cf28ba1d865ed483d148ef53786e9f1592c00a752ef166c1f0a23c SHA512 24fa5df6878f510ad0eaeeee37f9ec56817b3943f60584a33902898ef1870dcbb7fe961fb19bcf989844eff7c4c6647e160c4aceb87661b8529c4af4fdc673a1
-DIST movit-1.6.3.tar.gz 605922 BLAKE2B b207e587a20aeccc16017b7b1a7334d88381d4268dfb516d0a030b864e41eb06771e6e2c466699ee6ff01a2c972456152b6450bed654e1961dacc9ff2b800c5d SHA512 6f7169710fbb60f79c44393aea57619f4c83d64fb296ea946d591e78fb9a71b513869dc6325f90e4c2dc843b7ed4841eaef41ca69f64787c8a57f4fde583b1e5
+DIST movit-1.7.1.tar.gz 606885 BLAKE2B 24977aa7aedc6111f0d7c3350df5bb2529b2c604842040c712eb08b99853e42cc9ed1cc0c297348e9a17926c07b1dd9ace10b3c5d25c6c18aad5b63a797d9c32 SHA512 3893bf983ff3df592f2ab599566e83d1f44aae3bb56ce68a23a584a485341a41da4ee3a9eec131dae4075e459526321a24428ef3ceba858a77590e690020089f
DIST movit-googletest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
-EBUILD movit-1.6.3-r1.ebuild 1099 BLAKE2B 97eb841ff742ddb694eb27b2777827c0ad7a9915decc2c2566e8fd249168cf1b3ae817416454a1ecd4148079af738c280d4d23712a5a9775976c35c74d153097 SHA512 24963f2550850bb2d055fa03851ef4f67722483697a58474fe44370f7a7851dd702f9ddff82a36bf711013d8966cc691ba48eb051106c71e5643922596c6bb9b
+EBUILD movit-1.7.1.ebuild 1102 BLAKE2B b1119b99807d9da2e391d3521799865d9b615a61a7f477efa1b0e8646883735aaf16d1e73cbcabd4f8df7c5c0fe893e0abdf5794e2e72fdb116965d3b6bc4eb2 SHA512 fd8056a865fea29c708e3fc3b59ba0623ec255e21d5986dbbf2eccf986664b64a901c52bd8250ada7c81dbda13b3109bbb1a6d63f170740a327cf237ff04a0ea
MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/media-video/movit/movit-1.6.3-r1.ebuild b/media-video/movit/movit-1.7.1.ebuild
index a874a7ac114f..8055f4fe1563 100644
--- a/media-video/movit/movit-1.6.3-r1.ebuild
+++ b/media-video/movit/movit-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,7 +20,7 @@ RESTRICT="test"
RDEPEND="media-libs/mesa[X(+)]
>=dev-cpp/eigen-3.2.0:3
- media-libs/libepoxy[egl,X]
+ media-libs/libepoxy[egl(+),X]
>=sci-libs/fftw-3:=
media-libs/libsdl2"
DEPEND="${RDEPEND}"
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 846ba38c1a97..02580937dfa5 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -2,6 +2,6 @@ AUX mpv-0.37.0-drm-fix.patch 1444 BLAKE2B e0645e9b12ebbd0088b10aed34cabadbdb1b06
DIST mpv-0.37.0.tar.gz 3384190 BLAKE2B 31d8d47ed7ae94540189fe05b7ea63f5b0d5c987a22191f931e4bd90664d05dca4c7e0bd0e05fcdf48b977e38e5f8eec0d2572265f2cf4a969a8a9a9dbf83d68 SHA512 a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257
DIST mpv-0.38.0.tar.gz 3419741 BLAKE2B 3ff59d30bc305394f58a1fff4f24540aa3be9412bc3cad27bec0c3478f4b7c13190e26847f38edc52996bb9f9a36dd6832c6fccebd6d873058acf78a320e42e4 SHA512 b5b2af59039ef4711814f94bbdfedb37f8ce914301670e42d4ed05fe1900025a3d3a2f3d5e69628a8aad115a647a27c386718959e2df1a18740468b3a84f8975
EBUILD mpv-0.37.0.ebuild 7087 BLAKE2B 322689b3988e47e41ae050e596518ca46d9f12048568d5d8920c98fe92f48adc28430a6fd92734cbf06ee9d01c74dea7f6aed133a9c8eb7aed50e2ffd2b5c0fb SHA512 b38640e3fae2cdaa8db042779516ce4143af50162af42548e49129c259d44bf76b217744d8541a7cc223f4385f1f9c55ba2fc8e7ea1c257a9034994a3b7f859d
-EBUILD mpv-0.38.0.ebuild 6881 BLAKE2B d440452a44439fb4f0a74ff6a3e221a98c80b8a910a5f0230fd8425c34580f4f4fdcf0a3a587f92d564e207d4db087952e7aa99815b60bc82ab52dc970395bda SHA512 c20624072cc97e353589793e1fee3da0edc49fc95d041c67cfa396fa54fe1bebd166425d5f51a17b81cc5045c9d8307e59673fe820f01e965c6b4a74def90087
-EBUILD mpv-9999.ebuild 6881 BLAKE2B d440452a44439fb4f0a74ff6a3e221a98c80b8a910a5f0230fd8425c34580f4f4fdcf0a3a587f92d564e207d4db087952e7aa99815b60bc82ab52dc970395bda SHA512 c20624072cc97e353589793e1fee3da0edc49fc95d041c67cfa396fa54fe1bebd166425d5f51a17b81cc5045c9d8307e59673fe820f01e965c6b4a74def90087
+EBUILD mpv-0.38.0.ebuild 6929 BLAKE2B 64266a19d95204f192c7e3ffb4c1fb6020f3345263cf7efc9a30c29c8caeaf6ff5c3cc1e6a07c30f55b5be05d1276de293a501242eb850d62f77aba0221a780c SHA512 800288819c47ccc9b80005136a7398a8432b5ec12807d269a5374c60f41c699878caa566a3fd270b0d1b4648c079f420cfaa275564763e441ad1f51fea511e6a
+EBUILD mpv-9999.ebuild 6934 BLAKE2B 9d16cd097b73eda03f8463869bbf5da9c5f870805c7714ff99ab8aab9af4fcaa20472097e1f74440018e3cdff5270fb245444093a418be489454b327a013db93 SHA512 da5ffbf99beb5e33e37adecebe6c9d7b75538faa3a7423e64fba49fbe4369d49ddd06ee8acebc7f3be80ca71c13a7c24bcbc4b985a6053c8104fa8748c9e0470
MISC metadata.xml 2248 BLAKE2B 384962e209948418c928a4a8d903f57a226116929db253847e7977d0febbf3fc23b18f947e9896b5a16e816267eb06c0e64145fc15270f66dca4fe7321c36897 SHA512 c4f1191adacde565a5d6ff6fdf10a9dedc84fae3d04792baac456e37fabcd80f04858031f442dcf1dd07c3d59e2343319c955969b23d0aef456c2d927a76bcbf
diff --git a/media-video/mpv/mpv-0.38.0.ebuild b/media-video/mpv/mpv-0.38.0.ebuild
index a79aeac37bd3..a44f459bb171 100644
--- a/media-video/mpv/mpv-0.38.0.ebuild
+++ b/media-video/mpv/mpv-0.38.0.ebuild
@@ -4,7 +4,7 @@
EAPI=8
LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
if [[ ${PV} == 9999 ]]; then
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
@@ -271,5 +271,6 @@ src_install() {
pkg_postinst() {
xdg_pkg_postinst
- optfeature "URL support with USE=lua" net-misc/yt-dlp
+ optfeature "various websites URL support$(usev !lua \
+ " (requires ${PN} with USE=lua)")" net-misc/yt-dlp
}
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index a79aeac37bd3..3825d102d45b 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=8
LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
if [[ ${PV} == 9999 ]]; then
@@ -271,5 +271,6 @@ src_install() {
pkg_postinst() {
xdg_pkg_postinst
- optfeature "URL support with USE=lua" net-misc/yt-dlp
+ optfeature "various websites URL support$(usev !lua \
+ " (requires ${PN} with USE=lua)")" net-misc/yt-dlp
}
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
deleted file mode 100644
index 35ed301e61d4..000000000000
--- a/media-video/openshot/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST openshot-2.6.1.tar.gz 68566443 BLAKE2B b3a163983bdb811103e5d9307beeb38938719747f743dd58520a0166c08eb11f4592d47bf24224062f9db323a66a2f353eb22f087982b929d60a519cd2c40789 SHA512 9e2d1eae5d72ec2deab914e464dac0d84a864ba2ca63104fad57c90fc907764d5683149fb8136d50030cae993cef9a977e995b0783868988de4668e71a3a5ee2
-DIST openshot-3.1.1.tar.gz 95843738 BLAKE2B 4059fe12b064692070278366f787789866dcbe39414d10217fb62b671dda98ebb6d2f76b8e1cfe2284a647e3d7ebc460b620ba0756a4542f5b26e7ef669e9b3e SHA512 4e5a42825abf8e3862957039169905a6f03872d81de454f52a57ace2e636e91b2f4e87ae603bf9669baa7d1bbbd6c0213efd0c72e23f2b209ba266af2fbe380f
-EBUILD openshot-2.6.1.ebuild 1370 BLAKE2B 26f1367c92a368a07aa14d540c7e9233cfa165e385585e6972b6cfacd120fc71c723d237841bcefd4a8ea899f8d79bb23afd80cd1311a9ffd4855b4025da606d SHA512 2e15da0888571917d60f06623300cc38388d6ca0cc8295f6cef3a3aff7c566d74901d1f6303635c17e62351eca2af41c7a4fa264a7a8b6eba037e5885d1236ab
-EBUILD openshot-3.1.1.ebuild 1370 BLAKE2B d457bf2bd21617852edf9cca1813f191c4b7cd844f463329e7a00b9fdd9f983bc30ff8cdac7efc6c8899e2268d18875883d4c27fc4a506cf9c2459de305d33a4 SHA512 3e9849eb5c84d2f3abfc3de8c0c4d5c93b818638c97585361574e0662e8e99a3aa0cd52e55aaa7c837e4fcf9744df5bdc0afb1fbf2518108bfe6de3d6728f047
-MISC metadata.xml 521 BLAKE2B 0594441c26e88ba0aa7ea85be94580dd73588711f4a9c529ab7525b7535a3753579f7ab17d71a9ee4d801b269eeb214a4a5886a9bf2c89752ea6d9540a191294 SHA512 1028c0ac29289a8507d9e23e963c4f3341fdc59d36d06780f6d212f667212509d50781be5544636827af141d8f0d16c45ece1bd8010f37ee6c91464b9dd14687
diff --git a/media-video/openshot/metadata.xml b/media-video/openshot/metadata.xml
deleted file mode 100644
index bd4e0bfea080..000000000000
--- a/media-video/openshot/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>steils@gentoo.org</email>
- <name>Stefan Strogin</name>
- </maintainer>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- <name>Gentoo Video project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">OpenShot/openshot-qt</remote-id>
- <bugs-to>https://github.com/OpenShot/openshot-qt/issues</bugs-to>
- </upstream>
-</pkgmetadata>
diff --git a/media-video/openshot/openshot-2.6.1.ebuild b/media-video/openshot/openshot-2.6.1.ebuild
deleted file mode 100644
index a013ab34e233..000000000000
--- a/media-video/openshot/openshot-2.6.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg
-
-MY_PN="${PN}-qt"
-
-DESCRIPTION="Award-winning free and open-source video editor"
-HOMEPAGE="https://openshot.org/"
-SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-3+"
-SLOT="1"
-KEYWORDS="amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="$(python_gen_cond_dep '
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/PyQt5[${PYTHON_USEDEP},gui,svg,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- dev-python/pyzmq[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- ')
- >=media-libs/libopenshot-0.2.7:0=[python,${PYTHON_SINGLE_USEDEP}]"
-DEPEND=""
-BDEPEND="$(python_gen_cond_dep '
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- ')"
-
-src_prepare() {
- distutils-r1_python_prepare_all
- # prevent setup.py from trying to update MIME databases
- sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
-}
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- distutils_install_for_testing
- "${EPYTHON}" src/tests/query_tests.py -v --platform minimal || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/media-video/openshot/openshot-3.1.1.ebuild b/media-video/openshot/openshot-3.1.1.ebuild
deleted file mode 100644
index e4e04dbc01cd..000000000000
--- a/media-video/openshot/openshot-3.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg
-
-MY_PN="${PN}-qt"
-
-DESCRIPTION="Award-winning free and open-source video editor"
-HOMEPAGE="https://openshot.org/"
-SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-3+"
-SLOT="1"
-KEYWORDS="amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="$(python_gen_cond_dep '
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/PyQt5[${PYTHON_USEDEP},gui,svg,widgets]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
- dev-python/pyzmq[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- ')
- >=media-libs/libopenshot-0.3.2:0=[python,${PYTHON_SINGLE_USEDEP}]"
-DEPEND=""
-BDEPEND="$(python_gen_cond_dep '
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- ')"
-
-src_prepare() {
- distutils-r1_python_prepare_all
- # prevent setup.py from trying to update MIME databases
- sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
-}
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- distutils_install_for_testing
- "${EPYTHON}" src/tests/query_tests.py -v --platform minimal || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 9807762bc2d5..ce03bf496e28 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,5 +1,3 @@
-AUX 1.0.0/0001-fix-compile-with-no-examples.patch 1388 BLAKE2B 9cf02967d8723f41c0bb456a064d90237fffef66cf8cb3e6678b3bce1d58418a0b4e347e71cf4c45240c150cdd8d08b1448efd1fad594886e3041558730b20c2 SHA512 65e1d6e572dff5fe63a05580696b8ec304477e58726dc7e0723dcae9bc03332111af131f57584ad8d62ca1e6bada982387c1df47dfcb9cfed8a47bf86831a2b5
-AUX 1.0.0/0002-fix-x11-bell-segfault.patch 988 BLAKE2B 2281275262157fa2545820e155d1182873b05738b6314c6b9d73c89f928cddf34a135ca02a552c6d124402439636a986f8aaab899ee8e872bdd6582ce60327b2 SHA512 24732d8c8c9d0ac951a9d7d30da68488da1b8da3b94652492706dd02859f7beeb8499a08a130b10332f50f81854825c80cffc5dca951d93e2eeab43a0bc786fe
AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
AUX gentoo-pipewire-launcher.1 1633 BLAKE2B 36c8888693bd0389dc9b1e49d0501d2679956d88f6b7ac42f0347c3fe2259775dd7082cb0bbdeb54a232fcc8902faa8086203e0fe2437c0eea5f1927ba2d0de4 SHA512 8085c9a989f21ee7f2528d56d5b104c0d14024df06f5cb6cd2aa8168b58469c71b91c788706b11021d9dbddb647a2203175603f4f8aa7b33a63a7b7cf8b59d1f
AUX gentoo-pipewire-launcher.in-r3 2848 BLAKE2B 5e6b8ca2df88cef240ca1ff4de28cc8ed3590fabd29b903b37880baf9cf52c35ca01be25b031898d4ee06f4600a5f0c61025a244778577a562f4a4bfa14e2aca SHA512 43cf3e07058e86bf6651106f7f192022c05c5640ba8e101b88e98a83efcc5614f9474107b6d0daf3d5234a51ebcc0a3a7ae5b359d9ba36b648c125813f4e1334
@@ -7,13 +5,12 @@ AUX gentoo-sound-server-enable-audio-bluetooth.conf 106 BLAKE2B 79945d2dac9671d9
AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
AUX pipewire.desktop-r2 333 BLAKE2B 6a8805bb4ea3f23af535867c0551b8f742543de1fa8d99d2b451575066c3394b01977587078356dab65a640899bf336252b7f81b83072c676110fce9b0732eff SHA512 292fbc7283b30454025be50c657803dcb0592c9a6f0757eebe4de5a98166c3bcfeb5563da3d72489762073fe782b5e1f913c01184fbd2e926d872fc7ade73eb7
DIST pipewire-1.0.0-docs.tar.xz 33632 BLAKE2B be06aa7242f7d2f8627b3bf2a2ae491dbda456a24811a767218eb89b1fd5961a461697e5d8ae2782323fdb927985fa4fd5dd40c21268b1c7939f4cd3c9e1a9ab SHA512 14f794c4152d7d9a4a7d9d4d5c2ff381c2a8262deaff034f993c4d28629fca8cc3d71d3a7c02982703e449fae5f58257fea0c20db02bf95b5aed88a4d99d2c58
-DIST pipewire-1.0.0.tar.bz2 1682155 BLAKE2B de48de0f486a530ee060acdc6d35e27bf298e195e2c3d21a9444da7459ef02b44d97147b3bd3a820bdf28ebffbee910f77306a28ffb1b12eeaf8ce37f8d97a6f SHA512 8955bd16ba8508d5838e960ae8c089efaeb9dab0c08719baea8f8f8047cd53b84a46b2459ecd7f000f21b0025a52e93f052025e71c07dc4a2aef89237c5c87f1
-DIST pipewire-1.0.3.tar.bz2 1682330 BLAKE2B cf7f69ee8db703b3e441b6ca34aec4e41cc9cd5c0a21344adee2adcbf5b1b9d5fc3913dece88946e34cf7081402d21ea617cfcd0d09bc2780394bc20a5149296 SHA512 e568b9eb328d701c06a93c4f1556bf8db6e972877a7f2a5776fe77a20130a63972b3f78d52da66ccb1b2ee9df5451a403ab83aef5662dc5d93a6dfbedb23f66a
DIST pipewire-1.0.4.tar.bz2 1698660 BLAKE2B 0842a5fca65c8a91eadd9f0594864ae0f0d428b3c03d2c5fecc3b7f62ff6f5d24fc1190eb351279c002e26596148b23b4b576551502be21beb2eeaa0d2ad4dac SHA512 42e8e28b1fd497f5329b5966abd5cfb7d7976fb0ca9f8f39bccf44195dd11f227cdec2448ba7db4559e866ea2dccf64b8172a2ae069c5204cd8f66c0f8a9e2d9
DIST pipewire-1.0.5.tar.bz2 1698291 BLAKE2B 0f919a01b5f84060fb2ce560a7790a0d59374671f52a941492930fe21ac39178688f27f00cad649d239901f88b392e16895648efae2ec2785c394c1f6d186ddf SHA512 18fbbe36c8752eb0f1df5ee3f3fffee279addcec9825281bd165ad8316f17af7e91bb5759f63c16139c074b03e5a77ef9d596a87f584d1580bbb754101b70a0f
-EBUILD pipewire-1.0.0-r1.ebuild 19657 BLAKE2B 3b82a4e466937ee6d1d0f21a5837071ff0730530e1bc7c09066ee1b666a36169b4284ae4296f693e60e2f11b1699140bb20cf1153f56f390a5e564b05235db0e SHA512 57c5c699a13cf8288e0cfbd08ef412405d50f6e5be9babe6d63a7a86cdc66b4c5e781364b83885925567e6ac4f91c09ebeeedcc55deb63ae02ac3a01f7022cdd
-EBUILD pipewire-1.0.3.ebuild 19576 BLAKE2B a83be9a9cf0473e41fc3098f23818325c3306d8a9e7d527047b16324c490b711cf799c4a7d892533e625c42a4e36fda6016f425541d718a18d23beedd91f9b7e SHA512 02ef47740b9a30f451718e923a51161dca4bfabe16317e46db1e412fb6247b2bd04bc0128b5769d9106617d938baa6e4c7854fba93ac7c67774ecad707c74d6a
+DIST pipewire-1.0.6.tar.bz2 1698889 BLAKE2B f782efa2aa8fa0976fd3025f58041f450505c63acd9028c3d79368d0c41465a51b4472059a1c13092aa72dc6110fc12589b03de653d7eac3c93bc5498cc17154 SHA512 09e5c951c835dcc2654ec284aaaad6be4254744e943f95556c494cd22a4fc67bdc481982856f2aa439e33ec84e7fbdb6df45a1d4b9ced261b01cd91b0ee4d2ed
EBUILD pipewire-1.0.4.ebuild 19988 BLAKE2B 49df8fcf2e136537401ebab8673c0815a275c2deb29a2779306a77536d2db0688c81e69bbf768061a2ee3e94888da5e77e12055594bf84b14951fd28f12e248c SHA512 5d6506afa393f6286ba33a88cdf17f739a265e2f09baf1b7f9ff5fb239a7b4d87b32ce553d366bfaf6ba36f4384982cf73a521488118d2e5f33d87b4cc9467e3
-EBUILD pipewire-1.0.5.ebuild 19994 BLAKE2B 2d369e36d27151586e4a6b9e6775577f43597bfe3489ba2c9006983bfea48482702e689cd11fbc50a8e52a04792fe01e9b29854bb5ea0721a390bdb75d6c3cc9 SHA512 24f4dd50e4d2681d5c61c26c733a75a1bd93a9fd36cc9827f42fceaf8a9a26dcd5bd5714cae6fe137c97d597741d2b5bc50a1f6f8a87e5f7d0caec02c05ed338
-EBUILD pipewire-9999.ebuild 19985 BLAKE2B 7bacb5fa282eccbad7142ae221ba169a2f19f006cf6a99e6d307ebeb563f5c4d4e91f963c15c69bbea51dd129022de74d520ff0cd68d040051d012cebf437cb1 SHA512 c74d11a0f3c0930028a659e5f4d09427442feae03c804bc69d632cf55f08d5975850778d3a37a97c4e69821602f6f3a3bb3e7a310ecbe4936ccc8b44e168a365
+EBUILD pipewire-1.0.5-r1.ebuild 19283 BLAKE2B c873436b2f3cad35aa2d6797085823cc215d621b275634c25c3b79e00a56121a97824f3092df74b13809a9ea7639b669710fb9ae7476441209c9f7aff1496827 SHA512 f290058849e339a64bb897e831618b9f886b9c6b7754a0f3b4301fc94be929c0531ffd6c98754228c30bc308371e508021fa907252028d6a5a57d14314d4b5b6
+EBUILD pipewire-1.0.5.ebuild 19988 BLAKE2B 49df8fcf2e136537401ebab8673c0815a275c2deb29a2779306a77536d2db0688c81e69bbf768061a2ee3e94888da5e77e12055594bf84b14951fd28f12e248c SHA512 5d6506afa393f6286ba33a88cdf17f739a265e2f09baf1b7f9ff5fb239a7b4d87b32ce553d366bfaf6ba36f4384982cf73a521488118d2e5f33d87b4cc9467e3
+EBUILD pipewire-1.0.6.ebuild 19283 BLAKE2B c873436b2f3cad35aa2d6797085823cc215d621b275634c25c3b79e00a56121a97824f3092df74b13809a9ea7639b669710fb9ae7476441209c9f7aff1496827 SHA512 f290058849e339a64bb897e831618b9f886b9c6b7754a0f3b4301fc94be929c0531ffd6c98754228c30bc308371e508021fa907252028d6a5a57d14314d4b5b6
+EBUILD pipewire-9999.ebuild 19274 BLAKE2B 86ec3c9efdaa0fd53839c261ae7e23a570d534df6670fd78cab1f0c31b5065017b4c483f9249407a32a928df9b127586fa523fe27e1dabe359c1e247c7bbcc94 SHA512 bdc4d9a357dd5839614aca7b2fbe52ea27a818bc660db55b08e1d696b648e2801ab2f2b1078123e4bf084479918eaf6ec39a9e7f4a6dfe89b54188989956070d
MISC metadata.xml 2156 BLAKE2B 974459115e0f3cf4e4c3ac15159740b42e01a093da37d8a27f80e122c9ab2a3fe9194443eaf08f9b66d613db90a14465abbe1b76816bce90e11a46c8409c7513 SHA512 cfe0fdb86c993f167507e22635878d6d7d5dcd48f4c23323231263551ceff986fc454700428ecb7d2ee2abe82093c35d8e7bd491020fd6dd3f3889c09e9020bb
diff --git a/media-video/pipewire/files/1.0.0/0001-fix-compile-with-no-examples.patch b/media-video/pipewire/files/1.0.0/0001-fix-compile-with-no-examples.patch
deleted file mode 100644
index fee0ac1bc328..000000000000
--- a/media-video/pipewire/files/1.0.0/0001-fix-compile-with-no-examples.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3675
-https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1790
-
-From 6b4cdab57a0678e88992fb4e5b216e481b051808 Mon Sep 17 00:00:00 2001
-From: Pauli Virtanen <pav@iki.fi>
-Date: Sun, 26 Nov 2023 18:31:43 +0200
-Subject: [PATCH] meson.build: fix compile with -Dexamples=disabled
-
---- a/spa/examples/meson.build
-+++ b/spa/examples/meson.build
-@@ -6,6 +6,10 @@ spa_examples = [
- 'local-v4l2',
- ]
-
-+if not get_option('examples').allowed()
-+ subdir_done()
-+endif
-+
- spa_examples_extra_deps = {
- 'local-v4l2': [sdl_dep],
- 'local-libcamera': [sdl_dep, libcamera_dep],
---- a/spa/meson.build
-+++ b/spa/meson.build
-@@ -113,6 +113,4 @@ endif
-
- subdir('tools')
- subdir('tests')
--if get_option('examples').allowed()
-- subdir('examples')
--endif
-+subdir('examples')
---- a/src/examples/meson.build
-+++ b/src/examples/meson.build
-@@ -22,6 +22,10 @@ examples = [
- 'local-v4l2',
- ]
-
-+if not get_option('examples').allowed()
-+ subdir_done()
-+endif
-+
- examples_extra_deps = {
- 'video-src-fixate': [drm_dep],
- 'video-play': [sdl_dep],
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -3,9 +3,7 @@ subdir('pipewire')
- subdir('daemon')
- subdir('tools')
- subdir('modules')
--if get_option('examples').allowed()
-- subdir('examples')
--endif
-+subdir('examples')
- if get_option('tests').allowed()
- subdir('tests')
- endif
---
-GitLab
diff --git a/media-video/pipewire/files/1.0.0/0002-fix-x11-bell-segfault.patch b/media-video/pipewire/files/1.0.0/0002-fix-x11-bell-segfault.patch
deleted file mode 100644
index ecf7ded220f4..000000000000
--- a/media-video/pipewire/files/1.0.0/0002-fix-x11-bell-segfault.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/919133
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3688
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/8ecc61e1177c94e78fa171ee359cfbbd239942bc
-
-From 8ecc61e1177c94e78fa171ee359cfbbd239942bc Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Tue, 5 Dec 2023 16:18:30 +0100
-Subject: [PATCH] module-x11-bell: force pulse backend
-
-The libcanberra ALSA backend has some races and causes crashes, we
-should try to not use that one.
-
-Fixes #3688
---- a/src/modules/module-x11-bell.c
-+++ b/src/modules/module-x11-bell.c
-@@ -104,6 +104,11 @@ static int play_sample(struct impl *impl)
- res = -EIO;
- goto exit;
- }
-+ if ((res = ca_context_set_driver(ca, "pulse")) < 0) {
-+ pw_log_error("canberra context set backend error: %s", ca_strerror(res));
-+ res = -EIO;
-+ goto exit_destroy;
-+ }
- if ((res = ca_context_open(ca)) < 0) {
- pw_log_error("canberra context open error: %s", ca_strerror(res));
- res = -EIO;
---
-GitLab
diff --git a/media-video/pipewire/pipewire-1.0.3.ebuild b/media-video/pipewire/pipewire-1.0.5-r1.ebuild
index ddb46df4ee73..1373789d2b11 100644
--- a/media-video/pipewire/pipewire-1.0.3.ebuild
+++ b/media-video/pipewire/pipewire-1.0.5-r1.ebuild
@@ -47,7 +47,7 @@ else
PIPEWIRE_DOCS_USEFLAG="man"
fi
- KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
DESCRIPTION="Multimedia processing graphs"
@@ -162,9 +162,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+PDEPEND=">=media-video/wireplumber-0.5.2"
# Present RDEPEND that are currently always disabled due to the PW
# code using them being required to be disabled by Gentoo guidelines
@@ -313,11 +311,9 @@ multilib_src_install_all() {
# Enable required wireplumber alsa and bluez monitors
if use sound-server; then
- dodir /etc/wireplumber/main.lua.d
- echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
-
- dodir /etc/wireplumber/bluetooth.lua.d
- echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+ # Install sound-server enabler for wireplumber 0.5.0+ conf syntax
+ insinto /etc/wireplumber/wireplumber.conf.d
+ doins "${FILESDIR}"/gentoo-sound-server-enable-audio-bluetooth.conf
fi
if use system-service; then
diff --git a/media-video/pipewire/pipewire-1.0.5.ebuild b/media-video/pipewire/pipewire-1.0.5.ebuild
index 88312367a689..0115d177525b 100644
--- a/media-video/pipewire/pipewire-1.0.5.ebuild
+++ b/media-video/pipewire/pipewire-1.0.5.ebuild
@@ -47,7 +47,7 @@ else
PIPEWIRE_DOCS_USEFLAG="man"
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
fi
DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/pipewire/pipewire-1.0.0-r1.ebuild b/media-video/pipewire/pipewire-1.0.6.ebuild
index 2a642ac6f537..1373789d2b11 100644
--- a/media-video/pipewire/pipewire-1.0.0-r1.ebuild
+++ b/media-video/pipewire/pipewire-1.0.6.ebuild
@@ -23,11 +23,11 @@ EAPI=8
: ${PIPEWIRE_DOCS_PREBUILT:=1}
PIPEWIRE_DOCS_PREBUILT_DEV=sam
-PIPEWIRE_DOCS_VERSION="${PV}"
+PIPEWIRE_DOCS_VERSION=$(ver_cut 1-2).0
# Default to generating docs (inc. man pages) if no prebuilt; overridden later
PIPEWIRE_DOCS_USEFLAG="+man"
PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
+inherit meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
if [[ ${PV} == 9999 ]]; then
PIPEWIRE_DOCS_PREBUILT=0
@@ -47,7 +47,7 @@ else
PIPEWIRE_DOCS_USEFLAG="man"
fi
- KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
DESCRIPTION="Multimedia processing graphs"
@@ -162,9 +162,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+PDEPEND=">=media-video/wireplumber-0.5.2"
# Present RDEPEND that are currently always disabled due to the PW
# code using them being required to be disabled by Gentoo guidelines
@@ -193,9 +191,6 @@ src_prepare() {
}
multilib_src_configure() {
- # https://bugs.gentoo.org/838301
- filter-flags -fno-semantic-interposition
-
local emesonargs=(
-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
@@ -316,11 +311,9 @@ multilib_src_install_all() {
# Enable required wireplumber alsa and bluez monitors
if use sound-server; then
- dodir /etc/wireplumber/main.lua.d
- echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
-
- dodir /etc/wireplumber/bluetooth.lua.d
- echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+ # Install sound-server enabler for wireplumber 0.5.0+ conf syntax
+ insinto /etc/wireplumber/wireplumber.conf.d
+ doins "${FILESDIR}"/gentoo-sound-server-enable-audio-bluetooth.conf
fi
if use system-service; then
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index b792e5bf1639..0e1cb10820aa 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -162,9 +162,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+PDEPEND=">=media-video/wireplumber-0.5.2"
# Present RDEPEND that are currently always disabled due to the PW
# code using them being required to be disabled by Gentoo guidelines
@@ -313,16 +311,8 @@ multilib_src_install_all() {
# Enable required wireplumber alsa and bluez monitors
if use sound-server; then
- # Install sound-server enabler, alsa part, wireplumber 0.4.15 syntax, clean this up with wireplumber dep bump
- dodir /etc/wireplumber/main.lua.d
- echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
-
- # Install sound-server enabler, bluetooth part, wireplumber 0.4.15 syntax, clean this up with wireplumber dep bump
- dodir /etc/wireplumber/bluetooth.lua.d
- echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
-
- # Install sound-server enabler for wireplumber 0.4.81+ conf syntax
- insinto /etc/pipewire/wireplumber.conf.d
+ # Install sound-server enabler for wireplumber 0.5.0+ conf syntax
+ insinto /etc/wireplumber/wireplumber.conf.d
doins "${FILESDIR}"/gentoo-sound-server-enable-audio-bluetooth.conf
fi
diff --git a/media-video/popcorntime-bin/Manifest b/media-video/popcorntime-bin/Manifest
index c295dc8ac0ef..617157afa58f 100644
--- a/media-video/popcorntime-bin/Manifest
+++ b/media-video/popcorntime-bin/Manifest
@@ -3,7 +3,7 @@ DIST Popcorn-Time-0.4.9-i386.deb 104225348 BLAKE2B d162f6afc7f57b2cc1ddf8d14a044
DIST Popcorn-Time-0.5.0-amd64.deb 154055688 BLAKE2B e099038e6cd6f3a214209243c0ab3791b607b2c127ea92b8f1a024f64b0ad1fbea7d1f108619a64a40f4531b5b8e1f0cce3371abc30beadf1b4a4decedf7e3dd SHA512 b81ab4c9a2af1dde80b1fea883d481a64ab04babfc3faa5eec993a8f07ab09f0b6bab7c36292988de375cd70f3ce03f325cd833f083072f2aa900191ef0092bf
DIST Popcorn-Time-0.5.0-i386.deb 159146908 BLAKE2B 2eebf6bd8c473b68dbd8019ae85155b85f249d9b2e5ec74d467606dc6b455b5e03413d6394d2b220eb70326a6b45bd25386a04fc8de546256b49af6b4774cdcd SHA512 6a45fe9c977fbadeb21133a67fb16fa0795b2e7d7af24e5a0e72c57963d11674de03fec89880d61cd7a2f218efc6db8666a1878e12628b346e4f5b6afc03bfa5
DIST Popcorn-Time-0.5.1-amd64.deb 150323412 BLAKE2B 6c15e01ba8d9a1f6efac0b663b6112a52a5c5aa82b93e627bacad4e1c8e3c29b81898769dc16e58cc0adc6f4f1684c66063a2ded8b6236adebd8c5f3f0168f67 SHA512 ad6646b8f1e6f4ffa40ab4276fabb957a418c764442bca3a775df4af4a6621e9514ef22ceaf435025d8aa515e9bf7a8490f285faacc824c3f26ccf6e5dfe5f79
-EBUILD popcorntime-bin-0.4.9.ebuild 2125 BLAKE2B 9cf5b628d2bc3b70562ac4b7fc9a311cd0c626426f462dd578f9d405b4e2cee74df56d5891827ab06b3ecbfd15aabcd50e047224c0f706c6d0b6ecba08044714 SHA512 629058224e66dccb5201b2b9f9b32c5f1e1858ea4fd7904da1fc23203f8f2d60ad8d8d46751cad4d9bb3bca876797a05219bacb5f9ed02790a7d1cf2419e3f46
-EBUILD popcorntime-bin-0.5.0-r1.ebuild 2437 BLAKE2B 416ffbc51bfe9f98460a17e6c468292f9d4236da3bd3b21718de46a4321106da8c2fbc0d2d7334e984beba06b419cec00377fb6247fb7924ca931c9e6f99736c SHA512 92c365bb534c1db9575196320d98f3f55dead82132c7acfa43d86b15d875543f73cc90b9d9df8b1b56db6ae84befefd977ecfc480fba6da4e32eeb2878e2a822
-EBUILD popcorntime-bin-0.5.1.ebuild 2303 BLAKE2B d1fc024f454d6c78974a1a460cfa846cb45445487859b80ad19ea6a10b54597429bab559319f44a66b1305259cdf5fead8871b10169d17a668d8e2de55807a75 SHA512 2d23fcbfa87b4d6d5f330d25e180dde2bdfacd178fb49373fe2ba13b6992a336de7ebdb49ccf98d2c8cfc108a01895cf8f1d3c6043bc3fd35319c521424ac926
+EBUILD popcorntime-bin-0.4.9.ebuild 2129 BLAKE2B 19cebe0f05101a8209978cbd56d4d487da2409913d091901206eb15b89848fd0335341a4ae35385d54d72c4f7eed03130782b7ac246c04f32a7242796d9813dc SHA512 9a5aa9b49b3208ef5d4a46c6b14c8f2893a8b5618a3b0b8c4c2f640bf25a456cc355eb136c6b7e29d17c6c3a71b8cbe3d1f12d0d7a499b7843f4ce17a13757af
+EBUILD popcorntime-bin-0.5.0-r2.ebuild 2441 BLAKE2B 5eb8878ae4994a979728939083aeea07f73f1dbe7c3f4ef6812ea65e2b4bde4f72b9a02605af4f41b9ca8660399e8a5dd9a512f9493e1e3fc7bb611a766da5d8 SHA512 eafefccc965a0027c3ba4471f4e535dc4c950ac8b7c10bf260bffbb2b6b36c53417ce30bb18d886ec52aa8c25dc9afbb519e8152aa61eb7c472651fef8194826
+EBUILD popcorntime-bin-0.5.1-r1.ebuild 2307 BLAKE2B eabcd3911649a17b4569d23a7bba55a8273be18b4e1629f2770aa461352b115959d4feb4939c5ad48734dc827dcfb6399cb5b9e59296702a04a80ff9fff8065d SHA512 09c10ac46b4780c1c5381db32e55783ef2ed166caf55abe8aa19de83240899fac55aa0473d844c9204eea9233fb51b92375d2201b14324e0b4871af5f18adb03
MISC metadata.xml 436 BLAKE2B da1f7867d1f3a3b6a04a0975899b592976adb0299e2c370fa613d025993aeed81f719d1bde50565f3e8da15cfdd4ed6cd7f1bf4abb77c3d9371fdcfe7f4e9d13 SHA512 fec3c45b96ed58c61fb5454edc2351384b67bb52e156542bd0d71ce51f36b5943c1bee083a05c5c99917630da6ca5ffe0b87cfacde3a07d521a3c2032e42985e
diff --git a/media-video/popcorntime-bin/popcorntime-bin-0.4.9.ebuild b/media-video/popcorntime-bin/popcorntime-bin-0.4.9.ebuild
index 194dd26d3375..732f6f49a8e4 100644
--- a/media-video/popcorntime-bin/popcorntime-bin-0.4.9.ebuild
+++ b/media-video/popcorntime-bin/popcorntime-bin-0.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -23,7 +23,7 @@ KEYWORDS="-* ~amd64 ~x86"
# Electron bundles a bunch of things
LICENSE="
MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
- unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+ unRAR OFL-1.1 CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
"
SLOT="0"
RESTRICT="bindist mirror"
diff --git a/media-video/popcorntime-bin/popcorntime-bin-0.5.0-r1.ebuild b/media-video/popcorntime-bin/popcorntime-bin-0.5.0-r2.ebuild
index 4d14332ff5f3..761a93ccf625 100644
--- a/media-video/popcorntime-bin/popcorntime-bin-0.5.0-r1.ebuild
+++ b/media-video/popcorntime-bin/popcorntime-bin-0.5.0-r2.ebuild
@@ -23,7 +23,7 @@ KEYWORDS="-* ~amd64 ~x86"
# Electron bundles a bunch of things
LICENSE="
MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
- unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+ unRAR OFL-1.1 CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
"
SLOT="0"
RESTRICT="bindist mirror"
diff --git a/media-video/popcorntime-bin/popcorntime-bin-0.5.1.ebuild b/media-video/popcorntime-bin/popcorntime-bin-0.5.1-r1.ebuild
index 1a57d5895207..e8fb9e1cdf91 100644
--- a/media-video/popcorntime-bin/popcorntime-bin-0.5.1.ebuild
+++ b/media-video/popcorntime-bin/popcorntime-bin-0.5.1-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"
# Electron bundles a bunch of things
LICENSE="
MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
- unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+ unRAR OFL-1.1 CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
"
SLOT="0"
KEYWORDS="-* ~amd64"
diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index dceb5ff4ac6a..04b4ab9fb4c7 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -7,5 +7,6 @@ DIST projectx-0.91.0.10-r4.tar.xz 830232 BLAKE2B 26171e583dc608c181d3ab3de050beb
DIST projectx-icon.png 1692 BLAKE2B 6da85b69961b81f64638b04860b467e8cf599287513d85157aa71e4575003b8ef6e96cbe4b0b40b54bb15b6ca74c14f4bf1855c80f1f6db89294567a77f9e151 SHA512 33d9e505140d2dd22d34f87ebff040530130bbb7d1e9958d7345f442bd3d6e17dff8d243e22f374217aed20139871e406e46ca6f03ca48eb338dc3630af2417a
DIST projectx-idctfast.tar.xz 12444 BLAKE2B e4b2a6ab235601dbdd1acf8a73a14fecb5da455670bad52598e0dbd8a7300305fad1b22b3d550dd046dcac68975af4b225e042f7c968ce9108f702d01586302f SHA512 85dd6dd0011c166aaefd47a47c4455dda68ba6da65c9eda5a996f7d078ce3900168714c0c72c6250f7b99181fda84c6d81e3afb392ace9c12c3c5690de01c1d8
DIST xdg-20100731.java.xz 648 BLAKE2B 8bd082c445d64051c65c66e8a22b61e582d04f1f650e3b15ee2f3400d47b10f137d245bd8a7633d96299e2c688f7bf836b59a4dd49ea3c181684a78fa55304c3 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b
-EBUILD projectx-0.91.0.10-r4.ebuild 3096 BLAKE2B c0cbf0c11c99fe31f287e0b467aed0096c9b6130ad7fbd746c11062e819f5fbe9322702d6d146b03335b5023b0e7b7e19dbd06d057aa7e36ee4dad86e6b74035 SHA512 5dc830f7cf8c0f8e0d42f9c786e9fbb4918db0ebf29fedbc4485acb379f868d4b45e1e0e57d733fb8a98ba670225570225eb0675bd7a68ea338b4be136f0e97d
+EBUILD projectx-0.91.0.10-r4.ebuild 3096 BLAKE2B 28381e7606ed1ac8e163bc3f4cc623722e4e7de07974ff341b69d7fa74e243e6e508e4fa873f960176d7e6cfa28529cea9aa61532f89fadbde5dcdd894f4eda1 SHA512 7dfc86db8a7116737aeaf4d8ba1f1663edc2018f6be8ba639f4b042b80115a2ef878fff876ec55e1e3d4dff460b25d1c34aed92a38f3b349c5930448e8ea9eb5
+EBUILD projectx-0.91.0.10-r5.ebuild 2990 BLAKE2B daa1ddf2371c78a7caa164bf3524f33bc94d0742e8bbabcfa9d5ddb6401e7357a7d20d6d39ab76d2ac4ead59d864425bad8fe108f02f51174823e28922f963b2 SHA512 bbd6006d383823ea08ad9c006f307e023a9e408517fe49bd41e44dbef9ccc0217877391f804d4092f58f082ca3cb2f3a7d3576836a72d0de6d6c6caac0c4c9ba
MISC metadata.xml 743 BLAKE2B 1100ef8186544c4605495d3cee7ba506559e124fd500a20b54a7cbd912a792b6873143040f46d9b30837c6dd79c0e1f18f6464d25b84dc1681b0886c209471b0 SHA512 7644cbc684eaaaec7838c38a7856b3421e4e9069dc208bad12c9b4c40567ecce706633148656d2ceb193ebd925761599856f6290126ecf88405f9b86af49ab25
diff --git a/media-video/projectx/projectx-0.91.0.10-r4.ebuild b/media-video/projectx/projectx-0.91.0.10-r4.ebuild
index 29c0eef255d3..57ef227ba394 100644
--- a/media-video/projectx/projectx-0.91.0.10-r4.ebuild
+++ b/media-video/projectx/projectx-0.91.0.10-r4.ebuild
@@ -16,6 +16,8 @@ SRC_URI="https://dev.gentoo.org/~billie/distfiles/${PF}.tar.xz
https://dev.gentoo.org/~billie/distfiles/${XDG_P}.java.xz
https://dev.gentoo.org/~billie/distfiles/${PN}-icon.png"
+S="${WORKDIR}/Project-X"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc64 x86"
@@ -35,8 +37,6 @@ DEPEND="
app-arch/xz-utils
"
-S="${WORKDIR}/Project-X"
-
mainclass() {
# read Main-Class from MANIFEST.MF
sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" || die
diff --git a/media-video/projectx/projectx-0.91.0.10-r5.ebuild b/media-video/projectx/projectx-0.91.0.10-r5.ebuild
new file mode 100644
index 000000000000..3e5d18a572cc
--- /dev/null
+++ b/media-video/projectx/projectx-0.91.0.10-r5.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit desktop java-pkg-2 java-pkg-simple toolchain-funcs xdg
+
+XDG_P="xdg-20100731"
+
+DESCRIPTION="Converts, splits and demuxes DVB and other MPEG recordings"
+HOMEPAGE="https://project-x.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}-r4.tar.xz
+ https://dev.gentoo.org/~billie/distfiles/${PN}-idctfast.tar.xz
+ https://dev.gentoo.org/~billie/distfiles/${XDG_P}.java.xz
+ https://dev.gentoo.org/~billie/distfiles/${PN}-icon.png"
+
+S="${WORKDIR}/Project-X"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="X cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+COMMON_DEPEND="
+ dev-java/commons-net:0
+ X? ( dev-java/browserlauncher2:1.0 )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=virtual/jre-1.8:*
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ >=virtual/jdk-1.8:*
+ app-arch/xz-utils
+"
+
+JAVA_ENCODING="iso-8859-1"
+JAVA_GENTOO_CLASSPATH="commons-net"
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+ default
+
+ xdg_environment_reset
+
+ local X
+
+ # apply stdout corruption patch (zzam@gentoo.org)
+ eapply "${FILESDIR}/${PN}-0.91.0.10-stdout-corrupt.patch"
+
+ # apply BrowserLauncher2 patch
+ if use X; then
+ eapply "${FILESDIR}/${PN}-0.91.0.10-bl2.patch"
+ JAVA_GENTOO_CLASSPATH+=" browserlauncher2-1.0"
+ fi
+ rm -rf src/edu || die
+
+ # apply IDCTFast patch
+ eapply "${FILESDIR}/${PN}-0.91.0.10-idctfast.patch"
+
+ # apply XDG patch
+ cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die
+ eapply "${FILESDIR}/${PN}-0.91.0.10-xdg.patch"
+
+ # patch executable and icon
+ sed -i -e "s:^\(Exec=\).*:\1${PN}_gui:g" \
+ -e "s:^\(Icon=\).*:\1${PN}:g" *.desktop || die
+
+ JAVA_MAIN_CLASS="$(grep Main MANIFEST.MF | cut -d' ' -f2)"
+
+ # merge/remove resources depending on USE="X"
+ if use X; then
+ mv -f htmls resources/ || die
+ else
+ rm -rf src/net/sourceforge/dvb/projectx/gui || die
+ rm resources/*.gif || die
+ fi
+
+ # update library packages
+ cd lib || die
+ rm -f {commons-net,jakarta-oro}*.jar || die
+ java-pkg_jar-from commons-net
+ use X && java-pkg_jar-from browserlauncher2-1.0
+ java-pkg_ensure-no-bundled-jars
+}
+
+src_compile() {
+ local IDCT="idct-mjpeg" # default IDCT implementation
+ if use x86 || use amd64; then
+ use cpu_flags_x86_mmx && IDCT="idct-mjpeg-mmx"
+ use cpu_flags_x86_sse && IDCT="idct-mjpeg-sse"
+ fi
+
+ java-pkg-simple_src_compile
+
+ cd lib/PORTABLE || die
+ emake CC="$(tc-getCC)" IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
+ CPLAT="${CFLAGS} -O3 -ffast-math -fPIC"
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_doso lib/PORTABLE/libidctfast.so
+
+ java-pkg_dolauncher ${PN}_cli --main ${JAVA_MAIN_CLASS} \
+ --java_args "-Djava.awt.headless=true -Xmx256m"
+
+ if use X; then
+ java-pkg_dolauncher ${PN}_gui --main ${JAVA_MAIN_CLASS} \
+ --java_args "-Xmx256m"
+ dosym ${PN}_gui /usr/bin/${PN}
+ newicon "${DISTDIR}/${PN}-icon.png" "${PN}.png"
+ domenu *.desktop
+ else
+ dosym ${PN}_cli /usr/bin/${PN}
+ fi
+
+ dodoc *.txt
+}
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 0d65ad1412a4..639ab327ae98 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -5,4 +5,4 @@ AUX smplayer-18.2.0-jobserver.patch 423 BLAKE2B 04452fa5992dd2cef5be64dc9a9c78ca
AUX smplayer-18.3.0-disable-werror.patch 367 BLAKE2B 68b0f5b9cb34afb3843de4dd366a0a2e77eea881277d7b8a7928e851d2456f8fe5220ee50ae77296b622187758b7f6f3a4c298c0400becfee0d2fa074e7706e3 SHA512 b330aee54397a3fce5cda3a1244918351831ffe37cc7d45bcfa93384952bdce3166875afd5cd4bae9f1d6e83281b6b6bfc3ad777317a0b2c6c5dcc5593ddcb54
DIST smplayer-23.6.0.tar.bz2 5164535 BLAKE2B 27200ad658a2acfc3c93c48ed59fca2333b5935d5b7e955cb12dd0c33566aaf0288c68081a68578904076e467bb3b39f9a5bb702d7ad8be0474aa400e40ce6e0 SHA512 097085ffae11b0d065f0822e36466f3e934d4484de29146deba66de14bfd4abcaa8dfd91aa5890921f336a99c3392650e932102812bf401a843d7a86dfc4996d
EBUILD smplayer-23.6.0.ebuild 2949 BLAKE2B 755329f4f39cbb197f0b649117711b993b7e47ac5f5984a15012dda4984f656b08af6c22b9a66faf606d102e1681a8073848189e89f2e13b0d6d00bcf9c33ea1 SHA512 0350083c5965481bfd220303f33ad4a3088e4ae16c510bd16ced76c046fd0d66c391325ec55481b9d9bbee4ed1cf87a5a80271135c1d7212b05a67eaa0184725
-MISC metadata.xml 462 BLAKE2B 67679a76ea014b5827fc37418379c888c4ff96e47de57cbf08a01c2db3b52795f0b8a9f8a46f54c6a417e148d20423d72260953062f5cdff5e04e19046d18d43 SHA512 f09c9c7b0e9431d450eb9dea8d5a189df3f14c04bf49b1dfb789b7756e20a924a8294ca814dce418b2aea427bf403a0f5a222ced23fe3da51cf2638319cec1d3
+MISC metadata.xml 348 BLAKE2B a067bafbbe7dcadc21c51f10caf242c344ffffd431e058cc2a3068c1431f25a631207e4de04c00b3a937d724f1d8b0798e2e84118221282267c909ee4a60a175 SHA512 1d45260220a3025faf008c7ba8199092a3ad22fbdc9e83f09fea1616c0403c419284e9d18da401ba2cba7b738d09d285387643a1e0d4034aadcde7c8587192e5
diff --git a/media-video/smplayer/metadata.xml b/media-video/smplayer/metadata.xml
index 56452d8c0459..9b4c43a953d1 100644
--- a/media-video/smplayer/metadata.xml
+++ b/media-video/smplayer/metadata.xml
@@ -2,10 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
- <email>qt@gentoo.org</email>
- <name>Gentoo Qt Project</name>
- </maintainer>
- <maintainer type="project">
<email>media-video@gentoo.org</email>
<name>Gentoo Video project</name>
</maintainer>
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index d359ddebc2bb..b5ccc34dcf02 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,4 +1,4 @@
AUX 43.0-gst-inspect-sandbox.patch 1470 BLAKE2B e92278c4951deb89d13dc96ddc33606ba0f1d21c0e16f4d49cc637fdd15fc5905509eb040e9857ccc4e56d1f5c9f9afb0f7e7e994371928f67cf26c1ff1fddca SHA512 d248b919ac90b27f51eb2a74127013acbf59e669d83b1d4d9b177ee75881fa98714a36e94232a4caf2ca101efff8df4dde12ad9deae49a2f2072d62c3aef7781
DIST totem-43.0.tar.xz 2486304 BLAKE2B 3b43ad2cbf40472bff3b7369001b9b7784ef52244812d9aae493fffa99982a8f24770d0f5063f0b1f1fd320d6b2cec5e702ded9ccfaece51f7bdf9d862b96230 SHA512 b35d32ebadf4b9900ab234f07f8a7128edbc15593e1447c22f3c7a653fcbd4a2df9d45484e2decce5dd5ab67849fca1003a1ded338a0af0930b6560ee4f764ae
-EBUILD totem-43.0-r1.ebuild 3010 BLAKE2B af35ea3c5a9c6e60b5b21bc5f77fa624d3d98afdf4e55863a5abed15caeef98d1676660e2b5a1e259a0e74c7a97572d4c1eb4df748d0ca5e1ae59f49b485eaa2 SHA512 7831829649e76c3e2d603b145a8b047c236183dd4d38a7072826bb1354e57626ff8342258f498c66952496e7eb191e26996792c7c63bfe5f6cf06962dcb66afa
+EBUILD totem-43.0-r1.ebuild 3011 BLAKE2B d428ec694914433b7c54149c77cfb471fb3b828d65bd305284505c383d2271283e8238c7c8121f69caf773908e852c8f016852c1d7cf8174b7c9bdcc8fc58163 SHA512 8c69b319bcfbd0e5ca982d38b2f8ca69936687092757ce15ae15172e4239278e2d3279a2f5cce3d1b505d6c63a3779aba472decc36015b376dcceee1daccff56
MISC metadata.xml 1144 BLAKE2B 93350ee033585bcb68019b5daed10bdb6fd3f436b234fe7a077695a230868b7733cad41dec152aaa44a2b61b6aea0c057c59896ebe84b8e9bbafbba4b0aecc27 SHA512 5ec35c0372f72d88b19502b561031387b3fa1421e5cd5c642350410918b3b538b4e55fb0cf6f1ee69442ddf3865680c747e70f5196c45c7c91ea708d68a2ad15
diff --git a/media-video/totem/totem-43.0-r1.ebuild b/media-video/totem/totem-43.0-r1.ebuild
index b5f233577b01..99c261c6b5ea 100644
--- a/media-video/totem/totem-43.0-r1.ebuild
+++ b/media-video/totem/totem-43.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="threads(+)"
inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
diff --git a/media-video/ttcut/Manifest b/media-video/ttcut/Manifest
index 302be2410922..35121ac105fb 100644
--- a/media-video/ttcut/Manifest
+++ b/media-video/ttcut/Manifest
@@ -1,4 +1,4 @@
AUX ttcut.desktop 304 BLAKE2B 9f0f6c6de3beae152b280a280953ddc156373cd3bfeacb35f265648b8e1d0c92b001bb4456ac3e1208edf6730a2a75e90cd9d879aaee73eff0c9aa198ffa8430 SHA512 82f004f65755ea24ba6b379f18e15c5fe8736da0afe4854cc5ed3e8ceeb55b0b8b6c4f3def3e4a09c25b179a3415d0a47dfcd5d8b92cb34fb7270c6a24c714ad
DIST ttcut-0.19.6_p1.tar.gz 283304 BLAKE2B ee0d000a1cc091be1848746d3b32930ae5f59865d7fc04779be9aac4bc9621eaace88a6d9263c767671643d9ce381af2cf57fc5b87707903a5abe8a59eb6cb99 SHA512 9d104436145ef209db4eaca1566d718ccdf84636a391e3f47bd829a165741f57a6123942f37ba2eb361dd46716e78e36832cb9a459ca9ed0130a70af92287494
-EBUILD ttcut-0.19.6_p1-r1.ebuild 809 BLAKE2B 82dc0b77aa8c036f77223d330d39cd8f124dcdc6db15b801374414ebe418c0632b0acd47f77aabef7f62fc3586ca55e83c5bdf65f2f688addb6b4000a10f8692 SHA512 9d7d6cdc753f85b61b12d2b9e1ca5680a9e4c657088f29299b62d783ccfffd88473b3e2cee3a06434ca47ec482d7981bcc3840f4ecc6646b058fc593085720e9
+EBUILD ttcut-0.19.6_p1-r1.ebuild 809 BLAKE2B 358b7132bff5be7d355090bc85126460ad997401786d5fe56d6b2f09ad4bbc0d95cb6b73ece170096bc76c18faad88624b9d2cc3fa8188e414a6e030f1f5e2af SHA512 a2a36b51b4cd06a82e772b9b9916b697a08c545e505cdb0765739803d348c082939ac72522d74529cc768d5a3432e8f4ab2f37066ee150d49a074649b21f7eff
MISC metadata.xml 986 BLAKE2B 89e318ee82e0592cc56b77849a89d0d54f9c8844c412aae9938f21576a8cbffc03819c1d7149861b8f13913ecc191c79b608787a3ed520b829b7ce35a2ae90cc SHA512 50601b3fcd369bae5bab4a9e49dd1d99d281eb148ef9edec8355ce542317fc8d0efd3b6228fb117b38da733edd2adb51d4fc4c70a23d905b1ec47a2b743651ff
diff --git a/media-video/ttcut/ttcut-0.19.6_p1-r1.ebuild b/media-video/ttcut/ttcut-0.19.6_p1-r1.ebuild
index 935aabf75b93..2c05203e247a 100644
--- a/media-video/ttcut/ttcut-0.19.6_p1-r1.ebuild
+++ b/media-video/ttcut/ttcut-0.19.6_p1-r1.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="Tool for cutting MPEG files especially for removing commercials"
HOMEPAGE="https://github.com/baltendorf/ttcut"
SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
@@ -28,8 +30,6 @@ RDEPEND="
>=media-video/ffmpeg-1.0.8[encode]
"
-S=${WORKDIR}/${PN}
-
src_prepare() {
default
diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest
deleted file mode 100644
index bd394157fc89..000000000000
--- a/media-video/unifi-video/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX commons-daemon-move.patch 337 BLAKE2B 79e847ce6e1c32c3cfbe192d8dce33175e2c0ef87b658d5ec8a3e8071bb737e8ea5d67814078d3c7693660879fca1a6c9038a124f19713382b0ded337bbf09ee SHA512 da836d7010769a0a81a959db4bb279418efeac75e2e444471d800889a6f2ff06227a76f04de9857da619af549b76f145263ca4c106d5485edcae679f9cf92ec5
-AUX unifi-video.initd 467 BLAKE2B c68d4b1efc3a2583e8624d306d667585022d27aa0ad4f2becd9569c8086b568e5c84508f2cc71c81605cc124bc17cd42c884d477b15181dba73544fc254610c1 SHA512 1cd4345daf09a27dcb8528abd076e920e30b6ff7a505acad74fdc291164c94569946cd493563331c5e52cb95c45e18522520aee47555db438fa87c46d07e35c5
-AUX unifi-video.service 209 BLAKE2B fd4d96fbd353c795621ec6ad2cb23d8c27132071ebee2843364283da712e46f8fb1d1fcb9ce7b3f042938a55cf3689c7976095ed2f5e72b71bb915ae8a32763d SHA512 ea6eb21bc15c887f4f5e27669bb72eb31db9d8af48d9efdfc32901f1eeff2fb1626ce161dab2bf636eabd4a49c16966cfc55dcd8e572f01a829f491248f7b474
-DIST unifi-video.Ubuntu18.04_amd64.v3.10.13.deb 178800688 BLAKE2B b35f91e77514fcf0165298473be503f6d977cb9f8f53e88f5bb700a2c76a3636e2f475c93c395eab6af4a215074521e47e1dc2d868695c1de83968b64e157cc8 SHA512 58d03b1004ba6da58b52c20720137639167647539c135c71c6abb36b80e37c4f33f0d0ae4092f98858bed8fcb4a3c9f05cc2a0a25e96fee957da176b9b6801d2
-EBUILD unifi-video-3.10.13-r5.ebuild 2167 BLAKE2B f3ac14d9ecad119aad672b07390e0d7783097c30036777efb73b31471fbea952a1b831e14fbf7eabece554868e0f9141159f7f3b7429e13921f7786f53902ae4 SHA512 1d50db8445ddb2fa51b7e3239fe361c8d072c73bdb342f1c548cf42bed1658f2c69ff105500951b565eff17afae39753b0c07be9708cde31590fe6f7232133da
-MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/media-video/unifi-video/files/commons-daemon-move.patch b/media-video/unifi-video/files/commons-daemon-move.patch
deleted file mode 100644
index 448f77249e82..000000000000
--- a/media-video/unifi-video/files/commons-daemon-move.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/usr/sbin/unifi-video
-+++ b/usr/sbin/unifi-video
-@@ -271,7 +271,7 @@
- JSVC_OPTS="${JSVC_OPTS} \
- -user ${PKGUSER} \
- -home ${JAVA_HOME} \
-- -cp /usr/share/java/commons-daemon.jar:${MAINJAR} \
-+ -cp /usr/share/commons-daemon/lib/commons-daemon.jar:${MAINJAR} \
- -pidfile ${PIDFILE} \
- -procname ${NAME} \
- ${JSVC_EXTRA_OPTS} \
-
diff --git a/media-video/unifi-video/files/unifi-video.initd b/media-video/unifi-video/files/unifi-video.initd
deleted file mode 100644
index 55d6e805453d..000000000000
--- a/media-video/unifi-video/files/unifi-video.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PID_FILE="/run/unifi-video.pid"
-
-start() {
- ebegin "Starting unifi-video"
- start-stop-daemon --start --quiet -b \
- --pidfile "${PID_FILE}" -m \
- --exec /usr/sbin/unifi-video start
- eend $?
- #--user nobody --group nobody \
-}
-
-stop() {
- ebegin "Stopping unifi-video"
- start-stop-daemon --quiet --stop -R 20 --pidfile "${PID_FILE}"
- eend $?
-}
diff --git a/media-video/unifi-video/files/unifi-video.service b/media-video/unifi-video/files/unifi-video.service
deleted file mode 100644
index 6587be4f1cac..000000000000
--- a/media-video/unifi-video/files/unifi-video.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=UniFi Video Server
-Requires=network.target
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/unifi-video -D start
-ExecStop=/usr/sbin/unifi-video -D stop
-
-[Install]
-WantedBy=network.target
diff --git a/media-video/unifi-video/metadata.xml b/media-video/unifi-video/metadata.xml
deleted file mode 100644
index aa20bff17b1d..000000000000
--- a/media-video/unifi-video/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bkohler@gentoo.org</email>
- <name>Ben Kohler</name>
- </maintainer>
-</pkgmetadata>
diff --git a/media-video/unifi-video/unifi-video-3.10.13-r5.ebuild b/media-video/unifi-video/unifi-video-3.10.13-r5.ebuild
deleted file mode 100644
index 09f2a37096a3..000000000000
--- a/media-video/unifi-video/unifi-video-3.10.13-r5.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-MY_PV="${PV/_beta/-beta.}"
-DESCRIPTION="UniFi Video Server"
-HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
-SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu18.04_amd64.v${MY_PV}.deb"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND="acct-group/unifi-video
- acct-user/unifi-video
- app-arch/zip"
-RDEPEND="${DEPEND}
- dev-db/mongodb
- dev-java/commons-daemon
- sys-apps/lsb-release
- sys-apps/util-linux
- sys-libs/libcap
- virtual/jre:1.8"
-
-S=${WORKDIR}
-QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
-
-src_unpack() {
- default
- unpack "${WORKDIR}"/data.tar.gz
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/commons-daemon-move.patch
- sed -i usr/sbin/${PN} \
- -e '/require_root$/d' \
- -e '/update_limits$/d' \
- -e '/ulimit/d' \
- -e '/coredump_filter/d' || die
- default
- #delete problematic class in bundled log4j
- zip -q -d \
- usr/lib/unifi-video/lib/log4j-core-2.1.jar \
- org/apache/logging/log4j/core/lookup/JndiLookup.class || die
-}
-
-src_install() {
- export CODEPATH=/usr/lib/${PN}
- export DATAPATH=/var/lib/${PN}
- LOGPATH=${DATAPATH}/logs
- VARLOGPATH=/var/log/${PN}
-
- insinto /usr/lib
- doins -r .${CODEPATH}
- into /usr
- dosbin usr/sbin/unifi-video
-
- keepdir ${LOGPATH}
- dodir ${DATAPATH}
- fowners -R ${PN}:${PN} ${DATAPATH}
- dosym ${LOGPATH} ${VARLOGPATH}
- dosym ${LOGPATH} ${CODEPATH}/logs
-
- dosym ${DATAPATH} ${CODEPATH}/data
-
- fperms 500 ${CODEPATH}/bin/ubnt.avtool
- fperms 500 ${CODEPATH}/bin/evostreamms
- fperms 500 /usr/sbin/${PN}
- fowners -R ${PN}:${PN} ${CODEPATH}
- fperms -R 0400 ${CODEPATH}/lib/
- fperms 500 ${CODEPATH}/lib/
-
- echo "CONFIG_PROTECT=\"${DATAPATH}/system.properties\"" > "${T}"/99${PN}
- doenvd "${T}"/99${PN}
-
- dosym ../../../bin/mongod ${CODEPATH}/bin/mongod
-
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
- if [[ ! -f ${DATAPATH}/system.properties ]]; then
- cp ${CODEPATH}/etc/system.properties ${DATAPATH}/system.properties
- echo uuid=$(uuidgen) >> ${DATAPATH}/system.properties
- fi
-}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index a55174218c95..1f2d295be450 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -10,8 +10,7 @@ AUX vlc-9999-configure-lua-version.patch 1840 BLAKE2B 1b9f11c05ed58e12616732c73a
AUX vlc-9999-fix-libtremor-libs.patch 480 BLAKE2B 86102dc088705f546185023b2f941520b5435f852e0b0e7cdb8763e15df645cdc794087c188fb17ee331be7ba4d953311276583886e3fe0f93d6de32e63e3207 SHA512 93893a0accecc3470f33e505ef2ce86aeb5f2a3a6524adc7de354366bb8e51def2d67957be4ea705ff20c1510e7274691e587e70740d4b3657b35f5c91de7280
AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
DIST vlc-3.0.20.tar.xz 25596392 BLAKE2B 4537d6b4b3445a28366cdb7ed7e12d0dc864e19a53d34efcdc0a62226642ec8653cf8d5b74d4aea30c9f324c34166e8fa71653b3b298f5abdebe29c4f21f2865 SHA512 02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406
-EBUILD vlc-3.0.20-r10.ebuild 13713 BLAKE2B 257afd14cfd7f663cdb05ecd0bc8743e79016461309c828b99c780352dc99e41685f7339432631d9255c58db8dfef784e7670e5a7c86d1b73c7a78b9a5572c84 SHA512 22c1183ad1643d685926e6799fd97be93da08f9613ae49311733d947d36ee04782c55531da8b7bcea4b8a8bec9f013c64e55c1a9f7c3d3036e33792ccbfcea0f
-EBUILD vlc-3.0.20-r5.ebuild 13695 BLAKE2B 2d7be752bd34bc9235cb04755b349a737357d2e38737c71f7b3dd6b1c01389d2542bbb208caeed86c8ba8b509b24486c20eff0f378d3de9d1954dc32a89ba335 SHA512 4598328236de70aeec4164f922a9f731be4e6ddd394df28a7dcb38cdf3d9008c96ef1395a90ea9c27dd21beeeedcbb5f8f9f795438a42d431a314b420b4fb7fa
-EBUILD vlc-3.0.9999.ebuild 13640 BLAKE2B 046e11a9895755093d585a379064ceffbce7b25342d0636b4cbd9cb2dabf186899b1244ec0ab7b9c24127a87b4758f882a0fd684216a36c89a64fc7d5c911b6b SHA512 fbaedcb6ba8d47dc39dbba7ec68ef69ee26d041af171eb94c3e76d6ef306e874c21fa0cb160fdd70014982ac96a9e9b47855962a72d8abfc14a249d0f3777493
-EBUILD vlc-9999.ebuild 13468 BLAKE2B 9368b716f838feffe9ffbed08cf002ed5c5ccca0244dad4d5a51f2dd9f942ff3fc9662388391339083a8d4d0b1047dcb0750b22bf924b320dfceda7a3f5b58f9 SHA512 c3c5353ebf8e99a860b6b862a5002f833c35875f26885ed63fc784dc252d15edfa6ff1143123ee5066def0f34763932ce64dfecb15ecbf19e008f82afde648bd
+EBUILD vlc-3.0.20-r11.ebuild 13702 BLAKE2B 209d3e1221dcb353400383c6d9e4d1fbec3d9ac337eacfcb478473b46706868551bce7604c0c70d58c7bc10da74f60d4a381d7736a9eb680473385bbaf88eb2d SHA512 0c0b1383526fff2093b93a3afe002026a1766408b55ed589ca36ff9a8d720aa5b956850a4b739c98bab864993a72a1a54d10ef4eb7064047456e8ff972e61d18
+EBUILD vlc-3.0.9999.ebuild 13629 BLAKE2B 8ae0d493b94834e7209a14f2d2162bdaf6e5f64b0a29ae538ae58da3c41edeaa5bd2262e353d1f021c0edc5d2bfbeaa812ab5438a5ad813501c20c205b06f97f SHA512 01432aeafddf27949afac97047d072031e9254291c7ef840451b22216aa408ecccf072c45a05158cc236ca2b817e94a06dc9254baa1a938990f94541d6b95e8a
+EBUILD vlc-9999.ebuild 13457 BLAKE2B d9b3a9ddda3a2cbf86e8091523d836a5611f54320d17ce3881a23b49668c1bbc3c872d49170c1ea38e0b2c3b92be05bfd6480ae63e9500976557c392c71b259c SHA512 a01a3430cb81d03d61b190da4b2dfbcdf0dfe3448d2605c995b7df05910917e4e719dd02f69f06d0e4208f9eaa563483cda2a24d47428136b734802296f2dd28
MISC metadata.xml 4815 BLAKE2B 90ef1af4058b83694f6b233c0b2daf46f45f6d23517103923b324db6ca167bb0e04226cae62162fc86a39bca5666b969b13f9d53d8b967a14af2595943d8c4e6 SHA512 544df4a6e4ed05f055f0aababa8c396932440f21336705818cbbce1397d0810ea5050ec16cdf2e3ebf0d7d63b70e77cd07c35edffeecde182ae2ecc571a1dbf7
diff --git a/media-video/vlc/vlc-3.0.20-r10.ebuild b/media-video/vlc/vlc-3.0.20-r11.ebuild
index 7e985624bdd5..9559fbe675d4 100644
--- a/media-video/vlc/vlc-3.0.20-r10.ebuild
+++ b/media-video/vlc/vlc-3.0.20-r11.ebuild
@@ -169,7 +169,7 @@ RDEPEND="
>=media-libs/libprojectm-3.1.12:0=
)
pulseaudio? ( media-libs/libpulse )
- rdp? ( >=net-misc/freerdp-2.0.0_rc0:2=[client(+)] )
+ rdp? ( >=net-misc/freerdp-2.0.0_rc0:2= )
samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
sdl-image? ( media-libs/sdl-image )
sftp? ( net-libs/libssh2 )
diff --git a/media-video/vlc/vlc-3.0.20-r5.ebuild b/media-video/vlc/vlc-3.0.20-r5.ebuild
deleted file mode 100644
index 13f40cc843a3..000000000000
--- a/media-video/vlc/vlc-3.0.20-r5.ebuild
+++ /dev/null
@@ -1,518 +0,0 @@
-# Copyright 2000-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
- if [[ ${PV%.9999} != ${PV} ]] ; then
- EGIT_BRANCH="3.0.x"
- fi
- EGIT_REPO_URI="https://code.videolan.org/videolan/vlc.git"
- inherit git-r3
-else
- if [[ ${MY_P} = ${P} ]] ; then
- SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
- else
- SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
- fi
- KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv -sparc x86"
-fi
-inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus
- dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth
- fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate
- libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
- macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg
- omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image
- sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame
- udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi
- cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse
-"
-REQUIRED_USE="
- chromecast? ( encode )
- directx? ( ffmpeg )
- fontconfig? ( truetype )
- libcaca? ( X )
- libtar? ( skins )
- libtiger? ( kate )
- lua? ( ${LUA_REQUIRED_USE} )
- skins? ( archive gui truetype X xml )
- ssl? ( gcrypt )
- vaapi? ( ffmpeg X )
- vdpau? ( ffmpeg X )
-"
-BDEPEND="
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- lua? ( ${LUA_DEPS} )
- amd64? ( dev-lang/yasm )
- wayland? ( dev-util/wayland-scanner )
- x86? ( dev-lang/yasm )
-"
-# <ffmpeg-5 dep for USE="ffmpeg vaapi" for bug #864721
-RDEPEND="
- media-libs/libvorbis
- net-dns/libidn:=
- sys-libs/zlib
- virtual/libintl
- virtual/opengl
- a52? ( media-libs/a52dec )
- alsa? ( media-libs/alsa-lib )
- aom? ( media-libs/libaom:= )
- archive? ( app-arch/libarchive:= )
- aribsub? ( media-libs/aribb24 )
- bidi? (
- dev-libs/fribidi
- media-libs/freetype:2[harfbuzz]
- media-libs/harfbuzz:=
- virtual/ttf-fonts
- )
- bluray? ( >=media-libs/libbluray-1.3.0:= )
- cddb? ( media-libs/libcddb )
- chromaprint? ( media-libs/chromaprint:= )
- chromecast? (
- >=dev-libs/protobuf-2.5.0:=
- >=net-libs/libmicrodns-0.1.2:=
- )
- dav1d? ( media-libs/dav1d:= )
- dbus? ( sys-apps/dbus )
- dc1394? (
- media-libs/libdc1394:2
- sys-libs/libraw1394
- )
- dts? ( media-libs/libdca )
- dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
- dvd? (
- >=media-libs/libdvdnav-6.1.1:=
- >=media-libs/libdvdread-6.1.2:=
- )
- faad? ( media-libs/faad2 )
- fdk? ( media-libs/fdk-aac:= )
- ffmpeg? ( >=media-video/ffmpeg-3.1.3:=[postproc,vaapi?,vdpau?] )
- flac? (
- media-libs/flac:=
- media-libs/libogg
- )
- fluidsynth? ( media-sound/fluidsynth:= )
- fontconfig? ( media-libs/fontconfig:1.0 )
- gcrypt? (
- dev-libs/libgcrypt:=
- dev-libs/libgpg-error
- )
- gme? ( media-libs/game-music-emu )
- keyring? ( app-crypt/libsecret )
- gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- X? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- )
- )
- ieee1394? (
- sys-libs/libavc1394
- sys-libs/libraw1394
- )
- jack? ( virtual/jack )
- jpeg? ( media-libs/libjpeg-turbo:0 )
- kate? ( media-libs/libkate )
- libass? (
- media-libs/fontconfig:1.0
- media-libs/libass:=
- )
- libcaca? ( media-libs/libcaca )
- libnotify? (
- dev-libs/glib:2
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/libnotify
- )
- libsamplerate? ( media-libs/libsamplerate )
- libtar? ( dev-libs/libtar )
- libtiger? ( media-libs/libtiger )
- linsys? ( media-libs/zvbi )
- lirc? ( app-misc/lirc )
- live? ( media-plugins/live:= )
- lua? ( ${LUA_DEPS} )
- mad? ( media-libs/libmad )
- matroska? (
- >=dev-libs/libebml-1.4.2:=
- media-libs/libmatroska:=
- )
- modplug? ( >=media-libs/libmodplug-0.8.9.0 )
- mp3? ( media-sound/mpg123-base )
- mpeg? ( media-libs/libmpeg2 )
- mtp? ( media-libs/libmtp:= )
- musepack? ( media-sound/musepack-tools )
- ncurses? ( sys-libs/ncurses:=[unicode(+)] )
- nfs? ( >=net-fs/libnfs-0.10.0:= )
- ogg? ( media-libs/libogg )
- opus? ( >=media-libs/opus-1.0.3 )
- png? ( media-libs/libpng:0= )
- projectm? (
- media-fonts/dejavu
- >=media-libs/libprojectm-3.1.12:0=
- )
- pulseaudio? ( media-libs/libpulse )
- rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client(+)] <net-misc/freerdp-3:0 )
- samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
- sdl-image? ( media-libs/sdl-image )
- sftp? ( net-libs/libssh2 )
- shout? ( media-libs/libshout )
- sid? ( media-libs/libsidplay:2 )
- skins? (
- x11-libs/libXext
- x11-libs/libXinerama
- x11-libs/libXpm
- )
- soxr? ( >=media-libs/soxr-0.1.2 )
- speex? (
- >=media-libs/speex-1.2.0
- media-libs/speexdsp
- )
- srt? ( >=net-libs/srt-1.4.2:= )
- ssl? ( net-libs/gnutls:= )
- svg? (
- gnome-base/librsvg:2
- x11-libs/cairo
- )
- taglib? ( >=media-libs/taglib-1.9 )
- theora? ( media-libs/libtheora )
- tremor? ( media-libs/tremor )
- truetype? (
- media-libs/freetype:2
- virtual/ttf-fonts
- !fontconfig? ( media-fonts/dejavu )
- )
- twolame? ( media-sound/twolame )
- udev? ( virtual/udev )
- upnp? ( net-libs/libupnp:=[ipv6(+)] )
- v4l? ( media-libs/libv4l:= )
- vaapi? (
- <media-video/ffmpeg-5
- media-libs/libva:=[drm(+),wayland?,X?]
- )
- vdpau? ( x11-libs/libvdpau )
- vnc? ( net-libs/libvncserver )
- vpx? ( media-libs/libvpx:= )
- wayland? (
- >=dev-libs/wayland-1.15
- dev-libs/wayland-protocols
- )
- X? (
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/xcb-util
- x11-libs/xcb-util-keysyms
- )
- x264? ( >=media-libs/x264-0.0.20190214:= )
- x265? ( media-libs/x265:= )
- xml? ( dev-libs/libxml2:2 )
- zeroconf? ( net-dns/avahi[dbus] )
- zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
- "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
- "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
- "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
- "${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
- "${FILESDIR}"/${PN}-3.0.20-c99.patch
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if use lua; then
- lua-single_pkg_setup
- fi
-}
-
-src_prepare() {
- default
-
- # bug 608256
- xdg_environment_reset
-
- has_version 'net-libs/libupnp:1.8' && \
- eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
- # Bootstrap when we are on a git checkout.
- if [[ ${PV} = *9999 ]] ; then
- ./bootstrap
- fi
-
- # Make it build with libtool 1.5
- rm m4/lt* m4/libtool.m4 || die
-
- # We are not in a real git checkout due to the absence of a .git directory.
- touch src/revision.txt || die
-
- # Don't use --started-from-file when not using dbus.
- if ! use dbus ; then
- sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
- fi
-
- # Disable running of vlc-cache-gen, we do that in pkg_postinst
- sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
- -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
- # Fix gettext version mismatch errors.
- sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
-
- eautoreconf
-
- # Disable automatic running of tests.
- find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
- local -x BUILDCC="$(tc-getBUILD_CC)"
-
- local myeconfargs=(
- --disable-aa
- --disable-optimizations
- --disable-rpath
- --disable-update-check
- --enable-fast-install
- --enable-screen
- --enable-vcd
- --enable-vlc
- --enable-vorbis
- $(use_enable a52)
- $(use_enable alsa)
- $(use_enable aom)
- $(use_enable archive)
- $(use_enable aribsub)
- $(use_enable bidi fribidi)
- $(use_enable bidi harfbuzz)
- $(use_enable bluray)
- $(use_enable cddb libcddb)
- $(use_enable chromaprint)
- $(use_enable chromecast)
- $(use_enable chromecast microdns)
- $(use_enable cpu_flags_arm_neon neon)
- $(use_enable cpu_flags_ppc_altivec altivec)
- $(use_enable cpu_flags_x86_mmx mmx)
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable dav1d)
- $(use_enable dbus)
- $(use_enable dbus kwallet)
- $(use_enable dc1394)
- $(use_enable debug)
- $(use_enable directx)
- $(use_enable directx d3d11va)
- $(use_enable directx dxva2)
- $(use_enable dts dca)
- $(use_enable dvbpsi)
- $(use_enable dvd dvdnav)
- $(use_enable dvd dvdread)
- $(use_enable encode sout)
- $(use_enable encode vlm)
- $(use_enable faad)
- $(use_enable fdk fdkaac)
- $(use_enable ffmpeg avcodec)
- $(use_enable ffmpeg avformat)
- $(use_enable ffmpeg postproc)
- $(use_enable ffmpeg swscale)
- $(use_enable flac)
- $(use_enable fluidsynth)
- $(use_enable fontconfig)
- $(use_enable gcrypt libgcrypt)
- $(use_enable gme)
- $(use_enable keyring secret)
- $(use_enable gstreamer gst-decode)
- $(use_enable gui qt)
- $(use_enable ieee1394 dv1394)
- $(use_enable jack)
- $(use_enable jpeg)
- $(use_enable kate)
- $(use_enable libass)
- $(use_enable libcaca caca)
- $(use_enable libnotify notify)
- $(use_enable libsamplerate samplerate)
- $(use_enable libtar)
- $(use_enable libtiger tiger)
- $(use_enable linsys)
- $(use_enable lirc)
- $(use_enable live live555)
- $(use_enable lua)
- $(use_enable macosx-notifications osx-notifications)
- $(use_enable mad)
- $(use_enable matroska)
- $(use_enable modplug mod)
- $(use_enable mp3 mpg123)
- $(use_enable mpeg libmpeg2)
- $(use_enable mtp)
- $(use_enable musepack mpc)
- $(use_enable ncurses)
- $(use_enable nfs)
- $(use_enable ogg)
- $(use_enable omxil)
- $(use_enable omxil omxil-vout)
- $(use_enable optimisememory optimize-memory)
- $(use_enable opus)
- $(use_enable png)
- $(use_enable projectm)
- $(use_enable pulseaudio pulse)
- $(use_enable rdp freerdp)
- $(use_enable run-as-root)
- $(use_enable samba smbclient)
- $(use_enable sdl-image)
- $(use_enable sftp)
- $(use_enable shout)
- $(use_enable sid)
- $(use_enable skins skins2)
- $(use_enable soxr)
- $(use_enable speex)
- $(use_enable srt)
- $(use_enable ssl gnutls)
- $(use_enable svg)
- $(use_enable svg svgdec)
- $(use_enable taglib)
- $(use_enable theora)
- $(use_enable tremor)
- $(use_enable twolame)
- $(use_enable udev)
- $(use_enable upnp)
- $(use_enable v4l v4l2)
- $(use_enable vaapi libva)
- $(use_enable vdpau)
- $(use_enable vnc)
- $(use_enable vpx)
- $(use_enable wayland)
- $(use_with X x)
- $(use_enable X xcb)
- $(use_enable X xvideo)
- $(use_enable x264)
- $(use_enable x264 x26410b)
- $(use_enable x265)
- $(use_enable xml libxml2)
- $(use_enable zeroconf avahi)
- $(use_enable zvbi)
- $(use_enable !zvbi telx)
- --with-kde-solid="${EPREFIX}"/usr/share/solid/actions
- --disable-asdcp
- --disable-coverage
- --disable-cprof
- --disable-crystalhd
- --disable-decklink
- --disable-gles2
- --disable-goom
- --disable-kai
- --disable-kva
- --disable-libplacebo
- --disable-maintainer-mode
- --disable-merge-ffmpeg
- --disable-mfx
- --disable-mmal
- --disable-opencv
- --disable-opensles
- --disable-oss
- --disable-rpi-omxil
- --disable-schroedinger
- --disable-shine
- --disable-sndio
- --disable-spatialaudio
- --disable-vsxu
- --disable-wasapi
- --disable-wma-fixed
- )
- # ^ We don't have these disabled libraries in the Portage tree yet.
-
- # https://code.videolan.org/videolan/vlc/-/issues/17626 (bug #861143)
- append-flags -fno-strict-aliasing
- filter-lto
-
- # Compatibility fix for Samba 4.
- use samba && append-cppflags "-I${ESYSROOT}/usr/include/samba-4.0"
-
- if use x86; then
- # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
- append-cflags $(test-flags-CC -fno-stack-check)
- # Bug 569774
- replace-flags -Os -O2
- fi
-
- # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
- append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders/"
-
- if use riscv; then
- # bug #803473
- append-libs -latomic
- fi
-
- if use truetype || use bidi; then
- myeconfargs+=( --enable-freetype )
- else
- myeconfargs+=( --disable-freetype )
- fi
-
- if use truetype || use projectm; then
- local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
- myeconfargs+=(
- --with-default-font=${dejavu}/DejaVuSans.ttf
- --with-default-font-family=Sans
- --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
- --with-default-monospace-font-family=Monospace
- )
- fi
-
- econf "${myeconfargs[@]}"
-
- # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
- # Other values may break the build (bug 523144), so definition should not be removed.
- # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
- sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
- virtx emake check-TESTS
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
- einfo "Running ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
- "${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
- else
- ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
- ewarn "Please run ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
- ewarn "If you do not do it, vlc will take a long time to load."
- fi
-
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
- rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
- fi
-
- xdg_pkg_postrm
-}
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 278eb623b4b6..c78279fbee98 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -169,7 +169,7 @@ RDEPEND="
>=media-libs/libprojectm-3.1.12:0=
)
pulseaudio? ( media-libs/libpulse )
- rdp? ( >=net-misc/freerdp-2.0.0_rc0:2=[client(+)] )
+ rdp? ( >=net-misc/freerdp-2.0.0_rc0:2= )
samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
sdl-image? ( media-libs/sdl-image )
sftp? ( net-libs/libssh2 )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 069ca6ec43c2..2d66aaaa613d 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -170,7 +170,7 @@ RDEPEND="
>=media-libs/libprojectm-3.1.12:0=
)
pulseaudio? ( media-libs/libpulse )
- rdp? ( >=net-misc/freerdp-2.0.0_rc0:2=[client(+)] )
+ rdp? ( >=net-misc/freerdp-2.0.0_rc0:2= )
samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
sdl-image? ( media-libs/sdl-image )
sftp? ( net-libs/libssh2 )
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 92ff88dc18a4..39e4519b9216 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -1,6 +1,8 @@
AUX wireplumber-0.4.15-config-disable-sound-server-parts.patch 783 BLAKE2B ed172805cd263fa0320563eb2440147e83567cad24bbec253a9d6cddedffd969056e2041110b96fd0b1e210cd7a45c25385174031496f6931f0a6c27257d23b2 SHA512 b1838315d3629560a93f4d1c7065419b592a7cffe69e898147e37b9e56ae0f0e5cb45f1ba0b5217af01f711fb0c20f547dc61797276892a593f644c48992ae47
AUX wireplumber-0.4.81-config-disable-sound-server-parts.patch 906 BLAKE2B 9373bb9cd9234d0fd68ccfba41011083aadd2dfcfd19d7cdda235f075b5cbe02562f8719153ea4e0412614401b3c7f6b60083b3578e9d9450b0a0dfc4b6222a4 SHA512 9fb2c5b5baeebde8dac9c6b6cc192cf85a4b70db3ef7a50233a7c064dc407c763d906063958a5dd06746e1730e2110803eb328105802ea5c4d6bb6d685376a93
DIST wireplumber-0.4.17.tar.bz2 330355 BLAKE2B fec1cf75bec687bff1cb48416cf22503a79609cf11220ab9353d3b8038cae1db63da8aa269aca034c0c0afd474e2ba89b236bb7e778da111516e3b15d5449f02 SHA512 5efb71091f262458bc912f4670249fac3ef858021785fbee9be749564a3fa452b1c4ff75634132f7d44fd06d7fc5ea2debb022b1f4a8d5c9c3afa992fab7ecf8
+DIST wireplumber-0.5.2.tar.bz2 408788 BLAKE2B 51a9c0268212b353b54099d2d57fd93dec5b42d4ec3151f93b4ebd4df3f4478a19858ec8302af58558a9387afa647a00a0872d471f0f2ea5e681978afbdcf553 SHA512 4cd2949739b8af86f73e072fe8c1d8606fa9be77b6e109aa0825d516f11953c4811ae1162da07ae245f7039f4243d01c43b8e9c083d4e0be1066b180484abbfb
EBUILD wireplumber-0.4.17-r1.ebuild 3785 BLAKE2B c6108e4a024cb00a63bcc82a215fc80b6fe106903339e892416a017bc6d607d7bfb268a305b30e82988f2dcda793ecfd8fcc4e15d2691b8a6ba248e93e72916a SHA512 4bcda3c48ba1a23f61f6678e26eb420aeb057c193cc61ba5d65cbf560e5d292fe4dbd7dddc8fa7bf1d6f190a6297d4969961b8358707707d6a067e58feb94f89
-EBUILD wireplumber-9999.ebuild 3790 BLAKE2B e2a69da1ffac39dc653e16a07248c780d67a8b6845dd528ef03fca822dfc1f569bf45443a5ce0c8d5830895c5ae4039f075a7db8092cba6f55ecdbf59422135f SHA512 2793cd86071f19b77b6b301770aa845c0e801b046034002a78d59b1fb3b964fd0e7e1120a7e37b31816c2da936442852402aece71962f3d8f164f94e63733a25
+EBUILD wireplumber-0.5.2.ebuild 3801 BLAKE2B 67265b726b3267c13a3bc1ac5f393c69a8c65c3dba98e7c647ac1099ce28d449540604c3b0ff9b053843b5adaaba0325558692fcfb15ba995aa12f61b9b66fe5 SHA512 97382f121b1e594b26a8b4fe35b01ac855b70e2c9747d18de7a6d56fc99fbe52bec34ccc315faf0dff297934f2cad7edd4b24a4a2570115c7292b1e63daba128
+EBUILD wireplumber-9999.ebuild 3801 BLAKE2B 67265b726b3267c13a3bc1ac5f393c69a8c65c3dba98e7c647ac1099ce28d449540604c3b0ff9b053843b5adaaba0325558692fcfb15ba995aa12f61b9b66fe5 SHA512 97382f121b1e594b26a8b4fe35b01ac855b70e2c9747d18de7a6d56fc99fbe52bec34ccc315faf0dff297934f2cad7edd4b24a4a2570115c7292b1e63daba128
MISC metadata.xml 719 BLAKE2B 7ad70a19cbc55cb0c399cbc1c8c56a3bab16d2dd477a285a3c142793af3704a8dd6648f6cfa0b9aa6fd8338c9cddd93cc565356a8a2e5031a6874b46ac66c2ee SHA512 a4617e6176a4dab7491103858ed5f663b8dda2a6cd97c348cc274ac959df813a811f70963487ccb670999fd51d107726762d872ce42290d02ea6ed24ea021e55
diff --git a/media-video/wireplumber/wireplumber-0.5.2.ebuild b/media-video/wireplumber/wireplumber-0.5.2.ebuild
new file mode 100644
index 000000000000..ea1b71883dbb
--- /dev/null
+++ b/media-video/wireplumber/wireplumber-0.5.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/wireplumber/tree/rawhide
+#
+# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit lua-single meson systemd
+
+DESCRIPTION="Replacement for pipewire-media-session"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+else
+ SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/0.5"
+IUSE="elogind system-service systemd test"
+
+REQUIRED_USE="
+ ${LUA_REQUIRED_USE}
+ ?? ( elogind systemd )
+ system-service? ( systemd )
+"
+
+RESTRICT="!test? ( test )"
+
+# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building
+BDEPEND="
+ dev-libs/glib
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ sys-devel/gettext
+ test? ( sys-apps/dbus )
+"
+DEPEND="
+ ${LUA_DEPS}
+ >=dev-libs/glib-2.68
+ >=media-video/pipewire-1.0.5-r1:=
+ virtual/libintl
+ elogind? ( sys-auth/elogind )
+ systemd? ( sys-apps/systemd )
+"
+RDEPEND="
+ ${DEPEND}
+ system-service? (
+ acct-user/pipewire
+ acct-group/pipewire
+ )
+"
+
+DOCS=( {NEWS,README}.rst )
+
+PATCHES=(
+ # Defer enabling sound server parts to media-video/pipewire
+ # TODO: Soon, we should be able to migrate to just a dropin at
+ # /usr/share. See https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/652#note_2399735.
+ "${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ -Ddaemon=true
+ -Dtools=true
+ -Dmodules=true
+ # Ebuild not wired up yet (Sphinx, Doxygen?)
+ -Ddoc=disabled
+ # Only used for Sphinx doc generation
+ -Dintrospection=disabled
+ -Dsystem-lua=true
+ -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
+ $(meson_feature elogind)
+ $(meson_feature systemd)
+ $(meson_use system-service systemd-system-service)
+ $(meson_use systemd systemd-user-service)
+ -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir)
+ -Dsystemd-user-unit-dir=$(systemd_get_userunitdir)
+ $(meson_use test tests)
+ $(meson_use test dbus-tests)
+ )
+
+ meson_src_configure
+}
+
+pkg_postinst() {
+ if systemd_is_booted ; then
+ ewarn "pipewire-media-session.service is no longer installed. You must switch"
+ ewarn "to wireplumber.service user unit before your next logout/reboot:"
+ ewarn "systemctl --user disable pipewire-media-session.service"
+ ewarn "systemctl --user --force enable wireplumber.service"
+ else
+ ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
+ ewarn "is started (a replacement for directly calling pipewire binary)."
+ ewarn
+ ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
+ ewarn "or, if it does exist, that any reference to"
+ ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
+ fi
+
+ if use system-service; then
+ ewarn
+ ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+ ewarn "the system-wide systemd units that enable WirePlumber to run as a system"
+ ewarn "service. This is more than likely NOT what you want. You are strongly"
+ ewarn "advised not to enable this mode and instead stick with systemd user"
+ ewarn "units. The default configuration files will likely not work out of"
+ ewarn "box, and you are on your own with configuration."
+ ewarn
+ fi
+}
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index 88ddf0bb6b0e..ea1b71883dbb 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -14,6 +14,9 @@ LUA_COMPAT=( lua5-{3,4} )
inherit lua-single meson systemd
+DESCRIPTION="Replacement for pipewire-media-session"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
+
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
EGIT_BRANCH="master"
@@ -23,11 +26,8 @@ else
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
-DESCRIPTION="Replacement for pipewire-media-session"
-HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
-
LICENSE="MIT"
-SLOT="0/0.4"
+SLOT="0/0.5"
IUSE="elogind system-service systemd test"
REQUIRED_USE="
@@ -46,21 +46,16 @@ BDEPEND="
sys-devel/gettext
test? ( sys-apps/dbus )
"
-
DEPEND="
${LUA_DEPS}
>=dev-libs/glib-2.68
- >=media-video/pipewire-1.0.2:=
+ >=media-video/pipewire-1.0.5-r1:=
virtual/libintl
elogind? ( sys-auth/elogind )
systemd? ( sys-apps/systemd )
"
-
-# Any dev-lua/* deps get declared like this inside RDEPEND:
-# $(lua_gen_cond_dep '
-# dev-lua/<NAME>[${LUA_USEDEP}]
-# ')
-RDEPEND="${DEPEND}
+RDEPEND="
+ ${DEPEND}
system-service? (
acct-user/pipewire
acct-group/pipewire
@@ -70,7 +65,10 @@ RDEPEND="${DEPEND}
DOCS=( {NEWS,README}.rst )
PATCHES=(
- "${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
+ # Defer enabling sound server parts to media-video/pipewire
+ # TODO: Soon, we should be able to migrate to just a dropin at
+ # /usr/share. See https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/652#note_2399735.
+ "${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch
)
src_configure() {
@@ -78,9 +76,11 @@ src_configure() {
-Ddaemon=true
-Dtools=true
-Dmodules=true
- -Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?)
- -Dintrospection=disabled # Only used for Sphinx doc generation
- -Dsystem-lua=true # We always unbundle everything we can
+ # Ebuild not wired up yet (Sphinx, Doxygen?)
+ -Ddoc=disabled
+ # Only used for Sphinx doc generation
+ -Dintrospection=disabled
+ -Dsystem-lua=true
-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
$(meson_feature elogind)
$(meson_feature systemd)
@@ -109,6 +109,7 @@ pkg_postinst() {
ewarn "or, if it does exist, that any reference to"
ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
fi
+
if use system-service; then
ewarn
ewarn "WARNING: you have enabled the system-service USE flag, which installs"
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index e1b7f78e7773..fbb65f8eada6 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,5 +1,5 @@
DIST yle-dl-20240130.tar.gz 77787 BLAKE2B b0dd82813a3defb6305cd5b6529d5c5558a0c82d7c8ba9714e836b1d98a09bdad27882c975ca8a98b26a6188194157586fef882437c486bf4c7f480677fc386f SHA512 d803c6703987f4fbd787c608830398ff4081407349146d7fc98de2387f0313e6354b27b1c6d3de14a7a4bc7d44c30d05c63708cc7f780a7534e15f193f988138
DIST yle-dl-20240429.tar.gz 78464 BLAKE2B d42eaf30bb93125c00007072c1c96fbadccc755bbac3bd11599b58a7b5aad2b1fc0ab06aadfb83a3c66155f7fe1d271f54ad929ea3047758b8719987b74800fa SHA512 73a0eedbfafe97ab9c9857c088d309462e70f916de78be0d2b5399cec8ad50bee5701f0748d07e92dc2c3dca2a73273f367948dd7dd571dd022bce68bcc5f010
EBUILD yle-dl-20240130.ebuild 1645 BLAKE2B dfaf08491d68989ca75e38acb9affe10072e6a63ef1ff220223a9bf3cbf8c72bb0b21bb30cf7f93927d1cb81774f09c7501267f7f0f229eb331bb32268c575d3 SHA512 be707b7dc0923fe99fbe35de6f1fdec25697691b0e9ac280cc4eb0ec38283f57ad57e423209ef641ddb22df6e3d1d8b453d4acfbdce16bbed068c6ce03bf2fcc
-EBUILD yle-dl-20240429.ebuild 1647 BLAKE2B bac141003962b789c48bb03d917ee0d0b300b6aff7421c5a85487bbd0df688f6c08beb81119d2cdb6e64b8868424ec48569d2b8f7d10ed3e8e630ba12aa08ef5 SHA512 deffc77072dc064daf0a1982997e408ea4e12dc8d29ab141f81fdd971f5a25e7a718c39fff6d158ee07b53a0376de4beeffcfd0df9a4c82afb7a38a9faaa13a1
+EBUILD yle-dl-20240429.ebuild 1645 BLAKE2B dfaf08491d68989ca75e38acb9affe10072e6a63ef1ff220223a9bf3cbf8c72bb0b21bb30cf7f93927d1cb81774f09c7501267f7f0f229eb331bb32268c575d3 SHA512 be707b7dc0923fe99fbe35de6f1fdec25697691b0e9ac280cc4eb0ec38283f57ad57e423209ef641ddb22df6e3d1d8b453d4acfbdce16bbed068c6ce03bf2fcc
MISC metadata.xml 363 BLAKE2B b27761ed00c4849b5e9a0c51fdf699ab7e1589acc017be236339e8e5044fbe05ad62ad8c7104f6e9e43de0779ad6f9f3fe4144fc57376d87d0304f7c7c3fe7cf SHA512 1b061009279fcf8271bec4958ddb93d93e1455686e42d623a64ef51a65e4f852d23873c59d5e547bbf66d6c596f542fd29f78de5c7b33f484918b01beb76dc92
diff --git a/media-video/yle-dl/yle-dl-20240429.ebuild b/media-video/yle-dl/yle-dl-20240429.ebuild
index b64611d3bbe0..d879b645e845 100644
--- a/media-video/yle-dl/yle-dl-20240429.ebuild
+++ b/media-video/yle-dl/yle-dl-20240429.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/aajanki/yle-dl/archive/refs/tags/${PV}.tar.gz -> ${P
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"