commit: c8c15132d789169852cf66d1796607609dc45ca1
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Sat Mar 26 10:44:24 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 14:14:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c15132
media-video/ffmpeg: order alphabetically amf entries
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild | 10 +++++-----
media-video/ffmpeg/ffmpeg-5.0-r1.ebuild | 8 ++++----
media-video/ffmpeg/ffmpeg-9999.ebuild | 10 +++++-----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild
b/media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild
index 2c8dc26e3f13..f7b57d1b616c 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild
@@ -95,10 +95,10 @@ 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 mp3:libmp3lame
- kvazaar:libkvazaar libaom
- openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1
theora:libtheora twolame:libtwolame
- webp:libwebp x264:libx264 x265:libx265 xvid:libxvid amf:amf
+ 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="
@@ -287,11 +287,11 @@ 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 )
test? ( net-misc/wget sys-devel/bc )
- amf? ( media-libs/amf-headers )
"
# Code requiring FFmpeg to be built under gpl license
diff --git a/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild
b/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild
index a818aa4782dc..b73748c2373a 100644
--- a/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild
@@ -95,10 +95,10 @@ 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 mp3:libmp3lame
- kvazaar:libkvazaar libaom
- openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1
theora:libtheora twolame:libtwolame
- webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+ 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="
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild
b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 89a0768ff91c..97bebae910d4 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -95,10 +95,10 @@ 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 mp3:libmp3lame
- kvazaar:libkvazaar libaom
- openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1
theora:libtheora twolame:libtwolame
- webp:libwebp x264:libx264 x265:libx265 xvid:libxvid amf:amf
+ 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="
@@ -287,11 +287,11 @@ 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 )
test? ( net-misc/wget sys-devel/bc )
- amf? ( media-libs/amf-headers )
"
# Code requiring FFmpeg to be built under gpl license
