diff options
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r-- | media-video/ffmpeg/Manifest | 10 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-4.4.5-r3.ebuild (renamed from media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild) | 5 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-6.1.2-r2.ebuild (renamed from media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild) | 35 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-7.1.1-r1.ebuild (renamed from media-video/ffmpeg/ffmpeg-7.1.1.ebuild) | 37 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 41 |
5 files changed, 46 insertions, 82 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index db9b196207a9..44bc9947faa1 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -10,11 +10,9 @@ DIST ffmpeg-6.1.2.tar.xz.asc 520 BLAKE2B f26a2d6f5423f93090f2a448172e49f3858aeb5 DIST ffmpeg-7.1.1.tar.xz 11019500 BLAKE2B 85d1850bfa39ec28d358b5454daa7c1cf8580af73a6f83e7c070ea94db40ad485adbaeb89e886e0b3908e0f1765bd9f2b40ddd838e33e0a76e5b286917535310 SHA512 42486e485c8fc6f3ec61598a1a7cb40360535762b3fcf28c10d7c6840bc55afe3334434912746e69eef862d3cedf45a02953bde73d38547d2d9a7a38a65e123a DIST ffmpeg-7.1.1.tar.xz.asc 520 BLAKE2B 3bb276ab356ba50a805a76e3e3cd2113141c28daf69d1f43aceded79769fffd686729f9db99df1046c88d5c1a6f12d224e34ddf409aa9989acfa87ebbbcd0155 SHA512 480846fd939d00f2ea90c0256081519a6996c7a990d0f66444a7ae1bce2e5ad6380f5d751efc9bde18da9c4d34738ade57dd66288b989dfd074c484562e20e75 DIST ffmpeg-rpi-6.1-r3.patch 800738 BLAKE2B b7e449ee5eec8b50a3b3bba233c5269f3b6845dbd18a619b844c841a97345ce24c7a5d7f4da05b08e3cb49668426b9044f3d3553d9c2ef3a50aec7199bfa3c09 SHA512 aeaf12afabf5f2192fb0b6ef47397d8477b109e49cee8c02a890d1656a27b1985c62c719ef72966d8c97b0709918233b65ea2e0ef988771507e4be137fcd9158 -DIST ffmpeg-rpi-6.1-r3.patch.asc 833 BLAKE2B 31fd5823c06d5884f7b0980de9072c35bbf4e1d6c0ed20b089439325d50956127238ca29469b003dba623b888a5aae3c4d8ad177862534e77b8e51f29cbed96c SHA512 3d8943b7151e20f73e9c14b121c501847bd7e01f2cf57ff135fc8c223653ec9d433bfe4012fa564f70c0471980b66d7ec3d9b5b1b14865187187719ba110cb5f DIST ffmpeg-rpi-7.1.1.patch 847869 BLAKE2B efc3fef1810034b40eee1f637499171529fc6027c4fc0ef66da587c704a7742b454903aa060b21305e1d9a714eb31d96cd93f93d7cadb5815a0de22ac040b9e1 SHA512 a3f9013aec9b17e0fc1689d946e57e251a88eac3f9e7856d46fe9614fea29211feaf106d32a31f97c0e8c83c1685ca454c31f9bcb5dafb669a0933d683e581c8 -DIST ffmpeg-rpi-7.1.1.patch.asc 833 BLAKE2B a30e8d0216325ac86a3b7f8ac132a61a1d3eb97eff5e758cdad5af89e74ecfb577bda6438b263651d772b265a38f8ac6bf5056598f6f707411236245f939045a SHA512 a75547b38ab1445b94fea2d38f60c93092a70ecd45ec6ec0830084280d684c631a49ccbf46327ac4052ade3e7934b257f8d2c3aa107950ec9da0e66873f3e5be -EBUILD ffmpeg-4.4.5-r2.ebuild 15002 BLAKE2B 903682168147ac3cf4f0b72d38f305169864e75ec794d8c9a2990486c91779ea44d623623c50591a09ff10c31ee9235f59074167849219cf46e18f4a1969e350 SHA512 bf159fb253a301335010fb74776610a3df160d3c94cb519f173370c7d010464f706c82490a956238a081911d4295ae5435b749b9ad375062a1135edc10e55448 -EBUILD ffmpeg-6.1.2-r1.ebuild 17131 BLAKE2B 4b655a95c8d9131cdc0e4158ba288ae73df98d8c008192588f8cae25a2893d95134271e509793973d382516275525567f0e67a5eb016fa91da82c263a9d63202 SHA512 761207fa46faaa4ca3d869158aaa80b38a27837986dd13a69041fafe7aa9995123938b39a6ceb5c0b69f5cbb9a20a71f4a3a04b8f6fbfb17a9338ec59c6697b1 -EBUILD ffmpeg-7.1.1.ebuild 17575 BLAKE2B 97548c9f846ec2b694c90a5e7f2fc366d58b900d03568e54effc26b45847f241055034b8ddab70e9cf37496b48718bdae9f4b6fcb49dfa5361847a33060ca35d SHA512 b82516c603d56cbe58543cb5f8d45ed8758ee7ffd2e905818b44ff6a8e72d8628924efb9fd020e9c981db0762710430a3ebec9f43d53663e173e25523988852b -EBUILD ffmpeg-9999.ebuild 17537 BLAKE2B 3368a80182e6adb43c2baaed3a818dc308709e2f79cb2701e1a24bf75e39dda38c6d7eac4e18de30e78fea43a3e73ff59e9f3993a032a0fba8e923a42ca374d2 SHA512 bec97a8a64cb3b8ce91eba01313509c1ff51377b6dcab04a3491ed20974f7505e12f087bce02be571fba7831e07a1c715307fc6d0c70680cbec74b013ab6e161 +EBUILD ffmpeg-4.4.5-r3.ebuild 14993 BLAKE2B 1fc5bdf79fb621e966c8d02820f2d00c01f5eb688a7ba2551fbf82e383b1fe8b0213c8bdfcced530adf1bedc13576f7476fcdd45516134404eb8496441db0690 SHA512 f4a7585a355a8b9ad331720da881b0d26f4da8dff822650c2dde263be25068b058e73e8afa32f9c717bf293eb386eef5fd0f16ce01eac9e86448c55c8f0c934e +EBUILD ffmpeg-6.1.2-r2.ebuild 16814 BLAKE2B 45418ad3868e524511218ab458151d971c4b9d2e61d96d9f527f64ee4805d2af006e9ca97374eca65273bfaa54be6abe4bd9733a117d8172a668a7ddc01c35ab SHA512 50ac71293b8178809eefc37bc11d20f441d36e0655cb3afd71d267eaaa687c597c8c35fe0d59895c891fb3327a89ed83f50e011c80ea907577ef2287d8b7c370 +EBUILD ffmpeg-7.1.1-r1.ebuild 17252 BLAKE2B 0907d00efdddb5adfee2357c58b77c51fb3aa1bcf474bef6decaf39499c468d192b212e28c016823ffe7356364ffd50eb67fd56652b57e08f3c5e440f6a7eeae SHA512 172ab3c8655c37d378676b46683f6afd10b38023a6387dbcef7f6b8b99903d91d3be56def3790be8ba9918bce844dbba6fdfb7d8a0e5fa94d6abbffe27d63256 +EBUILD ffmpeg-9999.ebuild 17155 BLAKE2B 6a5b74e574b1de48ab697846a5296be1dc4ba3fef29a912d0df80d1444a51aac40b4db2d6d3cf3489b9ecbb0339d10889a136ffacd87db52b816c73e0564399b SHA512 e59ce6342f442b9fab040ea4045d8988013e157e004d294ccd25df108ff688701d17d557767b2ef5a0a3a159c7864459794cffa9bb0a5cf950a5ac6cfaf35a75 MISC metadata.xml 8057 BLAKE2B 1acd5f3b8df2c2ef798e3f3cde26e093ed94c09be4edeaa81cba5d99c5d2295090912006f9570eff94b9025f09aeb02c49462e0e4087b58adc8dde4bd7936e62 SHA512 985d262f99959827daed0317719fe16ad7df9db9eec0bd385a6b6d5f6ea3027fd68bc8346c5f3be74ba382d9f53ae0ff2ad4ca371c4d38dcc1f885436e0b88ca diff --git a/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.5-r3.ebuild index a61c33e1d509..fab7a2922ea3 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.5-r3.ebuild @@ -245,7 +245,7 @@ RDEPEND=" webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) x264? ( media-libs/x264:=[${MULTILIB_USEDEP}] ) x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] ) - xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) + xml? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] ) xvid? ( media-libs/xvid[${MULTILIB_USEDEP}] ) zeromq? ( net-libs/zeromq:= ) zimg? ( media-libs/zimg[${MULTILIB_USEDEP}] ) @@ -320,10 +320,9 @@ src_unpack() { if [[ ${PV} == 9999 ]]; then git-r3_src_unpack else - if use verify-sig; then + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/ffmpeg-${PV}.tar.xz{,.asc} \ "${BROOT}"/usr/share/openpgp-keys/ffmpeg.asc - fi default fi } diff --git a/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2-r2.ebuild index 4a3a3a7e15b3..ec4e103e9d2a 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.2-r2.ebuild @@ -20,10 +20,7 @@ else https://ffmpeg.org/releases/ffmpeg-${PV}.tar.xz verify-sig? ( https://ffmpeg.org/releases/ffmpeg-${PV}.tar.xz.asc ) ${FFMPEG_SOC_PATCH:+" - soc? ( - https://dev.gentoo.org/~chewi/distfiles/${FFMPEG_SOC_PATCH} - verify-sig? ( https://dev.gentoo.org/~chewi/distfiles/${FFMPEG_SOC_PATCH}.asc ) - ) + soc? ( https://dev.gentoo.org/~chewi/distfiles/${FFMPEG_SOC_PATCH} ) "} https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-1.tar.xz " @@ -160,7 +157,7 @@ REQUIRED_USE=" cuda? ( nvenc ) fribidi? ( truetype ) gmp? ( !librtmp ) - libplacebo? ( || ( sdl vulkan ) ) + libplacebo? ( vulkan ) npp? ( nvenc ) shaderc? ( vulkan ) libaribb24? ( gpl ) cdio? ( gpl ) frei0r? ( gpl ) postproc? ( gpl ) @@ -214,16 +211,16 @@ COMMON_DEPEND=" ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] ) - jpegxl? ( media-libs/libjxl:=[$MULTILIB_USEDEP] ) + jpegxl? ( media-libs/libjxl:=[${MULTILIB_USEDEP}] ) kvazaar? ( media-libs/kvazaar:=[${MULTILIB_USEDEP}] ) lame? ( media-sound/lame[${MULTILIB_USEDEP}] ) - lcms? ( media-libs/lcms:2[$MULTILIB_USEDEP] ) + lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] ) libaom? ( media-libs/libaom:=[${MULTILIB_USEDEP}] ) libaribb24? ( media-libs/aribb24[${MULTILIB_USEDEP}] ) libass? ( media-libs/libass:=[${MULTILIB_USEDEP}] ) libcaca? ( media-libs/libcaca[${MULTILIB_USEDEP}] ) libilbc? ( media-libs/libilbc:=[${MULTILIB_USEDEP}] ) - libplacebo? ( media-libs/libplacebo:=[$MULTILIB_USEDEP] ) + libplacebo? ( media-libs/libplacebo:=[vulkan,${MULTILIB_USEDEP}] ) librtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) libsoxr? ( media-libs/soxr[${MULTILIB_USEDEP}] ) libtesseract? ( app-text/tesseract:=[${MULTILIB_USEDEP}] ) @@ -247,7 +244,10 @@ COMMON_DEPEND=" rav1e? ( >=media-video/rav1e-0.5:=[capi] ) rubberband? ( media-libs/rubberband:=[${MULTILIB_USEDEP}] ) samba? ( net-fs/samba:=[client,${MULTILIB_USEDEP}] ) - sdl? ( media-libs/libsdl2[sound(+),video(+),${MULTILIB_USEDEP}] ) + sdl? ( + media-libs/libsdl2[sound(+),video(+),${MULTILIB_USEDEP}] + libplacebo? ( media-libs/libsdl2[vulkan] ) + ) shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] ) snappy? ( app-arch/snappy:=[${MULTILIB_USEDEP}] ) sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) @@ -280,7 +280,7 @@ COMMON_DEPEND=" webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) x264? ( media-libs/x264:=[${MULTILIB_USEDEP}] ) x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] ) - xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) + xml? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] ) xvid? ( media-libs/xvid[${MULTILIB_USEDEP}] ) zeromq? ( net-libs/zeromq:= ) zimg? ( media-libs/zimg[${MULTILIB_USEDEP}] ) @@ -320,14 +320,7 @@ BDEPEND=" "} " [[ ${PV} != 9999 ]] && - BDEPEND+=" - verify-sig? ( - sec-keys/openpgp-keys-ffmpeg - ${FFMPEG_SOC_PATCH:+" - soc? ( >=sec-keys/openpgp-keys-gentoo-developers-20240708 ) - "} - ) - " + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" DOCS=( CREDITS Changelog README.md doc/APIchanges ) [[ ${PV} != 9999 ]] && DOCS+=( RELEASE_NOTES ) @@ -370,13 +363,9 @@ src_unpack() { if [[ ${PV} == 9999 ]]; then git-r3_src_unpack else - if use verify-sig; then + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/ffmpeg-${PV}.tar.xz{,.asc} \ "${BROOT}"/usr/share/openpgp-keys/ffmpeg.asc - in_iuse soc && use soc && - verify-sig_verify_detached "${DISTDIR}"/${FFMPEG_SOC_PATCH}{,.asc} \ - "${BROOT}"/usr/share/openpgp-keys/gentoo-developers.asc - fi default fi } diff --git a/media-video/ffmpeg/ffmpeg-7.1.1.ebuild b/media-video/ffmpeg/ffmpeg-7.1.1-r1.ebuild index 48ce87160460..daceeed673b5 100644 --- a/media-video/ffmpeg/ffmpeg-7.1.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-7.1.1-r1.ebuild @@ -20,14 +20,11 @@ else https://ffmpeg.org/releases/ffmpeg-${PV}.tar.xz verify-sig? ( https://ffmpeg.org/releases/ffmpeg-${PV}.tar.xz.asc ) ${FFMPEG_SOC_PATCH:+" - soc? ( - https://dev.gentoo.org/~chewi/distfiles/${FFMPEG_SOC_PATCH} - verify-sig? ( https://dev.gentoo.org/~chewi/distfiles/${FFMPEG_SOC_PATCH}.asc ) - ) + soc? ( https://dev.gentoo.org/~chewi/distfiles/${FFMPEG_SOC_PATCH} ) "} " S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi DESCRIPTION="Complete solution to record/convert/stream audio and video" @@ -163,7 +160,7 @@ REQUIRED_USE=" cuda? ( nvenc ) fribidi? ( truetype ) gmp? ( !librtmp ) - libplacebo? ( || ( sdl vulkan ) ) + libplacebo? ( vulkan ) npp? ( nvenc ) shaderc? ( vulkan ) libaribb24? ( gpl ) cdio? ( gpl ) dvd? ( gpl ) frei0r? ( gpl ) @@ -221,17 +218,17 @@ COMMON_DEPEND=" ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] ) - jpegxl? ( media-libs/libjxl:=[$MULTILIB_USEDEP] ) + jpegxl? ( media-libs/libjxl:=[${MULTILIB_USEDEP}] ) kvazaar? ( media-libs/kvazaar:=[${MULTILIB_USEDEP}] ) lame? ( media-sound/lame[${MULTILIB_USEDEP}] ) - lcms? ( media-libs/lcms:2[$MULTILIB_USEDEP] ) + lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] ) libaom? ( media-libs/libaom:=[${MULTILIB_USEDEP}] ) libaribb24? ( media-libs/aribb24[${MULTILIB_USEDEP}] ) libass? ( media-libs/libass:=[${MULTILIB_USEDEP}] ) libcaca? ( media-libs/libcaca[${MULTILIB_USEDEP}] ) libilbc? ( media-libs/libilbc:=[${MULTILIB_USEDEP}] ) liblc3? ( >=media-sound/liblc3-1.1[${MULTILIB_USEDEP}] ) - libplacebo? ( media-libs/libplacebo:=[$MULTILIB_USEDEP] ) + libplacebo? ( media-libs/libplacebo:=[vulkan,${MULTILIB_USEDEP}] ) librtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) libsoxr? ( media-libs/soxr[${MULTILIB_USEDEP}] ) libtesseract? ( app-text/tesseract:=[${MULTILIB_USEDEP}] ) @@ -257,7 +254,10 @@ COMMON_DEPEND=" rav1e? ( >=media-video/rav1e-0.5:=[capi] ) rubberband? ( media-libs/rubberband:=[${MULTILIB_USEDEP}] ) samba? ( net-fs/samba:=[client,${MULTILIB_USEDEP}] ) - sdl? ( media-libs/libsdl2[sound(+),video(+),${MULTILIB_USEDEP}] ) + sdl? ( + media-libs/libsdl2[sound(+),video(+),${MULTILIB_USEDEP}] + libplacebo? ( media-libs/libsdl2[vulkan] ) + ) shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] ) snappy? ( app-arch/snappy:=[${MULTILIB_USEDEP}] ) sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) @@ -290,7 +290,7 @@ COMMON_DEPEND=" webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) x264? ( media-libs/x264:=[${MULTILIB_USEDEP}] ) x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] ) - xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) + xml? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] ) xvid? ( media-libs/xvid[${MULTILIB_USEDEP}] ) zeromq? ( net-libs/zeromq:= ) zimg? ( media-libs/zimg[${MULTILIB_USEDEP}] ) @@ -330,14 +330,7 @@ BDEPEND=" "} " [[ ${PV} != 9999 ]] && - BDEPEND+=" - verify-sig? ( - sec-keys/openpgp-keys-ffmpeg - ${FFMPEG_SOC_PATCH:+" - soc? ( >=sec-keys/openpgp-keys-gentoo-developers-20240708 ) - "} - ) - " + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" DOCS=( CREDITS Changelog README.md doc/APIchanges ) [[ ${PV} != 9999 ]] && DOCS+=( RELEASE_NOTES ) @@ -381,13 +374,9 @@ src_unpack() { if [[ ${PV} == 9999 ]]; then git-r3_src_unpack else - if use verify-sig; then + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/ffmpeg-${PV}.tar.xz{,.asc} \ "${BROOT}"/usr/share/openpgp-keys/ffmpeg.asc - in_iuse soc && use soc && - verify-sig_verify_detached "${DISTDIR}"/${FFMPEG_SOC_PATCH}{,.asc} \ - "${BROOT}"/usr/share/openpgp-keys/gentoo-developers.asc - fi default fi } diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 7ddbfafb70fc..030492526bf1 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -20,10 +20,7 @@ else https://ffmpeg.org/releases/ffmpeg-${PV}.tar.xz verify-sig? ( https://ffmpeg.org/releases/ffmpeg-${PV}.tar.xz.asc ) ${FFMPEG_SOC_PATCH:+" - soc? ( - https://dev.gentoo.org/~chewi/distfiles/${FFMPEG_SOC_PATCH} - verify-sig? ( https://dev.gentoo.org/~chewi/distfiles/${FFMPEG_SOC_PATCH}.asc ) - ) + soc? ( https://dev.gentoo.org/~chewi/distfiles/${FFMPEG_SOC_PATCH} ) "} " S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat @@ -97,7 +94,6 @@ FFMPEG_IUSE_MAP=( openmpt:libopenmpt openssl:openssl,!gnutls@v3ifgpl # still LGPL2.1+ if USE=-gpl opus:libopus - +postproc # exposed as a USE for clarity with the GPL requirement pulseaudio:libpulse qrcode:libqrencode qsv:libvpl @@ -163,12 +159,12 @@ REQUIRED_USE=" cuda? ( nvenc ) fribidi? ( truetype ) gmp? ( !librtmp ) - libplacebo? ( || ( sdl vulkan ) ) + libplacebo? ( vulkan ) npp? ( nvenc ) shaderc? ( vulkan ) libaribb24? ( gpl ) cdio? ( gpl ) dvd? ( gpl ) frei0r? ( gpl ) - postproc? ( gpl ) rubberband? ( gpl ) samba? ( gpl ) - vidstab? ( gpl ) x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) + rubberband? ( gpl ) samba? ( gpl ) vidstab? ( gpl ) x264? ( gpl ) + x265? ( gpl ) xvid? ( gpl ) ${FFMPEG_UNSLOTTED:+chromium? ( opus )} ${FFMPEG_SOC_PATCH:+soc? ( drm )} " @@ -221,17 +217,17 @@ COMMON_DEPEND=" ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] ) - jpegxl? ( media-libs/libjxl:=[$MULTILIB_USEDEP] ) + jpegxl? ( media-libs/libjxl:=[${MULTILIB_USEDEP}] ) kvazaar? ( media-libs/kvazaar:=[${MULTILIB_USEDEP}] ) lame? ( media-sound/lame[${MULTILIB_USEDEP}] ) - lcms? ( media-libs/lcms:2[$MULTILIB_USEDEP] ) + lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] ) libaom? ( media-libs/libaom:=[${MULTILIB_USEDEP}] ) libaribb24? ( media-libs/aribb24[${MULTILIB_USEDEP}] ) libass? ( media-libs/libass:=[${MULTILIB_USEDEP}] ) libcaca? ( media-libs/libcaca[${MULTILIB_USEDEP}] ) libilbc? ( media-libs/libilbc:=[${MULTILIB_USEDEP}] ) liblc3? ( >=media-sound/liblc3-1.1[${MULTILIB_USEDEP}] ) - libplacebo? ( media-libs/libplacebo:=[$MULTILIB_USEDEP] ) + libplacebo? ( media-libs/libplacebo:=[vulkan,${MULTILIB_USEDEP}] ) librtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) libsoxr? ( media-libs/soxr[${MULTILIB_USEDEP}] ) libtesseract? ( app-text/tesseract:=[${MULTILIB_USEDEP}] ) @@ -257,7 +253,10 @@ COMMON_DEPEND=" rav1e? ( >=media-video/rav1e-0.5:=[capi] ) rubberband? ( media-libs/rubberband:=[${MULTILIB_USEDEP}] ) samba? ( net-fs/samba:=[client,${MULTILIB_USEDEP}] ) - sdl? ( media-libs/libsdl2[sound(+),video(+),${MULTILIB_USEDEP}] ) + sdl? ( + media-libs/libsdl2[sound(+),video(+),${MULTILIB_USEDEP}] + libplacebo? ( media-libs/libsdl2[vulkan] ) + ) shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] ) snappy? ( app-arch/snappy:=[${MULTILIB_USEDEP}] ) sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) @@ -290,7 +289,7 @@ COMMON_DEPEND=" webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) x264? ( media-libs/x264:=[${MULTILIB_USEDEP}] ) x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] ) - xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) + xml? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] ) xvid? ( media-libs/xvid[${MULTILIB_USEDEP}] ) zeromq? ( net-libs/zeromq:= ) zimg? ( media-libs/zimg[${MULTILIB_USEDEP}] ) @@ -325,14 +324,7 @@ BDEPEND=" "} " [[ ${PV} != 9999 ]] && - BDEPEND+=" - verify-sig? ( - sec-keys/openpgp-keys-ffmpeg - ${FFMPEG_SOC_PATCH:+" - soc? ( >=sec-keys/openpgp-keys-gentoo-developers-20240708 ) - "} - ) - " + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" DOCS=( CREDITS Changelog README.md doc/APIchanges ) [[ ${PV} != 9999 ]] && DOCS+=( RELEASE_NOTES ) @@ -375,13 +367,9 @@ src_unpack() { if [[ ${PV} == 9999 ]]; then git-r3_src_unpack else - if use verify-sig; then + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/ffmpeg-${PV}.tar.xz{,.asc} \ "${BROOT}"/usr/share/openpgp-keys/ffmpeg.asc - in_iuse soc && use soc && - verify-sig_verify_detached "${DISTDIR}"/${FFMPEG_SOC_PATCH}{,.asc} \ - "${BROOT}"/usr/share/openpgp-keys/gentoo-developers.asc - fi default fi } @@ -462,6 +450,7 @@ multilib_src_configure() { --disable-libklvanc --disable-liblcevc-dec --disable-libmysofa + --disable-liboapv --disable-libopenvino --disable-libshine --disable-libtls |