commit: 08c0df84a87ae0666dffca6c267d24c98e7250b2 Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com> AuthorDate: Sat Mar 26 11:03:24 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sat Mar 26 14:15:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08c0df84
media-video/ffmpeg: add support for amf in v5.0 Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com> Closes: https://github.com/gentoo/gentoo/pull/24660 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../ffmpeg/{ffmpeg-5.0-r1.ebuild => ffmpeg-5.0-r2.ebuild} | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild b/media-video/ffmpeg/ffmpeg-5.0-r2.ebuild similarity index 98% rename from media-video/ffmpeg/ffmpeg-5.0-r1.ebuild rename to media-video/ffmpeg/ffmpeg-5.0-r2.ebuild index b73748c2373a..06b0a1258317 100644 --- a/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.0-r2.ebuild @@ -95,7 +95,7 @@ FFMPEG_FLAG_MAP=( # Same as above but for encoders, i.e. they do something only with USE=encode. FFMPEG_ENCODER_FLAG_MAP=( - amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame + 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 @@ -172,6 +172,7 @@ 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}] ) @@ -188,8 +189,8 @@ RDEPEND=" rav1e? ( >=media-video/rav1e-0.4:=[capi] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) theora? ( - >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] >=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}] ) @@ -249,10 +250,10 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) + nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) vmaf? ( media-libs/libvmaf[${MULTILIB_USEDEP}] ) @@ -268,11 +269,11 @@ RDEPEND=" >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] >=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}] ) + postproc? ( !media-libs/libpostproc ) zeromq? ( >=net-libs/zeromq-4.1.6 ) 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}] ) - postproc? ( !media-libs/libpostproc ) " RDEPEND="${RDEPEND} @@ -287,6 +288,7 @@ DEPEND="${RDEPEND} BDEPEND=" >=sys-devel/make-3.81 virtual/pkgconfig + amf? ( media-libs/amf-headers ) 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 ) @@ -562,4 +564,6 @@ multilib_src_install() { multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" + + use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override }
