| 1 |
commit: aa3f336eaaeba06e4b28fa579cd65a6488f6a8a4 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 2 14:25:26 2020 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 2 14:28:35 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3f336e |
| 7 |
|
| 8 |
media-video/ffmpeg: add rav1e useflag for AV1 encoding. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/701092 |
| 11 |
Package-Manager: Portage-2.3.101, Repoman-2.3.22 |
| 12 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 13 |
|
| 14 |
media-video/ffmpeg/{ffmpeg-9999.ebuild => ffmpeg-4.3-r1.ebuild} | 8 +++++--- |
| 15 |
media-video/ffmpeg/ffmpeg-9999.ebuild | 5 +++-- |
| 16 |
media-video/ffmpeg/metadata.xml | 1 + |
| 17 |
3 files changed, 9 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-4.3-r1.ebuild |
| 20 |
similarity index 98% |
| 21 |
copy from media-video/ffmpeg/ffmpeg-9999.ebuild |
| 22 |
copy to media-video/ffmpeg/ffmpeg-4.3-r1.ebuild |
| 23 |
index 38ae54ed0ac..f337de3968d 100644 |
| 24 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 25 |
+++ b/media-video/ffmpeg/ffmpeg-4.3-r1.ebuild |
| 26 |
@@ -59,7 +59,7 @@ LICENSE=" |
| 27 |
samba? ( GPL-3 ) |
| 28 |
" |
| 29 |
if [ "${PV#9999}" = "${PV}" ] ; then |
| 30 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 31 |
+ KEYWORDS="~amd64 ~mips ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 32 |
fi |
| 33 |
|
| 34 |
# Options to use as use_enable in the foo[:bar] form. |
| 35 |
@@ -97,7 +97,7 @@ FFMPEG_FLAG_MAP=( |
| 36 |
FFMPEG_ENCODER_FLAG_MAP=( |
| 37 |
amrenc:libvo-amrwbenc mp3:libmp3lame |
| 38 |
kvazaar:libkvazaar libaom |
| 39 |
- openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame |
| 40 |
+ openh264:libopenh264 rav1e:librav1e snappy:libsnappy theora:libtheora twolame:libtwolame |
| 41 |
wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid |
| 42 |
) |
| 43 |
|
| 44 |
@@ -185,6 +185,7 @@ RDEPEND=" |
| 45 |
kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] ) |
| 46 |
mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) |
| 47 |
openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] ) |
| 48 |
+ rav1e? ( media-video/rav1e:=[capi] ) |
| 49 |
snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) |
| 50 |
theora? ( |
| 51 |
>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] |
| 52 |
@@ -325,6 +326,7 @@ S=${WORKDIR}/${P/_/-} |
| 53 |
|
| 54 |
PATCHES=( |
| 55 |
"${FILESDIR}"/chromium-r1.patch |
| 56 |
+ "${FILESDIR}"/${PN}-4.3-fix-build-without-SSSE3.patch |
| 57 |
) |
| 58 |
|
| 59 |
MULTILIB_WRAPPED_HEADERS=( |
| 60 |
@@ -392,7 +394,7 @@ multilib_src_configure() { |
| 61 |
|
| 62 |
# (temporarily) disable non-multilib deps |
| 63 |
if ! multilib_is_native_abi; then |
| 64 |
- for i in frei0r libzmq ; do |
| 65 |
+ for i in frei0r librav1e libzmq ; do |
| 66 |
myconf+=( --disable-${i} ) |
| 67 |
done |
| 68 |
fi |
| 69 |
|
| 70 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 71 |
index 38ae54ed0ac..88bedca9d52 100644 |
| 72 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 73 |
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 74 |
@@ -97,7 +97,7 @@ FFMPEG_FLAG_MAP=( |
| 75 |
FFMPEG_ENCODER_FLAG_MAP=( |
| 76 |
amrenc:libvo-amrwbenc mp3:libmp3lame |
| 77 |
kvazaar:libkvazaar libaom |
| 78 |
- openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame |
| 79 |
+ openh264:libopenh264 rav1e:librav1e snappy:libsnappy theora:libtheora twolame:libtwolame |
| 80 |
wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid |
| 81 |
) |
| 82 |
|
| 83 |
@@ -185,6 +185,7 @@ RDEPEND=" |
| 84 |
kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] ) |
| 85 |
mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) |
| 86 |
openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] ) |
| 87 |
+ rav1e? ( media-video/rav1e:=[capi] ) |
| 88 |
snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) |
| 89 |
theora? ( |
| 90 |
>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] |
| 91 |
@@ -392,7 +393,7 @@ multilib_src_configure() { |
| 92 |
|
| 93 |
# (temporarily) disable non-multilib deps |
| 94 |
if ! multilib_is_native_abi; then |
| 95 |
- for i in frei0r libzmq ; do |
| 96 |
+ for i in frei0r librav1e libzmq ; do |
| 97 |
myconf+=( --disable-${i} ) |
| 98 |
done |
| 99 |
fi |
| 100 |
|
| 101 |
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml |
| 102 |
index f6e9c9f3cf8..68731ff2842 100644 |
| 103 |
--- a/media-video/ffmpeg/metadata.xml |
| 104 |
+++ b/media-video/ffmpeg/metadata.xml |
| 105 |
@@ -48,6 +48,7 @@ |
| 106 |
<flag name="openssl">Enables <pkg>dev-libs/openssl</pkg> support. Adds support for encrypted network protocols (TLS/HTTPS).</flag> |
| 107 |
<flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag> |
| 108 |
<flag name="postproc">Build and install libpostproc.</flag> |
| 109 |
+ <flag name="rav1e">Enables AV1 encoding support via <pkg>media-video/rav1e</pkg>.</flag> |
| 110 |
<flag name="rubberband">Adds time-stretching and pitch-shifting audio filter based on <pkg>media-libs/rubberband</pkg>.</flag> |
| 111 |
<flag name="snappy">Enable <pkg>app-arch/snappy</pkg> support. Required for e.g. Vidvox Hap encoder.</flag> |
| 112 |
<flag name="srt">Enable support for Secure Reliable Transport (SRT) via <pkg>net-libs/srt</pkg></flag> |
Archives