commit:     969f6291dbab70a53266f225323fabadecb2f151
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 07:29:30 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 29 07:29:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=969f6291

media-video/ffmpeg-chromium: Version bump to 102

Closes: https://bugs.gentoo.org/847883
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 media-video/ffmpeg-chromium/Manifest               |   1 +
 .../ffmpeg-chromium/ffmpeg-chromium-102.ebuild     | 245 +++++++++++++++++++++
 2 files changed, 246 insertions(+)

diff --git a/media-video/ffmpeg-chromium/Manifest 
b/media-video/ffmpeg-chromium/Manifest
index 4fac8cdb143c..811a0841b20f 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -1,2 +1,3 @@
 DIST ffmpeg-chromium-100.tar.gz 15144675 BLAKE2B 
1195078e12ef0d8b5562b2eed068eea331a03727f3dfbd198fdd1088d70346f892bc9161ecd80ed54f7c5c842c9ae9b16f6d02858f3c4a538ce19de03b5ec9f8
 SHA512 
35f5ca7164d8d8f58b2f553ec7c6181629af217752fe49bd890051675734864ae4b5d1f135808d101fb0c9855d14842a0074759679a15e9b94fb571c9e2ccee7
+DIST ffmpeg-chromium-102.tar.gz 15165192 BLAKE2B 
ecf9b9ff538730d8a265e25e3d30900b119bfa5baa8e097e58151d744c95b3e768b96f477f6394015cd77a8ae35991c7cdaee5fb2f700d129b6c6d7ee87b34d9
 SHA512 
f5aa4c47e801d2547321c7995240e004706f9b5835610f9726ac45a63ac58a62de64d463ddeb8c1a001d31d89a4dbaee3a1be568c33316f29dc2b675b2f3161a
 DIST ffmpeg-chromium-96.tar.gz 14782341 BLAKE2B 
686f5e0970ab49663e43d54cdb9b0216560dabc676711666c9e51840af64d2c78d47b55bcf36625751676839869e1b1f3b65516499646db00fd29f5ed2ff90d3
 SHA512 
169a1bf58000be0799b05b1d3f3a63b5a93ec66023d31f1ac6f5d9cd77408a390a9308fb626e94c3f1d4e1170638c1c81ac68b248e06c28d318d731ddda8e4d2

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild
new file mode 100644
index 000000000000..ced0a90f7959
--- /dev/null
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+COMMIT="5cd95cdf972ad92c38a4ea2d059ac9d6167302ca"
+DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based 
browsers"
+HOMEPAGE="https://ffmpeg.org/";
+SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz";
+
+SLOT="${PV}"
+LICENSE="
+       !gpl? ( LGPL-2.1 )
+       gpl? ( GPL-2 )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+               cpudetection:runtime-cpudetect debug
+               +gpl
+               vaapi vdpau vulkan
+               # decoders
+               mmal +opus:libopus
+               video_cards_nvidia:ffnvcodec
+               # Threads; we only support pthread for now but ffmpeg supports 
more
+               +threads:pthreads
+)
+
+IUSE="
+       ${FFMPEG_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+       cpu_flags_arm_thumb:armv5te
+       cpu_flags_arm_v6:armv6
+       cpu_flags_arm_thumb2:armv6t2
+       cpu_flags_arm_neon:neon
+       cpu_flags_arm_vfp:vfp
+       cpu_flags_arm_vfpv3:vfpv3
+       cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+       arm64? ( cpu_flags_arm_v8 )
+       cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+       cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+       cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+       cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+       cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx 
avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 
ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+       cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+       cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+       cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+       cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+       cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+       cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+       cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+       cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+       cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+       cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+       cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+       cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+       cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+       cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+       cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+       ${ARM_CPU_FEATURES[@]}
+       ${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+       ${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+       ${ARM_CPU_REQUIRED_USE}
+       ${X86_CPU_REQUIRED_USE}
+"
+
+RDEPEND="
+       mmal? ( media-libs/raspberrypi-userland )
+       opus? ( >=media-libs/opus-1.0.2-r2 )
+       vaapi? ( >=x11-libs/libva-1.2.1-r1:0= )
+       video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1 )
+       vdpau? ( >=x11-libs/libvdpau-0.7 )
+       vulkan? ( >=media-libs/vulkan-loader-1.2.189:= )
+"
+
+DEPEND="${RDEPEND}
+"
+BDEPEND="
+       >=sys-devel/make-3.81
+       virtual/pkgconfig
+       cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+"
+
+REQUIRED_USE="
+       ${CPU_REQUIRED_USE}"
+RESTRICT="
+       test
+"
+
+S="${WORKDIR}"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-100.patch
+       "${FILESDIR}"/chromium.patch
+)
+
+src_prepare() {
+       export revision=git-N-g${COMMIT:0:10}
+       default
+
+       # -fdiagnostics-color=auto gets appended after user flags which
+       # will ignore user's preference.
+       sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
+
+       echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+src_configure() {
+       local myconf=( )
+
+       # bug 842201
+       use ia64 && tc-is-gcc && append-flags \
+               -fno-tree-ccp \
+               -fno-tree-dominator-opts \
+               -fno-tree-fre \
+               -fno-code-hoisting \
+               -fno-tree-pre \
+               -fno-tree-vrp
+
+       local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+
+       for i in "${ffuse[@]#+}" ; do
+               myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+       done
+
+       # CPU features
+       for i in "${CPU_FEATURES_MAP[@]}" ; do
+               use ${i%:*} || myconf+=( --disable-${i#*:} )
+       done
+
+       # Try to get cpu type based on CFLAGS.
+       # Bug #172723
+       # We need to do this so that features of that CPU will be better used
+       # If they contain an unknown CPU it will not hurt since ffmpeg's 
configure
+       # will just ignore it.
+       for i in $(get-flag mcpu) $(get-flag march) ; do
+               [[ ${i} = native ]] && i="host" # bug #273421
+               myconf+=( --cpu=${i} )
+               break
+       done
+
+       # LTO support, bug #566282, bug #754654
+       is-flagq "-flto*" && myconf+=( "--enable-lto" )
+       filter-flags "-flto*"
+
+       # Mandatory configuration
+       myconf=(
+               --disable-stripping
+               # This is only for hardcoded cflags; those are used in 
configure checks that may
+               # interfere with proper detections, bug #671746 and bug #645778
+               # We use optflags, so that overrides them anyway.
+               --disable-optimizations
+               --disable-libcelt # bug #664158
+               "${myconf[@]}"
+       )
+
+       # cross compile support
+       if tc-is-cross-compiler ; then
+               myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) 
--cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+               case ${CHOST} in
+                       *freebsd*)
+                               myconf+=( --target-os=freebsd )
+                               ;;
+                       *mingw32*)
+                               myconf+=( --target-os=mingw32 )
+                               ;;
+                       *linux*)
+                               myconf+=( --target-os=linux )
+                               ;;
+               esac
+       fi
+
+       local extra_libs
+       if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then
+               # bug #782811
+               # bug #790590
+               extra_libs+="$(test-flags-CCLD -latomic) "
+       fi
+
+       set -- "${S}/configure" \
+               --prefix="${EPREFIX}/usr" \
+               --libdir="${EPREFIX}/usr/$(get_libdir)" \
+               --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+               --cc="$(tc-getCC)" \
+               --cxx="$(tc-getCXX)" \
+               --ar="$(tc-getAR)" \
+               --nm="$(tc-getNM)" \
+               --strip="$(tc-getSTRIP)" \
+               --ranlib="$(tc-getRANLIB)" \
+               --pkg-config="$(tc-getPKG_CONFIG)" \
+               --optflags="${CFLAGS}" \
+               --extra-libs="${extra_libs}" \
+               --disable-all \
+               --disable-autodetect \
+               --disable-error-resilience \
+               --disable-everything \
+               --disable-faan \
+               --disable-iconv \
+               --disable-network \
+               --enable-avcodec \
+               --enable-avformat \
+               --enable-avutil \
+               
--enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8
 \
+               --enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \
+               --enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 
\
+               --enable-pic \
+               --enable-static \
+               "${myconf[@]}" \
+               ${EXTRA_FFMPEG_CONF}
+
+       echo "${@}"
+       "${@}" || die
+}
+
+src_compile() {
+       emake V=1 libffmpeg
+}
+
+src_install() {
+       emake V=1 DESTDIR="${D}" install-libffmpeg
+}

Reply via email to