| 1 |
commit: 08c0df84a87ae0666dffca6c267d24c98e7250b2 |
| 2 |
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com> |
| 3 |
AuthorDate: Sat Mar 26 11:03:24 2022 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 26 14:15:59 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08c0df84 |
| 7 |
|
| 8 |
media-video/ffmpeg: add support for amf in v5.0 |
| 9 |
|
| 10 |
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/24660 |
| 12 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 13 |
|
| 14 |
.../ffmpeg/{ffmpeg-5.0-r1.ebuild => ffmpeg-5.0-r2.ebuild} | 12 ++++++++---- |
| 15 |
1 file changed, 8 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild b/media-video/ffmpeg/ffmpeg-5.0-r2.ebuild |
| 18 |
similarity index 98% |
| 19 |
rename from media-video/ffmpeg/ffmpeg-5.0-r1.ebuild |
| 20 |
rename to media-video/ffmpeg/ffmpeg-5.0-r2.ebuild |
| 21 |
index b73748c2373a..06b0a1258317 100644 |
| 22 |
--- a/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild |
| 23 |
+++ b/media-video/ffmpeg/ffmpeg-5.0-r2.ebuild |
| 24 |
@@ -95,7 +95,7 @@ FFMPEG_FLAG_MAP=( |
| 25 |
|
| 26 |
# Same as above but for encoders, i.e. they do something only with USE=encode. |
| 27 |
FFMPEG_ENCODER_FLAG_MAP=( |
| 28 |
- amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame |
| 29 |
+ amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame |
| 30 |
openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1 |
| 31 |
theora:libtheora twolame:libtwolame webp:libwebp x264:libx264 |
| 32 |
x265:libx265 xvid:libxvid |
| 33 |
@@ -172,6 +172,7 @@ IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" |
| 34 |
|
| 35 |
RDEPEND=" |
| 36 |
alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) |
| 37 |
+ amf? ( media-video/amdgpu-pro-amf ) |
| 38 |
amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) |
| 39 |
bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] ) |
| 40 |
bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) |
| 41 |
@@ -188,8 +189,8 @@ RDEPEND=" |
| 42 |
rav1e? ( >=media-video/rav1e-0.4:=[capi] ) |
| 43 |
snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) |
| 44 |
theora? ( |
| 45 |
- >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] |
| 46 |
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] |
| 47 |
+ >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] |
| 48 |
) |
| 49 |
twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] ) |
| 50 |
webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] ) |
| 51 |
@@ -249,10 +250,10 @@ RDEPEND=" |
| 52 |
gnome-base/librsvg:2=[${MULTILIB_USEDEP}] |
| 53 |
x11-libs/cairo[${MULTILIB_USEDEP}] |
| 54 |
) |
| 55 |
+ nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) |
| 56 |
svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] ) |
| 57 |
truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) |
| 58 |
vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) |
| 59 |
- nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) |
| 60 |
vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) |
| 61 |
vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) |
| 62 |
vmaf? ( media-libs/libvmaf[${MULTILIB_USEDEP}] ) |
| 63 |
@@ -268,11 +269,11 @@ RDEPEND=" |
| 64 |
>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] |
| 65 |
>=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}] |
| 66 |
) |
| 67 |
+ postproc? ( !media-libs/libpostproc ) |
| 68 |
zeromq? ( >=net-libs/zeromq-4.1.6 ) |
| 69 |
zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] ) |
| 70 |
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
| 71 |
zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] ) |
| 72 |
- postproc? ( !media-libs/libpostproc ) |
| 73 |
" |
| 74 |
|
| 75 |
RDEPEND="${RDEPEND} |
| 76 |
@@ -287,6 +288,7 @@ DEPEND="${RDEPEND} |
| 77 |
BDEPEND=" |
| 78 |
>=sys-devel/make-3.81 |
| 79 |
virtual/pkgconfig |
| 80 |
+ amf? ( media-libs/amf-headers ) |
| 81 |
cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) |
| 82 |
cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) |
| 83 |
doc? ( sys-apps/texinfo ) |
| 84 |
@@ -562,4 +564,6 @@ multilib_src_install() { |
| 85 |
multilib_src_install_all() { |
| 86 |
dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges |
| 87 |
[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" |
| 88 |
+ |
| 89 |
+ use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override |
| 90 |
} |
Archives