commit:     aa3f336eaaeba06e4b28fa579cd65a6488f6a8a4
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  2 14:25:26 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul  2 14:28:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3f336e

media-video/ffmpeg: add rav1e useflag for AV1 encoding.

Closes: https://bugs.gentoo.org/701092
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 media-video/ffmpeg/{ffmpeg-9999.ebuild => ffmpeg-4.3-r1.ebuild} | 8 +++++---
 media-video/ffmpeg/ffmpeg-9999.ebuild                           | 5 +++--
 media-video/ffmpeg/metadata.xml                                 | 1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild 
b/media-video/ffmpeg/ffmpeg-4.3-r1.ebuild
similarity index 98%
copy from media-video/ffmpeg/ffmpeg-9999.ebuild
copy to media-video/ffmpeg/ffmpeg-4.3-r1.ebuild
index 38ae54ed0ac..f337de3968d 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3-r1.ebuild
@@ -59,7 +59,7 @@ LICENSE="
        samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-       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"
+       KEYWORDS="~amd64 ~mips ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
@@ -97,7 +97,7 @@ FFMPEG_FLAG_MAP=(
 FFMPEG_ENCODER_FLAG_MAP=(
        amrenc:libvo-amrwbenc mp3:libmp3lame
        kvazaar:libkvazaar libaom
-       openh264:libopenh264 snappy:libsnappy theora:libtheora 
twolame:libtwolame
+       openh264:libopenh264 rav1e:librav1e snappy:libsnappy theora:libtheora 
twolame:libtwolame
        wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
 )
 
@@ -185,6 +185,7 @@ RDEPEND="
                kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
                mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
                openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+               rav1e? ( media-video/rav1e:=[capi] )
                snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
                theora? (
                        >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
@@ -325,6 +326,7 @@ S=${WORKDIR}/${P/_/-}
 
 PATCHES=(
        "${FILESDIR}"/chromium-r1.patch
+       "${FILESDIR}"/${PN}-4.3-fix-build-without-SSSE3.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -392,7 +394,7 @@ multilib_src_configure() {
 
        # (temporarily) disable non-multilib deps
        if ! multilib_is_native_abi; then
-               for i in frei0r libzmq ; do
+               for i in frei0r librav1e libzmq ; do
                        myconf+=( --disable-${i} )
                done
        fi

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild 
b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 38ae54ed0ac..88bedca9d52 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -97,7 +97,7 @@ FFMPEG_FLAG_MAP=(
 FFMPEG_ENCODER_FLAG_MAP=(
        amrenc:libvo-amrwbenc mp3:libmp3lame
        kvazaar:libkvazaar libaom
-       openh264:libopenh264 snappy:libsnappy theora:libtheora 
twolame:libtwolame
+       openh264:libopenh264 rav1e:librav1e snappy:libsnappy theora:libtheora 
twolame:libtwolame
        wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
 )
 
@@ -185,6 +185,7 @@ RDEPEND="
                kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
                mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
                openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+               rav1e? ( media-video/rav1e:=[capi] )
                snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
                theora? (
                        >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
@@ -392,7 +393,7 @@ multilib_src_configure() {
 
        # (temporarily) disable non-multilib deps
        if ! multilib_is_native_abi; then
-               for i in frei0r libzmq ; do
+               for i in frei0r librav1e libzmq ; do
                        myconf+=( --disable-${i} )
                done
        fi

diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index f6e9c9f3cf8..68731ff2842 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -48,6 +48,7 @@
        <flag name="openssl">Enables <pkg>dev-libs/openssl</pkg> support. Adds 
support for encrypted network protocols (TLS/HTTPS).</flag>
        <flag name="pic">Force shared libraries to be built as PIC (this is 
slower)</flag>
        <flag name="postproc">Build and install libpostproc.</flag>
+       <flag name="rav1e">Enables AV1 encoding support via 
<pkg>media-video/rav1e</pkg>.</flag>
        <flag name="rubberband">Adds time-stretching and pitch-shifting audio 
filter based on <pkg>media-libs/rubberband</pkg>.</flag>
        <flag name="snappy">Enable <pkg>app-arch/snappy</pkg> support. Required 
for e.g. Vidvox Hap encoder.</flag>
        <flag name="srt">Enable support for Secure Reliable Transport (SRT) via 
<pkg>net-libs/srt</pkg></flag>

Reply via email to