gentoo auto-resync : 30:04:2023 - 11:17:09

5 files changed, 238 insertions, 50 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 86fa1381d737..b5c08142adee 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index 5743dbe32311..283469e71f17 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -3,6 +3,8 @@ AUX ffmpeg-chromium-100.patch 1653 BLAKE2B 4d0b025b024aa9ce9e325487c09bb3a566b45
 AUX ffmpeg-chromium-vk-headers.patch 1733 BLAKE2B 8d6e7b72d1dbfcd21d3549be4c54c76a0fa72c3b4bf9882e4e9baa7e69e00739ed9a6c65ff1e21cb6abc00fa09941713ee090b9538c7a4665cd79e4be4e5f4d9 SHA512 2f424c344fcfa24048dcefa082b6216375ff8fb28f830cdfaeb1e84dc84146640b0243741b3688b4ea614a0d91e2cb858cf3251baafbdc412bad595d2e71518e
 DIST ffmpeg-chromium-102.tar.gz 15165192 BLAKE2B ecf9b9ff538730d8a265e25e3d30900b119bfa5baa8e097e58151d744c95b3e768b96f477f6394015cd77a8ae35991c7cdaee5fb2f700d129b6c6d7ee87b34d9 SHA512 f5aa4c47e801d2547321c7995240e004706f9b5835610f9726ac45a63ac58a62de64d463ddeb8c1a001d31d89a4dbaee3a1be568c33316f29dc2b675b2f3161a
 DIST ffmpeg-chromium-106.tar.xz 9707176 BLAKE2B 8ab9b006328e15faa38b8014f2870e7a9fd9eaacc723cd6079bfaadc05db4d1f8c542dff5a331e1f93c9c877eea6d2ed0dc2bf567c77680227b22b2a9baf8834 SHA512 9f04feee42bf548cbda542be16f186bfe0d8179289a1512cf77ec492a8608b2c9d5c758f93fb6d229be67c20762075dd266fa4b203556f8b7ec4bf66579f2b6b
+DIST ffmpeg-chromium-112.tar.xz 9888952 BLAKE2B 48a2e0e93a890ae3ec436b2c9504c6f5d063c2ed04ed67db9c8b17f1d1111ce56519a8af8c44635901de7f46fb2f0529818e70874a17432c64c1192968a3ae4b SHA512 f0d5e7cd77d5daeddf1c2d47b3435bf9306fdbf23239890cbbaef86ad6e462e9606da5282c39dcd5f32ac6a721b5dd5f01c1f1525f6a66a0dad8a927db2c3217
 EBUILD ffmpeg-chromium-102.ebuild 6595 BLAKE2B 2470806a5aaaff46584f4fbceb00354455f3469380cf0078503774326cb0517801c1f00787ff5264a5b7f601d64c03fe2c460b43b021b918b135169cdc49cfd1 SHA512 43daadcde541fd9bcc53b49299dae69f560a23b961bed4e626f2df794523f16077b7812a61c205a8b6584cb3ddca48481d735b6508e8a81c54f29b773fce143c
 EBUILD ffmpeg-chromium-106.ebuild 6391 BLAKE2B c4a9a8bed4ad5cf0c0d9d278256d13dab81400d5ecf31ce397a9482bccfb8203bf48a3791c2e758a50b5e71901202e0a675cbf8c5e65e707a3d42f2a24515f2f SHA512 9fe6f096d9264e7efbe5d266e7bdcd2ce07d5554803c5a97818ca0dd694904f2d5704dc3c76b1ac70a5b030d2b3908b4eb5972c7d3fdd45e55fe196c72999647
+EBUILD ffmpeg-chromium-112.ebuild 6354 BLAKE2B f71c48e4c45a0a160d63b74de06e42b0d5aa2854022a41cc179175db92e30745b6cf2d8c2fe9a5918849e89b07b94396fa4b8468c5f40130b060803aa8f64f2a SHA512 b1e1b837429fd2271ac6e3093399cae02034e6d8a9cc005b207f760d0570642d357f555ad51fe094c17b3f287af9acbd86459a29aa8c83ea4448d9ced1c89f0a
 MISC metadata.xml 669 BLAKE2B 3e1b3934b51d07a5620026f2d24e027d217380a9ef7819b3ee54e09b12b0d3ed377cef911989d63a6ab65bd7cb92752997fdd90afb0e6f29dc9496a9035daf4c SHA512 556601bbb7357eb7b8be23a93268b8f173bf16b42518f4b931e97d13880b5e0642546c1ead253a625a8938a9c7020cf52f69eaa629e65de47dfa010af6299674
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-112.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-112.ebuild
new file mode 100644
index 000000000000..04db7f5c85c7
--- /dev/null
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-112.ebuild
@@ -0,0 +1,236 @@
+# 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="ee0c52d52036ecadfd38affec86c04937480bedb"
+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.xz"
+
+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
+		nvenc: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? ( >=media-libs/libva-1.2.1-r1:0= )
+	nvenc? ( >=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
+"
+
+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, bug #772854
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+	filter-lto
+
+	# 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
+
+	# Use --extra-libs if needed for LIBS
+	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}" \
+		--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
+}
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index 89bdf8d83a34..907617d42a65 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -10,5 +10,4 @@ AUX ffmpeg5-8.patch 1953 BLAKE2B 18f207ae5f42be46d00d003add9c2432a086e0e65a799a8
 AUX ffmpeg5-9.patch 1855 BLAKE2B 7f85c786641825d9f722b63682e1fe63c4e7178890a0b05a02dd7af93ae057f7b259b0a1311df5553c4fbdfee60268036e4004253b395f87f87e27a6918c1264 SHA512 560d0018df15299d527a3a7f218f3899d03f264c434ec5d7d9f411c22f2467d9583d7a94e5c69da03c55abe9774119e1ee1685aa48dda525ab8aae0488c4ef2a
 DIST ffmpegthumbnailer-2.2.2.tar.bz2 1201838 BLAKE2B 449a876eaf56feb41c06dc5f3d123b138d66dfe8b6e1bc2e53f1742ef6fbd4ec5d14d77402e13cf8c369ee0cf0707ae5b100ac1d9fb02435b3c3a776cc9dc5f4 SHA512 52760dcf59430e5e85024c9f19dc1fac1d5f0edb4f937b33feac2b3ca8f12bbf549b5f658fc16fc07bf773717b9e10048aa3eb24bf52811c5c88c995ef492612
 EBUILD ffmpegthumbnailer-2.2.2-r1.ebuild 1367 BLAKE2B 606b57fc42dc917adfe8e0f71c32e0c543da7bff54e2dabf430b58df23b12e2227293caa69788f4b636667efa3c56ad5354a81707b2dbf3b4876f62749732d53 SHA512 b8ee92f1708bdd149be9e633c29b7a5c5ef07657923167a3fe916defceec3c0566f82361e33f5e8c8b10a226d37c44d2c656be28bcab910753907643cf116982
-EBUILD ffmpegthumbnailer-2.2.2.ebuild 1037 BLAKE2B 0e448619b80a4edf33a6bfc617a62ec24e97730b8d548ef94280a8b9c03febfa9915dcf3da4044265b139be55fc4e9e3f7e6da4b4d62675a2017387a4339bf80 SHA512 76a7f27b82b951e16eeb2997f01d252abdc7d258ff2f008670a92ffc392132de633799093d2e772267be51a666a768cd5461ecb60ab7d50a617773095e09bb5d
 MISC metadata.xml 376 BLAKE2B df0d1b58a98ba2ae162e809f763889e3f84a51363ebb65d7a530217f723198fada6c7e0445ac50057c8ac5a082ecfaada6f6b3479faf8294bf9ee5cef9db53c5 SHA512 b902ffa5d659e09df7635fa70ffde6cd31848bd5c20033b9933217c6331aa9e9a34cfdf90c3f10c5cded9bc9ba6e6601f21d752ad1eca287c4754c01e31bc43e
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild
deleted file mode 100644
index 009948d53ef0..000000000000
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
-HOMEPAGE="https://github.com/dirkvdb/ffmpegthumbnailer"
-SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="gnome gtk jpeg png test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="gnome? ( gtk )
-	test? ( png jpeg )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	gtk? ( dev-libs/glib:2= )
-	jpeg? ( virtual/jpeg:0= )
-	>=media-video/ffmpeg-2.7:0=
-	png? ( media-libs/libpng:0= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-src_prepare() {
-	rm -rf out* || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_GIO=$(usex gtk)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_THUMBNAILER=$(usex gnome)
-		-DHAVE_JPEG=$(usex jpeg)
-		-DHAVE_PNG=$(usex png)
-	)
-	cmake_src_configure
-}