| 1 |
commit: c8c15132d789169852cf66d1796607609dc45ca1 |
| 2 |
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com> |
| 3 |
AuthorDate: Sat Mar 26 10:44:24 2022 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 26 14:14:59 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c15132 |
| 7 |
|
| 8 |
media-video/ffmpeg: order alphabetically amf entries |
| 9 |
|
| 10 |
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com> |
| 11 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 12 |
|
| 13 |
media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild | 10 +++++----- |
| 14 |
media-video/ffmpeg/ffmpeg-5.0-r1.ebuild | 8 ++++---- |
| 15 |
media-video/ffmpeg/ffmpeg-9999.ebuild | 10 +++++----- |
| 16 |
3 files changed, 14 insertions(+), 14 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild |
| 19 |
index 2c8dc26e3f13..f7b57d1b616c 100644 |
| 20 |
--- a/media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild |
| 21 |
+++ b/media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild |
| 22 |
@@ -95,10 +95,10 @@ FFMPEG_FLAG_MAP=( |
| 23 |
|
| 24 |
# Same as above but for encoders, i.e. they do something only with USE=encode. |
| 25 |
FFMPEG_ENCODER_FLAG_MAP=( |
| 26 |
- amrenc:libvo-amrwbenc mp3:libmp3lame |
| 27 |
- kvazaar:libkvazaar libaom |
| 28 |
- openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1 theora:libtheora twolame:libtwolame |
| 29 |
- webp:libwebp x264:libx264 x265:libx265 xvid:libxvid amf:amf |
| 30 |
+ amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame |
| 31 |
+ openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1 |
| 32 |
+ theora:libtheora twolame:libtwolame webp:libwebp x264:libx264 |
| 33 |
+ x265:libx265 xvid:libxvid |
| 34 |
) |
| 35 |
|
| 36 |
IUSE=" |
| 37 |
@@ -287,11 +287,11 @@ DEPEND="${RDEPEND} |
| 38 |
BDEPEND=" |
| 39 |
>=sys-devel/make-3.81 |
| 40 |
virtual/pkgconfig |
| 41 |
+ amf? ( media-libs/amf-headers ) |
| 42 |
cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) |
| 43 |
cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) |
| 44 |
doc? ( sys-apps/texinfo ) |
| 45 |
test? ( net-misc/wget sys-devel/bc ) |
| 46 |
- amf? ( media-libs/amf-headers ) |
| 47 |
" |
| 48 |
|
| 49 |
# Code requiring FFmpeg to be built under gpl license |
| 50 |
|
| 51 |
diff --git a/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild b/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild |
| 52 |
index a818aa4782dc..b73748c2373a 100644 |
| 53 |
--- a/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild |
| 54 |
+++ b/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild |
| 55 |
@@ -95,10 +95,10 @@ FFMPEG_FLAG_MAP=( |
| 56 |
|
| 57 |
# Same as above but for encoders, i.e. they do something only with USE=encode. |
| 58 |
FFMPEG_ENCODER_FLAG_MAP=( |
| 59 |
- amrenc:libvo-amrwbenc mp3:libmp3lame |
| 60 |
- kvazaar:libkvazaar libaom |
| 61 |
- openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1 theora:libtheora twolame:libtwolame |
| 62 |
- webp:libwebp x264:libx264 x265:libx265 xvid:libxvid |
| 63 |
+ amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame |
| 64 |
+ openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1 |
| 65 |
+ theora:libtheora twolame:libtwolame webp:libwebp x264:libx264 |
| 66 |
+ x265:libx265 xvid:libxvid |
| 67 |
) |
| 68 |
|
| 69 |
IUSE=" |
| 70 |
|
| 71 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 72 |
index 89a0768ff91c..97bebae910d4 100644 |
| 73 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 74 |
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 75 |
@@ -95,10 +95,10 @@ FFMPEG_FLAG_MAP=( |
| 76 |
|
| 77 |
# Same as above but for encoders, i.e. they do something only with USE=encode. |
| 78 |
FFMPEG_ENCODER_FLAG_MAP=( |
| 79 |
- amrenc:libvo-amrwbenc mp3:libmp3lame |
| 80 |
- kvazaar:libkvazaar libaom |
| 81 |
- openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1 theora:libtheora twolame:libtwolame |
| 82 |
- webp:libwebp x264:libx264 x265:libx265 xvid:libxvid amf:amf |
| 83 |
+ amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame |
| 84 |
+ openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1 |
| 85 |
+ theora:libtheora twolame:libtwolame webp:libwebp x264:libx264 |
| 86 |
+ x265:libx265 xvid:libxvid |
| 87 |
) |
| 88 |
|
| 89 |
IUSE=" |
| 90 |
@@ -287,11 +287,11 @@ DEPEND="${RDEPEND} |
| 91 |
BDEPEND=" |
| 92 |
>=sys-devel/make-3.81 |
| 93 |
virtual/pkgconfig |
| 94 |
+ amf? ( media-libs/amf-headers ) |
| 95 |
cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) |
| 96 |
cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) |
| 97 |
doc? ( sys-apps/texinfo ) |
| 98 |
test? ( net-misc/wget sys-devel/bc ) |
| 99 |
- amf? ( media-libs/amf-headers ) |
| 100 |
" |
| 101 |
|
| 102 |
# Code requiring FFmpeg to be built under gpl license |
Archives