[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: d893865e2d5e5f0d403cd145f10c6c1f2395ac26 Author: Joonas Niilola gentoo org> AuthorDate: Sat Mar 16 08:37:59 2024 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Mar 16 08:38:29 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d893865e media-video/ffmpeg: revbump due to libvmaf subslot change Signed-off-by: Joonas Niilola gentoo.org> ...mpeg-4.4.4-r8.ebuild => ffmpeg-4.4.4-r9.ebuild} | 2 +- ...ffmpeg-6.0-r11.ebuild => ffmpeg-6.0-r12.ebuild} | 2 +- media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild | 606 - ...mpeg-6.0.1-r3.ebuild => ffmpeg-6.0.1-r4.ebuild} | 2 +- ...mpeg-6.1.1-r4.ebuild => ffmpeg-6.1.1-r5.ebuild} | 2 +- media-video/ffmpeg/ffmpeg-.ebuild | 2 +- 6 files changed, 5 insertions(+), 611 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r9.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild rename to media-video/ffmpeg/ffmpeg-4.4.4-r9.ebuild index 748acd8d7375..7eb94f61dbb6 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r9.ebuild @@ -271,7 +271,7 @@ RDEPEND=" vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) - vmaf? ( media-libs/libvmaf[${MULTILIB_USEDEP}] ) + vmaf? ( media-libs/libvmaf:=[${MULTILIB_USEDEP}] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] diff --git a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r12.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-6.0-r11.ebuild rename to media-video/ffmpeg/ffmpeg-6.0-r12.ebuild index a8e255034559..27356c86a31d 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r12.ebuild @@ -273,7 +273,7 @@ RDEPEND=" vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) - vmaf? ( >=media-libs/libvmaf-2.0.0[${MULTILIB_USEDEP}] ) + vmaf? ( >=media-libs/libvmaf-2.0.0:=[${MULTILIB_USEDEP}] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild deleted file mode 100644 index 0a3b999635a5.. --- a/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild +++ /dev/null @@ -1,606 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Subslot: libavutil major.libavcodec major.libavformat major -# Since FFmpeg ships several libraries, subslot is kind of limited here. -# Most consumers will use those three libraries, if a "less used" library -# changes its soname, consumers will have to be rebuilt the old way -# (preserve-libs). -# If, for example, a package does not link to libavformat and only libavformat -# changes its ABI then this package will be rebuilt needlessly. Hence, such a -# package is free _not_ to := depend on FFmpeg but I would strongly encourage -# doing so since such a case is unlikely. -FFMPEG_SUBSLOT=58.60.60 - -SCM="" -if [ "${PV#}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_MIN_CLONE_TYPE="single" - EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; -fi - -inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" -HOMEPAGE="https://ffmpeg.org/; -if [ "${PV#}" != "${PV}" ] ; then - SRC_URI="" -elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.xz" -else # Release - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc - inherit verify-sig - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; - SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" - - BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" -fi -FFMPEG_REVISION="${PV#*_p}" - -SLOT="0/${FFMPEG_SUBSLOT}" -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) - amr? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - gmp? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - libaribb24? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - encode? ( - amrenc? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - ) - samba? ( GPL-3 ) -" -if [ "${PV#}" = "${PV}" ] ; then
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 1f8d3d6cd2b8c35e6432973d188168235cfc44e0 Author: Sam James gentoo org> AuthorDate: Tue Mar 12 03:36:08 2024 + Commit: Sam James gentoo org> CommitDate: Tue Mar 12 03:36:56 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f8d3d6c media-video/ffmpeg: Stabilize 6.0.1-r3 sparc, #926151 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild index 361a05ba4aa9..94dc90ad4029 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 23f62a60be6b7405c5d6a35da49d5a10e65803e5 Author: Sam James gentoo org> AuthorDate: Tue Mar 12 03:36:05 2024 + Commit: Sam James gentoo org> CommitDate: Tue Mar 12 03:36:56 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23f62a60 media-video/ffmpeg: Stabilize 6.0.1-r3 arm, #926151 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild index 7d18fc6a4b42..361a05ba4aa9 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: d49bad2f661781b97ed88de8702537ed3d046ef3 Author: Sam James gentoo org> AuthorDate: Tue Mar 12 03:36:00 2024 + Commit: Sam James gentoo org> CommitDate: Tue Mar 12 03:36:55 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d49bad2f media-video/ffmpeg: Stabilize 6.0.1-r3 amd64, #926151 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild index 4393adc2906b..7d18fc6a4b42 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: a2a6dac6903836fb85d3570f137bb7e80dfa44cf Author: Sam James gentoo org> AuthorDate: Tue Mar 12 03:36:11 2024 + Commit: Sam James gentoo org> CommitDate: Tue Mar 12 03:36:57 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2a6dac6 media-video/ffmpeg: Stabilize 6.0.1-r3 x86, #926151 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild index 94dc90ad4029..76ce44470f7a 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/
commit: 0b5305498974c036f83c71adc8fb4a40106858c7 Author: Sam James gentoo org> AuthorDate: Tue Mar 12 03:35:38 2024 + Commit: Sam James gentoo org> CommitDate: Tue Mar 12 03:36:54 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b530549 media-video/ffmpeg: fix build w/ newer libjxl Closes: https://bugs.gentoo.org/924431 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild | 1 + .../ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch | 112 + 2 files changed, 113 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild index 8cf74299df2e..4393adc2906b 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild @@ -348,6 +348,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch "${FILESDIR}"/${PN}-4.4.4-opencl-parallel-gmake-fix.patch "${FILESDIR}"/${PN}-6.0.1-alignment.patch + "${FILESDIR}"/${PN}-6.0.1-libjxl-0.9.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch b/media-video/ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch new file mode 100644 index ..10c216ec4c88 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch @@ -0,0 +1,112 @@ +https://bugs.gentoo.org/924431 +https://git.videolan.org/?p=ffmpeg.git;a=commit;h=75b1a555a70c178a9166629e43ec2f6250219eb2 +https://git.videolan.org/?p=ffmpeg.git;a=commit;h=ac06190a5a11f2b170e7719d769d7c0d65bff3e0 + +From 75b1a555a70c178a9166629e43ec2f6250219eb2 Mon Sep 17 00:00:00 2001 +From: Leo Izen +Date: Sat, 8 Jul 2023 14:43:31 -0400 +Subject: [PATCH] avcodec/libjxldec: build against libjxl 0.9 + +Git master libjxl changed several function signatures, so this commit +adds some #ifdefs to handle the new signatures without breaking old +releases. Do note that old git master development versions of libjxl +will be broken, but no releases will be. + +Signed-off-by: Leo Izen +--- a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c +@@ -210,14 +210,22 @@ static int libjxl_get_icc(AVCodecContext *avctx) + JxlDecoderStatus jret; + /* an ICC profile is present, and we can meaningfully get it, + * because the pixel data is not XYB-encoded */ ++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0) + jret = JxlDecoderGetICCProfileSize(ctx->decoder, >jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, _len); ++#else ++jret = JxlDecoderGetICCProfileSize(ctx->decoder, JXL_COLOR_PROFILE_TARGET_DATA, _len); ++#endif + if (jret == JXL_DEC_SUCCESS && icc_len > 0) { + av_buffer_unref(>iccp); + ctx->iccp = av_buffer_alloc(icc_len); + if (!ctx->iccp) + return AVERROR(ENOMEM); ++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0) + jret = JxlDecoderGetColorAsICCProfile(ctx->decoder, >jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, +-ctx->iccp->data, icc_len); ++ ctx->iccp->data, icc_len); ++#else ++jret = JxlDecoderGetColorAsICCProfile(ctx->decoder, JXL_COLOR_PROFILE_TARGET_DATA, ctx->iccp->data, icc_len); ++#endif + if (jret != JXL_DEC_SUCCESS) { + av_log(avctx, AV_LOG_WARNING, "Unable to obtain ICC Profile\n"); + av_buffer_unref(>iccp); +@@ -253,12 +261,21 @@ static int libjxl_color_encoding_event(AVCodecContext *avctx, AVFrame *frame) + /* set this flag if we need to fall back on wide gamut */ + int fallback = 0; + ++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0) + jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, NULL, JXL_COLOR_PROFILE_TARGET_ORIGINAL, _color); ++#else ++jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, JXL_COLOR_PROFILE_TARGET_ORIGINAL, _color); ++#endif + if (jret == JXL_DEC_SUCCESS) { + /* enum values describe the colors of this image */ + jret = JxlDecoderSetPreferredColorProfile(ctx->decoder, _color); + if (jret == JXL_DEC_SUCCESS) +-jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, >jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, _color); ++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0) ++jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, >jxl_pixfmt, ++ JXL_COLOR_PROFILE_TARGET_DATA, _color); ++#else ++jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, JXL_COLOR_PROFILE_TARGET_DATA, _color); ++#endif + /* if we couldn't successfully request the pixel data space, we fall back on wide gamut */ + /* this code path is very unlikely to happen in practice */ + if (jret != JXL_DEC_SUCCESS) +-- +2.30.2 + +From ac06190a5a11f2b170e7719d769d7c0d65bff3e0 Mon Sep 17 00:00:00 2001 +From:
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/
commit: 9d632b7ec4dd911a86d08711082511f9dd2dd49a Author: James Le Cuirot gentoo org> AuthorDate: Sat Mar 9 22:16:19 2024 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Mar 9 22:16:19 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d632b7e media-video/ffmpeg: Patch to fix 4.4.4 with newer glslang Closes: https://bugs.gentoo.org/926551 Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 1 + .../ffmpeg/files/ffmpeg-4.4.4-glslang.patch| 25 ++ 2 files changed, 26 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index 00d867dd517c..748acd8d7375 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -349,6 +349,7 @@ PATCHES=( "${FILESDIR}"/${P}-fix-build-svt-av1-1.5.0.patch "${FILESDIR}"/${PN}-5.1.3-binutils-2.41.patch "${FILESDIR}"/${PN}-4.4.4-opencl-parallel-gmake-fix.patch + "${FILESDIR}"/${PN}-4.4.4-glslang.patch "${WORKDIR}"/${PN}-4.4.4-texinfo.patch ) diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.4-glslang.patch b/media-video/ffmpeg/files/ffmpeg-4.4.4-glslang.patch new file mode 100644 index ..f19bf8e47a42 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-4.4.4-glslang.patch @@ -0,0 +1,25 @@ +Bug: https://bugs.gentoo.org/926551 + +diff -Naur a/configure b/configure +--- a/configure2024-03-09 22:07:52.005888104 + b/configure2024-03-09 22:08:18.634656978 + +@@ -6374,7 +6374,7 @@ + enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit + enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType + enabled libfribidi&& require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info +-enabled libglslang&& require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ ++enabled libglslang&& require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ + enabled libgme&& { check_pkg_config libgme libgme gme/gme.h gme_new_emu || +require libgme gme/gme.h gme_new_emu -lgme -lstdc++; } + enabled libgsm&& { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do +diff -Naur a/libavfilter/glslang.cpp b/libavfilter/glslang.cpp +--- a/libavfilter/glslang.cpp 2023-04-12 19:01:50.0 +0100 b/libavfilter/glslang.cpp 2024-03-09 22:08:36.210161783 + +@@ -17,6 +17,7 @@ + */ + + #include ++#include + + extern "C" { + #include "libavutil/mem.h"
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/
commit: 4fdfad20aacc18b837d519ec1e636632acfa23e4 Author: James Le Cuirot gentoo org> AuthorDate: Sat Mar 9 14:10:35 2024 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Mar 9 14:13:05 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fdfad20 media-video/ffmpeg-chromium: Stabilise 121 on amd64 Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild index 3bb780532c13..b15c702a5284 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild @@ -16,7 +16,7 @@ LICENSE=" gpl? ( GPL-2 ) " -KEYWORDS="~amd64 ~arm ~arm64" +KEYWORDS="amd64 ~arm ~arm64" # Options to use as use_enable in the foo[:bar] form. # This will feed configure with $(use_enable foo bar)
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: f539c44cdb69292ddb1930339557fa1dd22ce7fe Author: Andrew Ammerlaan gentoo org> AuthorDate: Thu Mar 7 19:46:43 2024 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Thu Mar 7 19:55:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f539c44c media-video/ffmpeg: media-libs/oneVPL -> media-libs/libvpl Signed-off-by: Andrew Ammerlaan gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r11.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.1.1-r4.ebuild | 2 +- media-video/ffmpeg/ffmpeg-.ebuild | 2 +- media-video/ffmpeg/metadata.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild index 3599c9b0aee6..a8e255034559 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild @@ -255,7 +255,7 @@ RDEPEND=" opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - qsv? ( media-libs/oneVPL[${MULTILIB_USEDEP}] ) + qsv? ( media-libs/libvpl[${MULTILIB_USEDEP}] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] ) samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild index d50d1b93465a..0a3b999635a5 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild @@ -255,7 +255,7 @@ RDEPEND=" opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) - qsv? ( media-libs/oneVPL[${MULTILIB_USEDEP}] ) + qsv? ( media-libs/libvpl[${MULTILIB_USEDEP}] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] ) samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild index 3361ae8231b6..8cf74299df2e 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild @@ -255,7 +255,7 @@ RDEPEND=" opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) - qsv? ( media-libs/oneVPL[${MULTILIB_USEDEP}] ) + qsv? ( media-libs/libvpl[${MULTILIB_USEDEP}] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] ) samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r4.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r4.ebuild index b4c881278474..71a7f4ad575a 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r4.ebuild @@ -278,7 +278,7 @@ RDEPEND=" opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) - qsv? ( media-libs/oneVPL[${MULTILIB_USEDEP}] ) + qsv? ( media-libs/libvpl[${MULTILIB_USEDEP}] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] ) samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-.ebuild index 12bc542e102c..d0e4dbe9766d 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-.ebuild @@ -278,7 +278,7 @@ RDEPEND=" opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) - qsv? ( media-libs/oneVPL[${MULTILIB_USEDEP}] ) + qsv? ( media-libs/libvpl[${MULTILIB_USEDEP}] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] ) samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index f309fd82b53b..31380f3cda3d 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -58,7 +58,7 @@ Enables MIPS DSP ASE R1 optimizations. Enables MIPS DSP ASE R2 optimizations.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: e2142c27fe22a95e96904924bdfa52d7ee8506c6 Author: Sam James gentoo org> AuthorDate: Mon Mar 4 11:27:25 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 4 11:27:25 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2142c27 media-video/ffmpeg: Stabilize 6.0.1-r3 arm64, #926151 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild index e5b640360a6e..3361ae8231b6 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 9e8a7178bf9ff8a0248ad5be0b5cf60c0e13413a Author: Sam James gentoo org> AuthorDate: Mon Mar 4 11:18:45 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 4 11:18:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e8a7178 media-video/ffmpeg: drop 6.1.1-r2, 6.1.1-r3 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild | 584 media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild | 613 -- 2 files changed, 1197 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild deleted file mode 100644 index d82fd894afc1.. --- a/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild +++ /dev/null @@ -1,584 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Subslot: libavutil major.libavcodec major.libavformat major -# Since FFmpeg ships several libraries, subslot is kind of limited here. -# Most consumers will use those three libraries, if a "less used" library -# changes its soname, consumers will have to be rebuilt the old way -# (preserve-libs). -# If, for example, a package does not link to libavformat and only libavformat -# changes its ABI then this package will be rebuilt needlessly. Hence, such a -# package is free _not_ to := depend on FFmpeg but I would strongly encourage -# doing so since such a case is unlikely. -FFMPEG_SUBSLOT=58.60.60 - -SCM="" -if [ "${PV#}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_MIN_CLONE_TYPE="single" - EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; -fi - -inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" -HOMEPAGE="https://ffmpeg.org/; -if [ "${PV#}" != "${PV}" ] ; then - SRC_URI="" -elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.xz" -else # Release - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc - inherit verify-sig - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; - SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" - - BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" -fi -FFMPEG_REVISION="${PV#*_p}" - -SLOT="0/${FFMPEG_SUBSLOT}" -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) - amr? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - gmp? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - libaribb24? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - encode? ( - amrenc? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - ) - samba? ( GPL-3 ) -" -if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" -fi - -# 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=( - +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp - +gpl hardcoded-tables +iconv libxml2 lzma +network opencl - openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan - X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib - # libavdevice options - cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal - opengl - # indevs - libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack - # decoders - amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac - jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm - libaribb24 mmal modplug:libmodplug opus:libopus qsv:libvpl libilbc librtmp ssh:libssh - speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec - vorbis:libvorbis vpx:libvpx zvbi:libzvbi - # libavfilter options - appkit - bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite fontconfig frei0r - fribidi:libfribidi glslang:libglslang ladspa lcms:lcms2 libass libplacebo - libtesseract lv2 rubberband:librubberband shaderc:libshaderc truetype:libfreetype - truetype:libharfbuzz vidstab:libvidstab vmaf:libvmaf zeromq:libzmq zimg:libzimg - # libswresample options - libsoxr - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) -
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 4f5e8b8ccdc61100fd65af5f97cf484e6db7a7b9 Author: Sam James gentoo org> AuthorDate: Mon Mar 4 11:12:36 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 4 11:12:36 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f5e8b8c media-video/ffmpeg: Stabilize 6.0.1-r3 ppc64, #926151 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild index 53a0404e..bbab07d8a475 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 7632bad875fd6c0282e131161c47116569a0281e Author: Sam James gentoo org> AuthorDate: Mon Mar 4 11:12:37 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 4 11:12:37 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7632bad8 media-video/ffmpeg: Stabilize 6.0.1-r3 ppc, #926151 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild index bbab07d8a475..e5b640360a6e 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/
commit: 4e4da320675b49841b4e7f477a6efe3c0413f674 Author: Sam James gentoo org> AuthorDate: Thu Feb 29 05:42:04 2024 + Commit: Sam James gentoo org> CommitDate: Thu Feb 29 05:44:22 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e4da320 media-video/ffmpeg: fix crash when CPU_FLAGS_x86 and CFLAGS disagree When CPU_FLAGS_X86 was set to the default for amd64 and CFLAGS was higher with e.g. -march=native including AVX, we could get crashes because we disable intrinsics which would otherwise adjust the alignment ffmpeg requests. Backport an upstream patch for more sensible behaviour. Note that the upstream patch doesn't apply to 4.4.x but I haven't tried to backport it manually. Someone is welcome to, but 4.4.x should really be on its way out by now. Bug: https://trac.ffmpeg.org/ticket/10549 Bug: https://bugs.gentoo.org/915384 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild | 607 media-video/ffmpeg/ffmpeg-6.1.1-r4.ebuild | 614 + .../ffmpeg/files/ffmpeg-6.0.1-alignment.patch | 114 3 files changed, 1335 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild new file mode 100644 index ..53a0404e --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r3.ebuild @@ -0,0 +1,607 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=58.60.60 + +SCM="" +if [ "${PV#}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; +fi + +inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/; +if [ "${PV#}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.xz" +else # Release + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc + inherit verify-sig + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; + SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" + + BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) + amr? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + gmp? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + libaribb24? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + encode? ( + amrenc? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + ) + samba? ( GPL-3 ) +" +if [ "${PV#}" = "${PV}" ] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +fi + +# 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=( + +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl + openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan + X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib + # libavdevice options + cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal + opengl + # indevs + libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack + # decoders + amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac + jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm + libaribb24 mmal modplug:libmodplug opus:libopus qsv:libvpl libilbc librtmp ssh:libssh + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec + vorbis:libvorbis vpx:libvpx zvbi:libzvbi +
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 8b4661e4909f4361a2af0caaa172092502a61335 Author: James Le Cuirot gentoo org> AuthorDate: Wed Feb 21 23:29:17 2024 + Commit: James Le Cuirot gentoo org> CommitDate: Wed Feb 21 23:29:17 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b4661e4 media-video/ffmpeg: Fix tests with USE=soc and check patch with verify-sig I will sign the patch myself so that it can be checked against openpgp-keys-gentoo-developers. I had originally allowed for more than one USE=soc patch, but let's just assume one now for simplicity. Closes: https://bugs.gentoo.org/924986 Closes: https://bugs.gentoo.org/925094 Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg/Manifest | 3 ++- media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild | 34 +++ media-video/ffmpeg/ffmpeg-.ebuild | 34 +++ 3 files changed, 52 insertions(+), 19 deletions(-) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index c0a923653788..d370d825a43e 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -7,4 +7,5 @@ DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5ab DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012d82dc7aa1a83d5fe6d5453bd3c8620fdfb743df780cf588983a06a66a458c4e3e454dbe535cbba9da30c48c SHA512 a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370fe23501169cb1eab08ff5ede77cfd5b397e8fb1d38756812cc82277898fd5c74b7d8495842556570c0c5570daeb SHA512 fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5 DIST ffmpeg-6.1.1.tar.xz.asc 520 BLAKE2B 801cd976d10363d1f9fc302351b330cb57e609a266407627ef378172f28974f4a18435b8a77b9cc7a8ff7b75701185211739f685629bbda961c3588c15af1221 SHA512 0e10c1f560bab0812d759d286656593dea5940f02bb52d88d9ba7f10b12b9cc3d7aa2a41c5f7a45b319069e04dce22dc1286b3c1ba685b35cd6d04cd81c5a0f5 -DIST ffmpeg-rpi-6.1-r2.patch 797985 BLAKE2B 0678a2439361897698c6dd3d878a4d798ce1e45d3f117489882114e6b227a99ad97e9bf5a655daf051ee587afb161ca37f869c03a9585f3fc2ef6d58938f4323 SHA512 821126b311130ed408367765854d7e856767a25aef5acfc5e87cd86aef81b5a6c86135d371a0d740a1305718da43ed98ec9851ade2e33f7cdd09425cfa5b +DIST ffmpeg-rpi-6.1-r3.patch 800738 BLAKE2B b7e449ee5eec8b50a3b3bba233c5269f3b6845dbd18a619b844c841a97345ce24c7a5d7f4da05b08e3cb49668426b9044f3d3553d9c2ef3a50aec7199bfa3c09 SHA512 aeaf12afabf5f2192fb0b6ef47397d8477b109e49cee8c02a890d1656a27b1985c62c719ef72966d8c97b0709918233b65ea2e0ef988771507e4be137fcd9158 +DIST ffmpeg-rpi-6.1-r3.patch.asc 833 BLAKE2B 31fd5823c06d5884f7b0980de9072c35bbf4e1d6c0ed20b089439325d50956127238ca29469b003dba623b888a5aae3c4d8ad177862534e77b8e51f29cbed96c SHA512 3d8943b7151e20f73e9c14b121c501847bd7e01f2cf57ff135fc8c223653ec9d433bfe4012fa564f70c0471980b66d7ec3d9b5b1b14865187187719ba110cb5f diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild index 888e0620aa5c..596ee769ea0d 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild @@ -14,9 +14,7 @@ EAPI=8 # doing so since such a case is unlikely. FFMPEG_SUBSLOT=58.60.60 -SOC_PATCHES=( - ffmpeg-rpi-6.1-r2.patch -) +SOC_PATCH="ffmpeg-rpi-6.1-r3.patch" SCM="" if [ "${PV#}" != "${PV}" ] ; then @@ -29,18 +27,36 @@ inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" HOMEPAGE="https://ffmpeg.org/; -SRC_URI="soc? ( "${SOC_PATCHES[@]/#/https://dev.gentoo.org/~chewi/distfiles/}; )" +SRC_URI="soc? ( https://dev.gentoo.org/~chewi/distfiles/${SOC_PATCH} )" if [ "${PV#}" != "${PV}" ] ; then : elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot SRC_URI+=" mirror://gentoo/${P}.tar.xz" else # Release - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc inherit verify-sig - SRC_URI+=" https://ffmpeg.org/releases/${P/_/-}.tar.xz; - SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" - BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" + SRC_URI+=" + https://ffmpeg.org/releases/${P/_/-}.tar.xz + verify-sig? ( + https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc + soc? ( https://dev.gentoo.org/~chewi/distfiles/${SOC_PATCH}.asc ) + ) + " + + BDEPEND=" + verify-sig? ( + sec-keys/openpgp-keys-ffmpeg + soc? ( sec-keys/openpgp-keys-gentoo-developers ) + ) + " + + src_unpack() { + if use verify-sig;
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 86d153ff4a1d965671cb49f2e1c5b172cf932c05 Author: James Le Cuirot gentoo org> AuthorDate: Sun Feb 18 09:25:37 2024 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Feb 18 09:26:33 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86d153ff media-video/ffmpeg: Fix musl build with new RPi patch Closes: https://bugs.gentoo.org/924818 Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg/Manifest | 2 +- media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild | 2 +- media-video/ffmpeg/ffmpeg-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 46e2ae80d0e7..c0a923653788 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -7,4 +7,4 @@ DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5ab DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012d82dc7aa1a83d5fe6d5453bd3c8620fdfb743df780cf588983a06a66a458c4e3e454dbe535cbba9da30c48c SHA512 a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370fe23501169cb1eab08ff5ede77cfd5b397e8fb1d38756812cc82277898fd5c74b7d8495842556570c0c5570daeb SHA512 fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5 DIST ffmpeg-6.1.1.tar.xz.asc 520 BLAKE2B 801cd976d10363d1f9fc302351b330cb57e609a266407627ef378172f28974f4a18435b8a77b9cc7a8ff7b75701185211739f685629bbda961c3588c15af1221 SHA512 0e10c1f560bab0812d759d286656593dea5940f02bb52d88d9ba7f10b12b9cc3d7aa2a41c5f7a45b319069e04dce22dc1286b3c1ba685b35cd6d04cd81c5a0f5 -DIST ffmpeg-rpi-6.1-r1.patch 797961 BLAKE2B 7da7ed15098af72e1e5e659b8ce23f5f83583798ea21f1e8c968d26de660a911dd114381948885760e8192002023d1c837296e712baac34f1422e02b599c5f5b SHA512 098f111d2c83e2642b53cd69378bbcb24d6f85d3bcf75f474f87cf45b5b97eb240b16960ab981a516b14b0ba3ff51075e527fe66d792d1677c6f78d608c982c0 +DIST ffmpeg-rpi-6.1-r2.patch 797985 BLAKE2B 0678a2439361897698c6dd3d878a4d798ce1e45d3f117489882114e6b227a99ad97e9bf5a655daf051ee587afb161ca37f869c03a9585f3fc2ef6d58938f4323 SHA512 821126b311130ed408367765854d7e856767a25aef5acfc5e87cd86aef81b5a6c86135d371a0d740a1305718da43ed98ec9851ade2e33f7cdd09425cfa5b diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild index 62ce17b2fbd3..888e0620aa5c 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild @@ -15,7 +15,7 @@ EAPI=8 FFMPEG_SUBSLOT=58.60.60 SOC_PATCHES=( - ffmpeg-rpi-6.1-r1.patch + ffmpeg-rpi-6.1-r2.patch ) SCM="" diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-.ebuild index 623a4e57eb4d..db1b3604cfde 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-.ebuild @@ -15,7 +15,7 @@ EAPI=8 FFMPEG_SUBSLOT=58.60.60 SOC_PATCHES=( - ffmpeg-rpi-6.1-r1.patch + ffmpeg-rpi-6.1-r2.patch ) SCM=""
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/
commit: ebf0a62268c4b27ffd37234cc8ed9e6054e0053c Author: James Le Cuirot gentoo org> AuthorDate: Sat Feb 17 14:51:49 2024 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Feb 17 14:52:56 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf0a622 media-video/ffmpeg: Fix Clang and GCC 14 issues with new RPi patch Closes: https://bugs.gentoo.org/924558 Closes: https://bugs.gentoo.org/924743 Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg/Manifest | 2 +- media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild| 3 ++- media-video/ffmpeg/ffmpeg-.ebuild| 2 +- media-video/ffmpeg/files/ffmpeg-6.1-gcc-14.patch | 13 + 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 4175fef70c6f..46e2ae80d0e7 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -7,4 +7,4 @@ DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5ab DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012d82dc7aa1a83d5fe6d5453bd3c8620fdfb743df780cf588983a06a66a458c4e3e454dbe535cbba9da30c48c SHA512 a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370fe23501169cb1eab08ff5ede77cfd5b397e8fb1d38756812cc82277898fd5c74b7d8495842556570c0c5570daeb SHA512 fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5 DIST ffmpeg-6.1.1.tar.xz.asc 520 BLAKE2B 801cd976d10363d1f9fc302351b330cb57e609a266407627ef378172f28974f4a18435b8a77b9cc7a8ff7b75701185211739f685629bbda961c3588c15af1221 SHA512 0e10c1f560bab0812d759d286656593dea5940f02bb52d88d9ba7f10b12b9cc3d7aa2a41c5f7a45b319069e04dce22dc1286b3c1ba685b35cd6d04cd81c5a0f5 -DIST ffmpeg-rpi-6.1.patch 1356823 BLAKE2B 094404eac6d1e43ac094634fa662ce312807013b8af3f80ced03b3d85f2547f803c71181b567c4db2756b2ea54b9bbaf7516a1f72a389d0889c2531edd177275 SHA512 7bdb857146d01ac54ce23c0b2bf32f0255419af52217aed873036cdc82678c3c7ac0e9557ed316fd316faf41c011778bcec277cc4de4d3b7fd9f5eab4078da69 +DIST ffmpeg-rpi-6.1-r1.patch 797961 BLAKE2B 7da7ed15098af72e1e5e659b8ce23f5f83583798ea21f1e8c968d26de660a911dd114381948885760e8192002023d1c837296e712baac34f1422e02b599c5f5b SHA512 098f111d2c83e2642b53cd69378bbcb24d6f85d3bcf75f474f87cf45b5b97eb240b16960ab981a516b14b0ba3ff51075e527fe66d792d1677c6f78d608c982c0 diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild index f512e9d9ac81..62ce17b2fbd3 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild @@ -15,7 +15,7 @@ EAPI=8 FFMPEG_SUBSLOT=58.60.60 SOC_PATCHES=( - ffmpeg-rpi-6.1.patch + ffmpeg-rpi-6.1-r1.patch ) SCM="" @@ -363,6 +363,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.1-wint-conversion.patch "${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch + "${FILESDIR}"/${PN}-6.1-gcc-14.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-.ebuild index b5e32f2c8f88..623a4e57eb4d 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-.ebuild @@ -15,7 +15,7 @@ EAPI=8 FFMPEG_SUBSLOT=58.60.60 SOC_PATCHES=( - ffmpeg-rpi-6.1.patch + ffmpeg-rpi-6.1-r1.patch ) SCM="" diff --git a/media-video/ffmpeg/files/ffmpeg-6.1-gcc-14.patch b/media-video/ffmpeg/files/ffmpeg-6.1-gcc-14.patch new file mode 100644 index ..0db7301f18d9 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-6.1-gcc-14.patch @@ -0,0 +1,13 @@ +diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c +index 29fc8bd648..1f85fac7f4 100644 +--- a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c +@@ -1203,7 +1203,7 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst, + + if (!use_prime2 || vas != VA_STATUS_SUCCESS) { + int k; +-unsigned long buffer_handle; ++uintptr_t buffer_handle; + VASurfaceAttribExternalBuffers buffer_desc; + VASurfaceAttrib buffer_attrs[2] = { + {
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 972c8c59a5a8d6516fea191631db251289267568 Author: James Le Cuirot gentoo org> AuthorDate: Sun Feb 11 22:14:17 2024 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Feb 13 21:12:01 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972c8c59 media-video/ffmpeg: Make ebuild uniform by adding soc USE flag This makes maintenance easier. It will likely break due to the Raspberry Pi patch set being very heavy, so I have already masked the flag against . Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg/ffmpeg-.ebuild | 21 + 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-.ebuild index e79ef6ab48eb..b5e32f2c8f88 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-.ebuild @@ -14,6 +14,10 @@ EAPI=8 # doing so since such a case is unlikely. FFMPEG_SUBSLOT=58.60.60 +SOC_PATCHES=( + ffmpeg-rpi-6.1.patch +) + SCM="" if [ "${PV#}" != "${PV}" ] ; then SCM="git-r3" @@ -25,14 +29,15 @@ inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" HOMEPAGE="https://ffmpeg.org/; +SRC_URI="soc? ( "${SOC_PATCHES[@]/#/https://dev.gentoo.org/~chewi/distfiles/}; )" if [ "${PV#}" != "${PV}" ] ; then - SRC_URI="" + : elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.xz" + SRC_URI+=" mirror://gentoo/${P}.tar.xz" else # Release VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc inherit verify-sig - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; + SRC_URI+=" https://ffmpeg.org/releases/${P/_/-}.tar.xz; SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" @@ -108,7 +113,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss +pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l soc ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " @@ -263,6 +268,7 @@ RDEPEND=" sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] ) sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) + soc? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] ) ssh? ( >=net-libs/libssh-0.6.0:=[sftp,${MULTILIB_USEDEP}] ) @@ -341,6 +347,7 @@ REQUIRED_USE=" glslang? ( vulkan !shaderc ) libv4l? ( v4l ) shaderc? ( vulkan !glslang ) + soc? ( libdrm ) test? ( encode ) ${GPL_REQUIRED_USE} ${CPU_REQUIRED_USE}" @@ -379,6 +386,9 @@ src_prepare() { export revision=git-N-${FFMPEG_REVISION} fi + use soc && + eapply "${SOC_PATCHES[@]/#/${DISTDIR}/}" + default # -fdiagnostics-color=auto gets appended after user flags which @@ -392,6 +402,9 @@ src_prepare() { multilib_src_configure() { local myconf=( ) + # Conditional patch options + use soc && myconf+=( --enable-v4l2-request --enable-libudev --enable-sand ) + # bug 842201 use ia64 && tc-is-gcc && append-flags \ -fno-tree-ccp \
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 2e0e7b01a0c127d0b15a50ae27c6af9b9fb63c8f Author: James Le Cuirot gentoo org> AuthorDate: Sat Dec 16 17:45:32 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Feb 10 21:23:14 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e0e7b01 media-video/ffmpeg: Conditionally apply patch set for playback on SoCs As much as we hate deviating from upstream, this patch set is really important for smooth playback on SoCs commonly used for ARM and RISC-V, including the Raspberry Pi. We will enable the "soc" USE flag by default on these architectures. These are different patch sets floating around, but this one from John Cox of Kynesim is the most comprehensive. It is the only one that enables smooth playback for the Pi under Kodi, while benefiting other systems at the same time. John keeps the set reasonably in sync with upstream. The road is long, but the hope is that the changes will eventually be upstreamed. Note that LibreELEC only applies this patch set specifically for its Pi builds, while using lighter sets for some other builds, but they have told me that if we're only going to use one set then this is the one to have. Following this, also drop legacy Raspberry Pi support as media-libs/raspberrypi-userland is being last-rited. Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg/Manifest| 1 + .../{ffmpeg-.ebuild => ffmpeg-6.1.1-r3.ebuild} | 28 -- media-video/ffmpeg/ffmpeg-.ebuild | 3 +-- media-video/ffmpeg/metadata.xml| 6 + 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 1aa25cb51598..4175fef70c6f 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -7,3 +7,4 @@ DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5ab DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012d82dc7aa1a83d5fe6d5453bd3c8620fdfb743df780cf588983a06a66a458c4e3e454dbe535cbba9da30c48c SHA512 a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370fe23501169cb1eab08ff5ede77cfd5b397e8fb1d38756812cc82277898fd5c74b7d8495842556570c0c5570daeb SHA512 fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5 DIST ffmpeg-6.1.1.tar.xz.asc 520 BLAKE2B 801cd976d10363d1f9fc302351b330cb57e609a266407627ef378172f28974f4a18435b8a77b9cc7a8ff7b75701185211739f685629bbda961c3588c15af1221 SHA512 0e10c1f560bab0812d759d286656593dea5940f02bb52d88d9ba7f10b12b9cc3d7aa2a41c5f7a45b319069e04dce22dc1286b3c1ba685b35cd6d04cd81c5a0f5 +DIST ffmpeg-rpi-6.1.patch 1356823 BLAKE2B 094404eac6d1e43ac094634fa662ce312807013b8af3f80ced03b3d85f2547f803c71181b567c4db2756b2ea54b9bbaf7516a1f72a389d0889c2531edd177275 SHA512 7bdb857146d01ac54ce23c0b2bf32f0255419af52217aed873036cdc82678c3c7ac0e9557ed316fd316faf41c011778bcec277cc4de4d3b7fd9f5eab4078da69 diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild similarity index 95% copy from media-video/ffmpeg/ffmpeg-.ebuild copy to media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild index 461eb1559ef2..f512e9d9ac81 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild @@ -14,6 +14,10 @@ EAPI=8 # doing so since such a case is unlikely. FFMPEG_SUBSLOT=58.60.60 +SOC_PATCHES=( + ffmpeg-rpi-6.1.patch +) + SCM="" if [ "${PV#}" != "${PV}" ] ; then SCM="git-r3" @@ -25,14 +29,15 @@ inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" HOMEPAGE="https://ffmpeg.org/; +SRC_URI="soc? ( "${SOC_PATCHES[@]/#/https://dev.gentoo.org/~chewi/distfiles/}; )" if [ "${PV#}" != "${PV}" ] ; then - SRC_URI="" + : elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.xz" + SRC_URI+=" mirror://gentoo/${P}.tar.xz" else # Release VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc inherit verify-sig - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; + SRC_URI+=" https://ffmpeg.org/releases/${P/_/-}.tar.xz; SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" @@ -84,7 +89,7 @@ FFMPEG_FLAG_MAP=( # decoders amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm - libaribb24 mmal modplug:libmodplug opus:libopus qsv:libvpl
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/
commit: 9996461ea1e5f7d6dd741d3ebed5ee98597e7024 Author: James Le Cuirot gentoo org> AuthorDate: Sat Feb 10 17:52:06 2024 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Feb 10 17:53:25 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9996461e media-video/ffmpeg-chromium: Version bump to 121 Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg-chromium/Manifest | 1 + .../ffmpeg-chromium/ffmpeg-chromium-121.ebuild | 250 + 2 files changed, 251 insertions(+) diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest index 3798d6bde713..02eec2054858 100644 --- a/media-video/ffmpeg-chromium/Manifest +++ b/media-video/ffmpeg-chromium/Manifest @@ -1 +1,2 @@ DIST ffmpeg-chromium-120.tar.xz 10096036 BLAKE2B 8f24dfed854c713df369e6ef15bc773a3166fdf6eb8c90bcb1d1b7aca0702df7615bc323432a40b5d213352945fa49acf8e864df2caa358764b5068a75f3 SHA512 0e0bfb44225981f91edceeb6f302592a7e108da49c5e6503b43f0e12b91d84dece908efe5e548bb31ccab49c5fba5a8365f5f0793bbf1450d35bfd836f8a3e9b +DIST ffmpeg-chromium-121.tar.xz 10128048 BLAKE2B ba8e25356b7e0820dffea1b919288ddb3d6ec56fe8d17493529ec978deae629607ff5a5857a313e478193a1fca55fa3e5256e37d57251141e1f0a892cbdcf674 SHA512 e6cef1285237673ce5851cbddf4cda9821c247a120bf73af2b931745b2886c915a35bb2bc21a8a9c5154be9e540f8abccc3bb64e704f5b859141d0dcc2e1 diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild new file mode 100644 index ..3bb780532c13 --- /dev/null +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild @@ -0,0 +1,250 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +COMMIT="3997177624f6b302bbc8a7edbb6f8a6ab47ea978" +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 + 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 + cpu_flags_arm_asimddp:dotprod + cpu_flags_arm_i8mm:i8mm +) +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_vfp + arm? ( cpu_flags_arm_thumb2 ) + ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( + arm? ( 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=" +
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/
commit: 9885b8a284f8e7ca8f9bd758bf9f495ddf923aaf Author: Sam James gentoo org> AuthorDate: Tue Feb 6 04:01:03 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 6 04:01:03 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9885b8a2 media-video/ffmpeg: drop 6.1-r4 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/Manifest| 2 - media-video/ffmpeg/ffmpeg-6.1-r4.ebuild| 589 - ...-Use-av_mallocz-to-avoid-invalid-free-uni.patch | 54 -- ...coded-fft-Fix-memory-leak-if-ctx2-is-used.patch | 26 - ...ode-validate-hw_frames_ctx-when-AVHWAccel.patch | 64 --- ...enc-only-check-canvas-size-when-it-is-act.patch | 31 -- ...le-build-vulkan-decode-code-if-vulkan_av1.patch | 31 -- ...6-hwcontext_vulkan-guard-unistd.h-include.patch | 33 -- 8 files changed, 830 deletions(-) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index c2054eb5009c..43c6764a4783 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -9,5 +9,3 @@ DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5ab DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012d82dc7aa1a83d5fe6d5453bd3c8620fdfb743df780cf588983a06a66a458c4e3e454dbe535cbba9da30c48c SHA512 a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370fe23501169cb1eab08ff5ede77cfd5b397e8fb1d38756812cc82277898fd5c74b7d8495842556570c0c5570daeb SHA512 fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5 DIST ffmpeg-6.1.1.tar.xz.asc 520 BLAKE2B 801cd976d10363d1f9fc302351b330cb57e609a266407627ef378172f28974f4a18435b8a77b9cc7a8ff7b75701185211739f685629bbda961c3588c15af1221 SHA512 0e10c1f560bab0812d759d286656593dea5940f02bb52d88d9ba7f10b12b9cc3d7aa2a41c5f7a45b319069e04dce22dc1286b3c1ba685b35cd6d04cd81c5a0f5 -DIST ffmpeg-6.1.tar.xz 10455956 BLAKE2B 5eaee0e0f72139e3b018e6ee26a102c7d6881ec8e7a70b21c51e4a515a37396ae12f19185112bb3f8b3401b85e68c08435146a83470e07ffb571d3d9bca89289 SHA512 72f47924806b9b128672bd268aa2c8fc2c9b8491899a772b6f82421daa2b67de45a4bdd71f6071825814e599a73adb1e42682e202a12fc055e9a224c7d5baa4a -DIST ffmpeg-6.1.tar.xz.asc 520 BLAKE2B 774ba20a8ad3d786368c7e6928ee0976cd943756f24e3f076dc0cc92fc0069637f0a9a92e3c5238c74148330385d040118d3c5f9af6b267d572283b8de83b286 SHA512 e4885270869cc6a1681bc3f76f344f77c4858c490a517e45a758d15214ce67c3c2113a1caa8ca65eb6447b68d822fa1dd730081345bcc0928faaf82bb76037ba diff --git a/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild deleted file mode 100644 index d462f165ce84.. --- a/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild +++ /dev/null @@ -1,589 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Subslot: libavutil major.libavcodec major.libavformat major -# Since FFmpeg ships several libraries, subslot is kind of limited here. -# Most consumers will use those three libraries, if a "less used" library -# changes its soname, consumers will have to be rebuilt the old way -# (preserve-libs). -# If, for example, a package does not link to libavformat and only libavformat -# changes its ABI then this package will be rebuilt needlessly. Hence, such a -# package is free _not_ to := depend on FFmpeg but I would strongly encourage -# doing so since such a case is unlikely. -FFMPEG_SUBSLOT=58.60.60 - -SCM="" -if [ "${PV#}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_MIN_CLONE_TYPE="single" - EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; -fi - -inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" -HOMEPAGE="https://ffmpeg.org/; -if [ "${PV#}" != "${PV}" ] ; then - SRC_URI="" -elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.xz" -else # Release - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc - inherit verify-sig - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; - SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" - - BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" -fi -FFMPEG_REVISION="${PV#*_p}" - -SLOT="0/${FFMPEG_SUBSLOT}" -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) - amr? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - gmp? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - libaribb24? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - encode? ( - amrenc? ( -
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 0cb1ca9363e762cc0ffc49465eb8c4bcb4120e45 Author: Sam James gentoo org> AuthorDate: Tue Feb 6 04:01:27 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 6 04:01:27 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb1ca93 media-video/ffmpeg: drop 5.1.4-r2 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/Manifest | 2 - media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild | 609 -- 2 files changed, 611 deletions(-) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 43c6764a4783..1aa25cb51598 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,8 +1,6 @@ DIST ffmpeg-4.4.4-texinfo.patch.xz 19136 BLAKE2B 591b46180fccdb58c5b6b102c5e12075ff4388dc6bc0ab1752531d4f9f2802c1fd09ed1353ed70a539fdc5c2298f9cfc84ec24e3a04d371ef0d9f3f30d8e8f38 SHA512 f86a324efe261801a5192d4f204f48de581466550cca49b54432fdf5430f1b3bc9a9d31b9b52e2f23481def67ad55b5ad315752c482709aa67b1f3a3e6c17a4f DIST ffmpeg-4.4.4.tar.xz 9565584 BLAKE2B 8cd76a91ae6e485e56c6e5ae7b31d678e2fc2d634b1c56240619a4b6924dae4ec7adb445932bf4455f409dbc03fdc6d52b4fc270da55393e329ccd3d129f5770 SHA512 253799eccd129dad331db85def5352178ae22303e42af47fc013a6adfd4b60d1e59ff5f9ac6118fe3b403affa56ea1f3ba658042f526a914fba27050c3065daf DIST ffmpeg-4.4.4.tar.xz.asc 520 BLAKE2B c8bf944883e37b6dd69029fe863c23f68a3584d84aa3e9c4278ae45aee0bfa3697cc1d8a768b95a1ebd7a9cb91553671072f88f46f6a9c947faa74344a44 SHA512 47afa042d8b529d0bfce391455a25cda261f39f8510601d7de2aba6398483ecb623992626e8489aa2a636e3cb93008f26b32080e526143254226d4e2651accea -DIST ffmpeg-5.1.4.tar.xz 10009968 BLAKE2B 3e632e6de23a8dd0a75b01910e9a642840f06dc3eba4cd015b729889f785b98d1fdb4e43b8e8a2e9ea69c8fa686f6fcc9f5785837a9f32ccd8d69331d408a99a SHA512 7d7fe8c660a62971a979553a864648d5c859059d3e64d4d32e4f5dca6fd4374270abdeec2dd782c34b2254e7485995c3fe0c1dcef54159e30536eab7f20e0795 -DIST ffmpeg-5.1.4.tar.xz.asc 520 BLAKE2B 5d391b77341a3da9bd5654be4eb688c3d8bc31b41075630bf17f6422d5a0b4cecdb2ebf8ee2e1bf82f6ecaaa07b00c29a9347cca57e9d278900d05b38de20484 SHA512 f161815d47c988f8b6281a95f22301d07a22ddc41a2a84bfc126b4d7de0e9175da499c2cc15b3bdaa415af0e8ed1d2b4d52096a81b4a3d804effb00ff9e8ec5b DIST ffmpeg-6.0.1.tar.xz 10240172 BLAKE2B 1e21862f1f4eac04b8e9ef5597853d9e105bac4e858960c07e244ec3dbcea8f9e9fbdec4ff20b64227afad5ea5d0b05eff79a905f8002314ab4e9c37116c1908 SHA512 8a86b2db4a9abb68bb86d770ba1babb76c8b8313cfb0258ae70c88e736a93b99c342a6ecda94b739e8e7c103bed75d4afd756dd94e08c6255f424ef62c264741 DIST ffmpeg-6.0.1.tar.xz.asc 520 BLAKE2B dc7222c7c55e9af28c54dcfae4fce33fb44aa2a7e9d2ca4af85a961568b67f63116a6597234cd7ce009669b8ecf6576defd9380c389356435ffc3026b1126f03 SHA512 314f9ef996b85bc93c9fb823d582697c7415ac35f56bfc9cd906893491c8076df90bd852cf6e5e757b1fa94bd415ed108488c1220add49eb1f4854fc253c178c DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5abe7f1d7fa797d05e29e00971f98cbf37832c1c3dc5fa949a5beddef05a6ec55ae6668091976ea870ad93c0e8d SHA512 4d0e8f635d5a1633710f30cb3e0a854b6ca3bf85e33a289d1ec7aca2ad55dc4910010bc9cf3f13eee9f6decb9d50a0df6d7aa5a342f308c3868d2730f3a6b980 diff --git a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild deleted file mode 100644 index 698c9e33af5d.. --- a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild +++ /dev/null @@ -1,609 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Subslot: libavutil major.libavcodec major.libavformat major -# Since FFmpeg ships several libraries, subslot is kind of limited here. -# Most consumers will use those three libraries, if a "less used" library -# changes its soname, consumers will have to be rebuilt the old way -# (preserve-libs). -# If, for example, a package does not link to libavformat and only libavformat -# changes its ABI then this package will be rebuilt needlessly. Hence, such a -# package is free _not_ to := depend on FFmpeg but I would strongly encourage -# doing so since such a case is unlikely. -FFMPEG_SUBSLOT=57.59.59 - -SCM="" -if [ "${PV#}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_MIN_CLONE_TYPE="single" - EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; -fi - -inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" -HOMEPAGE="https://ffmpeg.org/; -if [ "${PV#}" != "${PV}" ] ; then - SRC_URI="" -elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.xz" -else # Release - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc - inherit verify-sig - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; - SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" - - BDEPEND=" verify-sig? (
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: f746dc8e0762bed9352bcb6a1f5989624712aeec Author: Sam James gentoo org> AuthorDate: Tue Feb 6 03:47:37 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 6 03:47:37 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f746dc8e media-video/ffmpeg: drop 6.0-r9 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r9.ebuild | 605 1 file changed, 605 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild deleted file mode 100644 index 9831ab3e47c5.. --- a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild +++ /dev/null @@ -1,605 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Subslot: libavutil major.libavcodec major.libavformat major -# Since FFmpeg ships several libraries, subslot is kind of limited here. -# Most consumers will use those three libraries, if a "less used" library -# changes its soname, consumers will have to be rebuilt the old way -# (preserve-libs). -# If, for example, a package does not link to libavformat and only libavformat -# changes its ABI then this package will be rebuilt needlessly. Hence, such a -# package is free _not_ to := depend on FFmpeg but I would strongly encourage -# doing so since such a case is unlikely. -FFMPEG_SUBSLOT=58.60.60 - -SCM="" -if [ "${PV#}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_MIN_CLONE_TYPE="single" - EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; -fi - -inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" -HOMEPAGE="https://ffmpeg.org/; -if [ "${PV#}" != "${PV}" ] ; then - SRC_URI="" -elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.xz" -else # Release - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc - inherit verify-sig - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; - SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" - - BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" -fi -FFMPEG_REVISION="${PV#*_p}" - -SLOT="0/${FFMPEG_SUBSLOT}" -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) - amr? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - gmp? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - libaribb24? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - encode? ( - amrenc? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - ) - samba? ( GPL-3 ) -" -if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" -fi - -# 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=( - +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp - +gpl hardcoded-tables +iconv libxml2 lzma +network opencl - openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan - X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib - # libavdevice options - cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal - opengl - # indevs - libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack - # decoders - amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac - jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm - libaribb24 mmal modplug:libmodplug opus:libopus qsv:libvpl libilbc librtmp ssh:libssh - speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec - vorbis:libvorbis vpx:libvpx zvbi:libzvbi - # libavfilter options - appkit - bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf - fribidi:libfribidi fontconfig ladspa lcms:lcms2 libass libplacebo libtesseract lv2 - truetype:libfreetype vidstab:libvidstab - rubberband:librubberband zeromq:libzmq zimg:libzimg - # libswresample options - libsoxr - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -# Same as above but for encoders, i.e. they do something only with USE=encode. -FFMPEG_ENCODER_FLAG_MAP=( - amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/
commit: c8e68487530e6ef184d02dfa14e4b4b358c122a4 Author: Sam James gentoo org> AuthorDate: Tue Feb 6 03:51:16 2024 + Commit: Sam James gentoo org> CommitDate: Tue Feb 6 03:58:41 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e68487 media-video/ffmpeg: fix parallel build w/ USE=opencl Closes: https://bugs.gentoo.org/782553 Thanks-to: Peter Levine gmail.com> Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 1 + media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild | 1 + media-video/ffmpeg/ffmpeg-6.0-r11.ebuild| 1 + media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild | 1 + media-video/ffmpeg/ffmpeg-6.1-r4.ebuild | 1 + media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild | 1 + media-video/ffmpeg/ffmpeg-.ebuild | 1 + .../files/ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch | 13 + .../ffmpeg/files/ffmpeg-6.1-opencl-parallel-gmake-fix.patch | 13 + 9 files changed, 33 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index e17af76cfa74..00d867dd517c 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -348,6 +348,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.4.4-wint-conversion-vulkan.patch "${FILESDIR}"/${P}-fix-build-svt-av1-1.5.0.patch "${FILESDIR}"/${PN}-5.1.3-binutils-2.41.patch + "${FILESDIR}"/${PN}-4.4.4-opencl-parallel-gmake-fix.patch "${WORKDIR}"/${PN}-4.4.4-texinfo.patch ) diff --git a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild index 5fc9eca96bfd..698c9e33af5d 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild @@ -349,6 +349,7 @@ PATCHES=( "${FILESDIR}"/chromium-r1.patch "${FILESDIR}"/${PN}-5.1.2-get_cabac_inline_x86-32-bit.patch "${FILESDIR}"/${PN}-6.0-libplacebo-remove-deprecated-field.patch + "${FILESDIR}"/${PN}-4.4.4-opencl-parallel-gmake-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild index 6d75a5d847db..3599c9b0aee6 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild @@ -348,6 +348,7 @@ PATCHES=( "${FILESDIR}"/${P}-wint-conversion-vulkan.patch "${FILESDIR}"/${P}-libplacebo-remove-deprecated-field.patch "${FILESDIR}"/${P}-binutils-2.41.patch + "${FILESDIR}"/${PN}-4.4.4-opencl-parallel-gmake-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild index 188b14013a42..675c19801444 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild @@ -346,6 +346,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.1.2-get_cabac_inline_x86-32-bit.patch "${FILESDIR}"/${PN}-6.0-libplacebo-remove-deprecated-field.patch "${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch + "${FILESDIR}"/${PN}-4.4.4-opencl-parallel-gmake-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild index d3edaba40eb7..d462f165ce84 100644 --- a/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild @@ -359,6 +359,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.1-0004-lavc-dvdsubenc-only-check-canvas-size-when-it-is-act.patch "${FILESDIR}"/${PN}-6.1-0005-lavc-Makefile-build-vulkan-decode-code-if-vulkan_av1.patch "${FILESDIR}"/${PN}-6.1-0006-hwcontext_vulkan-guard-unistd.h-include.patch + "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild index 4d42b25f4162..d82fd894afc1 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild @@ -356,6 +356,7 @@ PATCHES=( "${FILESDIR}"/chromium-r2.patch "${FILESDIR}"/${PN}-6.1-wint-conversion.patch "${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch + "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-.ebuild index 0b4ac4354fb6..461eb1559ef2 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-.ebuild @@ -354,6 +354,7 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r2.patch + "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/
commit: 38d66d124c45525244dfeb7b994efda5e480549b Author: Alfred Wingate protonmail com> AuthorDate: Wed Jan 24 10:19:15 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jan 24 10:57:53 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d66d12 media-video/ffmpeg: add patch for fixing lto-type-mismatch Bug: https://bugs.gentoo.org/907484 Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/34986 Signed-off-by: Sam James gentoo.org> ...mpeg-6.0.1-r1.ebuild => ffmpeg-6.0.1-r2.ebuild} | 1 + ...mpeg-6.1.1-r1.ebuild => ffmpeg-6.1.1-r2.ebuild} | 1 + .../files/ffmpeg-6.0-fix-lto-type-mismatch.patch | 41 ++ 3 files changed, 43 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild rename to media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild index 654f768272b2..188b14013a42 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild @@ -345,6 +345,7 @@ PATCHES=( "${FILESDIR}"/chromium-r1.patch "${FILESDIR}"/${PN}-5.1.2-get_cabac_inline_x86-32-bit.patch "${FILESDIR}"/${PN}-6.0-libplacebo-remove-deprecated-field.patch + "${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild rename to media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild index 73cdd4b40c76..4d42b25f4162 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild @@ -355,6 +355,7 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r2.patch "${FILESDIR}"/${PN}-6.1-wint-conversion.patch + "${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-fix-lto-type-mismatch.patch b/media-video/ffmpeg/files/ffmpeg-6.0-fix-lto-type-mismatch.patch new file mode 100644 index ..9cc2dd732016 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-6.0-fix-lto-type-mismatch.patch @@ -0,0 +1,41 @@ +https://ffmpeg.org//pipermail/ffmpeg-devel/2023-November/317055.html +https://bugs.gentoo.org/907484 + +From 408882a387f75ae57524073385b47d68339ec486 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate +Date: Tue, 14 Nov 2023 13:26:47 + +Subject: [PATCH 1/1] swscale/x86/rgb_2_rgb: Add opaque pointer to missed + definitions of ff_nv12ToUV + +Opaque parameters were previously added to the original definition of +ff_nv12ToUV, leading to gcc noticing a type mismatch with -Wlto-type-mismatch. + +https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/f2de911818fbd7e73343803626b697fd0c968121 +https://bugs.gentoo.org/907484 + +Signed-off-by: Alfred Wingate +Signed-off-by: Anton Khirnov +--- a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c +@@ -1823,7 +1823,8 @@ void RENAME(ff_nv12ToUV)(uint8_t *dstU, uint8_t *dstV, + const uint8_t *src1, + const uint8_t *src2, + int w, +- uint32_t *unused2); ++ uint32_t *unused2, ++ void *opq); + static void RENAME(deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t *dst2, + int width, int height, int srcStride, + int dst1Stride, int dst2Stride) +@@ -1831,7 +1832,7 @@ static void RENAME(deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t + int h; + + for (h = 0; h < height; h++) { +-RENAME(ff_nv12ToUV)(dst1, dst2, NULL, src, NULL, width, NULL); ++RENAME(ff_nv12ToUV)(dst1, dst2, NULL, src, NULL, width, NULL, NULL); + src += srcStride; + dst1 += dst1Stride; + dst2 += dst2Stride; +-- +2.43.0 +
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 68fd9e3e43929acc14fc41a40dd91875b4dc516a Author: Michał Górny gentoo org> AuthorDate: Wed Jan 24 08:33:22 2024 + Commit: Michał Górny gentoo org> CommitDate: Wed Jan 24 08:33:22 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68fd9e3e media-video/ffmpeg: Add := dep on media-libs/libjxl to more versions Signed-off-by: Michał Górny gentoo.org> media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild | 2 +- media-video/ffmpeg/ffmpeg-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild index 9ecde222b8e3..5fc9eca96bfd 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild @@ -233,7 +233,7 @@ RDEPEND=" ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) - jpegxl? ( >=media-libs/libjxl-0.7.0[$MULTILIB_USEDEP] ) + jpegxl? ( >=media-libs/libjxl-0.7.0:=[$MULTILIB_USEDEP] ) lcms? ( >=media-libs/lcms-2.13:2[$MULTILIB_USEDEP] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-.ebuild index 905f9dd7977b..0b4ac4354fb6 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-.ebuild @@ -235,7 +235,7 @@ RDEPEND=" ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) jpeg2k? ( >=media-libs/openjpeg-2.1:2=[${MULTILIB_USEDEP}] ) - jpegxl? ( >=media-libs/libjxl-0.7.0[$MULTILIB_USEDEP] ) + jpegxl? ( >=media-libs/libjxl-0.7.0:=[$MULTILIB_USEDEP] ) lcms? ( >=media-libs/lcms-2.13:2[$MULTILIB_USEDEP] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/
commit: dc09684ebe4f8e06660775f8492c32219eec67cc Author: Eli Schwartz gmail com> AuthorDate: Thu Jan 18 21:28:46 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jan 24 06:54:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc09684e media-video/ffmpeg-chromium: migrate checking for enabled lto, to tc-is-lto This toolchain func was recently added, and is a lot more reliable than get-flagq, for example if the active flags contain `-flto -fno-lto` then tc-is-lto gets it correct. We would rather use this wherever possible. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild index 26434d60d9c9..fedbdea1192e 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild @@ -174,7 +174,7 @@ src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && is-flagq "-flto*"; then + if [[ ${ABI} != x86 ]] && tc-is-lto; then # Respect -flto value, e.g -flto=thin local v="$(get-flag flto)" [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" )
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 47a2a87a9573f8d77f38f3a9bbfa4d4e8eb54d28 Author: Sam James gentoo org> AuthorDate: Tue Jan 23 18:41:15 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 23 18:45:25 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47a2a87a media-video/ffmpeg: use tc-is-lto instead of error-prone is-flagq is-flagq won't pick up on e.g. -fno-lto appended. Closes: https://bugs.gentoo.org/909572 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 2 +- media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0-r11.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0-r9.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.1-r4.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-.ebuild | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index b7074d60fdc3..e17af76cfa74 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -483,7 +483,7 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - [[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" ) + [[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" ) filter-lto # Mandatory configuration diff --git a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild index 6c34aca8e4cd..9ecde222b8e3 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild @@ -473,7 +473,7 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - [[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" ) + [[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" ) filter-lto # Mandatory configuration diff --git a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild index 24dde90568fd..6d75a5d847db 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild @@ -472,7 +472,7 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - [[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" ) + [[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" ) filter-lto # Mandatory configuration diff --git a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild index 8545e512f44c..9831ab3e47c5 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild @@ -470,7 +470,7 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - [[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" ) + [[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" ) filter-lto # Mandatory configuration diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild index f3fabab58737..bdc0a1471158 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild @@ -469,7 +469,7 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - [[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" ) + [[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" ) filter-lto # Mandatory configuration diff --git a/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild index 6db23cdd6bfc..d3edaba40eb7 100644 --- a/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild @@ -482,7 +482,7 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && is-flagq "-flto*"; then + if [[ ${ABI} != x86 ]] && tc-is-lto; then # Respect -flto value, e.g -flto=thin local v="$(get-flag flto)" [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild index 4a9376a14e3e..73cdd4b40c76 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild @@ -476,7 +476,7 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && is-flagq "-flto*"; then + if [[ ${ABI} != x86 ]] && tc-is-lto; then # Respect -flto value, e.g -flto=thin local v="$(get-flag flto)" [[ -n ${v} ]] &&
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 19a50bbdf1caba3c9552f52d2033ad4a2075dd7b Author: Michał Górny gentoo org> AuthorDate: Fri Jan 19 13:27:07 2024 + Commit: Michał Górny gentoo org> CommitDate: Fri Jan 19 13:34:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19a50bbd media-video/ffmpeg: Add := op on media-libs/libjxl Signed-off-by: Michał Górny gentoo.org> media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild index fc3dd3af02e5..4a9376a14e3e 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild @@ -235,7 +235,7 @@ RDEPEND=" ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) jpeg2k? ( >=media-libs/openjpeg-2.1:2=[${MULTILIB_USEDEP}] ) - jpegxl? ( >=media-libs/libjxl-0.7.0[$MULTILIB_USEDEP] ) + jpegxl? ( >=media-libs/libjxl-0.7.0:=[$MULTILIB_USEDEP] ) lcms? ( >=media-libs/lcms-2.13:2[$MULTILIB_USEDEP] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/
commit: 23c3b0fe82c87c4bd1c27c2f5d4ff8b8dc860410 Author: James Le Cuirot gentoo org> AuthorDate: Tue Jan 16 21:57:30 2024 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Jan 16 21:57:30 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23c3b0fe media-video/ffmpeg-chromium: add CPU_FLAGS_ARM_{I8MM,ASIMDDP} Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild index beeede979097..26434d60d9c9 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild @@ -47,6 +47,8 @@ ARM_CPU_FEATURES=( cpu_flags_arm_vfp:vfp cpu_flags_arm_vfpv3:vfpv3 cpu_flags_arm_v8:armv8 + cpu_flags_arm_asimddp:dotprod + cpu_flags_arm_i8mm:i8mm ) ARM_CPU_REQUIRED_USE=" arm64? ( cpu_flags_arm_v8 )
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 2cf117a43ae001e2d20ed338c946d21974400902 Author: Matoro Mahri matoro tk> AuthorDate: Sun Jan 14 23:48:24 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Jan 15 03:20:13 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cf117a4 media-video/ffmpeg: Stabilize 6.0-r9 arm, #910314 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Ionen Wolkens gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild index 3ee81197644f..8545e512f44c 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: c3cf77edbf42025b6a3edfb26e371dc256545b94 Author: Matoro Mahri matoro tk> AuthorDate: Sun Jan 14 23:05:43 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Jan 15 03:20:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3cf77ed media-video/ffmpeg: Stabilize 6.0-r9 x86, #910314 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Ionen Wolkens gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild index 460582e278d4..3ee81197644f 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 74b8d9a127d7fff3187facd8099ebd3e764eac80 Author: Matoro Mahri matoro tk> AuthorDate: Sun Jan 14 21:54:46 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Jan 15 03:20:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74b8d9a1 media-video/ffmpeg: Stabilize 6.0-r9 ppc, #910314 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Ionen Wolkens gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild index 9b1c07268516..460582e278d4 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 9e927b6952e9365d5bc8547a8cb11d81e0679304 Author: Leonardo Hernández Hernández proton me> AuthorDate: Sat Jan 6 17:33:39 2024 + Commit: Sam James gentoo org> CommitDate: Sun Jan 14 04:50:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e927b69 media-video/ffmpeg: add CPU_FLAGS_ARM_{I8MM,ASIMDDP} Bug: https://bugs.gentoo.org/917277 Bug: https://bugs.gentoo.org/917278 Signed-off-by: Leonardo Hernández Hernández proton.me> Closes: https://github.com/gentoo/gentoo/pull/34689 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild | 4 ++-- media-video/ffmpeg/ffmpeg-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild index 8da462e593fe..fc3dd3af02e5 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild @@ -123,6 +123,8 @@ ARM_CPU_FEATURES=( cpu_flags_arm_vfp:vfp cpu_flags_arm_vfpv3:vfpv3 cpu_flags_arm_v8:armv8 + cpu_flags_arm_asimddp:dotprod + cpu_flags_arm_i8mm:i8mm ) ARM_CPU_REQUIRED_USE=" arm64? ( cpu_flags_arm_v8 ) @@ -453,8 +455,6 @@ multilib_src_configure() { for i in "${CPU_FEATURES_MAP[@]}" ; do use ${i%:*} || myconf+=( --disable-${i#*:} ) done - # Bug #917277, #917278 - myconf+=( --disable-dotprod --disable-i8mm ) if use pic ; then myconf+=( --enable-pic ) diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-.ebuild index 4117023d4157..af17b97264cd 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-.ebuild @@ -123,6 +123,8 @@ ARM_CPU_FEATURES=( cpu_flags_arm_vfp:vfp cpu_flags_arm_vfpv3:vfpv3 cpu_flags_arm_v8:armv8 + cpu_flags_arm_asimddp:dotprod + cpu_flags_arm_i8mm:i8mm ) ARM_CPU_REQUIRED_USE=" arm64? ( cpu_flags_arm_v8 ) @@ -452,8 +454,6 @@ multilib_src_configure() { for i in "${CPU_FEATURES_MAP[@]}" ; do use ${i%:*} || myconf+=( --disable-${i#*:} ) done - # Bug #917277, #917278 - myconf+=( --disable-dotprod --disable-i8mm ) if use pic ; then myconf+=( --enable-pic )
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 91b23bef24174c814594854ad9740a3a2991950c Author: Sam James gentoo org> AuthorDate: Mon Jan 8 12:49:50 2024 + Commit: Sam James gentoo org> CommitDate: Mon Jan 8 12:49:50 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b23bef media-video/ffmpeg: Stabilize 6.0.1-r1 amd64, #921542 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild index 7e84ef874d15..ef173d48e83f 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: f7243ba33e8268af84407abdf0c5b68ee18694f2 Author: Sam James gentoo org> AuthorDate: Mon Jan 8 12:49:47 2024 + Commit: Sam James gentoo org> CommitDate: Mon Jan 8 12:49:47 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7243ba3 media-video/ffmpeg: Stabilize 6.0-r11 amd64, #920240 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r11.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild index cf5c06b3132e..8c9dd49fcbef 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 03fd84caec409a954d3556672b2dab9d8d58ce9a Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Mon Jan 8 12:29:27 2024 + Commit: Sam James gentoo org> CommitDate: Mon Jan 8 12:40:24 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03fd84ca media-video/ffmpeg: not create 99amf-env-vulkan-override in /etc/env.d * This prevent setting the AMDGPU PRO Vulkan ICD Loader system wide * In some system can prevent some vulkan app from open * update elog message for amf use Closes: https://bugs.gentoo.org/917447 Signed-off-by: Gonçalo Negrier Duarte gmail.com> Closes: https://github.com/gentoo/gentoo/pull/33851 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/{ffmpeg-5.1.4-r1.ebuild => ffmpeg-5.1.4-r2.ebuild} | 2 +- media-video/ffmpeg/{ffmpeg-6.0-r10.ebuild => ffmpeg-6.0-r11.ebuild} | 2 +- media-video/ffmpeg/{ffmpeg-6.0.1.ebuild => ffmpeg-6.0.1-r1.ebuild}| 2 +- media-video/ffmpeg/{ffmpeg-6.1-r3.ebuild => ffmpeg-6.1-r4.ebuild} | 2 +- media-video/ffmpeg/{ffmpeg-6.1.1.ebuild => ffmpeg-6.1.1-r1.ebuild}| 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild rename to media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild index 9c78a326da8e..0a1efa6009aa 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild @@ -604,5 +604,5 @@ multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override + use amf && elog "To use AMF, prefix the ffmpeg call with the 'vk_pro' wrapper script, e.g. `vk_pro ffmpeg -vcodec h264_amf [...]`" } diff --git a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-6.0-r10.ebuild rename to media-video/ffmpeg/ffmpeg-6.0-r11.ebuild index 6e294de3fdcd..cf5c06b3132e 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild @@ -603,5 +603,5 @@ multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override + use amf && elog "To use AMF, prefix the ffmpeg call with the 'vk_pro' wrapper script, e.g. `vk_pro ffmpeg -vcodec h264_amf [...]`" } diff --git a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-6.0.1.ebuild rename to media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild index e6368716e0cb..7e84ef874d15 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild @@ -600,5 +600,5 @@ multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override + use amf && elog "To use AMF, prefix the ffmpeg call with the 'vk_pro' wrapper script, e.g. `vk_pro ffmpeg -vcodec h264_amf [...]`" } diff --git a/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-6.1-r3.ebuild rename to media-video/ffmpeg/ffmpeg-6.1-r4.ebuild index 7fdd234ffc36..3fcc5394ed43 100644 --- a/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild @@ -584,5 +584,5 @@ multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override + use amf && elog "To use AMF, prefix the ffmpeg call with the 'vk_pro' wrapper script, e.g. `vk_pro ffmpeg -vcodec h264_amf [...]`" } diff --git a/media-video/ffmpeg/ffmpeg-6.1.1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-6.1.1.ebuild rename to media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild index 877b70377d04..9c44868b697f 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild @@ -578,5 +578,5 @@ multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override + use amf && elog "To use AMF, prefix the ffmpeg call with the 'vk_pro' wrapper script, e.g. `vk_pro ffmpeg -vcodec h264_amf [...]`" }
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 6024652be6bc43b48cda7f440fe3617335419bbd Author: Sam James gentoo org> AuthorDate: Mon Jan 8 09:36:45 2024 + Commit: Sam James gentoo org> CommitDate: Mon Jan 8 09:42:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6024652b media-video/ffmpeg: sys-devel/bc -> app-alternatives/bc All of these will be using app-alternatives/bc anyway as they're not calling bc-reference, so make the dep reflect reality. Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 2 +- media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0-r10.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0-r9.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0.1.ebuild| 2 +- media-video/ffmpeg/ffmpeg-6.1-r3.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.1.1.ebuild| 2 +- media-video/ffmpeg/ffmpeg-.ebuild | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index dd95ea498d94..71b87b5d4839 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -308,7 +308,7 @@ BDEPEND+=" 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 ) + test? ( net-misc/wget app-alternatives/bc ) " # Code requiring FFmpeg to be built under gpl license diff --git a/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild index e10f598a6997..9c78a326da8e 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild @@ -312,7 +312,7 @@ BDEPEND+=" 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 ) + test? ( net-misc/wget app-alternatives/bc ) " # Code requiring FFmpeg to be built under gpl license diff --git a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild index 3680dca776f4..6e294de3fdcd 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild @@ -310,7 +310,7 @@ BDEPEND+=" 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 ) + test? ( net-misc/wget app-alternatives/bc ) " # Code requiring FFmpeg to be built under gpl license diff --git a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild index 2454bd54cad6..cce602989e5c 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild @@ -308,7 +308,7 @@ BDEPEND+=" 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 ) + test? ( net-misc/wget app-alternatives/bc ) " # Code requiring FFmpeg to be built under gpl license diff --git a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1.ebuild index 80b848c59b17..e6368716e0cb 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1.ebuild @@ -310,7 +310,7 @@ BDEPEND+=" 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 ) + test? ( net-misc/wget app-alternatives/bc ) " # Code requiring FFmpeg to be built under gpl license diff --git a/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild index 482524b3d718..7fdd234ffc36 100644 --- a/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild @@ -316,7 +316,7 @@ BDEPEND+=" 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 ) + test? ( net-misc/wget app-alternatives/bc ) " # Code requiring FFmpeg to be built under gpl license diff --git a/media-video/ffmpeg/ffmpeg-6.1.1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1.ebuild index aa526685a188..877b70377d04 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1.ebuild @@ -316,7 +316,7 @@ BDEPEND+=" 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 ) + test? (
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 80386bc37a279821dfeb43df2ed274171313f2de Author: Sam James gentoo org> AuthorDate: Sun Jan 7 09:04:58 2024 + Commit: Sam James gentoo org> CommitDate: Sun Jan 7 09:04:58 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80386bc3 media-video/ffmpeg: Stabilize 6.0.1 ppc64, #921542 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1.ebuild index 535da7a573b2..80b848c59b17 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 407e6bd8b20638daf14b075294411240c3abc75d Author: Sam James gentoo org> AuthorDate: Sun Jan 7 09:04:57 2024 + Commit: Sam James gentoo org> CommitDate: Sun Jan 7 09:04:57 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=407e6bd8 media-video/ffmpeg: Stabilize 6.0.1 arm64, #921542 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1.ebuild index 6b9dc10b5bf6..535da7a573b2 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 8afda1864ef142cb523c101dc8a0c6cb45d7a732 Author: Matoro Mahri matoro tk> AuthorDate: Thu Jan 4 02:10:30 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Thu Jan 4 05:29:42 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8afda186 media-video/ffmpeg: Stabilize 6.0-r10 sparc, #920240 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Ionen Wolkens gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild index 74a648a4cc18..3680dca776f4 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: fb2656e79a37fe7b11b2fbccd78930e05a7b Author: Sam James gentoo org> AuthorDate: Wed Jan 3 06:35:21 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jan 3 06:35:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb2656e7 media-video/ffmpeg: backport texinfo fixes to 4.4 Closes: https://bugs.gentoo.org/920570 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/Manifest | 1 + media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 13 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 5385f03466c4..c2054eb5009c 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,3 +1,4 @@ +DIST ffmpeg-4.4.4-texinfo.patch.xz 19136 BLAKE2B 591b46180fccdb58c5b6b102c5e12075ff4388dc6bc0ab1752531d4f9f2802c1fd09ed1353ed70a539fdc5c2298f9cfc84ec24e3a04d371ef0d9f3f30d8e8f38 SHA512 f86a324efe261801a5192d4f204f48de581466550cca49b54432fdf5430f1b3bc9a9d31b9b52e2f23481def67ad55b5ad315752c482709aa67b1f3a3e6c17a4f DIST ffmpeg-4.4.4.tar.xz 9565584 BLAKE2B 8cd76a91ae6e485e56c6e5ae7b31d678e2fc2d634b1c56240619a4b6924dae4ec7adb445932bf4455f409dbc03fdc6d52b4fc270da55393e329ccd3d129f5770 SHA512 253799eccd129dad331db85def5352178ae22303e42af47fc013a6adfd4b60d1e59ff5f9ac6118fe3b403affa56ea1f3ba658042f526a914fba27050c3065daf DIST ffmpeg-4.4.4.tar.xz.asc 520 BLAKE2B c8bf944883e37b6dd69029fe863c23f68a3584d84aa3e9c4278ae45aee0bfa3697cc1d8a768b95a1ebd7a9cb91553671072f88f46f6a9c947faa74344a44 SHA512 47afa042d8b529d0bfce391455a25cda261f39f8510601d7de2aba6398483ecb623992626e8489aa2a636e3cb93008f26b32080e526143254226d4e2651accea DIST ffmpeg-5.1.4.tar.xz 10009968 BLAKE2B 3e632e6de23a8dd0a75b01910e9a642840f06dc3eba4cd015b729889f785b98d1fdb4e43b8e8a2e9ea69c8fa686f6fcc9f5785837a9f32ccd8d69331d408a99a SHA512 7d7fe8c660a62971a979553a864648d5c859059d3e64d4d32e4f5dca6fd4374270abdeec2dd782c34b2254e7485995c3fe0c1dcef54159e30536eab7f20e0795 diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index 6b2411dd0079..b688a1857b4e 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,6 +33,7 @@ else # Release VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc inherit verify-sig SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-texinfo.patch.xz; SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" @@ -347,6 +348,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.4.4-wint-conversion-vulkan.patch "${FILESDIR}"/${P}-fix-build-svt-av1-1.5.0.patch "${FILESDIR}"/${PN}-5.1.3-binutils-2.41.patch + "${WORKDIR}"/${PN}-4.4.4-texinfo.patch ) MULTILIB_WRAPPED_HEADERS=( @@ -371,6 +373,15 @@ pkg_setup() { fi } +src_unpack() { + if use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc} + fi + + default +} + src_prepare() { if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot export revision=git-N-${FFMPEG_REVISION}
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: dba143d2e7f2485076b975290c8cff16202a5f6d Author: Sam James gentoo org> AuthorDate: Wed Jan 3 06:38:03 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jan 3 06:38:03 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dba143d2 media-video/ffmpeg: enable USE=pic by default binutils-2.41 is configured in Gentoo to reject textrels by default which the non-PIC-safe x86 (32-bit) asm requires. Start by defaulting USE=pic to on in general but we can remove the USE flag later and then just pass --disable-asm for 32-bit x86. Bug: https://bugs.gentoo.org/916067 Bug: https://bugs.gentoo.org/920808 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 2 +- media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild | 4 ++-- media-video/ffmpeg/ffmpeg-6.0-r10.ebuild | 4 ++-- media-video/ffmpeg/ffmpeg-6.0-r9.ebuild | 4 ++-- media-video/ffmpeg/ffmpeg-6.0.1.ebuild| 4 ++-- media-video/ffmpeg/ffmpeg-6.1-r3.ebuild | 4 ++-- media-video/ffmpeg/ffmpeg-6.1.1.ebuild| 2 +- media-video/ffmpeg/ffmpeg-.ebuild | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index b688a1857b4e..dd95ea498d94 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -108,7 +108,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " diff --git a/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild index 39d9265358be..e10f598a6997 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -108,7 +108,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " diff --git a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild index 635fcf2e4f7d..74a648a4cc18 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -108,7 +108,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " diff --git a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild index a494461a30e2..2454bd54cad6 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -108,7 +108,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " diff --git a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1.ebuild index 7a382e4aeebd..6b9dc10b5bf6 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -108,7 +108,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " diff --git a/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild index b79bccb0a98f..482524b3d718 100644 --- a/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -108,7 +108,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 1dffeee2fb94e4f3f82627abf76e9d1896230dc4 Author: Sam James gentoo org> AuthorDate: Tue Jan 2 05:56:23 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 2 05:56:23 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dffeee2 media-video/ffmpeg: add 6.1.1 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/Manifest| 2 + media-video/ffmpeg/ffmpeg-6.1.1.ebuild | 582 + 2 files changed, 584 insertions(+) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 5f74f17dfeb3..5385f03466c4 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -6,5 +6,7 @@ DIST ffmpeg-6.0.1.tar.xz 10240172 BLAKE2B 1e21862f1f4eac04b8e9ef5597853d9e105bac DIST ffmpeg-6.0.1.tar.xz.asc 520 BLAKE2B dc7222c7c55e9af28c54dcfae4fce33fb44aa2a7e9d2ca4af85a961568b67f63116a6597234cd7ce009669b8ecf6576defd9380c389356435ffc3026b1126f03 SHA512 314f9ef996b85bc93c9fb823d582697c7415ac35f56bfc9cd906893491c8076df90bd852cf6e5e757b1fa94bd415ed108488c1220add49eb1f4854fc253c178c DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5abe7f1d7fa797d05e29e00971f98cbf37832c1c3dc5fa949a5beddef05a6ec55ae6668091976ea870ad93c0e8d SHA512 4d0e8f635d5a1633710f30cb3e0a854b6ca3bf85e33a289d1ec7aca2ad55dc4910010bc9cf3f13eee9f6decb9d50a0df6d7aa5a342f308c3868d2730f3a6b980 DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012d82dc7aa1a83d5fe6d5453bd3c8620fdfb743df780cf588983a06a66a458c4e3e454dbe535cbba9da30c48c SHA512 a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed +DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370fe23501169cb1eab08ff5ede77cfd5b397e8fb1d38756812cc82277898fd5c74b7d8495842556570c0c5570daeb SHA512 fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5 +DIST ffmpeg-6.1.1.tar.xz.asc 520 BLAKE2B 801cd976d10363d1f9fc302351b330cb57e609a266407627ef378172f28974f4a18435b8a77b9cc7a8ff7b75701185211739f685629bbda961c3588c15af1221 SHA512 0e10c1f560bab0812d759d286656593dea5940f02bb52d88d9ba7f10b12b9cc3d7aa2a41c5f7a45b319069e04dce22dc1286b3c1ba685b35cd6d04cd81c5a0f5 DIST ffmpeg-6.1.tar.xz 10455956 BLAKE2B 5eaee0e0f72139e3b018e6ee26a102c7d6881ec8e7a70b21c51e4a515a37396ae12f19185112bb3f8b3401b85e68c08435146a83470e07ffb571d3d9bca89289 SHA512 72f47924806b9b128672bd268aa2c8fc2c9b8491899a772b6f82421daa2b67de45a4bdd71f6071825814e599a73adb1e42682e202a12fc055e9a224c7d5baa4a DIST ffmpeg-6.1.tar.xz.asc 520 BLAKE2B 774ba20a8ad3d786368c7e6928ee0976cd943756f24e3f076dc0cc92fc0069637f0a9a92e3c5238c74148330385d040118d3c5f9af6b267d572283b8de83b286 SHA512 e4885270869cc6a1681bc3f76f344f77c4858c490a517e45a758d15214ce67c3c2113a1caa8ca65eb6447b68d822fa1dd730081345bcc0928faaf82bb76037ba diff --git a/media-video/ffmpeg/ffmpeg-6.1.1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1.ebuild new file mode 100644 index ..36572f204937 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-6.1.1.ebuild @@ -0,0 +1,582 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=58.60.60 + +SCM="" +if [ "${PV#}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; +fi + +inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/; +if [ "${PV#}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.xz" +else # Release + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc + inherit verify-sig + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; + SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" + + BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) + amr? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + gmp? ( +
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/
commit: 689718f584770fd735e2d4adde6cc5eac7f2497c Author: Michael Mair-Keimberger levelnine at> AuthorDate: Fri Dec 29 14:07:22 2023 + Commit: Conrad Kostecki gentoo org> CommitDate: Sun Dec 31 02:37:42 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689718f5 media-video/ffmpeg: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/34534 Signed-off-by: Conrad Kostecki gentoo.org> .../ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch | 81 -- .../ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch| 67 -- 2 files changed, 148 deletions(-) diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch b/media-video/ffmpeg/files/ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch deleted file mode 100644 index 51a8cb02d7b5.. --- a/media-video/ffmpeg/files/ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch +++ /dev/null @@ -1,81 +0,0 @@ -https://bugs.gentoo.org/907478 -https://bugs.gentoo.org/907493 -https://git.videolan.org/?p=ffmpeg.git;a=commit;h=bea695d54372b66a6b9b136982fc92adb63e4745 -https://git.videolan.org/?p=ffmpeg.git;a=commit;h=3344d47a88506aba060b5fd2a214cf7785b11483 - -From bea695d54372b66a6b9b136982fc92adb63e4745 Mon Sep 17 00:00:00 2001 -From: Christopher Degawa -Date: Thu, 20 Oct 2022 22:55:28 -0500 -Subject: [PATCH] avcodec/libsvtav1: replace vbv_bufsize with - maximum_buffer_size_ms - -svt-av1 v1.2.0 has deprecated vbv_bufsize in favor of using -- maximum_buffer_size_ms (--buf-sz) -- starting_buffer_level_ms (--buf-initial-sz) -- optimal_buffer_level_ms (--buf-optimal-sz) - -and vbv_bufsize has not been in use since svt-av1 v0.8.6 - -Signed-off-by: Christopher Degawa a/libavcodec/libsvtav1.c -+++ b/libavcodec/libsvtav1.c -@@ -183,7 +183,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, - param->min_qp_allowed = avctx->qmin; - } - param->max_bit_rate = avctx->rc_max_rate; --param->vbv_bufsize = avctx->rc_buffer_size; -+param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate; - - if (svt_enc->crf > 0) { - param->qp = svt_enc->crf; -@@ -300,7 +300,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, - avctx->bit_rate = param->rate_control_mode > 0 ? - param->target_bit_rate : 0; - avctx->rc_max_rate= param->max_bit_rate; --avctx->rc_buffer_size = param->vbv_bufsize; -+avctx->rc_buffer_size = param->maximum_buffer_size_ms * avctx->bit_rate / 1000LL; - - if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) { - AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx); --- -2.30.2 - -From 3344d47a88506aba060b5fd2a214cf7785b11483 Mon Sep 17 00:00:00 2001 -From: Christopher Degawa -Date: Thu, 20 Oct 2022 22:55:27 -0500 -Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and - simplify alloc_buffer - -compressed_ten_bit_format has been deprecated upstream and has no effect -and can be removed. Plus, technically it was never used in the first place -since it would require the app (ffmpeg) to set it and do additional -processing of the input frames. - -Also simplify alloc_buffer by removing calculations relating to the -non-existant processing. - -Signed-off-by: Christopher Degawa a/libavcodec/libsvtav1.c -+++ b/libavcodec/libsvtav1.c -@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err, - - static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc) - { --const intpack_mode_10bit = --(config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0; --const size_t luma_size_8bit = --config->source_width * config->source_height * (1 << pack_mode_10bit); --const size_t luma_size_10bit = --(config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0; -+const size_t luma_size = config->source_width * config->source_height * -+(config->encoder_bit_depth > 8 ? 2 : 1); - - EbSvtIOFormat *in_data; - --svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2; -+svt_enc->raw_size = luma_size * 3 / 2; - - // allocate buffer for in and out - svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf)); --- -2.30.2 diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch b/media-video/ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch deleted file mode 100644 index fb905f714fa3.. --- a/media-video/ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch +++ /dev/null @@ -1,67 +0,0 @@ -https://git.videolan.org/?p=ffmpeg.git;a=commit;h=8fe2fec45321d1b82f98f9725ad9118cefcfa58d -https://git.videolan.org/?p=ffmpeg.git;a=commit;h=e5b5dd66535f51e0fee59247b224d866f334 - -From 8fe2fec45321d1b82f98f9725ad9118cefcfa58d Mon Sep 17 00:00:00
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 6a33663e574333fd8cdf989aab70dc447bacda15 Author: Sam James gentoo org> AuthorDate: Thu Dec 28 04:33:21 2023 + Commit: Sam James gentoo org> CommitDate: Thu Dec 28 04:33:21 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a33663e media-video/ffmpeg: drop 6.1-r1, 6.1-r2 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.1-r1.ebuild | 581 --- media-video/ffmpeg/ffmpeg-6.1-r2.ebuild | 582 2 files changed, 1163 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-6.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r1.ebuild deleted file mode 100644 index 188eb6e7b762.. --- a/media-video/ffmpeg/ffmpeg-6.1-r1.ebuild +++ /dev/null @@ -1,581 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Subslot: libavutil major.libavcodec major.libavformat major -# Since FFmpeg ships several libraries, subslot is kind of limited here. -# Most consumers will use those three libraries, if a "less used" library -# changes its soname, consumers will have to be rebuilt the old way -# (preserve-libs). -# If, for example, a package does not link to libavformat and only libavformat -# changes its ABI then this package will be rebuilt needlessly. Hence, such a -# package is free _not_ to := depend on FFmpeg but I would strongly encourage -# doing so since such a case is unlikely. -FFMPEG_SUBSLOT=58.60.60 - -SCM="" -if [ "${PV#}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_MIN_CLONE_TYPE="single" - EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; -fi - -inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" -HOMEPAGE="https://ffmpeg.org/; -if [ "${PV#}" != "${PV}" ] ; then - SRC_URI="" -elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.xz" -else # Release - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc - inherit verify-sig - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; - SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" - - BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" -fi -FFMPEG_REVISION="${PV#*_p}" - -SLOT="0/${FFMPEG_SUBSLOT}" -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) - amr? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - gmp? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - libaribb24? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - encode? ( - amrenc? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - ) - samba? ( GPL-3 ) -" -if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" -fi - -# 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=( - +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp - +gpl hardcoded-tables +iconv libxml2 lzma +network opencl - openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan - X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib - # libavdevice options - cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal - opengl - # indevs - libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack - # decoders - amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac - jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm - libaribb24 mmal modplug:libmodplug opus:libopus qsv:libvpl libilbc librtmp ssh:libssh - speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec - vorbis:libvorbis vpx:libvpx zvbi:libzvbi - # libavfilter options - appkit - bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite fontconfig frei0r - fribidi:libfribidi glslang:libglslang ladspa lcms:lcms2 libass libplacebo - libtesseract lv2 rubberband:librubberband shaderc:libshaderc truetype:libfreetype - truetype:libharfbuzz vidstab:libvidstab vmaf:libvmaf zeromq:libzmq zimg:libzimg - # libswresample options - libsoxr - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -# Same
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 33cc830e2dcb2bce5ee95d36f78ce4dfe6f9a2eb Author: Sam James gentoo org> AuthorDate: Thu Dec 28 04:33:01 2023 + Commit: Sam James gentoo org> CommitDate: Thu Dec 28 04:33:01 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33cc830e media-video/ffmpeg: drop 5.1.3-r5, 5.1.4 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/Manifest | 2 - media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild | 606 -- media-video/ffmpeg/ffmpeg-5.1.4.ebuild| 604 - 3 files changed, 1212 deletions(-) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index e2033d12f60b..5f74f17dfeb3 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,7 +1,5 @@ DIST ffmpeg-4.4.4.tar.xz 9565584 BLAKE2B 8cd76a91ae6e485e56c6e5ae7b31d678e2fc2d634b1c56240619a4b6924dae4ec7adb445932bf4455f409dbc03fdc6d52b4fc270da55393e329ccd3d129f5770 SHA512 253799eccd129dad331db85def5352178ae22303e42af47fc013a6adfd4b60d1e59ff5f9ac6118fe3b403affa56ea1f3ba658042f526a914fba27050c3065daf DIST ffmpeg-4.4.4.tar.xz.asc 520 BLAKE2B c8bf944883e37b6dd69029fe863c23f68a3584d84aa3e9c4278ae45aee0bfa3697cc1d8a768b95a1ebd7a9cb91553671072f88f46f6a9c947faa74344a44 SHA512 47afa042d8b529d0bfce391455a25cda261f39f8510601d7de2aba6398483ecb623992626e8489aa2a636e3cb93008f26b32080e526143254226d4e2651accea -DIST ffmpeg-5.1.3.tar.xz 10007756 BLAKE2B 033dddac096d5dbbfadcf1af51fd1e93d222af1ec6ce7c36000c6a02cf9413288c7fcc7316d450926c60ea9e4193cc66ee004130836816ada5d5833375c7 SHA512 4310f27fe0c7b4363207e1535115e0ad266a45772bdb5445f5c8658f35b0f3216d8f2cf70d1d2baa71b12069fbdccf418a774b353ddf092d4f66829ef391508a -DIST ffmpeg-5.1.3.tar.xz.asc 520 BLAKE2B 09d7ff694a2fc61a00443b90f905bb771c3fb7244a154bbe289fe98a4520202a8066bff593ef0142d8d7387a75d4e4dc68e553fbeba98d0fdd51881f28a54623 SHA512 a7348205ef6648e5c73c32fbe99b8130256d1157d1a7c128701b240e4096ac16778cfcc74a922fe8147e0a137119b8a5fd60f006328454b712eefe154f546318 DIST ffmpeg-5.1.4.tar.xz 10009968 BLAKE2B 3e632e6de23a8dd0a75b01910e9a642840f06dc3eba4cd015b729889f785b98d1fdb4e43b8e8a2e9ea69c8fa686f6fcc9f5785837a9f32ccd8d69331d408a99a SHA512 7d7fe8c660a62971a979553a864648d5c859059d3e64d4d32e4f5dca6fd4374270abdeec2dd782c34b2254e7485995c3fe0c1dcef54159e30536eab7f20e0795 DIST ffmpeg-5.1.4.tar.xz.asc 520 BLAKE2B 5d391b77341a3da9bd5654be4eb688c3d8bc31b41075630bf17f6422d5a0b4cecdb2ebf8ee2e1bf82f6ecaaa07b00c29a9347cca57e9d278900d05b38de20484 SHA512 f161815d47c988f8b6281a95f22301d07a22ddc41a2a84bfc126b4d7de0e9175da499c2cc15b3bdaa415af0e8ed1d2b4d52096a81b4a3d804effb00ff9e8ec5b DIST ffmpeg-6.0.1.tar.xz 10240172 BLAKE2B 1e21862f1f4eac04b8e9ef5597853d9e105bac4e858960c07e244ec3dbcea8f9e9fbdec4ff20b64227afad5ea5d0b05eff79a905f8002314ab4e9c37116c1908 SHA512 8a86b2db4a9abb68bb86d770ba1babb76c8b8313cfb0258ae70c88e736a93b99c342a6ecda94b739e8e7c103bed75d4afd756dd94e08c6255f424ef62c264741 diff --git a/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild b/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild deleted file mode 100644 index 26bb3186e662.. --- a/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild +++ /dev/null @@ -1,606 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Subslot: libavutil major.libavcodec major.libavformat major -# Since FFmpeg ships several libraries, subslot is kind of limited here. -# Most consumers will use those three libraries, if a "less used" library -# changes its soname, consumers will have to be rebuilt the old way -# (preserve-libs). -# If, for example, a package does not link to libavformat and only libavformat -# changes its ABI then this package will be rebuilt needlessly. Hence, such a -# package is free _not_ to := depend on FFmpeg but I would strongly encourage -# doing so since such a case is unlikely. -FFMPEG_SUBSLOT=57.59.59 - -SCM="" -if [ "${PV#}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_MIN_CLONE_TYPE="single" - EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; -fi - -inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" -HOMEPAGE="https://ffmpeg.org/; -if [ "${PV#}" != "${PV}" ] ; then - SRC_URI="" -elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.xz" -else # Release - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc - inherit verify-sig - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; - SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" - - BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" -fi -FFMPEG_REVISION="${PV#*_p}" - -SLOT="0/${FFMPEG_SUBSLOT}" -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) - amr? ( - gpl? ( GPL-3 ) - !gpl? (
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: d573f131a82b53ccb0bef94aeaed08b5ad6a3c21 Author: Sam James gentoo org> AuthorDate: Thu Dec 28 04:32:36 2023 + Commit: Sam James gentoo org> CommitDate: Thu Dec 28 04:32:36 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d573f131 media-video/ffmpeg: drop 4.4.4-r6, 4.4.4-r7 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild | 603 - media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild | 606 -- 2 files changed, 1209 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild deleted file mode 100644 index 6645a2cf80b4.. --- a/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild +++ /dev/null @@ -1,603 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Subslot: libavutil major.libavcodec major.libavformat major -# Since FFmpeg ships several libraries, subslot is kind of limited here. -# Most consumers will use those three libraries, if a "less used" library -# changes its soname, consumers will have to be rebuilt the old way -# (preserve-libs). -# If, for example, a package does not link to libavformat and only libavformat -# changes its ABI then this package will be rebuilt needlessly. Hence, such a -# package is free _not_ to := depend on FFmpeg but I would strongly encourage -# doing so since such a case is unlikely. -FFMPEG_SUBSLOT=56.58.58 - -SCM="" -if [ "${PV#}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_MIN_CLONE_TYPE="single" - EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; -fi - -inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" -HOMEPAGE="https://ffmpeg.org/; -if [ "${PV#}" != "${PV}" ] ; then - SRC_URI="" -elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.xz" -else # Release - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc - inherit verify-sig - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; - SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" - - BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" -fi -FFMPEG_REVISION="${PV#*_p}" - -SLOT="0/${FFMPEG_SUBSLOT}" -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) - amr? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - gmp? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - libaribb24? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - encode? ( - amrenc? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - ) - samba? ( GPL-3 ) -" -if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -fi - -# 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=( - +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp - +gpl hardcoded-tables +iconv libxml2 lzma +network opencl - openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan - X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib - # libavdevice options - cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal - opengl - # indevs - libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack - # decoders - amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac - jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm - libaribb24 mmal modplug:libmodplug opus:libopus qsv:libmfx libilbc librtmp ssh:libssh - speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec - vorbis:libvorbis vpx:libvpx zvbi:libzvbi - # libavfilter options - appkit - bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf - fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab - rubberband:librubberband zeromq:libzmq zimg:libzimg - # libswresample options - libsoxr - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -# Same as above but for encoders, i.e. they do something only with USE=encode. -FFMPEG_ENCODER_FLAG_MAP=( - amf
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/files/, media-video/ffmpeg-chromium/
commit: 7e1da0f34edf3491b3ea3767f632147347d4fec3 Author: James Le Cuirot gentoo org> AuthorDate: Sat Dec 23 21:35:25 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Dec 23 21:48:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e1da0f3 media-video/ffmpeg-chromium: Drop old 114 Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg-chromium/Manifest | 1 - .../ffmpeg-chromium/ffmpeg-chromium-114-r1.ebuild | 235 - .../files/ffmpeg-chromium-100.patch| 27 --- .../files/ffmpeg-chromium-binutils-2.41.patch | 77 --- 4 files changed, 340 deletions(-) diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest index 5c98ac2cff30..3798d6bde713 100644 --- a/media-video/ffmpeg-chromium/Manifest +++ b/media-video/ffmpeg-chromium/Manifest @@ -1,2 +1 @@ -DIST ffmpeg-chromium-114.tar.xz 9934024 BLAKE2B cc11bd00bcf6bef5f946a16f1544881c71503207ba3c6ec57cdc37124ea562366dced2e029f31e57a6f78ec7073412ac0b8ec470d14975a3cc40fad2e96ec5df SHA512 1b1743664d58f5b92971d113ea441604e0b46f28b22df1b02ab0431b8e884789fb6d81b4f50ff1526f716381abcc63e1b336d23edd9ea28abe8b3526fba08ce9 DIST ffmpeg-chromium-120.tar.xz 10096036 BLAKE2B 8f24dfed854c713df369e6ef15bc773a3166fdf6eb8c90bcb1d1b7aca0702df7615bc323432a40b5d213352945fa49acf8e864df2caa358764b5068a75f3 SHA512 0e0bfb44225981f91edceeb6f302592a7e108da49c5e6503b43f0e12b91d84dece908efe5e548bb31ccab49c5fba5a8365f5f0793bbf1450d35bfd836f8a3e9b diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-114-r1.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-114-r1.ebuild deleted file mode 100644 index af6f8a58ab78.. --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-114-r1.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -COMMIT="842ef367665edee29efa2b09f7298fa5ecabe8b5" -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 - 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=" -
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/
commit: a26f49b98191b9a824e2655a26c28f456e0dbfc2 Author: James Le Cuirot gentoo org> AuthorDate: Sat Dec 23 21:29:10 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Dec 23 21:48:08 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a26f49b9 media-video/ffmpeg-chromium: Stabilise 120 on amd64 Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild index 804389fc0ccc..bb38df15a23a 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild @@ -16,7 +16,7 @@ LICENSE=" gpl? ( GPL-2 ) " -KEYWORDS="~amd64 ~arm ~arm64" +KEYWORDS="amd64 ~arm ~arm64" # Options to use as use_enable in the foo[:bar] form. # This will feed configure with $(use_enable foo bar)
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: f3ce69b5c2a1c7b221e55ae40d590081047d2287 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Dec 22 15:14:12 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Dec 22 15:14:12 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3ce69b5 media-video/ffmpeg: Stabilize 6.0-r10 ppc, #920240 Signed-off-by: Arthur Zamarin gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild index 51acdf2ba915..635fcf2e4f7d 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: b3cd4066d46e7af2903810ba616c5d9906eb06d8 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Dec 18 15:13:41 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Dec 18 15:13:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3cd4066 media-video/ffmpeg: Stabilize 4.4.4-r8 ppc64, #920238 Signed-off-by: Arthur Zamarin gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index 319528b06e8b..6b2411dd0079 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: e1fdfe4ee5a7d5fcc9f636424b096f902fd325d0 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Dec 18 15:13:39 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Dec 18 15:13:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1fdfe4e media-video/ffmpeg: Stabilize 4.4.4-r8 ppc, #920238 Signed-off-by: Arthur Zamarin gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index 3ac2311e2a3c..319528b06e8b 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 8268024a918f37a176c5047350114489630c24fd Author: Arthur Zamarin gentoo org> AuthorDate: Mon Dec 18 15:13:25 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Dec 18 15:13:25 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8268024a media-video/ffmpeg: Stabilize 4.4.4-r8 x86, #920238 Signed-off-by: Arthur Zamarin gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index dfc720ca2d59..5a8ba94bc249 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 8e320b7df8d7e61fdf488c726039689496a02774 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Dec 18 15:13:30 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Dec 18 15:13:30 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e320b7d media-video/ffmpeg: Stabilize 4.4.4-r8 sparc, #920238 Signed-off-by: Arthur Zamarin gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index 5a8ba94bc249..207a706fc32e 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 59453b012b5aaa848d1216f3b11a77c718376831 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Dec 18 15:13:33 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Dec 18 15:13:33 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59453b01 media-video/ffmpeg: Stabilize 4.4.4-r8 arm, #920238 Signed-off-by: Arthur Zamarin gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index 207a706fc32e..3ac2311e2a3c 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 58a122e4cb83cf5221745d7d205ec46d6c7b38a8 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Dec 18 15:13:22 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Dec 18 15:13:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58a122e4 media-video/ffmpeg: Stabilize 4.4.4-r8 amd64, #920238 Signed-off-by: Arthur Zamarin gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index 84e1e85687fe..dfc720ca2d59 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 7a7b3072678940fcffc0720b76e56aaec237421e Author: Sam James gentoo org> AuthorDate: Mon Dec 18 06:56:57 2023 + Commit: Sam James gentoo org> CommitDate: Mon Dec 18 06:56:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a7b3072 media-video/ffmpeg: Stabilize 4.4.4-r8 arm64, #920238 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index 19f8a2283312..84e1e85687fe 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: b67e60c11e03ed2d730f2abed733f44ac1d62555 Author: Sam James gentoo org> AuthorDate: Mon Dec 18 06:34:48 2023 + Commit: Sam James gentoo org> CommitDate: Mon Dec 18 06:34:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67e60c1 media-video/ffmpeg: Stabilize 6.0-r10 ppc64, #920240 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild index f75c29975380..51acdf2ba915 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: efd56a61282bdcccfc6f7731c0e74c22a605cfd4 Author: Sam James gentoo org> AuthorDate: Mon Dec 18 06:14:01 2023 + Commit: Sam James gentoo org> CommitDate: Mon Dec 18 06:14:01 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd56a61 media-video/ffmpeg: Stabilize 6.0-r10 arm64, #920240 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild index c1788e15f04e..f75c29975380 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/
commit: cef2e06f2fabd2cb77dd2432a15d1a32c187813e Author: Sam James gentoo org> AuthorDate: Mon Dec 18 04:50:05 2023 + Commit: Sam James gentoo org> CommitDate: Mon Dec 18 04:50:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cef2e06f media-video/ffmpeg: backport fixes from 6.1 branch for 6.1 ``` $ git shortlog d4ff0020b40b524a490cf62eccbd3a318f4c0e58..HEAD Anton Khirnov (1): lavc/dvdsubenc: only check canvas size when it is actually set Benjamin Cheng (1): hwcontext_vulkan: guard unistd.h include Dmitry Rogozhkin (1): avcodec/decode: validate hw_frames_ctx when AVHWAccel.free_frame_priv is used Lynne (1): lavc/Makefile: build vulkan decode code if vulkan_av1 has been enabled Sebastian Ramacher (2): avcodec/fft: Use av_mallocz to avoid invalid free/uninit avcoded/fft: Fix memory leak if ctx2 is used ``` Closes: https://bugs.gentoo.org/920185 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.1-r3.ebuild| 588 + ...-Use-av_mallocz-to-avoid-invalid-free-uni.patch | 54 ++ ...coded-fft-Fix-memory-leak-if-ctx2-is-used.patch | 26 + ...ode-validate-hw_frames_ctx-when-AVHWAccel.patch | 64 +++ ...enc-only-check-canvas-size-when-it-is-act.patch | 31 ++ ...le-build-vulkan-decode-code-if-vulkan_av1.patch | 31 ++ ...6-hwcontext_vulkan-guard-unistd.h-include.patch | 33 ++ 7 files changed, 827 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild new file mode 100644 index ..b79bccb0a98f --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild @@ -0,0 +1,588 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=58.60.60 + +SCM="" +if [ "${PV#}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; +fi + +inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/; +if [ "${PV#}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.xz" +else # Release + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc + inherit verify-sig + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; + SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" + + BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) + amr? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + gmp? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + libaribb24? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + encode? ( + amrenc? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + ) + samba? ( GPL-3 ) +" +if [ "${PV#}" = "${PV}" ] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +fi + +# 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=( + +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl + openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan + X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib + # libavdevice options + cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal + opengl + # indevs + libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack + # decoders + amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac + jpeg2k:libopenjpeg jpegxl:libjxl
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/, media-video/ffmpeg/files/
commit: 065f150386f661d27862e152f1613db28aa51d23 Author: Sam James gentoo org> AuthorDate: Sat Dec 16 11:25:19 2023 + Commit: Sam James gentoo org> CommitDate: Sat Dec 16 11:25:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=065f1503 media-video/ffmpeg: fix modern C issues I've sent this upstream but I think it's stuck in the moderation queue. Closes: https://bugs.gentoo.org/919067 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.1-r2.ebuild| 582 + .../ffmpeg/files/ffmpeg-6.1-wint-conversion.patch | 88 2 files changed, 670 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-6.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r2.ebuild new file mode 100644 index ..22bd618b553c --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-6.1-r2.ebuild @@ -0,0 +1,582 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=58.60.60 + +SCM="" +if [ "${PV#}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; +fi + +inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/; +if [ "${PV#}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.xz" +else # Release + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc + inherit verify-sig + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; + SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" + + BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) + amr? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + gmp? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + libaribb24? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + encode? ( + amrenc? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + ) + samba? ( GPL-3 ) +" +if [ "${PV#}" = "${PV}" ] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +fi + +# 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=( + +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl + openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan + X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib + # libavdevice options + cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal + opengl + # indevs + libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack + # decoders + amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac + jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm + libaribb24 mmal modplug:libmodplug opus:libopus qsv:libvpl libilbc librtmp ssh:libssh + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec + vorbis:libvorbis vpx:libvpx zvbi:libzvbi + # libavfilter options + appkit + bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite fontconfig frei0r + fribidi:libfribidi glslang:libglslang ladspa lcms:lcms2 libass libplacebo + libtesseract lv2 rubberband:librubberband shaderc:libshaderc truetype:libfreetype + truetype:libharfbuzz vidstab:libvidstab vmaf:libvmaf zeromq:libzmq zimg:libzimg + # libswresample options + libsoxr + # Threads; we only
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/, media-video/ffmpeg-chromium/files/
commit: 269ceee9f09c565b32a938ed289d0b9ec71f61cb Author: James Le Cuirot gentoo org> AuthorDate: Fri Dec 15 14:23:35 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Fri Dec 15 14:32:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=269ceee9 media-video/ffmpeg-chromium: Drop old 117-r1 Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg-chromium/Manifest | 1 - .../ffmpeg-chromium/ffmpeg-chromium-117-r1.ebuild | 248 - .../files/ffmpeg-chromium-117.patch| 27 --- 3 files changed, 276 deletions(-) diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest index 03013e2ca2ac..5c98ac2cff30 100644 --- a/media-video/ffmpeg-chromium/Manifest +++ b/media-video/ffmpeg-chromium/Manifest @@ -1,3 +1,2 @@ DIST ffmpeg-chromium-114.tar.xz 9934024 BLAKE2B cc11bd00bcf6bef5f946a16f1544881c71503207ba3c6ec57cdc37124ea562366dced2e029f31e57a6f78ec7073412ac0b8ec470d14975a3cc40fad2e96ec5df SHA512 1b1743664d58f5b92971d113ea441604e0b46f28b22df1b02ab0431b8e884789fb6d81b4f50ff1526f716381abcc63e1b336d23edd9ea28abe8b3526fba08ce9 -DIST ffmpeg-chromium-117.tar.xz 10085348 BLAKE2B 2de4d0913061f97967013481a878cd97adca0af0c0eb89c6909cb83ce56ad6ee077b527651f6392b15d78090fb5d7bf05d0734ca4c0aebb678405f51fceab11a SHA512 2bbc6b34cdb1e47fd741e443cde32e95e8adba569d27a559f14a25440280cb0a6a56e5856fc6d7ebdd73aca9942da3ec9c0037079fd39007653c134e1be96e67 DIST ffmpeg-chromium-120.tar.xz 10096036 BLAKE2B 8f24dfed854c713df369e6ef15bc773a3166fdf6eb8c90bcb1d1b7aca0702df7615bc323432a40b5d213352945fa49acf8e864df2caa358764b5068a75f3 SHA512 0e0bfb44225981f91edceeb6f302592a7e108da49c5e6503b43f0e12b91d84dece908efe5e548bb31ccab49c5fba5a8365f5f0793bbf1450d35bfd836f8a3e9b diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-117-r1.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-117-r1.ebuild deleted file mode 100644 index c09c48466f08.. --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-117-r1.ebuild +++ /dev/null @@ -1,248 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -COMMIT="556e3ba65d21006a8732d66e4aa8f810cee39ed0" -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 - 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_vfp - arm? ( cpu_flags_arm_thumb2 ) - ) - cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) - cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) - cpu_flags_arm_v6? ( - arm? ( 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? (
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/, media-video/ffmpeg-chromium/files/
commit: 839baca182506268dfdac70f9034c5dfa9683a76 Author: James Le Cuirot gentoo org> AuthorDate: Sun Dec 10 15:01:14 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Dec 10 15:01:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=839baca1 media-video/ffmpeg-chromium: Version bump to 120 Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg-chromium/Manifest | 1 + .../ffmpeg-chromium/ffmpeg-chromium-120.ebuild | 248 + .../files/ffmpeg-chromium-120.patch| 27 +++ 3 files changed, 276 insertions(+) diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest index 053efc7c0468..03013e2ca2ac 100644 --- a/media-video/ffmpeg-chromium/Manifest +++ b/media-video/ffmpeg-chromium/Manifest @@ -1,2 +1,3 @@ DIST ffmpeg-chromium-114.tar.xz 9934024 BLAKE2B cc11bd00bcf6bef5f946a16f1544881c71503207ba3c6ec57cdc37124ea562366dced2e029f31e57a6f78ec7073412ac0b8ec470d14975a3cc40fad2e96ec5df SHA512 1b1743664d58f5b92971d113ea441604e0b46f28b22df1b02ab0431b8e884789fb6d81b4f50ff1526f716381abcc63e1b336d23edd9ea28abe8b3526fba08ce9 DIST ffmpeg-chromium-117.tar.xz 10085348 BLAKE2B 2de4d0913061f97967013481a878cd97adca0af0c0eb89c6909cb83ce56ad6ee077b527651f6392b15d78090fb5d7bf05d0734ca4c0aebb678405f51fceab11a SHA512 2bbc6b34cdb1e47fd741e443cde32e95e8adba569d27a559f14a25440280cb0a6a56e5856fc6d7ebdd73aca9942da3ec9c0037079fd39007653c134e1be96e67 +DIST ffmpeg-chromium-120.tar.xz 10096036 BLAKE2B 8f24dfed854c713df369e6ef15bc773a3166fdf6eb8c90bcb1d1b7aca0702df7615bc323432a40b5d213352945fa49acf8e864df2caa358764b5068a75f3 SHA512 0e0bfb44225981f91edceeb6f302592a7e108da49c5e6503b43f0e12b91d84dece908efe5e548bb31ccab49c5fba5a8365f5f0793bbf1450d35bfd836f8a3e9b diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild new file mode 100644 index ..804389fc0ccc --- /dev/null +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild @@ -0,0 +1,248 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +COMMIT="bed545c1488e1f95075168dfe02388c16ffe1418" +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 + 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_vfp + arm? ( cpu_flags_arm_thumb2 ) + ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( + arm? ( 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? (
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: e90a3cd1f250a19facc2e0a1d7aecc8a6f8a210f Author: James Le Cuirot gentoo org> AuthorDate: Sat Dec 9 21:14:35 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Dec 9 21:25:14 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90a3cd1 media-video/ffmpeg: Revbump following Chromium changes Sorry, should have done this before. Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg/{ffmpeg-6.1.ebuild => ffmpeg-6.1-r1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-6.1.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r1.ebuild similarity index 100% rename from media-video/ffmpeg/ffmpeg-6.1.ebuild rename to media-video/ffmpeg/ffmpeg-6.1-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 1779330ebf50e7d41667d3adedf6738b7ec4bcce Author: Ulrich Müller gentoo org> AuthorDate: Fri Nov 24 11:56:44 2023 + Commit: Ulrich Müller gentoo org> CommitDate: Sat Dec 9 18:48:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1779330e media-video/ffmpeg: Fix indentation of metadata.xml Signed-off-by: Ulrich Müller gentoo.org> media-video/ffmpeg/metadata.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index 4324d416d85b..d0ff2dc9a99b 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -24,7 +24,7 @@ Enables fribidi support in the drawtext filter. Enables gcrypt support: Needed for rtmp(t)e support if openssl, librtmp or gmp is not used. Enables support for media-libs/game-music-emu for playing various video game music formats. -Use dev-util/glslang to compile GLSL + Use dev-util/glslang to compile GLSL Build GPL code. Should be enabled unless you require LGPL binaries. Use pre-calculated tables rather than calculating them on the fly. @@ -63,7 +63,7 @@ Build and install libpostproc. Enables AV1 encoding support via media-video/rav1e. Adds time-stretching and pitch-shifting audio filter based on media-libs/rubberband. -Use media-libs/shaderc to compile GLSL + Use media-libs/shaderc to compile GLSL Enable app-arch/snappy support. Required for e.g. Vidvox Hap encoder. Enable support for the media-sound/sndio backend Enable support for Secure Reliable Transport (SRT) via net-libs/srt
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: fb535b822ae7b73a575559e929c82e2310005ee6 Author: James Le Cuirot gentoo org> AuthorDate: Sun Dec 3 22:56:28 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Dec 3 23:20:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb535b82 media-video/ffmpeg: Stop building a separate Chromium library for 6.1+ A long time ago, enabling OpenCL broke the libffmpeg.so Chromium library, so we had to perform a separate build without it when necessary. That issue seems to have gone away now so simplify the build. Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg/ffmpeg-6.1.ebuild | 47 ++- media-video/ffmpeg/ffmpeg-.ebuild | 47 ++- 2 files changed, 14 insertions(+), 80 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-6.1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.ebuild index 992b5f8baa39..665e6e7610cb 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.ebuild @@ -357,10 +357,6 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/libavutil/avconfig.h ) -build_separate_libffmpeg() { - use opencl -} - pkg_setup() { # ffmpeg[chromaprint] depends on chromaprint, and chromaprint[tools] depends on ffmpeg. # May cause breakage while updating, #862996, #625210, #833821. @@ -538,20 +534,6 @@ multilib_src_configure() { ${EXTRA_FFMPEG_CONF} echo "${@}" "${@}" || die - - if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then - einfo "Configuring for Chromium" - mkdir -p ../chromium || die - pushd ../chromium >/dev/null || die - set -- "${@}" \ - --disable-shared \ - --enable-static \ - --enable-pic \ - --disable-opencl - echo "${@}" - "${@}" || die - popd >/dev/null || die - fi } multilib_src_compile() { @@ -564,16 +546,8 @@ multilib_src_compile() { fi done - if use chromium; then - if build_separate_libffmpeg; then - einfo "Compiling for Chromium" - pushd ../chromium >/dev/null || die - emake V=1 libffmpeg - popd >/dev/null || die - else - emake V=1 libffmpeg - fi - fi + use chromium && + emake V=1 libffmpeg fi } @@ -593,18 +567,11 @@ multilib_src_install() { done if use chromium; then - if build_separate_libffmpeg; then - einfo "Installing for Chromium" - pushd ../chromium >/dev/null || die - emake V=1 DESTDIR="${D}" install-libffmpeg - popd >/dev/null || die - else - emake V=1 DESTDIR="${D}" install-libffmpeg - - # When not built separately, libffmpeg has no code of - # its own so this QA check raises a false positive. - QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*" - fi + emake V=1 DESTDIR="${D}" install-libffmpeg + + # When not built separately, libffmpeg has no code of + # its own so this QA check raises a false positive. + QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*" fi fi } diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-.ebuild index 992b5f8baa39..665e6e7610cb 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-.ebuild @@ -357,10 +357,6 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/libavutil/avconfig.h ) -build_separate_libffmpeg() { - use opencl -} - pkg_setup() { # ffmpeg[chromaprint] depends on chromaprint, and chromaprint[tools] depends on ffmpeg. # May cause breakage while updating, #862996, #625210, #833821. @@ -538,20 +534,6 @@ multilib_src_configure() { ${EXTRA_FFMPEG_CONF} echo "${@}" "${@}" || die - - if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then - einfo "Configuring for Chromium" - mkdir -p ../chromium || die - pushd ../chromium >/dev/null || die - set -- "${@}" \ - --disable-shared \ - --enable-static \ - --enable-pic \ - --disable-opencl -
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/, media-video/ffmpeg/files/
commit: 7f29ab93f0b3a680d39e48dece2bb98149dd8aff Author: James Le Cuirot gentoo org> AuthorDate: Sun Dec 3 23:00:26 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Dec 3 23:20:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f29ab93 media-video/ffmpeg: Make Chromium library useful again for 6.1+ The libffmpeg.so Chromium library hasn't actually been usable with Chromium for a long time due to a missing symbol. It seems like this symbol will never be upstreamed, so patch it in here. Also ensure Opus support is enabled as browsers expect this. Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg/ffmpeg-6.1.ebuild | 11 +++- media-video/ffmpeg/ffmpeg-.ebuild | 11 +++- media-video/ffmpeg/files/chromium-r2.patch | 41 ++ media-video/ffmpeg/files/chromium.c| 8 ++ 4 files changed, 57 insertions(+), 14 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-6.1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.ebuild index 665e6e7610cb..188eb6e7b762 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.ebuild @@ -334,6 +334,7 @@ GPL_REQUIRED_USE=" ) " REQUIRED_USE=" + chromium? ( opus ) cuda? ( nvenc ) fftools_cws2fws? ( zlib ) glslang? ( vulkan !shaderc ) @@ -350,7 +351,7 @@ RESTRICT=" S=${WORKDIR}/${P/_/-} PATCHES=( - "${FILESDIR}"/chromium-r1.patch + "${FILESDIR}"/chromium-r2.patch ) MULTILIB_WRAPPED_HEADERS=( @@ -382,6 +383,7 @@ src_prepare() { # will ignore user's preference. sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die + ln -snf "${FILESDIR}"/chromium.c chromium.c || die echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die } @@ -566,13 +568,8 @@ multilib_src_install() { fi done - if use chromium; then + use chromium && emake V=1 DESTDIR="${D}" install-libffmpeg - - # When not built separately, libffmpeg has no code of - # its own so this QA check raises a false positive. - QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*" - fi fi } diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-.ebuild index 665e6e7610cb..188eb6e7b762 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-.ebuild @@ -334,6 +334,7 @@ GPL_REQUIRED_USE=" ) " REQUIRED_USE=" + chromium? ( opus ) cuda? ( nvenc ) fftools_cws2fws? ( zlib ) glslang? ( vulkan !shaderc ) @@ -350,7 +351,7 @@ RESTRICT=" S=${WORKDIR}/${P/_/-} PATCHES=( - "${FILESDIR}"/chromium-r1.patch + "${FILESDIR}"/chromium-r2.patch ) MULTILIB_WRAPPED_HEADERS=( @@ -382,6 +383,7 @@ src_prepare() { # will ignore user's preference. sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die + ln -snf "${FILESDIR}"/chromium.c chromium.c || die echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die } @@ -566,13 +568,8 @@ multilib_src_install() { fi done - if use chromium; then + use chromium && emake V=1 DESTDIR="${D}" install-libffmpeg - - # When not built separately, libffmpeg has no code of - # its own so this QA check raises a false positive. - QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*" - fi fi } diff --git a/media-video/ffmpeg/files/chromium-r2.patch b/media-video/ffmpeg/files/chromium-r2.patch new file mode 100644 index ..1de86fe09a1e --- /dev/null +++ b/media-video/ffmpeg/files/chromium-r2.patch @@ -0,0 +1,41 @@ +Allow libffmpeg to be built for Chromium-based browsers +https://patchwork.ffmpeg.org/patch/4500/ + +NOTE: This patch lacks the Makefile include line. We append it +manually instead to make patching across different versions easier. + +diff --git a/ffbuild/libffmpeg.mak b/ffbuild/libffmpeg.mak +new file mode 100644 +index 000..992cf3c +--- /dev/null b/ffbuild/libffmpeg.mak +@@ -0,0 +1,27 @@ ++LIBFFMPEG = $(SLIBPREF)ffmpeg$(SLIBSUF) ++LIBFFMPEG_LINK = $(LD) -shared -Wl,-soname,$(LIBFFMPEG) -Wl,-Bsymbolic -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -Wl,--gc-sections $(LDFLAGS) $(LDLIBFLAGS) -o $(LIBFFMPEG) ++ ++ifeq ($(CONFIG_SHARED),yes) ++LIBFFMPEG_DEPS = libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF) ++else ++LIBFFMPEG_DEPS = libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF) ++endif ++ ++$(LIBFFMPEG): $(LIBFFMPEG_DEPS)
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/
commit: c1281eb0240b0ae1740b82b1ccf6f5f53b276084 Author: James Le Cuirot gentoo org> AuthorDate: Sun Dec 3 23:11:01 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Dec 3 23:20:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1281eb0 media-video/ffmpeg-chromium: Drop opus USE flag to always enable support Browsers always expect Opus support. Signed-off-by: James Le Cuirot gentoo.org> .../{ffmpeg-chromium-114.ebuild => ffmpeg-chromium-114-r1.ebuild}| 5 +++-- .../{ffmpeg-chromium-117.ebuild => ffmpeg-chromium-117-r1.ebuild}| 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-114-r1.ebuild similarity index 99% rename from media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild rename to media-video/ffmpeg-chromium/ffmpeg-chromium-114-r1.ebuild index da89ecc4a215..af6f8a58ab78 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-114-r1.ebuild @@ -27,7 +27,7 @@ FFMPEG_FLAG_MAP=( +gpl vaapi vdpau vulkan # decoders - mmal +opus:libopus + mmal nvenc:ffnvcodec # Threads; we only support pthread for now but ffmpeg supports more +threads:pthreads @@ -90,7 +90,7 @@ CPU_REQUIRED_USE=" RDEPEND=" mmal? ( media-libs/raspberrypi-userland ) - opus? ( >=media-libs/opus-1.0.2-r2 ) + >=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 ) @@ -213,6 +213,7 @@ src_configure() { --enable-avcodec \ --enable-avformat \ --enable-avutil \ + --enable-libopus \ --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 \ diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-117.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-117-r1.ebuild similarity index 99% rename from media-video/ffmpeg-chromium/ffmpeg-chromium-117.ebuild rename to media-video/ffmpeg-chromium/ffmpeg-chromium-117-r1.ebuild index 3709cb55e8ee..c09c48466f08 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-117.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-117-r1.ebuild @@ -27,7 +27,7 @@ FFMPEG_FLAG_MAP=( +gpl vaapi vdpau vulkan # decoders - mmal +opus:libopus + mmal nvenc:ffnvcodec # Threads; we only support pthread for now but ffmpeg supports more +threads:pthreads @@ -96,7 +96,7 @@ CPU_REQUIRED_USE=" RDEPEND=" mmal? ( media-libs/raspberrypi-userland ) - opus? ( >=media-libs/opus-1.0.2-r2 ) + >=media-libs/opus-1.0.2-r2 vaapi? ( >=media-libs/libva-1.2.1-r1:0= ) nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) vdpau? ( >=x11-libs/libvdpau-0.7 ) @@ -226,6 +226,7 @@ src_configure() { --enable-avcodec \ --enable-avformat \ --enable-avutil \ + --enable-libopus \ --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 \
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/
commit: a6d55492eca0425b5bc9750681d00510d809e4ea Author: James Le Cuirot gentoo org> AuthorDate: Sun Dec 3 16:32:47 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Dec 3 16:32:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d55492 media-video/ffmpeg-chromium: Work around vulkan linking issue with flag This should be fixed upstream in the next release. Closes: https://bugs.gentoo.org/918997 Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg-chromium/ffmpeg-chromium-117.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-117.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-117.ebuild index c51a4c4b8b9b..3709cb55e8ee 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-117.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-117.ebuild @@ -137,6 +137,9 @@ src_prepare() { src_configure() { local myconf=( ) + # Bug #918997. Will probably be fixed upstream in the next release. + use vulkan && append-ldflags -Wl,-z,muldefs + # bug 842201 use ia64 && tc-is-gcc && append-flags \ -fno-tree-ccp \
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/files/, media-video/ffmpeg-chromium/
commit: 33f108891044253b68de92157add2a032dd67b0a Author: James Le Cuirot gentoo org> AuthorDate: Fri Dec 1 23:28:30 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Fri Dec 1 23:31:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33f10889 media-video/ffmpeg-chromium: Version bump to 117 Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg-chromium/Manifest | 1 + .../ffmpeg-chromium/ffmpeg-chromium-117.ebuild | 244 + .../files/ffmpeg-chromium-117.patch| 27 +++ 3 files changed, 272 insertions(+) diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest index 62b13188f8f7..053efc7c0468 100644 --- a/media-video/ffmpeg-chromium/Manifest +++ b/media-video/ffmpeg-chromium/Manifest @@ -1 +1,2 @@ DIST ffmpeg-chromium-114.tar.xz 9934024 BLAKE2B cc11bd00bcf6bef5f946a16f1544881c71503207ba3c6ec57cdc37124ea562366dced2e029f31e57a6f78ec7073412ac0b8ec470d14975a3cc40fad2e96ec5df SHA512 1b1743664d58f5b92971d113ea441604e0b46f28b22df1b02ab0431b8e884789fb6d81b4f50ff1526f716381abcc63e1b336d23edd9ea28abe8b3526fba08ce9 +DIST ffmpeg-chromium-117.tar.xz 10085348 BLAKE2B 2de4d0913061f97967013481a878cd97adca0af0c0eb89c6909cb83ce56ad6ee077b527651f6392b15d78090fb5d7bf05d0734ca4c0aebb678405f51fceab11a SHA512 2bbc6b34cdb1e47fd741e443cde32e95e8adba569d27a559f14a25440280cb0a6a56e5856fc6d7ebdd73aca9942da3ec9c0037079fd39007653c134e1be96e67 diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-117.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-117.ebuild new file mode 100644 index ..c51a4c4b8b9b --- /dev/null +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-117.ebuild @@ -0,0 +1,244 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +COMMIT="556e3ba65d21006a8732d66e4aa8f810cee39ed0" +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_vfp + arm? ( cpu_flags_arm_thumb2 ) + ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( + arm? ( 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=" +
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 1a7a4c504ad981e8d6b7b6d80738796c48152f14 Author: Ionen Wolkens gentoo org> AuthorDate: Thu Nov 23 07:32:52 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Thu Nov 23 08:11:55 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a7a4c50 media-video/ffmpeg: update nv-codec-headers version requirements ffmpeg-4, 5, and 6.0: Building against nv-codec-headers-12 *works* but then nvenc is unusable at runtime. ffmpeg-6.0.1: Any in-tree version seems fine. >=ffmpeg-6.1: Requires >=11.1.5.3 wrt bug #917765 (mpv is fine with -12 as well, but have not tested other consumers). No need for revbumps, technically this shouldn't be in RDEPEND but not going to re-arrange things more than necessary. Closes: https://bugs.gentoo.org/917765 Signed-off-by: Ionen Wolkens gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild | 2 +- media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild | 2 +- media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 2 +- media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild | 2 +- media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-5.1.4.ebuild| 2 +- media-video/ffmpeg/ffmpeg-6.0-r10.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0-r9.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0.1.ebuild| 2 +- media-video/ffmpeg/ffmpeg-6.1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-.ebuild | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild index 57679511d8c1..6645a2cf80b4 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild @@ -261,7 +261,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( =media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild index ddefa61892eb..f58a29fe1bc4 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild @@ -263,7 +263,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( =media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index 8cdd98613c21..19f8a2283312 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -264,7 +264,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( =media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild b/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild index 3eee659198b1..26bb3186e662 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild @@ -267,7 +267,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( =media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild index 255803ae6dee..39d9265358be 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild @@ -269,7 +269,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( =media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-5.1.4.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4.ebuild index ce56738559ae..dc24b0c54150 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.4.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.4.ebuild @@ -267,7 +267,7 @@ RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 70d036f4b3b93858bd7f96d4e2da8e83e16e2e41 Author: Leonardo Hernández Hernández proton me> AuthorDate: Sun Nov 12 03:35:40 2023 + Commit: Sam James gentoo org> CommitDate: Wed Nov 22 17:35:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70d036f4 media-video/ffmpeg: add 6.1 Signed-off-by: Leonardo Hernández Hernández proton.me> Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/Manifest | 2 + media-video/ffmpeg/ffmpeg-6.1.ebuild | 613 +++ 2 files changed, 615 insertions(+) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index ca57f93232e7..e2033d12f60b 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -8,3 +8,5 @@ DIST ffmpeg-6.0.1.tar.xz 10240172 BLAKE2B 1e21862f1f4eac04b8e9ef5597853d9e105bac DIST ffmpeg-6.0.1.tar.xz.asc 520 BLAKE2B dc7222c7c55e9af28c54dcfae4fce33fb44aa2a7e9d2ca4af85a961568b67f63116a6597234cd7ce009669b8ecf6576defd9380c389356435ffc3026b1126f03 SHA512 314f9ef996b85bc93c9fb823d582697c7415ac35f56bfc9cd906893491c8076df90bd852cf6e5e757b1fa94bd415ed108488c1220add49eb1f4854fc253c178c DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5abe7f1d7fa797d05e29e00971f98cbf37832c1c3dc5fa949a5beddef05a6ec55ae6668091976ea870ad93c0e8d SHA512 4d0e8f635d5a1633710f30cb3e0a854b6ca3bf85e33a289d1ec7aca2ad55dc4910010bc9cf3f13eee9f6decb9d50a0df6d7aa5a342f308c3868d2730f3a6b980 DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012d82dc7aa1a83d5fe6d5453bd3c8620fdfb743df780cf588983a06a66a458c4e3e454dbe535cbba9da30c48c SHA512 a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed +DIST ffmpeg-6.1.tar.xz 10455956 BLAKE2B 5eaee0e0f72139e3b018e6ee26a102c7d6881ec8e7a70b21c51e4a515a37396ae12f19185112bb3f8b3401b85e68c08435146a83470e07ffb571d3d9bca89289 SHA512 72f47924806b9b128672bd268aa2c8fc2c9b8491899a772b6f82421daa2b67de45a4bdd71f6071825814e599a73adb1e42682e202a12fc055e9a224c7d5baa4a +DIST ffmpeg-6.1.tar.xz.asc 520 BLAKE2B 774ba20a8ad3d786368c7e6928ee0976cd943756f24e3f076dc0cc92fc0069637f0a9a92e3c5238c74148330385d040118d3c5f9af6b267d572283b8de83b286 SHA512 e4885270869cc6a1681bc3f76f344f77c4858c490a517e45a758d15214ce67c3c2113a1caa8ca65eb6447b68d822fa1dd730081345bcc0928faaf82bb76037ba diff --git a/media-video/ffmpeg/ffmpeg-6.1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.ebuild new file mode 100644 index ..2f76b30f7342 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-6.1.ebuild @@ -0,0 +1,613 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=58.60.60 + +SCM="" +if [ "${PV#}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; +fi + +inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/; +if [ "${PV#}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.xz" +else # Release + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc + inherit verify-sig + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; + SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" + + BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) + amr? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + gmp? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + libaribb24? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + encode? ( + amrenc? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + ) + samba? ( GPL-3 ) +" +if [ "${PV#}" = "${PV}" ] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +fi + +# Options to
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 1e1baa011f5afccf122c9d24545eae9834aa47c8 Author: Leonardo Hernández Hernández proton me> AuthorDate: Wed Nov 15 20:14:05 2023 + Commit: Sam James gentoo org> CommitDate: Wed Nov 22 17:35:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1baa01 media-video/ffmpeg: wire up vulkan filters Signed-off-by: Leonardo Hernández Hernández proton.me> Signed-off-by: Sam James gentoo.org> .../{ffmpeg-6.1.ebuild => ffmpeg-4.4.4-r8.ebuild} | 79 ++ .../{ffmpeg-6.1.ebuild => ffmpeg-5.1.4-r1.ebuild} | 51 +++--- media-video/ffmpeg/ffmpeg-6.1.ebuild | 14 ++-- media-video/ffmpeg/ffmpeg-.ebuild | 14 ++-- media-video/ffmpeg/metadata.xml| 2 + 5 files changed, 80 insertions(+), 80 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-6.1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild similarity index 89% copy from media-video/ffmpeg/ffmpeg-6.1.ebuild copy to media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index 2f76b30f7342..8cdd98613c21 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -12,7 +12,7 @@ EAPI=8 # changes its ABI then this package will be rebuilt needlessly. Hence, such a # package is free _not_ to := depend on FFmpeg but I would strongly encourage # doing so since such a case is unlikely. -FFMPEG_SUBSLOT=58.60.60 +FFMPEG_SUBSLOT=56.58.58 SCM="" if [ "${PV#}" != "${PV}" ] ; then @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form. @@ -83,16 +83,15 @@ FFMPEG_FLAG_MAP=( libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack # decoders amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac - jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm - libaribb24 mmal modplug:libmodplug opus:libopus qsv:libvpl libilbc librtmp ssh:libssh + jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm + libaribb24 mmal modplug:libmodplug opus:libopus qsv:libmfx libilbc librtmp ssh:libssh speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec vorbis:libvorbis vpx:libvpx zvbi:libzvbi # libavfilter options appkit - bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf - fribidi:libfribidi fontconfig ladspa lcms:lcms2 libass libplacebo libtesseract lv2 - truetype:libfreetype truetype:libharfbuzz vidstab:libvidstab - rubberband:librubberband zeromq:libzmq zimg:libzimg + bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r fribidi:libfribidi + fontconfig glslang:libglslang ladspa libass libtesseract lv2 truetype:libfreetype + vidstab:libvidstab vmaf:libvmaf rubberband:librubberband zeromq:libzmq zimg:libzimg # libswresample options libsoxr # Threads; we only support pthread for now but ffmpeg supports more @@ -101,8 +100,8 @@ FFMPEG_FLAG_MAP=( # Same as above but for encoders, i.e. they do something only with USE=encode. FFMPEG_ENCODER_FLAG_MAP=( - amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame - openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1 + 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 ) @@ -193,13 +192,13 @@ RDEPEND=" cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] ) - dav1d? ( >=media-libs/dav1d-0.5.0:0=[${MULTILIB_USEDEP}] ) + dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) - kvazaar? ( >=media-libs/kvazaar-2.0.0[${MULTILIB_USEDEP}] ) + 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-0.5:=[capi] ) + rav1e? (
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: edd65ed61fd33325159526d96493869ca2e05347 Author: Leonardo Hernández Hernández proton me> AuthorDate: Sun Nov 12 04:53:33 2023 + Commit: Sam James gentoo org> CommitDate: Wed Nov 22 17:35:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edd65ed6 media-video/ffmpeg: sync live Signed-off-by: Leonardo Hernández Hernández proton.me> Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-.ebuild | 16 +--- media-video/ffmpeg/metadata.xml | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-.ebuild index 9d0e86211982..2f76b30f7342 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-.ebuild @@ -91,7 +91,7 @@ FFMPEG_FLAG_MAP=( appkit bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf fribidi:libfribidi fontconfig ladspa lcms:lcms2 libass libplacebo libtesseract lv2 - truetype:libfreetype vidstab:libvidstab + truetype:libfreetype truetype:libharfbuzz vidstab:libvidstab rubberband:librubberband zeromq:libzmq zimg:libzimg # libswresample options libsoxr @@ -269,7 +269,10 @@ RDEPEND=" ) nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) svt-av1? ( >=media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) + truetype? ( + >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] + media-libs/harfbuzz:=[${MULTILIB_USEDEP}] + ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) @@ -447,6 +450,8 @@ multilib_src_configure() { for i in "${CPU_FEATURES_MAP[@]}" ; do use ${i%:*} || myconf+=( --disable-${i#*:} ) done + # Bug #917277, #917278 + myconf+=( --disable-dotprod --disable-i8mm ) if use pic ; then myconf+=( --enable-pic ) @@ -468,11 +473,16 @@ multilib_src_configure() { done # LTO support, bug #566282, bug #754654, bug #772854 - [[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" ) + if [[ ${ABI} != x86 ]] && is-flagq "-flto*"; then + # Respect -flto value, e.g -flto=thin + local v="$(get-flag flto)" + [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) + fi filter-lto # Mandatory configuration myconf=( + --disable-libaribcaption # libaribcaption is not packaged (yet?) --enable-avfilter --disable-stripping # This is only for hardcoded cflags; those are used in configure checks that may diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index d24bdaedb63c..14fb807be699 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -67,6 +67,7 @@ Enable support for Secure Reliable Transport (SRT) via net-libs/srt Enable SSH/sftp support via net-libs/libssh. Enables AV1 encoding support via media-libs/svt-av1. + Enables drawtext filter via media-libs/freetype and media-libs/harfbuzz. Enables MP2 encoding via media-sound/twolame as an alternative to the internal encoder. Enables video stabilization filter using vid.stab library (media-libs/vidstab). Enables Netflix's perceptual video quality assessment filter using the library (media-libs/libvmaf).
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: a072bf78d8bcfa90a5e6d69e9ca88fc013c1b5a3 Author: Sam James gentoo org> AuthorDate: Tue Nov 14 11:36:04 2023 + Commit: Sam James gentoo org> CommitDate: Tue Nov 14 11:41:27 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a072bf78 media-video/ffmpeg: add -k for tests to get full results We want full results even if one test fails - this is the general principle we follow in other tests, and feels in the spirit of the verbose logs policy too. We really don't want to play whack-a-mole if a user reports an issue, better to see the full thing. Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild | 2 +- media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild | 2 +- media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild | 2 +- media-video/ffmpeg/ffmpeg-5.1.4.ebuild| 2 +- media-video/ffmpeg/ffmpeg-6.0-r10.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0-r9.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0.1.ebuild| 2 +- media-video/ffmpeg/ffmpeg-.ebuild | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild index 007eb6883cf3..57679511d8c1 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild @@ -565,7 +565,7 @@ multilib_src_compile() { multilib_src_test() { LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \ - emake V=1 fate + emake V=1 fate -k } multilib_src_install() { diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild index 0dc8618c0acb..ddefa61892eb 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild @@ -568,7 +568,7 @@ multilib_src_compile() { multilib_src_test() { LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \ - emake V=1 fate + emake V=1 fate -k } multilib_src_install() { diff --git a/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild b/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild index d00124804595..3eee659198b1 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild @@ -568,7 +568,7 @@ multilib_src_compile() { multilib_src_test() { LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \ - emake V=1 fate + emake V=1 fate -k } multilib_src_install() { diff --git a/media-video/ffmpeg/ffmpeg-5.1.4.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4.ebuild index c2dea8e5cdb6..ce56738559ae 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.4.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.4.ebuild @@ -566,7 +566,7 @@ multilib_src_compile() { multilib_src_test() { LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \ - emake V=1 fate + emake V=1 fate -k } multilib_src_install() { diff --git a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild index 0c0a26a9e1db..d00189a64794 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild @@ -569,7 +569,7 @@ multilib_src_compile() { multilib_src_test() { LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \ - emake V=1 fate + emake V=1 fate -k } multilib_src_install() { diff --git a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild index 325d69256554..97928dcfec5f 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild @@ -567,7 +567,7 @@ multilib_src_compile() { multilib_src_test() { LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \ - emake V=1 fate + emake V=1 fate -k } multilib_src_install() { diff --git a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 11fd82132bd5fa7d79cd9154293c842d184996a2 Author: Leonardo Hernández Hernández proton me> AuthorDate: Sun Nov 12 03:08:57 2023 + Commit: Sam James gentoo org> CommitDate: Mon Nov 13 04:57:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11fd8213 media-video/ffmpeg: add 5.1.4 Closes: https://bugs.gentoo.org/916104 Signed-off-by: Leonardo Hernández Hernández proton.me> Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/Manifest| 2 + media-video/ffmpeg/ffmpeg-5.1.4.ebuild | 604 + 2 files changed, 606 insertions(+) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 59d50e6b6b7f..44163ad2f8a4 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -2,5 +2,7 @@ DIST ffmpeg-4.4.4.tar.xz 9565584 BLAKE2B 8cd76a91ae6e485e56c6e5ae7b31d678e2fc2d6 DIST ffmpeg-4.4.4.tar.xz.asc 520 BLAKE2B c8bf944883e37b6dd69029fe863c23f68a3584d84aa3e9c4278ae45aee0bfa3697cc1d8a768b95a1ebd7a9cb91553671072f88f46f6a9c947faa74344a44 SHA512 47afa042d8b529d0bfce391455a25cda261f39f8510601d7de2aba6398483ecb623992626e8489aa2a636e3cb93008f26b32080e526143254226d4e2651accea DIST ffmpeg-5.1.3.tar.xz 10007756 BLAKE2B 033dddac096d5dbbfadcf1af51fd1e93d222af1ec6ce7c36000c6a02cf9413288c7fcc7316d450926c60ea9e4193cc66ee004130836816ada5d5833375c7 SHA512 4310f27fe0c7b4363207e1535115e0ad266a45772bdb5445f5c8658f35b0f3216d8f2cf70d1d2baa71b12069fbdccf418a774b353ddf092d4f66829ef391508a DIST ffmpeg-5.1.3.tar.xz.asc 520 BLAKE2B 09d7ff694a2fc61a00443b90f905bb771c3fb7244a154bbe289fe98a4520202a8066bff593ef0142d8d7387a75d4e4dc68e553fbeba98d0fdd51881f28a54623 SHA512 a7348205ef6648e5c73c32fbe99b8130256d1157d1a7c128701b240e4096ac16778cfcc74a922fe8147e0a137119b8a5fd60f006328454b712eefe154f546318 +DIST ffmpeg-5.1.4.tar.xz 10009968 BLAKE2B 3e632e6de23a8dd0a75b01910e9a642840f06dc3eba4cd015b729889f785b98d1fdb4e43b8e8a2e9ea69c8fa686f6fcc9f5785837a9f32ccd8d69331d408a99a SHA512 7d7fe8c660a62971a979553a864648d5c859059d3e64d4d32e4f5dca6fd4374270abdeec2dd782c34b2254e7485995c3fe0c1dcef54159e30536eab7f20e0795 +DIST ffmpeg-5.1.4.tar.xz.asc 520 BLAKE2B 5d391b77341a3da9bd5654be4eb688c3d8bc31b41075630bf17f6422d5a0b4cecdb2ebf8ee2e1bf82f6ecaaa07b00c29a9347cca57e9d278900d05b38de20484 SHA512 f161815d47c988f8b6281a95f22301d07a22ddc41a2a84bfc126b4d7de0e9175da499c2cc15b3bdaa415af0e8ed1d2b4d52096a81b4a3d804effb00ff9e8ec5b DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5abe7f1d7fa797d05e29e00971f98cbf37832c1c3dc5fa949a5beddef05a6ec55ae6668091976ea870ad93c0e8d SHA512 4d0e8f635d5a1633710f30cb3e0a854b6ca3bf85e33a289d1ec7aca2ad55dc4910010bc9cf3f13eee9f6decb9d50a0df6d7aa5a342f308c3868d2730f3a6b980 DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012d82dc7aa1a83d5fe6d5453bd3c8620fdfb743df780cf588983a06a66a458c4e3e454dbe535cbba9da30c48c SHA512 a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed diff --git a/media-video/ffmpeg/ffmpeg-5.1.4.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4.ebuild new file mode 100644 index ..c2dea8e5cdb6 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-5.1.4.ebuild @@ -0,0 +1,604 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=57.59.59 + +SCM="" +if [ "${PV#}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; +fi + +inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/; +if [ "${PV#}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.xz" +else # Release + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc + inherit verify-sig + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; + SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" + + BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl?
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: a68f849b7d617acd32f29b1c1712f29cf6fe11bc Author: Leonardo Hernández Hernández proton me> AuthorDate: Sun Nov 12 03:25:17 2023 + Commit: Sam James gentoo org> CommitDate: Mon Nov 13 04:57:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68f849b media-video/ffmpeg: add 6.0.1 Closes: https://bugs.gentoo.org/916104 Signed-off-by: Leonardo Hernández Hernández proton.me> Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/Manifest| 2 + media-video/ffmpeg/ffmpeg-6.0.1.ebuild | 604 + 2 files changed, 606 insertions(+) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 44163ad2f8a4..ca57f93232e7 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -4,5 +4,7 @@ DIST ffmpeg-5.1.3.tar.xz 10007756 BLAKE2B 033dddac096d5dbbfadcf1af51fd1e93d222af DIST ffmpeg-5.1.3.tar.xz.asc 520 BLAKE2B 09d7ff694a2fc61a00443b90f905bb771c3fb7244a154bbe289fe98a4520202a8066bff593ef0142d8d7387a75d4e4dc68e553fbeba98d0fdd51881f28a54623 SHA512 a7348205ef6648e5c73c32fbe99b8130256d1157d1a7c128701b240e4096ac16778cfcc74a922fe8147e0a137119b8a5fd60f006328454b712eefe154f546318 DIST ffmpeg-5.1.4.tar.xz 10009968 BLAKE2B 3e632e6de23a8dd0a75b01910e9a642840f06dc3eba4cd015b729889f785b98d1fdb4e43b8e8a2e9ea69c8fa686f6fcc9f5785837a9f32ccd8d69331d408a99a SHA512 7d7fe8c660a62971a979553a864648d5c859059d3e64d4d32e4f5dca6fd4374270abdeec2dd782c34b2254e7485995c3fe0c1dcef54159e30536eab7f20e0795 DIST ffmpeg-5.1.4.tar.xz.asc 520 BLAKE2B 5d391b77341a3da9bd5654be4eb688c3d8bc31b41075630bf17f6422d5a0b4cecdb2ebf8ee2e1bf82f6ecaaa07b00c29a9347cca57e9d278900d05b38de20484 SHA512 f161815d47c988f8b6281a95f22301d07a22ddc41a2a84bfc126b4d7de0e9175da499c2cc15b3bdaa415af0e8ed1d2b4d52096a81b4a3d804effb00ff9e8ec5b +DIST ffmpeg-6.0.1.tar.xz 10240172 BLAKE2B 1e21862f1f4eac04b8e9ef5597853d9e105bac4e858960c07e244ec3dbcea8f9e9fbdec4ff20b64227afad5ea5d0b05eff79a905f8002314ab4e9c37116c1908 SHA512 8a86b2db4a9abb68bb86d770ba1babb76c8b8313cfb0258ae70c88e736a93b99c342a6ecda94b739e8e7c103bed75d4afd756dd94e08c6255f424ef62c264741 +DIST ffmpeg-6.0.1.tar.xz.asc 520 BLAKE2B dc7222c7c55e9af28c54dcfae4fce33fb44aa2a7e9d2ca4af85a961568b67f63116a6597234cd7ce009669b8ecf6576defd9380c389356435ffc3026b1126f03 SHA512 314f9ef996b85bc93c9fb823d582697c7415ac35f56bfc9cd906893491c8076df90bd852cf6e5e757b1fa94bd415ed108488c1220add49eb1f4854fc253c178c DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5abe7f1d7fa797d05e29e00971f98cbf37832c1c3dc5fa949a5beddef05a6ec55ae6668091976ea870ad93c0e8d SHA512 4d0e8f635d5a1633710f30cb3e0a854b6ca3bf85e33a289d1ec7aca2ad55dc4910010bc9cf3f13eee9f6decb9d50a0df6d7aa5a342f308c3868d2730f3a6b980 DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012d82dc7aa1a83d5fe6d5453bd3c8620fdfb743df780cf588983a06a66a458c4e3e454dbe535cbba9da30c48c SHA512 a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed diff --git a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1.ebuild new file mode 100644 index ..722cb88bd2cc --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-6.0.1.ebuild @@ -0,0 +1,604 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=58.60.60 + +SCM="" +if [ "${PV#}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; +fi + +inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/; +if [ "${PV#}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.xz" +else # Release + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc + inherit verify-sig + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; + SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" + + BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl?
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 93ef08e6eb5c718090a8156c00c5114525af90e0 Author: Michał Górny gentoo org> AuthorDate: Sun Oct 22 12:50:27 2023 + Commit: Michał Górny gentoo org> CommitDate: Fri Oct 27 15:18:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ef08e6 media-video/ffmpeg: Remove redundant local flag descs Signed-off-by: Michał Górny gentoo.org> media-video/ffmpeg/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index 88482e70770c..d24bdaedb63c 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -36,7 +36,6 @@ Improvements are being made to the runtime initialization, and so over time, this option will have an impact on fewer and fewer codecs. Support for FireWire DV/HDV input device using media-libs/libiec61883. - Enable JPEG XL de/encoding via media-libs/libjxl. Enables media-libs/kvazaar based HEVC encoder. Enable ICC profile support via media-libs/lcms. Enables media-libs/libaom based AV1 codec support.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: e887ce7bd6dcb082de177e506935af71212c2912 Author: Joonas Niilola gentoo org> AuthorDate: Sat Oct 21 16:08:29 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Oct 21 16:08:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e887ce7b media-video/ffmpeg: add newly registered subslot binder for amf Signed-off-by: Joonas Niilola gentoo.org> media-video/ffmpeg/{ffmpeg-4.4.4-r3.ebuild => ffmpeg-4.4.4-r6.ebuild} | 2 +- media-video/ffmpeg/{ffmpeg-4.4.4-r4.ebuild => ffmpeg-4.4.4-r7.ebuild} | 2 +- media-video/ffmpeg/{ffmpeg-5.1.3-r4.ebuild => ffmpeg-5.1.3-r5.ebuild} | 2 +- media-video/ffmpeg/{ffmpeg-6.0-r7.ebuild => ffmpeg-6.0-r10.ebuild}| 2 +- media-video/ffmpeg/{ffmpeg-6.0-r6.ebuild => ffmpeg-6.0-r9.ebuild} | 2 +- media-video/ffmpeg/ffmpeg-.ebuild | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r3.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-4.4.4-r3.ebuild rename to media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild index 717a0742f97b..14630c89725d 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild @@ -182,7 +182,7 @@ IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" RDEPEND=" alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - amf? ( media-video/amdgpu-pro-amf ) + amf? ( media-video/amdgpu-pro-amf:= ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r4.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-4.4.4-r4.ebuild rename to media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild index 0d8de811bc70..ee7606ca6f13 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild @@ -184,7 +184,7 @@ IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" RDEPEND=" alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - amf? ( media-video/amdgpu-pro-amf ) + amf? ( media-video/amdgpu-pro-amf:= ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-5.1.3-r4.ebuild b/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-5.1.3-r4.ebuild rename to media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild index 1d0d84cfa17f..0a11f2195cb0 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.3-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild @@ -185,7 +185,7 @@ IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" RDEPEND=" alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - amf? ( media-video/amdgpu-pro-amf ) + amf? ( media-video/amdgpu-pro-amf:= ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r7.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-6.0-r7.ebuild rename to media-video/ffmpeg/ffmpeg-6.0-r10.ebuild index 4b3fc984c7f2..2f4579d4dc85 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r7.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild @@ -185,7 +185,7 @@ IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" RDEPEND=" alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - amf? ( media-video/amdgpu-pro-amf ) + amf? ( media-video/amdgpu-pro-amf:= ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r6.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-6.0-r6.ebuild rename to media-video/ffmpeg/ffmpeg-6.0-r9.ebuild index 1db003708b80..22c7b8766cec 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r6.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild @@ -183,7 +183,7 @@ IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" RDEPEND=" alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - amf? ( media-video/amdgpu-pro-amf ) + amf? ( media-video/amdgpu-pro-amf:= ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) diff --git
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 99bea4cef6884fdadf9a58893009f42071b45c1a Author: Joonas Niilola gentoo org> AuthorDate: Sat Oct 21 16:09:22 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Oct 21 16:09:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99bea4ce media-video/ffmpeg: drop 5.1.3-r3, 6.0-r2, 6.0-r5 Signed-off-by: Joonas Niilola gentoo.org> media-video/ffmpeg/ffmpeg-5.1.3-r3.ebuild | 603 - media-video/ffmpeg/ffmpeg-6.0-r2.ebuild | 602 - media-video/ffmpeg/ffmpeg-6.0-r5.ebuild | 604 -- 3 files changed, 1809 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-5.1.3-r3.ebuild b/media-video/ffmpeg/ffmpeg-5.1.3-r3.ebuild deleted file mode 100644 index 8c290006f1db.. --- a/media-video/ffmpeg/ffmpeg-5.1.3-r3.ebuild +++ /dev/null @@ -1,603 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Subslot: libavutil major.libavcodec major.libavformat major -# Since FFmpeg ships several libraries, subslot is kind of limited here. -# Most consumers will use those three libraries, if a "less used" library -# changes its soname, consumers will have to be rebuilt the old way -# (preserve-libs). -# If, for example, a package does not link to libavformat and only libavformat -# changes its ABI then this package will be rebuilt needlessly. Hence, such a -# package is free _not_ to := depend on FFmpeg but I would strongly encourage -# doing so since such a case is unlikely. -FFMPEG_SUBSLOT=57.59.59 - -SCM="" -if [ "${PV#}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_MIN_CLONE_TYPE="single" - EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; -fi - -inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" -HOMEPAGE="https://ffmpeg.org/; -if [ "${PV#}" != "${PV}" ] ; then - SRC_URI="" -elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.xz" -else # Release - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/ffmpeg.asc - inherit verify-sig - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; - SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" - - BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" -fi -FFMPEG_REVISION="${PV#*_p}" - -SLOT="0/${FFMPEG_SUBSLOT}" -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) - amr? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - gmp? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - libaribb24? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - encode? ( - amrenc? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - ) - samba? ( GPL-3 ) -" -if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" -fi - -# 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=( - +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp - +gpl hardcoded-tables +iconv libxml2 lzma +network opencl - openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan - X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib - # libavdevice options - cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal - opengl - # indevs - libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack - # decoders - amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac - jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm - libaribb24 mmal modplug:libmodplug opus:libopus qsv:libmfx libilbc librtmp ssh:libssh - speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec - vorbis:libvorbis vpx:libvpx zvbi:libzvbi - # libavfilter options - appkit - bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf - fribidi:libfribidi fontconfig ladspa lcms:lcms2 libass libplacebo libtesseract lv2 - truetype:libfreetype vidstab:libvidstab - rubberband:librubberband zeromq:libzmq zimg:libzimg - # libswresample options - libsoxr - # Threads; we only support pthread for now but ffmpeg
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/, media-video/ffmpeg-chromium/files/
commit: d738508f98b85034ebfd515f35d82f832cb1580f Author: James Le Cuirot gentoo org> AuthorDate: Mon Oct 16 21:58:08 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Mon Oct 16 21:58:08 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d738508f media-video/ffmpeg-chromium: Drop old 102 and 106 Signed-off-by: James Le Cuirot gentoo.org> media-video/ffmpeg-chromium/Manifest | 2 - .../ffmpeg-chromium/ffmpeg-chromium-102.ebuild | 244 - .../ffmpeg-chromium/ffmpeg-chromium-106.ebuild | 235 .../files/ffmpeg-chromium-vk-headers.patch | 36 --- 4 files changed, 517 deletions(-) diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest index 2a8f8055040d..62b13188f8f7 100644 --- a/media-video/ffmpeg-chromium/Manifest +++ b/media-video/ffmpeg-chromium/Manifest @@ -1,3 +1 @@ -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-114.tar.xz 9934024 BLAKE2B cc11bd00bcf6bef5f946a16f1544881c71503207ba3c6ec57cdc37124ea562366dced2e029f31e57a6f78ec7073412ac0b8ec470d14975a3cc40fad2e96ec5df SHA512 1b1743664d58f5b92971d113ea441604e0b46f28b22df1b02ab0431b8e884789fb6d81b4f50ff1526f716381abcc63e1b336d23edd9ea28abe8b3526fba08ce9 diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild deleted file mode 100644 index 6e4409a5274b.. --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild +++ /dev/null @@ -1,244 +0,0 @@ -# Copyright 1999-2023 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 ) -
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: c03232c13925182a9c2dfcda50edf180b732a9ae Author: Sam James gentoo org> AuthorDate: Sat Oct 14 10:31:08 2023 + Commit: Sam James gentoo org> CommitDate: Sat Oct 14 10:31:08 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c03232c1 media-video/ffmpeg: destabilize 6.0-r7 for ~amd64, ~arm64, ~ppc64 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r7.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r7.ebuild index c66b8ced30f9..4b3fc984c7f2 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r7.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r7.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 4fb38c18bc1aa0010cea301d2e2de1f7aac60372 Author: Leonardo Hernández Hernández proton me> AuthorDate: Sat Oct 14 04:18:17 2023 + Commit: Sam James gentoo org> CommitDate: Sat Oct 14 10:25:25 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fb38c18 media-video/ffmpeg: fix ExcessiveLineLength Signed-off-by: Leonardo Hernández Hernández proton.me> Closes: https://github.com/gentoo/gentoo/pull/33322 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r4.ebuild | 6 -- media-video/ffmpeg/ffmpeg-5.1.3-r4.ebuild | 6 -- media-video/ffmpeg/ffmpeg-6.0-r7.ebuild | 6 -- media-video/ffmpeg/ffmpeg-.ebuild | 6 -- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r4.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r4.ebuild index bcd93c69c858..0d8de811bc70 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r4.ebuild @@ -142,7 +142,8 @@ PPC_CPU_REQUIRED_USE=" cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) " -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_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 ) @@ -177,7 +178,8 @@ CPU_REQUIRED_USE=" ${X86_CPU_REQUIRED_USE} " -FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) +FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt + graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" RDEPEND=" diff --git a/media-video/ffmpeg/ffmpeg-5.1.3-r4.ebuild b/media-video/ffmpeg/ffmpeg-5.1.3-r4.ebuild index b6e43feb919a..1d0d84cfa17f 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.3-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.3-r4.ebuild @@ -143,7 +143,8 @@ PPC_CPU_REQUIRED_USE=" cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) " -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_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 ) @@ -178,7 +179,8 @@ CPU_REQUIRED_USE=" ${X86_CPU_REQUIRED_USE} " -FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) +FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt + graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" RDEPEND=" diff --git a/media-video/ffmpeg/ffmpeg-6.0-r7.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r7.ebuild index 5246b3cd93dd..c66b8ced30f9 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r7.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r7.ebuild @@ -143,7 +143,8 @@ PPC_CPU_REQUIRED_USE=" cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) " -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_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 ) @@ -178,7 +179,8 @@ CPU_REQUIRED_USE=" ${X86_CPU_REQUIRED_USE} " -FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) +FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt + graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" RDEPEND=" diff --git a/media-video/ffmpeg/ffmpeg-.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 3d78f6746d7bebcd5afbbd391c87d1cd9df3058a Author: Leonardo Hernández Hernández proton me> AuthorDate: Sat Oct 14 04:02:19 2023 + Commit: Sam James gentoo org> CommitDate: Sat Oct 14 10:25:25 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d78f674 media-video/ffmpeg: virtual/opengl -> media-libs/libglvnd[X] libavdevice links to libGL (even with USE=-X) Signed-off-by: Leonardo Hernández Hernández proton.me> Signed-off-by: Sam James gentoo.org> .../{ffmpeg-.ebuild => ffmpeg-6.0-r7.ebuild} | 28 -- media-video/ffmpeg/ffmpeg-.ebuild | 2 +- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r7.ebuild similarity index 95% copy from media-video/ffmpeg/ffmpeg-.ebuild copy to media-video/ffmpeg/ffmpeg-6.0-r7.ebuild index 19848ded783c..5246b3cd93dd 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r7.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form. @@ -191,13 +191,13 @@ RDEPEND=" cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] ) - dav1d? ( >=media-libs/dav1d-0.5.0:0=[${MULTILIB_USEDEP}] ) + dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) - kvazaar? ( >=media-libs/kvazaar-2.0.0[${MULTILIB_USEDEP}] ) + 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-0.5:=[capi] ) + rav1e? ( >=media-video/rav1e-0.4:=[capi] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) theora? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] @@ -229,7 +229,7 @@ RDEPEND=" >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/openjpeg-2.1:2=[${MULTILIB_USEDEP}] ) + jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) jpegxl? ( >=media-libs/libjxl-0.7.0[$MULTILIB_USEDEP] ) lcms? ( >=media-libs/lcms-2.13:2[$MULTILIB_USEDEP] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] ) @@ -250,9 +250,9 @@ RDEPEND=" modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) - opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) + opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) qsv? ( media-libs/oneVPL[${MULTILIB_USEDEP}] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] ) samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] ) @@ -260,7 +260,7 @@ RDEPEND=" sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] ) - ssh? ( >=net-libs/libssh-0.6.0:=[sftp,${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh-0.5.5:=[sftp,${MULTILIB_USEDEP}] ) svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] @@ -277,14 +277,14 @@ RDEPEND=" >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] ) - vulkan? ( >=media-libs/vulkan-loader-1.3.255:=[${MULTILIB_USEDEP}] ) + vulkan? ( >=media-libs/vulkan-loader-1.2.189:=[${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] >=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}] ) - zeromq? ( >=net-libs/zeromq-4.2.1:= ) + zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? (
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: e61b114f3b07284d9f5d2f9314c150d3ed65d1ae Author: Leonardo Hernández Hernández proton me> AuthorDate: Sat Oct 14 03:58:33 2023 + Commit: Sam James gentoo org> CommitDate: Sat Oct 14 10:25:25 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61b114f media-video/ffmpeg: sync live Signed-off-by: Leonardo Hernández Hernández proton.me> Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-.ebuild | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-.ebuild index 8266db290460..19848ded783c 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-.ebuild @@ -191,13 +191,13 @@ RDEPEND=" cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] ) - dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] ) + dav1d? ( >=media-libs/dav1d-0.5.0:0=[${MULTILIB_USEDEP}] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) - kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] ) + kvazaar? ( >=media-libs/kvazaar-2.0.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-0.4:=[capi] ) + rav1e? ( >=media-video/rav1e-0.5:=[capi] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) theora? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] @@ -229,7 +229,7 @@ RDEPEND=" >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) + jpeg2k? ( >=media-libs/openjpeg-2.1:2=[${MULTILIB_USEDEP}] ) jpegxl? ( >=media-libs/libjxl-0.7.0[$MULTILIB_USEDEP] ) lcms? ( >=media-libs/lcms-2.13:2[$MULTILIB_USEDEP] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] ) @@ -260,7 +260,7 @@ RDEPEND=" sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] ) - ssh? ( >=net-libs/libssh-0.5.5:=[sftp,${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh-0.6.0:=[sftp,${MULTILIB_USEDEP}] ) svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] @@ -284,7 +284,7 @@ RDEPEND=" >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] >=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}] ) - zeromq? ( >=net-libs/zeromq-4.1.6 ) + zeromq? ( >=net-libs/zeromq-4.2.1:= ) zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 6973cb8eb48f6999d33cf48574abddf1786e79af Author: Sam James gentoo org> AuthorDate: Mon Sep 25 01:49:38 2023 + Commit: Sam James gentoo org> CommitDate: Mon Sep 25 01:49:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6973cb8e media-video/ffmpeg: Stabilize 6.0-r6 ppc64, #910314 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r6.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r6.ebuild index b2c086d3d23f..1db003708b80 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r6.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r6.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 09a07e069a605644b1a9016386f62163d05b64b3 Author: Sam James gentoo org> AuthorDate: Sun Sep 24 22:14:51 2023 + Commit: Sam James gentoo org> CommitDate: Sun Sep 24 22:14:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a07e06 media-video/ffmpeg: Stabilize 6.0-r6 arm64, #910314 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r6.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r6.ebuild index b5d593b52337..b2c086d3d23f 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r6.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r6.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 0ee08a8300b1e816cfd1625fd10fbe41febc5974 Author: Sam James gentoo org> AuthorDate: Sun Sep 24 22:00:38 2023 + Commit: Sam James gentoo org> CommitDate: Sun Sep 24 22:00:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ee08a83 media-video/ffmpeg: Stabilize 6.0-r6 amd64, #910314 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r6.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r6.ebuild index b62d5e8abe3d..b5d593b52337 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r6.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r6.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form.
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 9f5fa555a6b0cd1f023ebfa795e78aa68875ccfb Author: Leonardo Hernández Hernández proton me> AuthorDate: Wed Aug 30 01:30:12 2023 + Commit: Sam James gentoo org> CommitDate: Wed Aug 30 02:36:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f5fa555 media-video/ffmpeg: add missing DEPEND on vulkan-headers Signed-off-by: Leonardo Hernández Hernández proton.me> Closes: https://github.com/gentoo/gentoo/pull/32522 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-.ebuild index 2abee6b94854..8266db290460 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-.ebuild @@ -277,7 +277,7 @@ RDEPEND=" >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] ) - vulkan? ( >=media-libs/vulkan-loader-1.2.189:=[${MULTILIB_USEDEP}] ) + vulkan? ( >=media-libs/vulkan-loader-1.3.255:=[${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] @@ -299,6 +299,7 @@ DEPEND="${RDEPEND} amf? ( media-libs/amf-headers ) ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) v4l? ( sys-kernel/linux-headers ) + vulkan? ( >=dev-util/vulkan-headers-1.3.255 ) " # += for verify-sig above
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 0397d5e8b8ce260adb9fed90a1f33539a064bdda Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 13 14:27:35 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 13 17:56:43 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0397d5e8 media-video/ffmpeg: drop 4.2.9, 4.2.9-r1 Signed-off-by: Andreas Sturmlechner gentoo.org> media-video/ffmpeg/Manifest | 3 - media-video/ffmpeg/ffmpeg-4.2.9-r1.ebuild | 558 -- media-video/ffmpeg/ffmpeg-4.2.9.ebuild| 557 - 3 files changed, 1118 deletions(-) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 906039e3bc4b..59d50e6b6b7f 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,6 +1,3 @@ -DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418448c5b9b54fd8c803c3f0ab517c6fa7990be08098dd6f6a2b1b3e77a1bed31a069c702366aba79ef9141ff9e23cd8c1b6e2885 SHA512 6653975017de3f7bde420860419fbdddb50ae41dbb811b819f4b5b13807bf885a4c01736f05a684515f97b0d63bd8896d5951a3276af90cc74abfe32dc2e2407 -DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917bca3995d99d53b58221b23181a075f330132f83ea90a6110e89f90c7c3b5b2a7837559c5df414d9bd52dbb3ec166b1545 SHA512 701b0635e0819484a31de2062ba52d95ee03883ab56547cd75c3646a9b32bf3ecc7f719690b93f29202cfed0fdeecd26b51b9f3c66e72a999a3e8d9e97389275 -DIST ffmpeg-4.2.9.tar.xz 9117288 BLAKE2B 6fbebfc71a24fb876fc60fd6611346f4aded84b6d573441b2ee910ac1a831ba2e4ad1790592a0173e545c19416db1909344d48160a2dbf64fd4c2adf6c5f4d48 SHA512 db3e4489b0aee65195ca3f0e8ce32e749d5b4cbcdc7d5b8e4504ba3d52b0b40e84a2d8cfa8f599c6e722af0b8c5d969c908d6e2fe15d9d3ff2bd60002b59fe6e DIST ffmpeg-4.4.4.tar.xz 9565584 BLAKE2B 8cd76a91ae6e485e56c6e5ae7b31d678e2fc2d634b1c56240619a4b6924dae4ec7adb445932bf4455f409dbc03fdc6d52b4fc270da55393e329ccd3d129f5770 SHA512 253799eccd129dad331db85def5352178ae22303e42af47fc013a6adfd4b60d1e59ff5f9ac6118fe3b403affa56ea1f3ba658042f526a914fba27050c3065daf DIST ffmpeg-4.4.4.tar.xz.asc 520 BLAKE2B c8bf944883e37b6dd69029fe863c23f68a3584d84aa3e9c4278ae45aee0bfa3697cc1d8a768b95a1ebd7a9cb91553671072f88f46f6a9c947faa74344a44 SHA512 47afa042d8b529d0bfce391455a25cda261f39f8510601d7de2aba6398483ecb623992626e8489aa2a636e3cb93008f26b32080e526143254226d4e2651accea DIST ffmpeg-5.1.3.tar.xz 10007756 BLAKE2B 033dddac096d5dbbfadcf1af51fd1e93d222af1ec6ce7c36000c6a02cf9413288c7fcc7316d450926c60ea9e4193cc66ee004130836816ada5d5833375c7 SHA512 4310f27fe0c7b4363207e1535115e0ad266a45772bdb5445f5c8658f35b0f3216d8f2cf70d1d2baa71b12069fbdccf418a774b353ddf092d4f66829ef391508a diff --git a/media-video/ffmpeg/ffmpeg-4.2.9-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.2.9-r1.ebuild deleted file mode 100644 index 2cd1eb165e88.. --- a/media-video/ffmpeg/ffmpeg-4.2.9-r1.ebuild +++ /dev/null @@ -1,558 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Subslot: libavutil major.libavcodec major.libavformat major -# Since FFmpeg ships several libraries, subslot is kind of limited here. -# Most consumers will use those three libraries, if a "less used" library -# changes its soname, consumers will have to be rebuilt the old way -# (preserve-libs). -# If, for example, a package does not link to libavformat and only libavformat -# changes its ABI then this package will be rebuilt needlessly. Hence, such a -# package is free _not_ to := depend on FFmpeg but I would strongly encourage -# doing so since such a case is unlikely. -FFMPEG_SUBSLOT=56.58.58 - -SCM="" -if [ "${PV#}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_MIN_CLONE_TYPE="single" - EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; -fi - -inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" -HOMEPAGE="https://ffmpeg.org/; -if [ "${PV#}" != "${PV}" ] ; then - SRC_URI="" -elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.xz" -else # Release - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz - https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-4.2.2-ppc64-altivec.patch.gz - https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-4.2.2-ppc64-gcc.patch.gz - " -fi -FFMPEG_REVISION="${PV#*_p}" - -SLOT="0/${FFMPEG_SUBSLOT}" -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) - amr? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - gmp? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - libaribb24? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - encode? ( - amrenc? ( - gpl? ( GPL-3 ) -
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/files/, media-video/ffmpeg-chromium/
commit: a685f699e19daaa572044c82858580af15465189 Author: Sam James gentoo org> AuthorDate: Thu Aug 10 03:57:06 2023 + Commit: Sam James gentoo org> CommitDate: Thu Aug 10 03:57:06 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a685f699 media-video/ffmpeg-chromium: fix build w/ binutils-2.41 Closes: https://bugs.gentoo.org/911839 Signed-off-by: Sam James gentoo.org> .../ffmpeg-chromium/ffmpeg-chromium-102.ebuild | 1 + .../ffmpeg-chromium/ffmpeg-chromium-106.ebuild | 1 + .../ffmpeg-chromium/ffmpeg-chromium-114.ebuild | 1 + .../files/ffmpeg-chromium-binutils-2.41.patch | 77 ++ 4 files changed, 80 insertions(+) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild index 5c5350f293b1..6e4409a5274b 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild @@ -116,6 +116,7 @@ S="${WORKDIR}" PATCHES=( "${FILESDIR}"/${PN}-100.patch "${FILESDIR}"/${PN}-vk-headers.patch + "${FILESDIR}"/${PN}-binutils-2.41.patch "${FILESDIR}"/chromium.patch ) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild index 39b454aa1a07..a25fa2fc9cdb 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild @@ -114,6 +114,7 @@ RESTRICT=" PATCHES=( "${FILESDIR}"/${PN}-100.patch "${FILESDIR}"/${PN}-vk-headers.patch + "${FILESDIR}"/${PN}-binutils-2.41.patch "${FILESDIR}"/chromium.patch ) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild index a550da7245bf..da89ecc4a215 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild @@ -113,6 +113,7 @@ RESTRICT=" PATCHES=( "${FILESDIR}"/${PN}-100.patch + "${FILESDIR}"/${PN}-binutils-2.41.patch "${FILESDIR}"/chromium.patch ) diff --git a/media-video/ffmpeg-chromium/files/ffmpeg-chromium-binutils-2.41.patch b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-binutils-2.41.patch new file mode 100644 index ..81d544625919 --- /dev/null +++ b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-binutils-2.41.patch @@ -0,0 +1,77 @@ +https://bugs.gentoo.org/911582 +https://bugs.gentoo.org/911839 +https://trac.ffmpeg.org/ticket/10405 +https://git.videolan.org/?p=ffmpeg.git;a=commit;h=25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e +https://sourceware.org/PR30578 +https://gcc.gnu.org/PR108941 + +From 25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e Mon Sep 17 00:00:00 2001 +From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Sun, 16 Jul 2023 18:18:02 +0300 +Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift + instructions within inline assembly + +Fixes assembling with binutil as >= 2.41 + +Signed-off-by: James Almer +(cherry picked from commit effadce6c756247ea8bae32dc13bb3e6f464f0eb) +--- a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h +@@ -35,12 +35,20 @@ + static av_always_inline av_const int MULL(int a, int b, unsigned shift) + { + int rt, dummy; ++if (__builtin_constant_p(shift)) + __asm__ ( + "imull %3 \n\t" + "shrdl %4, %%edx, %%eax \n\t" + :"=a"(rt), "=d"(dummy) +-:"a"(a), "rm"(b), "ci"((uint8_t)shift) ++:"a"(a), "rm"(b), "i"(shift & 0x1F) + ); ++else ++__asm__ ( ++"imull %3 \n\t" ++"shrdl %4, %%edx, %%eax \n\t" ++:"=a"(rt), "=d"(dummy) ++:"a"(a), "rm"(b), "c"((uint8_t)shift) ++); + return rt; + } + +@@ -113,19 +121,31 @@ __asm__ volatile(\ + // avoid +32 for shift optimization (gcc should do that ...) + #define NEG_SSR32 NEG_SSR32 + static inline int32_t NEG_SSR32( int32_t a, int8_t s){ ++if (__builtin_constant_p(s)) + __asm__ ("sarl %1, %0\n\t" + : "+r" (a) +- : "ic" ((uint8_t)(-s)) ++ : "i" (-s & 0x1F) + ); ++else ++__asm__ ("sarl %1, %0\n\t" ++ : "+r" (a) ++ : "c" ((uint8_t)(-s)) ++); + return a; + } + + #define NEG_USR32 NEG_USR32 + static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ ++if (__builtin_constant_p(s)) + __asm__ ("shrl %1, %0\n\t" + : "+r" (a) +- : "ic" ((uint8_t)(-s)) ++ : "i" (-s & 0x1F) + ); ++else ++__asm__ ("shrl %1, %0\n\t" ++ : "+r" (a) ++ : "c" ((uint8_t)(-s)) ++); + return a; + } + +-- +2.30.2
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 4cb970048f661599c5ae9c2422a88f822c57f717 Author: Sam James gentoo org> AuthorDate: Wed Aug 2 18:19:00 2023 + Commit: Sam James gentoo org> CommitDate: Wed Aug 2 18:19:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cb97004 media-video/ffmpeg: backport binutils-2.41 fix all the way down for 4.x Followup to 15aad11f0bc671bc81e5e998f19a00d05f1803ac. Bug: https://bugs.gentoo.org/911582 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-4.2.9-r1.ebuild | 558 +++ media-video/ffmpeg/ffmpeg-4.4.4-r4.ebuild | 604 ++ 2 files changed, 1162 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-4.2.9-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.2.9-r1.ebuild new file mode 100644 index ..2cd1eb165e88 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-4.2.9-r1.ebuild @@ -0,0 +1,558 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=56.58.58 + +SCM="" +if [ "${PV#}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; +fi + +inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/; +if [ "${PV#}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.xz" +else # Release + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz + https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-4.2.2-ppc64-altivec.patch.gz + https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-4.2.2-ppc64-gcc.patch.gz + " +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) + amr? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + gmp? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + libaribb24? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + encode? ( + amrenc? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + ) + samba? ( GPL-3 ) +" +if [ "${PV#}" = "${PV}" ] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +# 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=( + +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl + openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau + X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib + # libavdevice options + cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal + opengl + # indevs + libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack + # decoders + amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 dav1d:libdav1d fdk:libfdk-aac + jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm + libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec + vorbis:libvorbis vpx:libvpx zvbi:libzvbi + # libavfilter options + appkit + bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r + fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab + rubberband:librubberband zeromq:libzmq zimg:libzimg + # libswresample options + libsoxr + # Threads; we only support pthread for now but ffmpeg supports more + +threads:pthreads +) + +# Same as above but for encoders, i.e. they do something only with USE=encode. +FFMPEG_ENCODER_FLAG_MAP=( +
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/, media-video/ffmpeg/files/
commit: 15aad11f0bc671bc81e5e998f19a00d05f1803ac Author: Sam James gentoo org> AuthorDate: Wed Aug 2 08:12:17 2023 + Commit: Sam James gentoo org> CommitDate: Wed Aug 2 08:12:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15aad11f media-video/ffmpeg: fix build w/ binutils-2.41 Closes: https://bugs.gentoo.org/911582 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-5.1.3-r4.ebuild | 604 media-video/ffmpeg/ffmpeg-6.0-r6.ebuild| 605 + .../ffmpeg/files/ffmpeg-5.1.3-binutils-2.41.patch | 76 +++ .../ffmpeg/files/ffmpeg-6.0-binutils-2.41.patch| 76 +++ 4 files changed, 1361 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-5.1.3-r4.ebuild b/media-video/ffmpeg/ffmpeg-5.1.3-r4.ebuild new file mode 100644 index ..b6e43feb919a --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-5.1.3-r4.ebuild @@ -0,0 +1,604 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=57.59.59 + +SCM="" +if [ "${PV#}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; +fi + +inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/; +if [ "${PV#}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.xz" +else # Release + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/ffmpeg.asc + inherit verify-sig + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; + SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" + + BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) + amr? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + gmp? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + libaribb24? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + encode? ( + amrenc? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + ) + samba? ( GPL-3 ) +" +if [ "${PV#}" = "${PV}" ] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +fi + +# 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=( + +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl + openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan + X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib + # libavdevice options + cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal + opengl + # indevs + libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack + # decoders + amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac + jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm + libaribb24 mmal modplug:libmodplug opus:libopus qsv:libmfx libilbc librtmp ssh:libssh + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec + vorbis:libvorbis vpx:libvpx zvbi:libzvbi + # libavfilter options + appkit + bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf + fribidi:libfribidi fontconfig ladspa lcms:lcms2 libass libplacebo libtesseract lv2 + truetype:libfreetype vidstab:libvidstab + rubberband:librubberband zeromq:libzmq zimg:libzimg + # libswresample options + libsoxr +
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 48e25a7bc7d7206f69b863622abcdf83bbdbee25 Author: Karl-Johan Karlsson ferretporn se> AuthorDate: Wed Jul 26 10:01:17 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jul 27 09:38:44 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e25a7b media-video/ffmpeg: Rename AMF env.d file, and revbump Leading digits are required for env-update to consider the file. This commit leaves the file in the repository as is and uses "newenvd" to install it under a different name. This makes sure that the 6.0-r2 ebuild continues to work. If that is not required, a simpler solution would be to instead rename the file in the repository to 99amf-env-vulkan-override and keep using "doenvd". Closes: https://bugs.gentoo.org/911249 Signed-off-by: Karl-Johan Karlsson lysator.liu.se> Closes: https://github.com/gentoo/gentoo/pull/32050 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/{ffmpeg-4.4.4-r2.ebuild => ffmpeg-4.4.4-r3.ebuild} | 2 +- media-video/ffmpeg/{ffmpeg-5.1.3-r2.ebuild => ffmpeg-5.1.3-r3.ebuild} | 2 +- media-video/ffmpeg/{ffmpeg-6.0-r4.ebuild => ffmpeg-6.0-r5.ebuild} | 2 +- media-video/ffmpeg/ffmpeg-.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r3.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-4.4.4-r2.ebuild rename to media-video/ffmpeg/ffmpeg-4.4.4-r3.ebuild index 4a3c4e8f1038..717a0742f97b 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r3.ebuild @@ -599,5 +599,5 @@ multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override + use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override } diff --git a/media-video/ffmpeg/ffmpeg-5.1.3-r2.ebuild b/media-video/ffmpeg/ffmpeg-5.1.3-r3.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-5.1.3-r2.ebuild rename to media-video/ffmpeg/ffmpeg-5.1.3-r3.ebuild index f55c39bea2fb..8c290006f1db 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.3-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.3-r3.ebuild @@ -599,5 +599,5 @@ multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override + use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override } diff --git a/media-video/ffmpeg/ffmpeg-6.0-r4.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r5.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-6.0-r4.ebuild rename to media-video/ffmpeg/ffmpeg-6.0-r5.ebuild index e4b90e3a7bf4..646efd85ae1a 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r5.ebuild @@ -600,5 +600,5 @@ multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override + use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override } diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-.ebuild index 29d9e2cfbfa6..2abee6b94854 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-.ebuild @@ -596,5 +596,5 @@ multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override + use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override }
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/, media-video/ffmpeg/files/
commit: 180b5c780fbc8154bf4be5c69d67ff184cd539c6 Author: Peter Levine gmail com> AuthorDate: Fri Jul 21 02:54:23 2023 + Commit: Sam James gentoo org> CommitDate: Wed Jul 26 03:49:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=180b5c78 media-video/ffmpeg: fix building against libplacebo-6 Backports two commits from master that remove the offending force_icc_lut field. Closes: https://bugs.gentoo.org/910406 Closes: https://github.com/gentoo/gentoo/pull/31987 Signed-off-by: Peter Levine gmail.com> Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r4.ebuild| 1 + ...eg-6.0-libplacebo-remove-deprecated-field.patch | 103 + 2 files changed, 104 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r4.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r4.ebuild index d3ce1df53e9f..e4b90e3a7bf4 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r4.ebuild @@ -344,6 +344,7 @@ PATCHES=( "${FILESDIR}"/${P}-DECLARE_ALIGNED.patch "${FILESDIR}"/${PN}-5.1.2-get_cabac_inline_x86-32-bit.patch "${FILESDIR}"/${P}-wint-conversion-vulkan.patch + "${FILESDIR}"/${P}-libplacebo-remove-deprecated-field.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-libplacebo-remove-deprecated-field.patch b/media-video/ffmpeg/files/ffmpeg-6.0-libplacebo-remove-deprecated-field.patch new file mode 100644 index ..ca05c1c56ea4 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-6.0-libplacebo-remove-deprecated-field.patch @@ -0,0 +1,103 @@ +Bug: https://bugs.gentoo.org/910406 + +Backports the following two commits: + https://github.com/FFmpeg/FFmpeg/commit/11eca6018c40f5ebe6af93cbc4b4dce447d8b3bc + https://github.com/FFmpeg/FFmpeg/commit/1231003c3c6d4839a9e838d06f8e16ee7690958f + +--- a/doc/filters.texi b/doc/filters.texi +@@ -16242,9 +16242,6 @@ + @item disable_builtin + Disable built-in GPU sampling (forces LUT). + +-@item force_icc_lut +-Force the use of a full ICC 3DLUT for gamut mapping. +- + @item disable_fbos + Forcibly disable FBOs, resulting in loss of almost all functionality, but + offering the maximum possible speed. +--- a/libavfilter/version_major.h b/libavfilter/version_major.h +@@ -35,4 +35,6 @@ + * the public API and may change, break or disappear at any time. + */ + ++#define FF_API_LIBPLACEBO_OPTS (LIBAVFILTER_VERSION_MAJOR < 10) ++ + #endif /* AVFILTER_VERSION_MAJOR_H */ +--- a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c +@@ -97,7 +97,6 @@ + float polar_cutoff; + int disable_linear; + int disable_builtin; +-int force_icc_lut; + int force_dither; + int disable_fbos; + +@@ -132,11 +131,15 @@ + int inverse_tonemapping; + float crosstalk; + int tonemapping_lut_size; ++ ++#if FF_API_LIBPLACEBO_OPTS + /* for backwards compatibility */ + float desat_str; + float desat_exp; + int gamut_warning; + int gamut_clipping; ++int force_icc_lut; ++#endif + + /* pl_dither_params */ + int dithering; +@@ -380,6 +383,7 @@ + pl_rect2df_aspect_set(, aspect, s->pad_crop_ratio); + } + ++#if FF_API_LIBPLACEBO_OPTS + /* backwards compatibility with older API */ + if (!tonemapping_mode && (s->desat_str >= 0.0f || s->desat_exp >= 0.0f)) { + float str = s->desat_str < 0.0f ? 0.9f : s->desat_str; +@@ -397,6 +401,7 @@ + gamut_mode = PL_GAMUT_WARN; + if (s->gamut_clipping) + gamut_mode = PL_GAMUT_DESATURATE; ++#endif + + /* Update render params */ + params = (struct pl_render_params) { +@@ -458,7 +463,6 @@ + .polar_cutoff = s->polar_cutoff, + .disable_linear_scaling = s->disable_linear, + .disable_builtin_scalers = s->disable_builtin, +-.force_icc_lut = s->force_icc_lut, + .force_dither = s->force_dither, + .disable_fbos = s->disable_fbos, + }; +@@ -818,11 +822,14 @@ + { "inverse_tonemapping", "Inverse tone mapping (range expansion)", OFFSET(inverse_tonemapping), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, + { "tonemapping_crosstalk", "Crosstalk factor for tone-mapping", OFFSET(crosstalk), AV_OPT_TYPE_FLOAT, {.dbl = 0.04}, 0.0, 0.30, DYNAMIC }, + { "tonemapping_lut_size", "Tone-mapping LUT size", OFFSET(tonemapping_lut_size), AV_OPT_TYPE_INT, {.i64 = 256}, 2, 1024, DYNAMIC }, ++ ++#if FF_API_LIBPLACEBO_OPTS + /* deprecated options for backwards compatibility, defaulting to -1 to not override the new defaults */ + { "desaturation_strength", "Desaturation strength", OFFSET(desat_str), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 1.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, + { "desaturation_exponent", "Desaturation exponent", OFFSET(desat_exp), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 10.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, + { "gamut_warning", "Highlight out-of-gamut colors",
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: bd8d6ec95099c8141528e96bd8c8027ad01abf11 Author: Peter Levine gmail com> AuthorDate: Fri Jul 21 01:49:05 2023 + Commit: Sam James gentoo org> CommitDate: Wed Jul 26 03:49:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd8d6ec9 media-video/ffmpeg: depend on >=media-libs/amf-headers-1.4.28 Building with USE=amf now depends on >=media-libs/amf-headers-1.4.28 Closes: https://bugs.gentoo.org/908956 Signed-off-by: Peter Levine gmail.com> Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r4.ebuild | 603 1 file changed, 603 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r4.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r4.ebuild new file mode 100644 index ..d3ce1df53e9f --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-6.0-r4.ebuild @@ -0,0 +1,603 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=58.60.60 + +SCM="" +if [ "${PV#}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; +fi + +inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/; +if [ "${PV#}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.xz" +else # Release + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/ffmpeg.asc + inherit verify-sig + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; + SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" + + BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) + amr? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + gmp? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + libaribb24? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + encode? ( + amrenc? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + ) + samba? ( GPL-3 ) +" +if [ "${PV#}" = "${PV}" ] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +fi + +# 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=( + +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl + openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan + X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib + # libavdevice options + cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal + opengl + # indevs + libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack + # decoders + amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac + jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm + libaribb24 mmal modplug:libmodplug opus:libopus qsv:libvpl libilbc librtmp ssh:libssh + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec + vorbis:libvorbis vpx:libvpx zvbi:libzvbi + # libavfilter options + appkit + bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf + fribidi:libfribidi fontconfig ladspa lcms:lcms2 libass libplacebo libtesseract lv2 + truetype:libfreetype vidstab:libvidstab + rubberband:librubberband zeromq:libzmq zimg:libzimg + # libswresample options + libsoxr + # Threads; we only support pthread for now but ffmpeg supports more +
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: fd45d9cd151dca6b642f5f67b61384522df75786 Author: Peter Levine gmail com> AuthorDate: Tue Jul 25 22:55:49 2023 + Commit: Sam James gentoo org> CommitDate: Wed Jul 26 03:49:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd45d9cd media-video/ffmpeg: drop 6.0-r3 Signed-off-by: Peter Levine gmail.com> Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r3.ebuild | 603 1 file changed, 603 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r3.ebuild deleted file mode 100644 index fe431b8716e8.. --- a/media-video/ffmpeg/ffmpeg-6.0-r3.ebuild +++ /dev/null @@ -1,603 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Subslot: libavutil major.libavcodec major.libavformat major -# Since FFmpeg ships several libraries, subslot is kind of limited here. -# Most consumers will use those three libraries, if a "less used" library -# changes its soname, consumers will have to be rebuilt the old way -# (preserve-libs). -# If, for example, a package does not link to libavformat and only libavformat -# changes its ABI then this package will be rebuilt needlessly. Hence, such a -# package is free _not_ to := depend on FFmpeg but I would strongly encourage -# doing so since such a case is unlikely. -FFMPEG_SUBSLOT=58.60.60 - -SCM="" -if [ "${PV#}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_MIN_CLONE_TYPE="single" - EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; -fi - -inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" -HOMEPAGE="https://ffmpeg.org/; -if [ "${PV#}" != "${PV}" ] ; then - SRC_URI="" -elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.xz" -else # Release - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/ffmpeg.asc - inherit verify-sig - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; - SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" - - BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" -fi -FFMPEG_REVISION="${PV#*_p}" - -SLOT="0/${FFMPEG_SUBSLOT}" -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) - amr? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - gmp? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - libaribb24? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - encode? ( - amrenc? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) - ) - samba? ( GPL-3 ) -" -if [ "${PV#}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" -fi - -# 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=( - +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp - +gpl hardcoded-tables +iconv libxml2 lzma +network opencl - openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan - X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib - # libavdevice options - cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal - opengl - # indevs - libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack - # decoders - amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac - jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm - libaribb24 mmal modplug:libmodplug opus:libopus qsv:libvpl libilbc librtmp ssh:libssh - speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec - vorbis:libvorbis vpx:libvpx zvbi:libzvbi - # libavfilter options - appkit - bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf - fribidi:libfribidi fontconfig ladspa lcms:lcms2 libass libplacebo libtesseract lv2 - truetype:libfreetype vidstab:libvidstab - rubberband:librubberband zeromq:libzmq zimg:libzimg - # libswresample options - libsoxr - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -# Same as above but for encoders, i.e. they do something only with USE=encode. -FFMPEG_ENCODER_FLAG_MAP=(
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/
commit: 4bc3ebaf3dc53ab956f0b21aa02a2edf1b9dca9a Author: Sam James gentoo org> AuthorDate: Mon Jul 24 01:58:02 2023 + Commit: Sam James gentoo org> CommitDate: Mon Jul 24 01:58:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bc3ebaf media-video/ffmpeg: fix -Wint-conversion for 6.0 Bug: https://bugs.gentoo.org/903752 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-6.0-r3.ebuild| 603 + .../files/ffmpeg-6.0-wint-conversion-vulkan.patch | 43 ++ 2 files changed, 646 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r3.ebuild new file mode 100644 index ..fe431b8716e8 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-6.0-r3.ebuild @@ -0,0 +1,603 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=58.60.60 + +SCM="" +if [ "${PV#}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git; +fi + +inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/; +if [ "${PV#}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.xz" +else # Release + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/ffmpeg.asc + inherit verify-sig + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz; + SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" + + BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) + amr? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + gmp? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + libaribb24? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + encode? ( + amrenc? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + ) + samba? ( GPL-3 ) +" +if [ "${PV#}" = "${PV}" ] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +fi + +# 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=( + +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl + openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan + X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib + # libavdevice options + cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal + opengl + # indevs + libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack + # decoders + amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac + jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm + libaribb24 mmal modplug:libmodplug opus:libopus qsv:libvpl libilbc librtmp ssh:libssh + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec + vorbis:libvorbis vpx:libvpx zvbi:libzvbi + # libavfilter options + appkit + bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf + fribidi:libfribidi fontconfig ladspa lcms:lcms2 libass libplacebo libtesseract lv2 + truetype:libfreetype vidstab:libvidstab + rubberband:librubberband zeromq:libzmq zimg:libzimg + # libswresample options + libsoxr + # Threads; we only support pthread for now but ffmpeg supports more + +threads:pthreads +) + +# Same as above but for encoders,
[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
commit: 040a4614a1a31a5db87f6b164ed807983ad3a0e8 Author: Leonardo Hernández Hernández proton me> AuthorDate: Fri Jul 14 21:52:13 2023 + Commit: Sam James gentoo org> CommitDate: Sun Jul 16 18:36:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=040a4614 media-video/ffmpeg: subscribe to libplacebo subslot Signed-off-by: Leonardo Hernández Hernández proton.me> Closes: https://github.com/gentoo/gentoo/pull/31887 Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/{ffmpeg-5.1.3-r1.ebuild => ffmpeg-5.1.3-r2.ebuild} | 2 +- media-video/ffmpeg/{ffmpeg-6.0-r1.ebuild => ffmpeg-6.0-r2.ebuild} | 2 +- media-video/ffmpeg/ffmpeg-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-5.1.3-r1.ebuild b/media-video/ffmpeg/ffmpeg-5.1.3-r2.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-5.1.3-r1.ebuild rename to media-video/ffmpeg/ffmpeg-5.1.3-r2.ebuild index 7672b75496fd..f55c39bea2fb 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.3-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.3-r2.ebuild @@ -238,7 +238,7 @@ RDEPEND=" libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] ) - libplacebo? ( >=media-libs/libplacebo-4.192.0[$MULTILIB_USEDEP] ) + libplacebo? ( >=media-libs/libplacebo-4.192.0:=[$MULTILIB_USEDEP] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] ) libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r2.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-6.0-r1.ebuild rename to media-video/ffmpeg/ffmpeg-6.0-r2.ebuild index d5afdd06935e..b872b34e5a38 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r2.ebuild @@ -238,7 +238,7 @@ RDEPEND=" libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] ) - libplacebo? ( >=media-libs/libplacebo-4.192.0[$MULTILIB_USEDEP] ) + libplacebo? ( >=media-libs/libplacebo-4.192.0:=[$MULTILIB_USEDEP] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] ) libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-.ebuild b/media-video/ffmpeg/ffmpeg-.ebuild index f5b2b8abaa9c..29d9e2cfbfa6 100644 --- a/media-video/ffmpeg/ffmpeg-.ebuild +++ b/media-video/ffmpeg/ffmpeg-.ebuild @@ -238,7 +238,7 @@ RDEPEND=" libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] ) - libplacebo? ( >=media-libs/libplacebo-4.192.0[$MULTILIB_USEDEP] ) + libplacebo? ( >=media-libs/libplacebo-4.192.0:=[$MULTILIB_USEDEP] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] ) libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] )