From b88ad932ee1e2e0fc7a1573f7a4d2b3a9c21b512 Mon Sep 17 00:00:00 2001
From: kenmays <maybird1776@yahoo.com>
Date: Sun, 19 Nov 2023 22:36:33 -0800
Subject: [PATCH] ffmpeg: added ffmpeg 6.1 recipe (#9772)

* ffmpeg: bumped version for ffmpeg6
---
 ...{ffmpeg6-6.0.recipe => ffmpeg6-6.1.recipe} | 16 +++++++--------
 ...fmpeg-6.0.patchset => ffmpeg-6.1.patchset} | 20 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)
 rename media-video/ffmpeg/{ffmpeg6-6.0.recipe => ffmpeg6-6.1.recipe} (97%)
 rename media-video/ffmpeg/patches/{ffmpeg-6.0.patchset => ffmpeg-6.1.patchset} (82%)

diff --git a/media-video/ffmpeg/ffmpeg6-6.0.recipe b/media-video/ffmpeg/ffmpeg6-6.1.recipe
similarity index 97%
rename from media-video/ffmpeg/ffmpeg6-6.0.recipe
rename to media-video/ffmpeg/ffmpeg6-6.1.recipe
index 1ccd33c0b..a8b69585f 100644
--- a/media-video/ffmpeg/ffmpeg6-6.0.recipe
+++ b/media-video/ffmpeg/ffmpeg6-6.1.recipe
@@ -8,7 +8,7 @@ COPYRIGHT="2000-2003 Fabrice Bellard
 LICENSE="GNU LGPL v3"
 REVISION="1"
 SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
-CHECKSUM_SHA256="57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082"
+CHECKSUM_SHA256="488c76e57dd9b3bee901f71d5c95eaf1db4a5a31fe46a28654e837144207c270"
 PATCHES="ffmpeg-$portVersion.patchset"
 SOURCE_DIR="ffmpeg-$portVersion"
 ADDITIONAL_FILES="gcc_runtime.c"
@@ -26,13 +26,13 @@ ffmpegLibs="\
 	libswscale \
 	"
 # Do not sort alphabetically
-libavutilVersion="58.2.100"
-libavcodecVersion="60.3.100"
-libavformatVersion="60.3.100"
-libavdeviceVersion="60.1.100"
-libavfilterVersion="9.3.100"
-libswscaleVersion="7.1.100"
-libswresampleVersion="4.10.100"
+libavutilVersion="58.29.100"
+libavcodecVersion="60.31.102"
+libavformatVersion="60.16.100"
+libavdeviceVersion="60.3.100"
+libavfilterVersion="9.12.100"
+libswscaleVersion="7.5.100"
+libswresampleVersion="4.12.100"
 portVersionCompat="$portVersion compat >= 5"
 for i in $ffmpegLibs; do
 	eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\""
diff --git a/media-video/ffmpeg/patches/ffmpeg-6.0.patchset b/media-video/ffmpeg/patches/ffmpeg-6.1.patchset
similarity index 82%
rename from media-video/ffmpeg/patches/ffmpeg-6.0.patchset
rename to media-video/ffmpeg/patches/ffmpeg-6.1.patchset
index 19aa0047c..1390ed1a1 100644
--- a/media-video/ffmpeg/patches/ffmpeg-6.0.patchset
+++ b/media-video/ffmpeg/patches/ffmpeg-6.1.patchset
@@ -1,14 +1,14 @@
-From a7bd418338b555b6a1d5e9cf0c11eebae5a51896 Mon Sep 17 00:00:00 2001
+From c734e9aa1030bde7162c47f241882a88ffb1f04b Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 7 Aug 2019 16:21:12 +0300
 Subject: disable ebx on x86.
 
 
 diff --git a/configure b/configure
-index b6616f0..8c13b3a 100755
+index 1f0b949..12f64e2 100755
 --- a/configure
 +++ b/configure
-@@ -7374,6 +7374,7 @@ case $target_os in
+@@ -7508,6 +7508,7 @@ case $target_os in
  haiku)
      disable memalign
      disable posix_memalign
@@ -17,10 +17,10 @@ index b6616f0..8c13b3a 100755
  *-dos|freedos|opendos)
      if test_cpp_condition sys/version.h "defined(__DJGPP__) && __DJGPP__ == 2 && __DJGPP_MINOR__ == 5"; then
 -- 
-2.37.3
+2.42.0
 
 
-From 7106e536332325e4c659149de029fc7d21e94010 Mon Sep 17 00:00:00 2001
+From 45b39d00e380f87d5095bfbfdc8b725582232a28 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Wed, 7 Aug 2019 16:21:32 +0300
 Subject: Re-enable memalign for Haiku
@@ -32,10 +32,10 @@ If there are still problems with it we should rather fix them on Haiku
 side.
 
 diff --git a/configure b/configure
-index 8c13b3a..a7014d4 100755
+index 12f64e2..58ad366 100755
 --- a/configure
 +++ b/configure
-@@ -7372,8 +7372,6 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
+@@ -7506,8 +7506,6 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
  
  case $target_os in
  haiku)
@@ -45,10 +45,10 @@ index 8c13b3a..a7014d4 100755
      ;;
  *-dos|freedos|opendos)
 -- 
-2.37.3
+2.42.0
 
 
-From c2ec672ced34f60445c23c4c2f31779ce957f8f0 Mon Sep 17 00:00:00 2001
+From 07f46060f4acef6df65caa359a75260168bce783 Mon Sep 17 00:00:00 2001
 From: Ken Mays <kmays2000@gmail.com>
 Date: Sat, 13 Aug 2022 05:01:14 +0300
 Subject: Check for SSSE3
@@ -75,5 +75,5 @@ index 6754062..9ad4f20 100644
      if (EXTERNAL_MMXEXT(cpu_flags)) {
          switch (c->dstFormat) {
 -- 
-2.37.3
+2.42.0