[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/

[Sam James]

commit: e6803efe275c5173cea36143d5620ac7064902e1
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 25 22:26:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 25 22:26:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6803efe

media-video/ffmpeg-chromium: Stabilize 127 arm64, #936630

Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild
index b830bf595f20..91d93d2a4d58 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64"
 
 # 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-chromium/

[Jakov Smolić]

commit: b285981878cc5f3293bd289a601551cb8987a329
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Jul 25 22:25:25 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Jul 25 22:25:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2859818

media-video/ffmpeg-chromium: Stabilize 127 amd64, #936630

Signed-off-by: Jakov Smolić  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild
index eb68732fd0bc..b830bf595f20 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64"
 
 # 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/

[Sam James]

commit: 4bf61101f097f0d5bc61ad7190c37a6ffe655614
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 21 01:39:57 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 21 02:15:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bf61101

media-video/ffmpeg: drop 6.1.1-r7

Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r7.ebuild | 622 --
 1 file changed, 622 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r7.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r7.ebuild
deleted file mode 100644
index a25bc7572607..
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r7.ebuild
+++ /dev/null
@@ -1,622 +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
-
-SOC_PATCH="ffmpeg-rpi-6.1-r3.patch"
-
-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/;
-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
-   inherit verify-sig
-
-   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; then
-   verify-sig_verify_detached 
"${DISTDIR}"/${P/_/-}.tar.xz{,.asc} /usr/share/openpgp-keys/ffmpeg.asc
-   use soc && verify-sig_verify_detached 
"${DISTDIR}"/${SOC_PATCH}{,.asc} /usr/share/openpgp-keys/gentoo-developers.asc
-   fi
-   default
-   }
-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 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/

[Sam James]

commit: 2568714951be6c02878d3ab033d546c87ebb1e10
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 20 22:32:50 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 20 22:32:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25687149

media-video/ffmpeg: Stabilize 6.1.1-r8 x86, #936327

Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
index 3b1bf916c0ab..2c4afcc40118 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
@@ -85,7 +85,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/

[Sam James]

commit: 882f9fa9c49d29010be5b8c934e211b078571804
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 20 22:32:49 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 20 22:32:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=882f9fa9

media-video/ffmpeg: Stabilize 4.4.4-r10 x86, #936326

Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild 
b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
index d28685a86b08..e54372178894 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
@@ -65,7 +65,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-chromium/

[James Le Cuirot]

commit: 36b18ff3f8265aac2338ab5599a759b8aeeddd78
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jul 20 14:31:38 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jul 20 14:31:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36b18ff3

media-video/ffmpeg-chromium: Drop old 124

Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/ffmpeg-chromium/Manifest   |   1 -
 .../ffmpeg-chromium/ffmpeg-chromium-124.ebuild | 247 -
 2 files changed, 248 deletions(-)

diff --git a/media-video/ffmpeg-chromium/Manifest 
b/media-video/ffmpeg-chromium/Manifest
index 88814c871dda..4a46992c9d98 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -1,4 +1,3 @@
-DIST ffmpeg-chromium-124.tar.xz 10378648 BLAKE2B 
3cb79d356e84d76a241ad81491d22d42b7a768e348d245bda00101e3967c0864e95a1dd83372e6aaf3a9130ff5ae38610fe2bd4ee8e21fc8247af4172af0683a
 SHA512 
627d1ba81c50300e7188e8a2cc5f76ea9e81e817209631f2eecb81b7b9a0be60a12290eba16240dd0b0dce3d59550a8246be54df2035bd75a9e95ae77d67467b
 DIST ffmpeg-chromium-125.tar.xz 10372892 BLAKE2B 
53b805354b55f1dfbe2341b767aaccca7efea4cced02db9090be88e89a4d2d688904ffc996c206d92a99d4eb93733b7f8cb47fd80dc43019c3bb6690903a1140
 SHA512 
c1b68b16a3dbd6f96e52c313b9ddf1c193ef302e5cbe7e127c511e54a4453c32c84b3df954e397d7ba834ef17fe1cba6efabfde855d3bb9e497bcde1b66c3d8d
 DIST ffmpeg-chromium-126.tar.xz 10402160 BLAKE2B 
96a92ff2a5ece8668693f5ef7ed5da3e61a523b98a91d00316494df91edfc42c1622663719a3c192de2a4ebf7a6258f08c53393201ee3fc3261f162e1b529dcd
 SHA512 
8fc10b1d5fe159a1dd718229bf8ec50ed0bea1fedd917859b3a0703f15e94809087e67ccf2031eb14ae8b06ad32d958ed71ff54621fd667f5507abd9738a6f0c
 DIST ffmpeg-chromium-127.tar.xz 10418192 BLAKE2B 
2a623ee8e2c0940e4067e6ebecaecdc64c45b16022327a84d77323348c210b091c58eb52b4afea1f2918cd29a27c3457a3294f561a5e6ee2db28c63f432b23bd
 SHA512 
0cddb21761ad3b54f5393d3963ca94518cb4ab8183f2bbe975f8419bd94d8b20131750a22d75fd56b304a2b83be364993a839f727342b7eed6a2d1868f79af4c

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild
deleted file mode 100644
index 74a941cdeb9e..
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# 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="52d8ef3799b2f16b66351dd0972bb0bcee1648ac"
-DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based 
browsers"
-HOMEPAGE="https://ffmpeg.org/;
-SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz;
-
-LICENSE="
-   !gpl? ( LGPL-2.1 )
-   gpl? ( GPL-2 )
-"
-SLOT="${PV}"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64"
-
-# 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
-   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? 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[Arthur Zamarin]

commit: b872e98d1eba2f71487537b4a1fd6537fa84ac28
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jul 20 07:39:16 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jul 20 07:39:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b872e98d

media-video/ffmpeg: Stabilize 4.4.4-r10 amd64, #936326

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild 
b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
index 7c51384ea535..d28685a86b08 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
@@ -65,7 +65,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/

[Arthur Zamarin]

commit: c6b9806865d88df628b7220fa3f030da44471b8c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jul 20 05:52:40 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jul 20 05:52:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6b98068

media-video/ffmpeg: Stabilize 6.1.1-r8 ppc64, #936327

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
index d45a8bf1bf3f..7dbd3efb81a8 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
@@ -85,7 +85,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/

[Arthur Zamarin]

commit: 428c0e2786e1cc80bceb4f3502ba46017821a78a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jul 20 05:52:38 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jul 20 05:52:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428c0e27

media-video/ffmpeg: Stabilize 6.1.1-r8 ppc, #936327

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
index f015ce015024..b73ad8e7b942 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
@@ -85,7 +85,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/

[Arthur Zamarin]

commit: c871e9d2f7f774e1a9033a47bb0102a24e877c21
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jul 20 05:52:39 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jul 20 05:52:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c871e9d2

media-video/ffmpeg: Stabilize 6.1.1-r8 sparc, #936327

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
index b73ad8e7b942..d45a8bf1bf3f 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
@@ -85,7 +85,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/

[Arthur Zamarin]

commit: 0463b92292ff18846e4bc6633cdb87fdd5a014b3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jul 20 05:52:37 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jul 20 05:52:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0463b922

media-video/ffmpeg: Stabilize 4.4.4-r10 ppc64, #936326

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild 
b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
index 22d1f0f29e8e..7c51384ea535 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
@@ -65,7 +65,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/

[Arthur Zamarin]

commit: 9e60fc3290c833e50ad7f860e597a5b9f2aab0b5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jul 20 05:52:36 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jul 20 05:52:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e60fc32

media-video/ffmpeg: Stabilize 4.4.4-r10 sparc, #936326

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild 
b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
index 6d15b772c753..22d1f0f29e8e 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
@@ -65,7 +65,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/

[Arthur Zamarin]

commit: 4ac7aeea78db98bbaf34f6c0f82fab6beeb47e48
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jul 20 05:52:36 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jul 20 05:52:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac7aeea

media-video/ffmpeg: Stabilize 4.4.4-r10 ppc, #936326

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild 
b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
index f78276ad5e23..6d15b772c753 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
@@ -65,7 +65,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/

[Sam James]

commit: 11b711e40debc0ae3f4c9a7360f7daa22c370f9f
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 20 05:07:17 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 20 05:07:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b711e4

media-video/ffmpeg: Stabilize 6.1.1-r8 arm, #936327

Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
index ce39f64ea582..bdd6b281dc81 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
@@ -85,7 +85,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/

[Sam James]

commit: 2da6aea693edec088274ae4089a5ce555014822d
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 20 05:07:18 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 20 05:07:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da6aea6

media-video/ffmpeg: Stabilize 6.1.1-r8 arm64, #936327

Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
index bdd6b281dc81..f015ce015024 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
@@ -85,7 +85,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/

[Sam James]

commit: e22901c6fd47fde87b97462ff4c27341467393f7
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 20 05:07:16 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 20 05:07:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e22901c6

media-video/ffmpeg: Stabilize 4.4.4-r10 arm64, #936326

Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild 
b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
index 19704a1f8384..f78276ad5e23 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
@@ -65,7 +65,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/

[Sam James]

commit: 39db0ef60b6b9603438b56d69e25ecb58d6f9203
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 20 05:07:15 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 20 05:07:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39db0ef6

media-video/ffmpeg: Stabilize 4.4.4-r10 arm, #936326

Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild 
b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
index 18672eaccab3..19704a1f8384 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
@@ -65,7 +65,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/

[Sam James]

commit: 39accf62f4db88c95a561c354cd130911b399577
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 20 03:42:32 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 20 03:56:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39accf62

media-video/ffmpeg: drop 6.1.1-r6

Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild | 621 --
 1 file changed, 621 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild
deleted file mode 100644
index 78278c02f240..
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild
+++ /dev/null
@@ -1,621 +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
-
-SOC_PATCH="ffmpeg-rpi-6.1-r3.patch"
-
-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/;
-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
-   inherit verify-sig
-
-   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; then
-   verify-sig_verify_detached 
"${DISTDIR}"/${P/_/-}.tar.xz{,.asc} /usr/share/openpgp-keys/ffmpeg.asc
-   use soc && verify-sig_verify_detached 
"${DISTDIR}"/${SOC_PATCH}{,.asc} /usr/share/openpgp-keys/gentoo-developers.asc
-   fi
-   default
-   }
-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 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/files/

[Sam James]

commit: bc073449c565b6c5afd9709b05af6a8527d583ed
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 20 03:45:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 20 03:56:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc073449

media-video/ffmpeg: drop old patch

Signed-off-by: Sam James  gentoo.org>

 .../ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch  | 29 --
 1 file changed, 29 deletions(-)

diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch 
b/media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch
deleted file mode 100644
index 88af1e58458c..
--- a/media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Zhao Zhili 
-Date: Tue, 28 Feb 2023 18:23:00 + (+0800)
-Subject: avcodec/aacps_tablegen: fix build error after avutil bump
-X-Git-Url: 
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=46970dd1555b3e50eee48ec95c893ee9a52f7fab
-
-avcodec/aacps_tablegen: fix build error after avutil bump
-
-Fix tickets #10225
-
-DECLARE_ALIGNED has been moved to mem_internal.h.
-
-Signed-off-by: Zhao Zhili 
-Reviewed-by: Anton Khirnov 
-(cherry picked from commit 814178f92647be2411516bbb82f48532373d2554)

-
-diff --git a/libavcodec/aacps_tablegen.h b/libavcodec/aacps_tablegen.h
-index 0ac4f68d68..5fdd7f0a9d 100644
 a/libavcodec/aacps_tablegen.h
-+++ b/libavcodec/aacps_tablegen.h
-@@ -34,7 +34,7 @@
- #include "libavutil/common.h"
- #include "libavutil/libm.h"
- #include "libavutil/mathematics.h"
--#include "libavutil/mem.h"
-+#include "libavutil/mem_internal.h"
- #define NR_ALLPASS_BANDS20 30
- #define NR_ALLPASS_BANDS34 50
- #define PS_AP_LINKS 3

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/

[Sam James]

commit: 00fd18da17d96ebc907f61f5481d406b7c834cef
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 20 04:06:35 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 20 04:06:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00fd18da

media-video/ffmpeg: fix AMD AV1 vaapi regression w/ newer mesa for 6.1.x

Bug: https://bugs.gentoo.org/936310
Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild  | 623 +
 .../ffmpeg/files/ffmpeg-6.1.1-amd-av1-vaapi.patch  | 254 +
 2 files changed, 877 insertions(+)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
new file mode 100644
index ..ce39f64ea582
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
@@ -0,0 +1,623 @@
+# 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
+
+SOC_PATCH="ffmpeg-rpi-6.1-r3.patch"
+
+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/;
+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
+   inherit verify-sig
+
+   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; then
+   verify-sig_verify_detached 
"${DISTDIR}"/${P/_/-}.tar.xz{,.asc} /usr/share/openpgp-keys/ffmpeg.asc
+   use soc && verify-sig_verify_detached 
"${DISTDIR}"/${SOC_PATCH}{,.asc} /usr/share/openpgp-keys/gentoo-developers.asc
+   fi
+   default
+   }
+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 modplug:libmodplug opus:libopus qsv:libvpl libilbc 
librtmp 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[Sam James]

commit: f38482219fd10bedd73e15841e048348ca909df2
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 20 03:42:09 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 20 03:56:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3848221

media-video/ffmpeg: drop 6.0-r12

Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/Manifest  |   2 -
 media-video/ffmpeg/ffmpeg-6.0-r12.ebuild | 608 ---
 2 files changed, 610 deletions(-)

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 69b487a6d661..745b007c9410 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -3,8 +3,6 @@ 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-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
 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-7.0.1.tar.xz 10793572 BLAKE2B 
7468bb0768da56794c57b43db5fb8a1c5471f86dc7789ba342e494907b2f05fd0edbaa93159b05927a749d878c431ad8ac56cafc2434b54c5190b91ca6a6116a
 SHA512 
94e06c4ce64ed3888620547db0e33b29c68a9e78b3ea748346f34280f69723a6d4b7485911f45f1849f9aa3036c0699334abbcf7126d2763bdaa7276673b7daa

diff --git a/media-video/ffmpeg/ffmpeg-6.0-r12.ebuild 
b/media-video/ffmpeg/ffmpeg-6.0-r12.ebuild
deleted file mode 100644
index 27356c86a31d..
--- a/media-video/ffmpeg/ffmpeg-6.0-r12.ebuild
+++ /dev/null
@@ -1,608 +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? ( 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/

[Sam James]

commit: 50569482e7b98f08980f26be076b72b9ce5b2469
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 20 03:56:09 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 20 03:56:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50569482

media-video/ffmpeg: fix AMD AV1 vaapi regression w/ newer mesa for 4.4.x

For 4.4.x, use rebased versions from Solus.

Bug: https://bugs.gentoo.org/936310
Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild | 622 +
 .../ffmpeg/files/ffmpeg-4.4.4-amd-av1-vaapi.patch  | 257 +
 2 files changed, 879 insertions(+)

diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild 
b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
new file mode 100644
index ..18672eaccab3
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild
@@ -0,0 +1,622 @@
+# 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=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+=" 
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 )"
+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 
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 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[James Le Cuirot]

commit: 6a8ff47fb472f00f4f7a9df77a4f531ac33e029d
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jul 14 15:33:17 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul 14 15:34:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a8ff47f

media-video/ffmpeg: Bump rpi patch for 7.0

Closes: https://bugs.gentoo.org/935704
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/ffmpeg/Manifest| 2 ++
 media-video/ffmpeg/ffmpeg-7.0.1.ebuild | 4 ++--
 media-video/ffmpeg/ffmpeg-.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 1bc6100e9ac9..69b487a6d661 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -11,3 +11,5 @@ DIST ffmpeg-7.0.1.tar.xz 10793572 BLAKE2B 
7468bb0768da56794c57b43db5fb8a1c5471f8
 DIST ffmpeg-7.0.1.tar.xz.asc 520 BLAKE2B 
3fe3bdd8da390591849ac3784bf8e68e021124715de1a8d142a42096d625df9d9a27b224258f2f0c24b20397bfea7a8035ced4202904ca12fe0eef109516dbf1
 SHA512 
bd787bfa6dbb147800f5f79a3fe5e4c20054d48ea9e6af4d5c84ace68c19459f4ea677f5921b084eab889ed7b9f81dc138fa2ecf9ae306ac7fb19434a68aeced
 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
+DIST ffmpeg-rpi-7.0.patch 807653 BLAKE2B 
2d7d4fb55313c0ea227bf714af08fe17c118969aef972cf85bd8bf33643da08b2a224b2ea7c369a58e62fb758c0e8747c6cc6694672b889016fdb16b3d33f530
 SHA512 
cf65f68f6b0fa351d273c1b4fd74fca63a40cbd802bcd14124018784164fd1c6a09de3d9b0e0631eaf4c8b4fbcb846cc47a7831ad70eb0cfac6d21a51bd09941
+DIST ffmpeg-rpi-7.0.patch.asc 833 BLAKE2B 
3086d77e2cc05b7c295fcaef26a9a0d32775999d1bab9075eeeb0a80804b35928698efe870a432558ece55d7873e016422a00013e7d0cca160b71172c31ab449
 SHA512 
cc885f01b9547f17c6ef1d26d7d1d053186fdf57aa31c0a411a2ab1c0246cec9c2aeef8687e7f8eb0c998d3379712541c60432bc2521a3db1b45d72d316c2d2b

diff --git a/media-video/ffmpeg/ffmpeg-7.0.1.ebuild 
b/media-video/ffmpeg/ffmpeg-7.0.1.ebuild
index fa7e8bbf4005..797aa00fb30e 100644
--- a/media-video/ffmpeg/ffmpeg-7.0.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.0.1.ebuild
@@ -14,7 +14,7 @@ EAPI=8
 # doing so since such a case is unlikely.
 FFMPEG_SUBSLOT=58.60.60
 
-SOC_PATCH="ffmpeg-rpi-6.1-r3.patch"
+SOC_PATCH="ffmpeg-rpi-7.0.patch"
 
 SCM=""
 if [ "${PV#}" != "${PV}" ] ; then
@@ -46,7 +46,7 @@ else # Release
BDEPEND="
verify-sig? (
sec-keys/openpgp-keys-ffmpeg
-   soc? ( sec-keys/openpgp-keys-gentoo-developers )
+   soc? ( 
>=sec-keys/openpgp-keys-gentoo-developers-20240708 )
)
"
 

diff --git a/media-video/ffmpeg/ffmpeg-.ebuild 
b/media-video/ffmpeg/ffmpeg-.ebuild
index a7e9087b1df6..8294c24da0d7 100644
--- a/media-video/ffmpeg/ffmpeg-.ebuild
+++ b/media-video/ffmpeg/ffmpeg-.ebuild
@@ -14,7 +14,7 @@ EAPI=8
 # doing so since such a case is unlikely.
 FFMPEG_SUBSLOT=58.60.60
 
-SOC_PATCH="ffmpeg-rpi-6.1-r3.patch"
+SOC_PATCH="ffmpeg-rpi-7.0.patch"
 
 SCM=""
 if [ "${PV#}" != "${PV}" ] ; then
@@ -46,7 +46,7 @@ else # Release
BDEPEND="
verify-sig? (
sec-keys/openpgp-keys-ffmpeg
-   soc? ( sec-keys/openpgp-keys-gentoo-developers )
+   soc? ( 
>=sec-keys/openpgp-keys-gentoo-developers-20240708 )
)
"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[Sam James]

commit: 8f2becbfb7c1a190ab0bd96e3c637806eff6fa58
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul  7 00:35:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul  7 00:35:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f2becbf

media-video/ffmpeg: fix media-sound/liblc3 category in metadata.xml

Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 04f6fce5cbf7..09dba7627ec5 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -50,7 +50,7 @@
Uses media-libs/libdvdnav to 
enable DVD demuxing
Uses media-libs/libdvdread 
to enable DVD demuxing
Enables iLBC de/encoding via 
media-libs/libilbc.
-   Enables LC3 de/encoding via 
media-libs/liblc3.
+   Enables LC3 de/encoding via 
media-sound/liblc3.
Adds flexible GPU-accelerated 
processing filter based on media-libs/libplacebo.
Enables Real Time Messaging Protocol using 
librtmp (media-video/rtmpdump) in addition to FFmpeg's native 
implementation.
Enables audio resampling through 
media-libs/soxr.

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[Sam James]

commit: 721607c73a226d3f993c3462dab9a45ecf350969
Author: Leonardo Hernández Hernández  proton  me>
AuthorDate: Sat Jun 15 02:26:33 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul  7 00:32:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=721607c7

media-video/ffmpeg: fix VariableOrderWrong

Signed-off-by: Leonardo Hernández Hernández  proton.me>
Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-.ebuild 
b/media-video/ffmpeg/ffmpeg-.ebuild
index e6491c785ef4..322b5a1d739b 100644
--- a/media-video/ffmpeg/ffmpeg-.ebuild
+++ b/media-video/ffmpeg/ffmpeg-.ebuild
@@ -60,7 +60,7 @@ else # Release
 fi
 FFMPEG_REVISION="${PV#*_p}"
 
-SLOT="0/${FFMPEG_SUBSLOT}"
+S=${WORKDIR}/${P/_/-}
 LICENSE="
!gpl? ( LGPL-2.1 )
gpl? ( GPL-2 )
@@ -84,6 +84,7 @@ LICENSE="
)
samba? ( GPL-3 )
 "
+SLOT="0/${FFMPEG_SUBSLOT}"
 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
@@ -373,8 +374,6 @@ RESTRICT="
gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 "
 
-S=${WORKDIR}/${P/_/-}
-
 PATCHES=(
"${FILESDIR}"/chromium-r2.patch
"${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[Sam James]

commit: 93672ffcc594d22fc53f846f3f05331ab047dacf
Author: Leonardo Hernández Hernández  proton  me>
AuthorDate: Sat Jun 15 02:06:57 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul  7 00:32:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93672ffc

media-video/ffmpeg: add 7.0.1

Closes: https://bugs.gentoo.org/926628
Signed-off-by: Leonardo Hernández Hernández  proton.me>
Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/Manifest  |  2 ++
 .../ffmpeg/{ffmpeg-.ebuild => ffmpeg-7.0.1.ebuild}   | 12 ++--
 media-video/ffmpeg/ffmpeg-.ebuild| 12 ++--
 media-video/ffmpeg/metadata.xml  |  4 
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d370d825a43e..1bc6100e9ac9 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -7,5 +7,7 @@ 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-7.0.1.tar.xz 10793572 BLAKE2B 
7468bb0768da56794c57b43db5fb8a1c5471f86dc7789ba342e494907b2f05fd0edbaa93159b05927a749d878c431ad8ac56cafc2434b54c5190b91ca6a6116a
 SHA512 
94e06c4ce64ed3888620547db0e33b29c68a9e78b3ea748346f34280f69723a6d4b7485911f45f1849f9aa3036c0699334abbcf7126d2763bdaa7276673b7daa
+DIST ffmpeg-7.0.1.tar.xz.asc 520 BLAKE2B 
3fe3bdd8da390591849ac3784bf8e68e021124715de1a8d142a42096d625df9d9a27b224258f2f0c24b20397bfea7a8035ced4202904ca12fe0eef109516dbf1
 SHA512 
bd787bfa6dbb147800f5f79a3fe5e4c20054d48ea9e6af4d5c84ace68c19459f4ea677f5921b084eab889ed7b9f81dc138fa2ecf9ae306ac7fb19434a68aeced
 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-.ebuild 
b/media-video/ffmpeg/ffmpeg-7.0.1.ebuild
similarity index 97%
copy from media-video/ffmpeg/ffmpeg-.ebuild
copy to media-video/ffmpeg/ffmpeg-7.0.1.ebuild
index 322b5a1d739b..fa7e8bbf4005 100644
--- a/media-video/ffmpeg/ffmpeg-.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.0.1.ebuild
@@ -95,8 +95,9 @@ fi
 # 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
+   +gpl hardcoded-tables +iconv libxml2 libdvdnav libdvdread lzma 
+network
+   opencl openssl +postproc qrcode:libqrencode quirc:libquirc
+   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
@@ -264,6 +265,8 @@ RDEPEND="
libass? ( >=media-libs/libass-0.11.0:=[${MULTILIB_USEDEP}] )
libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+   libdvdnav? ( media-libs/libdvdnav[${MULTILIB_USEDEP}] )
+   libdvdread? ( media-libs/libdvdread:=[${MULTILIB_USEDEP}] )
libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
libplacebo? ( >=media-libs/libplacebo-4.192.0:=[$MULTILIB_USEDEP] )
librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
@@ -280,6 +283,8 @@ RDEPEND="
opus? ( 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[Sam James]

commit: 006771dbbc4c960ad0c895d4fd96a7ba3080115e
Author: Leonardo Hernández Hernández  proton  me>
AuthorDate: Sat Jun 15 02:39:34 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul  7 00:32:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=006771db

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 | 5 +++--
 media-video/ffmpeg/metadata.xml   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-.ebuild 
b/media-video/ffmpeg/ffmpeg-.ebuild
index fa7e8bbf4005..a7e9087b1df6 100644
--- a/media-video/ffmpeg/ffmpeg-.ebuild
+++ b/media-video/ffmpeg/ffmpeg-.ebuild
@@ -106,7 +106,7 @@ 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
+   jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme 
gsm:libgsm liblc3
libaribb24 modplug:libmodplug opus:libopus qsv:libvpl libilbc 
librtmp ssh:libssh
speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec
vorbis:libvorbis vpx:libvpx zvbi:libzvbi
@@ -260,7 +260,7 @@ RDEPEND="
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}] )
+   libaom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
libass? ( >=media-libs/libass-0.11.0:=[${MULTILIB_USEDEP}] )
libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
@@ -268,6 +268,7 @@ RDEPEND="
libdvdnav? ( media-libs/libdvdnav[${MULTILIB_USEDEP}] )
libdvdread? ( media-libs/libdvdread:=[${MULTILIB_USEDEP}] )
libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+   liblc3? ( >=media-sound/liblc3-1.1[${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}] )

diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index c122daa2c563..04f6fce5cbf7 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -50,6 +50,7 @@
Uses media-libs/libdvdnav to 
enable DVD demuxing
Uses media-libs/libdvdread 
to enable DVD demuxing
Enables iLBC de/encoding via 
media-libs/libilbc.
+   Enables LC3 de/encoding via 
media-libs/liblc3.
Adds flexible GPU-accelerated 
processing filter based on media-libs/libplacebo.
Enables Real Time Messaging Protocol using 
librtmp (media-video/rtmpdump) in addition to FFmpeg's native 
implementation.
Enables audio resampling through 
media-libs/soxr.

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/, media-video/ffmpeg/files/

[Sam James]

commit: 30a975a77cc37ac5678880eb8d1b6255fe270a88
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul  3 00:35:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul  3 00:35:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30a975a7

media-video/ffmpeg: fix another modern C issue

Closes: https://bugs.gentoo.org/935377
Closes: https://bugs.gentoo.org/935046
Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r7.ebuild  | 622 +
 .../ffmpeg-6.1.1-wint-inconversion-libgcrypt.patch |  68 +++
 2 files changed, 690 insertions(+)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r7.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r7.ebuild
new file mode 100644
index ..a25bc7572607
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r7.ebuild
@@ -0,0 +1,622 @@
+# 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
+
+SOC_PATCH="ffmpeg-rpi-6.1-r3.patch"
+
+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/;
+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
+   inherit verify-sig
+
+   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; then
+   verify-sig_verify_detached 
"${DISTDIR}"/${P/_/-}.tar.xz{,.asc} /usr/share/openpgp-keys/ffmpeg.asc
+   use soc && verify-sig_verify_detached 
"${DISTDIR}"/${SOC_PATCH}{,.asc} /usr/share/openpgp-keys/gentoo-developers.asc
+   fi
+   default
+   }
+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 modplug:libmodplug opus:libopus qsv:libvpl libilbc 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/

[Matt Jolly]

commit: 1ad016cf425f84fc1f8df9b9d13e9e2346beccc1
Author: Matt Jolly  gentoo  org>
AuthorDate: Thu Jun 13 09:38:53 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Wed Jun 19 05:38:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ad016cf

media-video/ffmpeg-chromium: add 127

Signed-off-by: Matt Jolly  gentoo.org>

 media-video/ffmpeg-chromium/Manifest   |   1 +
 .../ffmpeg-chromium/ffmpeg-chromium-127.ebuild | 248 +
 2 files changed, 249 insertions(+)

diff --git a/media-video/ffmpeg-chromium/Manifest 
b/media-video/ffmpeg-chromium/Manifest
index 1c00cc6cb094..3e2681fdb52f 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -4,3 +4,4 @@ DIST ffmpeg-chromium-123.tar.xz 10323756 BLAKE2B 
b56afd5946513511938feeea4fd60e2
 DIST ffmpeg-chromium-124.tar.xz 10378648 BLAKE2B 
3cb79d356e84d76a241ad81491d22d42b7a768e348d245bda00101e3967c0864e95a1dd83372e6aaf3a9130ff5ae38610fe2bd4ee8e21fc8247af4172af0683a
 SHA512 
627d1ba81c50300e7188e8a2cc5f76ea9e81e817209631f2eecb81b7b9a0be60a12290eba16240dd0b0dce3d59550a8246be54df2035bd75a9e95ae77d67467b
 DIST ffmpeg-chromium-125.tar.xz 10372892 BLAKE2B 
53b805354b55f1dfbe2341b767aaccca7efea4cced02db9090be88e89a4d2d688904ffc996c206d92a99d4eb93733b7f8cb47fd80dc43019c3bb6690903a1140
 SHA512 
c1b68b16a3dbd6f96e52c313b9ddf1c193ef302e5cbe7e127c511e54a4453c32c84b3df954e397d7ba834ef17fe1cba6efabfde855d3bb9e497bcde1b66c3d8d
 DIST ffmpeg-chromium-126.tar.xz 10402160 BLAKE2B 
96a92ff2a5ece8668693f5ef7ed5da3e61a523b98a91d00316494df91edfc42c1622663719a3c192de2a4ebf7a6258f08c53393201ee3fc3261f162e1b529dcd
 SHA512 
8fc10b1d5fe159a1dd718229bf8ec50ed0bea1fedd917859b3a0703f15e94809087e67ccf2031eb14ae8b06ad32d958ed71ff54621fd667f5507abd9738a6f0c
+DIST ffmpeg-chromium-127.tar.xz 10418192 BLAKE2B 
2a623ee8e2c0940e4067e6ebecaecdc64c45b16022327a84d77323348c210b091c58eb52b4afea1f2918cd29a27c3457a3294f561a5e6ee2db28c63f432b23bd
 SHA512 
0cddb21761ad3b54f5393d3963ca94518cb4ab8183f2bbe975f8419bd94d8b20131750a22d75fd56b304a2b83be364993a839f727342b7eed6a2d1868f79af4c

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild
new file mode 100644
index ..eb68732fd0bc
--- /dev/null
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild
@@ -0,0 +1,248 @@
+# 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=bc1ee906cede137c061bea5a5e8d0743374392a5
+DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based 
browsers"
+HOMEPAGE="https://ffmpeg.org/;
+SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz;
+
+LICENSE="
+   !gpl? ( LGPL-2.1 )
+   gpl? ( GPL-2 )
+"
+SLOT="${PV}"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64"
+
+# 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
+   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 )
+   

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/

[Matt Jolly]

commit: dc0f4705d4df4877d9101b11099b904bea0c1882
Author: Matt Jolly  gentoo  org>
AuthorDate: Thu Jun 13 10:44:36 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Wed Jun 19 05:40:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc0f4705

media-video/ffmpeg-chromium: drop 120, 121, 123

Signed-off-by: Matt Jolly  gentoo.org>

 media-video/ffmpeg-chromium/Manifest   |   3 -
 .../ffmpeg-chromium/ffmpeg-chromium-120.ebuild | 250 -
 .../ffmpeg-chromium/ffmpeg-chromium-121.ebuild | 250 -
 .../ffmpeg-chromium/ffmpeg-chromium-123.ebuild | 247 
 media-video/ffmpeg-chromium/metadata.xml   |   1 -
 5 files changed, 751 deletions(-)

diff --git a/media-video/ffmpeg-chromium/Manifest 
b/media-video/ffmpeg-chromium/Manifest
index 3e2681fdb52f..88814c871dda 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -1,6 +1,3 @@
-DIST ffmpeg-chromium-120.tar.xz 10096036 BLAKE2B 
8f24dfed854c713df369e6ef15bc773a3166fdf6eb8c90bcb1d1b7aca0702df7615bc323432a40b5d213352945fa49acf8e864df2caa358764b5068a75f3
 SHA512 
0e0bfb44225981f91edceeb6f302592a7e108da49c5e6503b43f0e12b91d84dece908efe5e548bb31ccab49c5fba5a8365f5f0793bbf1450d35bfd836f8a3e9b
-DIST ffmpeg-chromium-121.tar.xz 10128048 BLAKE2B 
ba8e25356b7e0820dffea1b919288ddb3d6ec56fe8d17493529ec978deae629607ff5a5857a313e478193a1fca55fa3e5256e37d57251141e1f0a892cbdcf674
 SHA512 
e6cef1285237673ce5851cbddf4cda9821c247a120bf73af2b931745b2886c915a35bb2bc21a8a9c5154be9e540f8abccc3bb64e704f5b859141d0dcc2e1
-DIST ffmpeg-chromium-123.tar.xz 10323756 BLAKE2B 
b56afd5946513511938feeea4fd60e22fcf241a2380b36990eadf812b3517d6941156de73135efdc873704d27bc3329c71193be5132e462caaf7f2dc29e8a058
 SHA512 
635e1c5496d6f41fa5dd69efbe6dd335a15705dce8544fc45df440b19965caa130646d16b7c22b2b7cc0809979d28f39245fc5c208637e445b1fc1eb384da418
 DIST ffmpeg-chromium-124.tar.xz 10378648 BLAKE2B 
3cb79d356e84d76a241ad81491d22d42b7a768e348d245bda00101e3967c0864e95a1dd83372e6aaf3a9130ff5ae38610fe2bd4ee8e21fc8247af4172af0683a
 SHA512 
627d1ba81c50300e7188e8a2cc5f76ea9e81e817209631f2eecb81b7b9a0be60a12290eba16240dd0b0dce3d59550a8246be54df2035bd75a9e95ae77d67467b
 DIST ffmpeg-chromium-125.tar.xz 10372892 BLAKE2B 
53b805354b55f1dfbe2341b767aaccca7efea4cced02db9090be88e89a4d2d688904ffc996c206d92a99d4eb93733b7f8cb47fd80dc43019c3bb6690903a1140
 SHA512 
c1b68b16a3dbd6f96e52c313b9ddf1c193ef302e5cbe7e127c511e54a4453c32c84b3df954e397d7ba834ef17fe1cba6efabfde855d3bb9e497bcde1b66c3d8d
 DIST ffmpeg-chromium-126.tar.xz 10402160 BLAKE2B 
96a92ff2a5ece8668693f5ef7ed5da3e61a523b98a91d00316494df91edfc42c1622663719a3c192de2a4ebf7a6258f08c53393201ee3fc3261f162e1b529dcd
 SHA512 
8fc10b1d5fe159a1dd718229bf8ec50ed0bea1fedd917859b3a0703f15e94809087e67ccf2031eb14ae8b06ad32d958ed71ff54621fd667f5507abd9738a6f0c

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild
deleted file mode 100644
index f5c83cb50871..
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# 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="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;
-
-LICENSE="
-   !gpl? ( LGPL-2.1 )
-   gpl? ( GPL-2 )
-"
-SLOT="${PV}"
-
-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 )
-   )
-   

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/

[Sam James]

commit: d1b3ef59d9917a5472a8fd4e0b0869fd4c83a1df
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 14 22:05:26 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 14 22:05:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b3ef59

media-video/ffmpeg-chromium: Stabilize 126 amd64, #934193

Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild
index 96b00d298e2a..e4db10a00285 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64"
 
 # 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-chromium/

[Arthur Zamarin]

commit: fee70b54e8201ea8d2c0393ca8bddbef61e2dee5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jun 13 19:44:30 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jun 13 19:44:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee70b54

media-video/ffmpeg-chromium: Stabilize 126 arm64, #934193

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild
index 75e65da60e4e..96b00d298e2a 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64"
 
 # 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/

[Sam James]

commit: 2fbd9aa700613a6070ca84af92b58e253a389e63
Author: Eli Schwartz  gmail  com>
AuthorDate: Tue Jun  4 03:52:49 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  4 06:53:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fbd9aa7

media-video/ffmpeg: fix another LTO breakage, this time with bare -flto

`get-flag` is a bit of a funny API. It offers to provide the value of a
flag, implying, the part after the =. But if there is no = then it
simply returns you the whole flag, whereas you might think it returns
empty.

ffmpeg was relying on it returning empty for the case where no value is
passed, but instead we ended up passing --enable-lto=-flto for such a
case, which the ffmpeg configure script happily accepts as a valid
value, and then silently drops since it doesn't actually work.

End result: no LTO for the package with -flto, but working LTO if you
used e.g. -flto=4 instead.

Explicitly handle the -flto case.

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild | 2 +-
 media-video/ffmpeg/ffmpeg-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild
index fa3dd7774141..78278c02f240 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild
@@ -424,7 +424,7 @@ src_prepare() {
if tc-is-lto ; then
# Respect -flto value, e.g -flto=thin
local v="$(get-flag flto)"
-   [[ -n ${v} ]] && LTO_FLAG="--enable-lto=${v}" || 
LTO_FLAG="--enable-lto"
+   [[ ${v} != -flto ]] && LTO_FLAG="--enable-lto=${v}" || 
LTO_FLAG="--enable-lto"
fi
filter-lto
 }

diff --git a/media-video/ffmpeg/ffmpeg-.ebuild 
b/media-video/ffmpeg/ffmpeg-.ebuild
index e4783cb8348f..e6491c785ef4 100644
--- a/media-video/ffmpeg/ffmpeg-.ebuild
+++ b/media-video/ffmpeg/ffmpeg-.ebuild
@@ -419,7 +419,7 @@ src_prepare() {
if tc-is-lto ; then
# Respect -flto value, e.g -flto=thin
local v="$(get-flag flto)"
-   [[ -n ${v} ]] && LTO_FLAG="--enable-lto=${v}" || 
LTO_FLAG="--enable-lto"
+   [[ ${v} != -flto ]] && LTO_FLAG="--enable-lto=${v}" || 
LTO_FLAG="--enable-lto"
fi
filter-lto
 }

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[Sam James]

commit: d9a701f0e4dfecb71ff54d4c8dba1a4494a2f3ea
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  4 03:23:30 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  4 03:25:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9a701f0

media-video/ffmpeg: fix LTO handling with multilib

Checking ABI and filtering based on that doesn't work in multilib_src_configure
because of contamination & the order the phases / ABIs run in.

Closes: https://bugs.gentoo.org/923491
Thanks-to: Michael Cook  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild | 15 ++-
 media-video/ffmpeg/ffmpeg-.ebuild | 15 ++-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild
index 9f5bd8424035..fa3dd7774141 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild
@@ -419,6 +419,14 @@ src_prepare() {
 
ln -snf "${FILESDIR}"/chromium.c chromium.c || die
echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+
+   # We need to detect LTO usage before multilib stuff and filter-lto is 
called (bug #923491)
+   if tc-is-lto ; then
+   # Respect -flto value, e.g -flto=thin
+   local v="$(get-flag flto)"
+   [[ -n ${v} ]] && LTO_FLAG="--enable-lto=${v}" || 
LTO_FLAG="--enable-lto"
+   fi
+   filter-lto
 }
 
 multilib_src_configure() {
@@ -510,12 +518,9 @@ multilib_src_configure() {
done
 
# LTO support, bug #566282, bug #754654, bug #772854
-   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" )
+   if [[ ${ABI} != x86 && ! -z ${LTO_FLAG} ]]; then
+   myconf+=( ${LTO_FLAG} )
fi
-   filter-lto
 
# Mandatory configuration
myconf=(

diff --git a/media-video/ffmpeg/ffmpeg-.ebuild 
b/media-video/ffmpeg/ffmpeg-.ebuild
index 867a4147d174..e4783cb8348f 100644
--- a/media-video/ffmpeg/ffmpeg-.ebuild
+++ b/media-video/ffmpeg/ffmpeg-.ebuild
@@ -414,6 +414,14 @@ src_prepare() {
 
ln -snf "${FILESDIR}"/chromium.c chromium.c || die
echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+
+   # We need to detect LTO usage before multilib stuff and filter-lto is 
called (bug #923491)
+   if tc-is-lto ; then
+   # Respect -flto value, e.g -flto=thin
+   local v="$(get-flag flto)"
+   [[ -n ${v} ]] && LTO_FLAG="--enable-lto=${v}" || 
LTO_FLAG="--enable-lto"
+   fi
+   filter-lto
 }
 
 multilib_src_configure() {
@@ -505,12 +513,9 @@ multilib_src_configure() {
done
 
# LTO support, bug #566282, bug #754654, bug #772854
-   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" )
+   if [[ ${ABI} != x86 && ! -z ${LTO_FLAG} ]]; then
+   myconf+=( ${LTO_FLAG} )
fi
-   filter-lto
 
# Mandatory configuration
myconf=(

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[Michał Górny]

commit: a356ecc5222301b9290d07eccaa036d1194b00da
Author: Michał Górny  gentoo  org>
AuthorDate: Tue May 28 12:10:55 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue May 28 12:10:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a356ecc5

media-video/ffmpeg: Stabilize 6.1.1-r5 arm, #932995

Signed-off-by: Michał Górny  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild
index 94fe73865b5b..b63175bbd68b 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild
@@ -85,7 +85,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-chromium/

[Jakov Smolić]

commit: 31bf8e01a0772709347a9fb6e6f3d6dbffddcc4f
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue May 28 06:24:29 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue May 28 06:24:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31bf8e01

media-video/ffmpeg-chromium: Stabilize 125 amd64, #932843

Signed-off-by: Jakov Smolić  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
index 543ca726ce56..3186f0ec2b6a 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64"
 
 # 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-chromium/

[Michał Górny]

commit: cb7613ccb9cd6d2839036ff5e459ee3d033da612
Author: Michał Górny  gentoo  org>
AuthorDate: Wed May 22 11:40:05 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed May 22 11:40:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb7613cc

media-video/ffmpeg-chromium: Stabilize 125 arm64, #932404

Signed-off-by: Michał Górny  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
index 31ce26ab8f8a..543ca726ce56 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64"
 
 # 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-chromium/

[WANG Xuerui]

commit: e1ff5402318125a6d58c47b790082ae7fd80b431
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue May 21 07:11:25 2024 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Tue May 21 07:11:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ff5402

media-video/ffmpeg-chromium: keyword 125 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
index 2b5c1d96a3ca..31ce26ab8f8a 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64"
 
 # 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-chromium/

[WANG Xuerui]

commit: 313b99cf1d6c0919a47935fe28a1be2bd2ce4504
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue May 21 07:11:52 2024 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Tue May 21 07:11:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=313b99cf

media-video/ffmpeg-chromium: keyword 126 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild
index 70f53ffe56a5..75e65da60e4e 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64"
 
 # 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-chromium/

[Matt Jolly]

commit: 93896e14aa6c330f85312e893a8508563c7c2df1
Author: Matt Jolly  gentoo  org>
AuthorDate: Mon May 20 05:54:17 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Tue May 21 05:51:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93896e14

media-video/ffmpeg-chromium: add 126

Signed-off-by: Matt Jolly  gentoo.org>

 media-video/ffmpeg-chromium/Manifest   |   1 +
 .../ffmpeg-chromium/ffmpeg-chromium-126.ebuild | 248 +
 2 files changed, 249 insertions(+)

diff --git a/media-video/ffmpeg-chromium/Manifest 
b/media-video/ffmpeg-chromium/Manifest
index 154062c50024..1c00cc6cb094 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -3,3 +3,4 @@ DIST ffmpeg-chromium-121.tar.xz 10128048 BLAKE2B 
ba8e25356b7e0820dffea1b919288dd
 DIST ffmpeg-chromium-123.tar.xz 10323756 BLAKE2B 
b56afd5946513511938feeea4fd60e22fcf241a2380b36990eadf812b3517d6941156de73135efdc873704d27bc3329c71193be5132e462caaf7f2dc29e8a058
 SHA512 
635e1c5496d6f41fa5dd69efbe6dd335a15705dce8544fc45df440b19965caa130646d16b7c22b2b7cc0809979d28f39245fc5c208637e445b1fc1eb384da418
 DIST ffmpeg-chromium-124.tar.xz 10378648 BLAKE2B 
3cb79d356e84d76a241ad81491d22d42b7a768e348d245bda00101e3967c0864e95a1dd83372e6aaf3a9130ff5ae38610fe2bd4ee8e21fc8247af4172af0683a
 SHA512 
627d1ba81c50300e7188e8a2cc5f76ea9e81e817209631f2eecb81b7b9a0be60a12290eba16240dd0b0dce3d59550a8246be54df2035bd75a9e95ae77d67467b
 DIST ffmpeg-chromium-125.tar.xz 10372892 BLAKE2B 
53b805354b55f1dfbe2341b767aaccca7efea4cced02db9090be88e89a4d2d688904ffc996c206d92a99d4eb93733b7f8cb47fd80dc43019c3bb6690903a1140
 SHA512 
c1b68b16a3dbd6f96e52c313b9ddf1c193ef302e5cbe7e127c511e54a4453c32c84b3df954e397d7ba834ef17fe1cba6efabfde855d3bb9e497bcde1b66c3d8d
+DIST ffmpeg-chromium-126.tar.xz 10402160 BLAKE2B 
96a92ff2a5ece8668693f5ef7ed5da3e61a523b98a91d00316494df91edfc42c1622663719a3c192de2a4ebf7a6258f08c53393201ee3fc3261f162e1b529dcd
 SHA512 
8fc10b1d5fe159a1dd718229bf8ec50ed0bea1fedd917859b3a0703f15e94809087e67ccf2031eb14ae8b06ad32d958ed71ff54621fd667f5507abd9738a6f0c

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild
new file mode 100644
index ..70f53ffe56a5
--- /dev/null
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild
@@ -0,0 +1,248 @@
+# 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=092f84b6141055bfab609b6b2666b724eee2e130
+DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based 
browsers"
+HOMEPAGE="https://ffmpeg.org/;
+SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz;
+
+LICENSE="
+   !gpl? ( LGPL-2.1 )
+   gpl? ( GPL-2 )
+"
+SLOT="${PV}"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+# 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
+   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 )
+   

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/

[Sam James]

commit: 90cfa72c27592c0d73ec8040f621e70153c9efbc
Author: Sam James  gentoo  org>
AuthorDate: Thu May  2 05:20:31 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  2 05:20:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90cfa72c

media-video/ffmpeg: backport (serious) memory leak fix

Closes: https://bugs.gentoo.org/931059
Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild  | 616 +
 .../ffmpeg/files/ffmpeg-6.1.1-memory-leak.patch| 129 +
 2 files changed, 745 insertions(+)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild
new file mode 100644
index ..9f5bd8424035
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r6.ebuild
@@ -0,0 +1,616 @@
+# 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
+
+SOC_PATCH="ffmpeg-rpi-6.1-r3.patch"
+
+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/;
+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
+   inherit verify-sig
+
+   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; then
+   verify-sig_verify_detached 
"${DISTDIR}"/${P/_/-}.tar.xz{,.asc} /usr/share/openpgp-keys/ffmpeg.asc
+   use soc && verify-sig_verify_detached 
"${DISTDIR}"/${SOC_PATCH}{,.asc} /usr/share/openpgp-keys/gentoo-developers.asc
+   fi
+   default
+   }
+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 modplug:libmodplug opus:libopus qsv:libvpl libilbc 
librtmp ssh:libssh
+   

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[James Le Cuirot]

commit: 991b62c98188ceaa919c0238174ec7d6fd31aa52
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Apr 25 21:48:57 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Apr 25 21:48:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=991b62c9

media-video/ffmpeg: Bump vulkan dependencies and require threads for 

Closes: https://bugs.gentoo.org/928394
Bug: https://bugs.gentoo.org/930209
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/ffmpeg/ffmpeg-.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-.ebuild 
b/media-video/ffmpeg/ffmpeg-.ebuild
index 06c2372b2a61..867a4147d174 100644
--- a/media-video/ffmpeg/ffmpeg-.ebuild
+++ b/media-video/ffmpeg/ffmpeg-.ebuild
@@ -307,7 +307,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.3.255:=[${MULTILIB_USEDEP}] )
+   vulkan? ( >=media-libs/vulkan-loader-1.3.277:=[${MULTILIB_USEDEP}] )
X? (
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
@@ -329,7 +329,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 )
+   vulkan? ( >=dev-util/vulkan-headers-1.3.277 )
 "
 
 # += for verify-sig above
@@ -365,6 +365,7 @@ REQUIRED_USE="
shaderc? ( vulkan !glslang )
soc? ( libdrm )
test? ( encode )
+   vulkan? ( threads )
${GPL_REQUIRED_USE}
${CPU_REQUIRED_USE}"
 RESTRICT="

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/

[James Le Cuirot]

commit: e5861e5df608ea837b6cf3ed5dea641adb983ea4
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Apr 25 21:50:48 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Apr 25 21:50:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5861e5d

media-video/ffmpeg-chromium: Bump vulkan deps and require threads for 125

Closes: https://bugs.gentoo.org/930209
Bug: https://bugs.gentoo.org/928394
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
index 57ac8aece340..2b5c1d96a3ca 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
@@ -99,11 +99,11 @@ RDEPEND="
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 )
-   vulkan? ( >=media-libs/vulkan-loader-1.3.255:= )
+   vulkan? ( >=media-libs/vulkan-loader-1.3.277:= )
 "
 
 DEPEND="${RDEPEND}
-   vulkan? ( >=dev-util/vulkan-headers-1.3.255 )
+   vulkan? ( >=dev-util/vulkan-headers-1.3.277 )
 "
 BDEPEND="
>=dev-build/make-3.81
@@ -112,6 +112,7 @@ BDEPEND="
 "
 
 REQUIRED_USE="
+   vulkan? ( threads )
${CPU_REQUIRED_USE}"
 RESTRICT="
test

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/

[Matt Jolly]

commit: fc1100eb45d59a712d5633a422a99d9ec248d1c3
Author: Matt Jolly  gentoo  org>
AuthorDate: Thu Apr 25 01:52:23 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Thu Apr 25 06:28:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc1100eb

media-video/ffmpeg-chromium: keyword 124 and 125 for ~ppc64

Signed-off-by: Matt Jolly  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild | 2 +-
 media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild
index 316bbbcc31a6..74a941cdeb9e 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-KEYWORDS="amd64 ~arm arm64"
+KEYWORDS="amd64 ~arm arm64 ~ppc64"
 
 # Options to use as use_enable in the foo[:bar] form.
 # This will feed configure with $(use_enable foo bar)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
index 8356541f8bcc..57ac8aece340 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
 # 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-chromium/

[Arthur Zamarin]

commit: ff7aac7cc5b629a4f08beb7bd4ffd6016433a3ed
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Apr 19 10:37:56 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Apr 19 10:37:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff7aac7c

media-video/ffmpeg-chromium: Stabilize 124 arm64, #930125

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild
index 99d53cb362b7..316bbbcc31a6 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-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-chromium/

[Arthur Zamarin]

commit: 6f3f8322dc19dd4acfd2d4814a30f90df9966291
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Apr 19 10:37:53 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Apr 19 10:37:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f3f8322

media-video/ffmpeg-chromium: Stabilize 124 amd64, #930125

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild
index 23b3cdef4e31..99d53cb362b7 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-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-chromium/

[Matt Jolly]

commit: 9cc853fa4efce991676ffadc3a14634c10013d24
Author: Matt Jolly  gentoo  org>
AuthorDate: Thu Apr 18 10:16:01 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Thu Apr 18 15:28:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc853fa

media-video/ffmpeg-chromium: add 125

Signed-off-by: Matt Jolly  gentoo.org>

 media-video/ffmpeg-chromium/Manifest   |   1 +
 .../ffmpeg-chromium/ffmpeg-chromium-125.ebuild | 247 +
 2 files changed, 248 insertions(+)

diff --git a/media-video/ffmpeg-chromium/Manifest 
b/media-video/ffmpeg-chromium/Manifest
index 7e2464b44f4f..154062c50024 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -2,3 +2,4 @@ DIST ffmpeg-chromium-120.tar.xz 10096036 BLAKE2B 
8f24dfed854c713df369e6ef15bc773
 DIST ffmpeg-chromium-121.tar.xz 10128048 BLAKE2B 
ba8e25356b7e0820dffea1b919288ddb3d6ec56fe8d17493529ec978deae629607ff5a5857a313e478193a1fca55fa3e5256e37d57251141e1f0a892cbdcf674
 SHA512 
e6cef1285237673ce5851cbddf4cda9821c247a120bf73af2b931745b2886c915a35bb2bc21a8a9c5154be9e540f8abccc3bb64e704f5b859141d0dcc2e1
 DIST ffmpeg-chromium-123.tar.xz 10323756 BLAKE2B 
b56afd5946513511938feeea4fd60e22fcf241a2380b36990eadf812b3517d6941156de73135efdc873704d27bc3329c71193be5132e462caaf7f2dc29e8a058
 SHA512 
635e1c5496d6f41fa5dd69efbe6dd335a15705dce8544fc45df440b19965caa130646d16b7c22b2b7cc0809979d28f39245fc5c208637e445b1fc1eb384da418
 DIST ffmpeg-chromium-124.tar.xz 10378648 BLAKE2B 
3cb79d356e84d76a241ad81491d22d42b7a768e348d245bda00101e3967c0864e95a1dd83372e6aaf3a9130ff5ae38610fe2bd4ee8e21fc8247af4172af0683a
 SHA512 
627d1ba81c50300e7188e8a2cc5f76ea9e81e817209631f2eecb81b7b9a0be60a12290eba16240dd0b0dce3d59550a8246be54df2035bd75a9e95ae77d67467b
+DIST ffmpeg-chromium-125.tar.xz 10372892 BLAKE2B 
53b805354b55f1dfbe2341b767aaccca7efea4cced02db9090be88e89a4d2d688904ffc996c206d92a99d4eb93733b7f8cb47fd80dc43019c3bb6690903a1140
 SHA512 
c1b68b16a3dbd6f96e52c313b9ddf1c193ef302e5cbe7e127c511e54a4453c32c84b3df954e397d7ba834ef17fe1cba6efabfde855d3bb9e497bcde1b66c3d8d

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
new file mode 100644
index ..8356541f8bcc
--- /dev/null
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild
@@ -0,0 +1,247 @@
+# 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=901248a373cbbe7af68fb92faf3be7d4f679150d
+DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based 
browsers"
+HOMEPAGE="https://ffmpeg.org/;
+SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz;
+
+LICENSE="
+   !gpl? ( LGPL-2.1 )
+   gpl? ( GPL-2 )
+"
+SLOT="${PV}"
+
+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
+   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?  ( 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/

[Sam James]

commit: 2a7ae185d12135418fee061d38e3d2e9ae497ddd
Author: germ  outlook  com>
AuthorDate: Tue Apr  9 23:13:30 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 10 01:46:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a7ae185

media-video/ffmpeg: fix build with vulkan-headers-1.3.280.0

Adds 
https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/fef22c87ada4517441701e6e61e062c9f4399c8e

[sam: Fixup commit message and add references to patch.]

Closes: https://bugs.gentoo.org/928593
Signed-off-by: germ  outlook.com>
Closes: https://github.com/gentoo/gentoo/pull/36186
Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild  |   2 +
 .../ffmpeg/files/ffmpeg-6.1.1-vulkan-rename.patch  | 127 +
 2 files changed, 129 insertions(+)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild
index 856822a88c5b..94fe73865b5b 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild
@@ -381,6 +381,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch
"${FILESDIR}"/${PN}-6.1-gcc-14.patch
"${FILESDIR}"/${PN}-6.0.1-alignment.patch
+   "${FILESDIR}"/ffmpeg-6.1.1-vulkan-rename.patch
+
 )
 
 MULTILIB_WRAPPED_HEADERS=(

diff --git a/media-video/ffmpeg/files/ffmpeg-6.1.1-vulkan-rename.patch 
b/media-video/ffmpeg/files/ffmpeg-6.1.1-vulkan-rename.patch
new file mode 100644
index ..b564e3874485
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-6.1.1-vulkan-rename.patch
@@ -0,0 +1,127 @@
+https://bugs.gentoo.org/928593
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/fef22c87ada4517441701e6e61e062c9f4399c8e
+
+From fef22c87ada4517441701e6e61e062c9f4399c8e Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Jan=20Ekstr=C3=B6m?= 
+Date: Wed, 14 Feb 2024 22:40:54 +0200
+Subject: [PATCH] {avcodec,tests}: rename the bundled Mesa AV1 vulkan video
+ headers
+
+This together with adjusting the inclusion define allows for the
+build to not fail with latest Vulkan-Headers that contain the
+stabilized Vulkan AV1 decoding definitions.
+
+Compilation fails currently as the AV1 header is getting included
+via hwcontext_vulkan.h ->  -> vulkan_core.h, which
+finally includes vk_video/vulkan_video_codec_av1std.h and the decode
+header, leading to the bundled header to never defining anything
+due to the inclusion define being the same.
+
+This fix is imperfect, as it leads to additional re-definition
+warnings for things such as
+VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_SPEC_VERSION. , but it is
+not clear how to otherwise have the bundled version trump the
+actually standardized one for a short-term compilation fix.
+
+(cherry picked from commit e06ce6d2b45edac4a2df04f304e18d4727417d24)
+---
+ libavcodec/Makefile   | 4 ++--
+ libavcodec/vulkan_video.h | 4 ++--
+ ...v1std_decode.h => vulkan_video_codec_av1std_decode_mesa.h} | 4 ++--
+ ..._video_codec_av1std.h => vulkan_video_codec_av1std_mesa.h} | 4 ++--
+ tests/ref/fate/source | 4 ++--
+ 5 files changed, 10 insertions(+), 10 deletions(-)
+ rename libavcodec/{vulkan_video_codec_av1std_decode.h => 
vulkan_video_codec_av1std_decode_mesa.h} (89%)
+ rename libavcodec/{vulkan_video_codec_av1std.h => 
vulkan_video_codec_av1std_mesa.h} (99%)
+
+diff --git a/libavcodec/Makefile b/libavcodec/Makefile
+index ec57e53e30..eb25707ef5 100644
+--- a/libavcodec/Makefile
 b/libavcodec/Makefile
+@@ -1284,7 +1284,7 @@ SKIPHEADERS+= %_tablegen.h   
   \
+   aacenc_quantization.h \
+   aacenc_quantization_misc.h\
+   bitstream_template.h  \
+-  vulkan_video_codec_av1std.h   \
++  vulkan_video_codec_av1std_mesa.h \
+   $(ARCH)/vpx_arith.h  \
+ 
+ SKIPHEADERS-$(CONFIG_AMF)  += amfenc.h
+@@ -1306,7 +1306,7 @@ SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h
+ SKIPHEADERS-$(CONFIG_VAAPI)+= vaapi_decode.h vaapi_hevc.h 
vaapi_encode.h
+ SKIPHEADERS-$(CONFIG_VDPAU)+= vdpau.h vdpau_internal.h
+ SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vt_internal.h
+-SKIPHEADERS-$(CONFIG_VULKAN)   += vulkan.h vulkan_video.h 
vulkan_decode.h vulkan_video_codec_av1std_decode.h
++SKIPHEADERS-$(CONFIG_VULKAN)   += vulkan.h vulkan_video.h 
vulkan_decode.h vulkan_video_codec_av1std_decode_mesa.h
+ SKIPHEADERS-$(CONFIG_V4L2_M2M) += v4l2_buffers.h v4l2_context.h 
v4l2_m2m.h
+ SKIPHEADERS-$(CONFIG_ZLIB) += zlib_wrapper.h
+ 
+diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h
+index 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[Arthur Zamarin]

commit: 3f3a5efa7fc39c2bf304a451c886a4c2ffa96c47
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Apr  7 19:20:15 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Apr  7 19:20:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f3a5efa

media-video/ffmpeg: Stabilize 6.1.1-r5 amd64, #928542

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild
index 28ac28cac415..856822a88c5b 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild
@@ -85,7 +85,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-chromium/

[Arthur Zamarin]

commit: 764dbacf79c7ed877cc2eaca94efda4c8f80f424
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Apr  7 19:20:15 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Apr  7 19:20:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=764dbacf

media-video/ffmpeg-chromium: Stabilize 123 amd64, #928542

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild
index 667856cb7c66..cdb9ff78f655 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-KEYWORDS="~amd64 ~arm arm64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ~ppc64"
 
 # 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-chromium/

[Sam James]

commit: 17bf4e0233ad20ab31f18af8d7776d0a8eaf09c6
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr  4 01:17:36 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  4 01:17:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17bf4e02

media-video/ffmpeg-chromium: Keyword 123 ppc64, #928543

Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild
index d3285deb8a3d..667856cb7c66 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-KEYWORDS="~amd64 ~arm arm64"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64"
 
 # 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-chromium/

[Matt Jolly]

commit: 6d82e5e7431c8a25df0a87312bc7a9790a3cbd51
Author: Matt Jolly  gentoo  org>
AuthorDate: Wed Apr  3 22:54:34 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Wed Apr  3 22:54:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d82e5e7

media-video/ffmpeg-chromium: add myself as a maintainer

Also adopt by the chromium project; this almost exclusively
supports web browsers that we look after.

Signed-off-by: Matt Jolly  gentoo.org>

 media-video/ffmpeg-chromium/metadata.xml | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/media-video/ffmpeg-chromium/metadata.xml 
b/media-video/ffmpeg-chromium/metadata.xml
index 1d15ec93bf0f..026866d3f537 100644
--- a/media-video/ffmpeg-chromium/metadata.xml
+++ b/media-video/ffmpeg-chromium/metadata.xml
@@ -1,10 +1,18 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   ch...@gentoo.org
-   James Le Cuirot
-
+   
+   ch...@gentoo.org
+   James Le Cuirot
+   
+   
+   chrom...@gentoo.org
+   Chromium in Gentoo Project
+   
+   
+   kan...@gentoo.org
+   Matt Jolly
+   
 
Enables runtime CPU detection (useful for 
bindist, compatibility on other CPUs)
Build GPL code. Should be enabled unless you require 
LGPL binaries.

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/

[Sam James]

commit: e893a79b75cd519db3ee351bf60cdca34aca5537
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 27 23:10:59 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 27 23:10:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e893a79b

media-video/ffmpeg-chromium: Stabilize 123 arm64, #927965

Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild
index 08fe358ac43b..d3285deb8a3d 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-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/

[Sam James]

commit: aa5faf3113eef36ce123d6f2a743987b11466c7a
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 27 23:10:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 27 23:10:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa5faf31

media-video/ffmpeg: Stabilize 6.1.1-r5 arm64, #927965

Signed-off-by: Sam James  gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild
index 508b2ffdf67f..28ac28cac415 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild
@@ -85,7 +85,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-chromium/

[Matt Jolly]

commit: 15163c282a202aaa4715c07de84d66a971958afe
Author: Matt Jolly  gentoo  org>
AuthorDate: Wed Mar 27 10:43:59 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Wed Mar 27 14:28:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15163c28

media-video/ffmpeg-chromium: add 123

Signed-off-by: Matt Jolly  gentoo.org>

 media-video/ffmpeg-chromium/Manifest   |   1 +
 .../ffmpeg-chromium/ffmpeg-chromium-123.ebuild | 247 +
 2 files changed, 248 insertions(+)

diff --git a/media-video/ffmpeg-chromium/Manifest 
b/media-video/ffmpeg-chromium/Manifest
index d8f3f685f537..7e2464b44f4f 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -1,3 +1,4 @@
 DIST ffmpeg-chromium-120.tar.xz 10096036 BLAKE2B 
8f24dfed854c713df369e6ef15bc773a3166fdf6eb8c90bcb1d1b7aca0702df7615bc323432a40b5d213352945fa49acf8e864df2caa358764b5068a75f3
 SHA512 
0e0bfb44225981f91edceeb6f302592a7e108da49c5e6503b43f0e12b91d84dece908efe5e548bb31ccab49c5fba5a8365f5f0793bbf1450d35bfd836f8a3e9b
 DIST ffmpeg-chromium-121.tar.xz 10128048 BLAKE2B 
ba8e25356b7e0820dffea1b919288ddb3d6ec56fe8d17493529ec978deae629607ff5a5857a313e478193a1fca55fa3e5256e37d57251141e1f0a892cbdcf674
 SHA512 
e6cef1285237673ce5851cbddf4cda9821c247a120bf73af2b931745b2886c915a35bb2bc21a8a9c5154be9e540f8abccc3bb64e704f5b859141d0dcc2e1
+DIST ffmpeg-chromium-123.tar.xz 10323756 BLAKE2B 
b56afd5946513511938feeea4fd60e22fcf241a2380b36990eadf812b3517d6941156de73135efdc873704d27bc3329c71193be5132e462caaf7f2dc29e8a058
 SHA512 
635e1c5496d6f41fa5dd69efbe6dd335a15705dce8544fc45df440b19965caa130646d16b7c22b2b7cc0809979d28f39245fc5c208637e445b1fc1eb384da418
 DIST ffmpeg-chromium-124.tar.xz 10378648 BLAKE2B 
3cb79d356e84d76a241ad81491d22d42b7a768e348d245bda00101e3967c0864e95a1dd83372e6aaf3a9130ff5ae38610fe2bd4ee8e21fc8247af4172af0683a
 SHA512 
627d1ba81c50300e7188e8a2cc5f76ea9e81e817209631f2eecb81b7b9a0be60a12290eba16240dd0b0dce3d59550a8246be54df2035bd75a9e95ae77d67467b

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild
new file mode 100644
index ..08fe358ac43b
--- /dev/null
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild
@@ -0,0 +1,247 @@
+# 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=7c1b0b524c639beeb25363b1d0809ebe5c6efe5e
+DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based 
browsers"
+HOMEPAGE="https://ffmpeg.org/;
+SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz;
+
+LICENSE="
+   !gpl? ( LGPL-2.1 )
+   gpl? ( GPL-2 )
+"
+SLOT="${PV}"
+
+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
+   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 )
+

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/

[Matt Jolly]

commit: 353927ad446987fce186a4897e5c18ade06a763d
Author: Matt Jolly  gentoo  org>
AuthorDate: Wed Mar 27 06:27:37 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Wed Mar 27 06:46:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=353927ad

media-video/ffmpeg-chromium: fix QA issues

Signed-off-by: Matt Jolly  gentoo.org>

 media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild | 2 +-
 media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild
index fedbdea1192e..f5c83cb50871 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild
@@ -10,11 +10,11 @@ DESCRIPTION="FFmpeg built specifically for codec support in 
Chromium-based brows
 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 )
 "
+SLOT="${PV}"
 
 KEYWORDS="amd64 ~arm ~arm64"
 

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild
index b15c702a5284..99c72fcc7a81 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild
@@ -10,11 +10,11 @@ DESCRIPTION="FFmpeg built specifically for codec support in 
Chromium-based brows
 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 )
 "
+SLOT="${PV}"
 
 KEYWORDS="amd64 ~arm ~arm64"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-chromium/

[Matt Jolly]

commit: c62dd46d5abb9a56a611d1201635214b45e5db90
Author: Matt Jolly  gentoo  org>
AuthorDate: Wed Mar 27 06:07:07 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Wed Mar 27 06:46:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c62dd46d

media-video/ffmpeg-chromium: add 124

Signed-off-by: Matt Jolly  gentoo.org>

 media-video/ffmpeg-chromium/Manifest   |   1 +
 .../ffmpeg-chromium/ffmpeg-chromium-124.ebuild | 247 +
 2 files changed, 248 insertions(+)

diff --git a/media-video/ffmpeg-chromium/Manifest 
b/media-video/ffmpeg-chromium/Manifest
index 02eec2054858..d8f3f685f537 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -1,2 +1,3 @@
 DIST ffmpeg-chromium-120.tar.xz 10096036 BLAKE2B 
8f24dfed854c713df369e6ef15bc773a3166fdf6eb8c90bcb1d1b7aca0702df7615bc323432a40b5d213352945fa49acf8e864df2caa358764b5068a75f3
 SHA512 
0e0bfb44225981f91edceeb6f302592a7e108da49c5e6503b43f0e12b91d84dece908efe5e548bb31ccab49c5fba5a8365f5f0793bbf1450d35bfd836f8a3e9b
 DIST ffmpeg-chromium-121.tar.xz 10128048 BLAKE2B 
ba8e25356b7e0820dffea1b919288ddb3d6ec56fe8d17493529ec978deae629607ff5a5857a313e478193a1fca55fa3e5256e37d57251141e1f0a892cbdcf674
 SHA512 
e6cef1285237673ce5851cbddf4cda9821c247a120bf73af2b931745b2886c915a35bb2bc21a8a9c5154be9e540f8abccc3bb64e704f5b859141d0dcc2e1
+DIST ffmpeg-chromium-124.tar.xz 10378648 BLAKE2B 
3cb79d356e84d76a241ad81491d22d42b7a768e348d245bda00101e3967c0864e95a1dd83372e6aaf3a9130ff5ae38610fe2bd4ee8e21fc8247af4172af0683a
 SHA512 
627d1ba81c50300e7188e8a2cc5f76ea9e81e817209631f2eecb81b7b9a0be60a12290eba16240dd0b0dce3d59550a8246be54df2035bd75a9e95ae77d67467b

diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild 
b/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild
new file mode 100644
index ..23b3cdef4e31
--- /dev/null
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-124.ebuild
@@ -0,0 +1,247 @@
+# 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="52d8ef3799b2f16b66351dd0972bb0bcee1648ac"
+DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based 
browsers"
+HOMEPAGE="https://ffmpeg.org/;
+SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz;
+
+LICENSE="
+   !gpl? ( LGPL-2.1 )
+   gpl? ( GPL-2 )
+"
+SLOT="${PV}"
+
+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
+   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 )
+ 

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/

[Sam James]

commit: ba51a1ee8ed6dfb8f0beaae97119da9b27e09f35
Author: Alexander Golubev  gmail  com>
AuthorDate: Mon Mar 25 18:53:50 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 26 20:24:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba51a1ee

media-video/ffmpeg: fix parallel build with opencl

Closes: https://bugs.gentoo.org/782553
Signed-off-by: Alexander Golubev  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35917
Signed-off-by: Sam James  gentoo.org>

 .../ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch| 21 ++---
 .../ffmpeg-6.1-opencl-parallel-gmake-fix.patch  | 21 ++---
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git 
a/media-video/ffmpeg/files/ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch 
b/media-video/ffmpeg/files/ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch
index c0b1b1b1ce76..9ac8ec79cf2e 100644
--- a/media-video/ffmpeg/files/ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch
+++ b/media-video/ffmpeg/files/ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch
@@ -1,13 +1,12 @@
 Bug: https://bugs.gentoo.org/782553
 
 a/libavfilter/Makefile
-+++ b/libavfilter/Makefile
-@@ -562,7 +562,7 @@
- clean::
-   $(RM) $(CLEANSUFFIXES:%=libavfilter/dnn/%) 
$(CLEANSUFFIXES:%=libavfilter/opencl/%)
- 
--OPENCL = $(subst $(SRC_PATH)/,,$(wildcard 
$(SRC_PATH)/libavfilter/opencl/*.cl))
-+OPENCL = $(wildcard libavfilter/opencl/*.cl)
- .SECONDARY: $(OPENCL:.cl=.c)
- libavfilter/opencl/%.c: TAG = OPENCL
- libavfilter/opencl/%.c: $(SRC_PATH)/libavfilter/opencl/%.cl
+--- ffmpeg-4.4.4/tools/cl2c.orig2024-03-14 04:53:45.468507151 +0300
 ffmpeg-4.4.4/tools/cl2c 2024-03-14 04:54:53.503086088 +0300
+@@ -24,6 +24,7 @@
+
+ name=$(basename "$input" | sed 's/.cl$//')
+
++mkdir -p "$(dirname "$output")"
+ cat >$output $output <

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[Joonas Niilola]

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/

[Sam James]

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/

[Sam James]

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/

[Sam James]

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/

[Sam James]

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/

[Sam James]

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/

[James Le Cuirot]

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/

[James Le Cuirot]

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/

[Andrew Ammerlaan]

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/

[Sam James]

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/

[Sam James]

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/

[Sam James]

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/

[Sam James]

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/

[Sam James]

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/

[James Le Cuirot]

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/

[James Le Cuirot]

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/

[James Le Cuirot]

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/

[James Le Cuirot]

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/

[James Le Cuirot]

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/

[James Le Cuirot]

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/

[Sam James]

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/

[Sam James]

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/

[Sam James]

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/

[Sam James]

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/

[Sam James]

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/

[Michał Górny]

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/

[Sam James]

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/

[Sam James]

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/

[Michał Górny]

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/

[James Le Cuirot]

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/

[Ionen Wolkens]

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/

[Ionen Wolkens]

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/

[Ionen Wolkens]

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/

[Sam James]

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/

[Sam James]

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/

[Sam James]

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/

[Sam James]

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/

[Sam James]

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/

[Sam James]

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/

[Sam James]

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/

[Ionen Wolkens]

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/

[Sam James]

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}