From 6c1d2604968d39e66591948cf3275de0dc62ea6c Mon Sep 17 00:00:00 2001 From: kenmays Date: Sat, 3 Jun 2023 11:27:06 -0700 Subject: [PATCH] ffmpeg: bump version (#8784) --- .../{ffmpeg-4.2.7.recipe => ffmpeg-4.2.9.recipe} | 4 ++-- .../{ffmpeg5-5.1.2.recipe => ffmpeg5-5.1.3.recipe} | 4 ++-- .../{ffmpeg-4.2.7.patchset => ffmpeg-4.2.9.patchset} | 12 ++++++------ .../{ffmpeg-5.1.2.patchset => ffmpeg-5.1.3.patchset} | 0 4 files changed, 10 insertions(+), 10 deletions(-) rename media-video/ffmpeg/{ffmpeg-4.2.7.recipe => ffmpeg-4.2.9.recipe} (99%) rename media-video/ffmpeg/{ffmpeg5-5.1.2.recipe => ffmpeg5-5.1.3.recipe} (98%) rename media-video/ffmpeg/patches/{ffmpeg-4.2.7.patchset => ffmpeg-4.2.9.patchset} (85%) rename media-video/ffmpeg/patches/{ffmpeg-5.1.2.patchset => ffmpeg-5.1.3.patchset} (100%) diff --git a/media-video/ffmpeg/ffmpeg-4.2.7.recipe b/media-video/ffmpeg/ffmpeg-4.2.9.recipe similarity index 99% rename from media-video/ffmpeg/ffmpeg-4.2.7.recipe rename to media-video/ffmpeg/ffmpeg-4.2.9.recipe index 09c1d3a14..5c6b219e9 100644 --- a/media-video/ffmpeg/ffmpeg-4.2.7.recipe +++ b/media-video/ffmpeg/ffmpeg-4.2.9.recipe @@ -4,11 +4,11 @@ and stream audio and video. It includes libavcodec - the leading audio/video \ codec library." HOMEPAGE="https://ffmpeg.org/" COPYRIGHT="2000-2003 Fabrice Bellard - 2003-2022 the FFmpeg developers" + 2003-2023 the FFmpeg developers" LICENSE="GNU LGPL v3" REVISION="1" SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz" -CHECKSUM_SHA256="95e357e8b147bd236fa1cedf30ce009273261ebb0bf5dd6ee75807341322292b" +CHECKSUM_SHA256="4974d62e7507ba3b26fa5f30af8ee36825917ddb4a1ad4118277698c1c8818cf" PATCHES="ffmpeg-$portVersion.patchset" ADDITIONAL_FILES="gcc_runtime.c" diff --git a/media-video/ffmpeg/ffmpeg5-5.1.2.recipe b/media-video/ffmpeg/ffmpeg5-5.1.3.recipe similarity index 98% rename from media-video/ffmpeg/ffmpeg5-5.1.2.recipe rename to media-video/ffmpeg/ffmpeg5-5.1.3.recipe index 016945d1f..fcacbe84c 100644 --- a/media-video/ffmpeg/ffmpeg5-5.1.2.recipe +++ b/media-video/ffmpeg/ffmpeg5-5.1.3.recipe @@ -4,11 +4,11 @@ and stream audio and video. It includes libavcodec - the leading audio/video \ codec library." HOMEPAGE="https://ffmpeg.org/" COPYRIGHT="2000-2003 Fabrice Bellard - 2003-2022 the FFmpeg developers" + 2003-2023 the FFmpeg developers" LICENSE="GNU LGPL v3" REVISION="1" SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz" -CHECKSUM_SHA256="619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc" +CHECKSUM_SHA256="1b113593ff907293be7aed95acdda5e785dd73616d7d4ec90a0f6adbc5a0312e" PATCHES="ffmpeg-$portVersion.patchset" SOURCE_DIR="ffmpeg-$portVersion" ADDITIONAL_FILES="gcc_runtime.c" diff --git a/media-video/ffmpeg/patches/ffmpeg-4.2.7.patchset b/media-video/ffmpeg/patches/ffmpeg-4.2.9.patchset similarity index 85% rename from media-video/ffmpeg/patches/ffmpeg-4.2.7.patchset rename to media-video/ffmpeg/patches/ffmpeg-4.2.9.patchset index e125305d6..e286d04c7 100644 --- a/media-video/ffmpeg/patches/ffmpeg-4.2.7.patchset +++ b/media-video/ffmpeg/patches/ffmpeg-4.2.9.patchset @@ -1,11 +1,11 @@ -From d17c1a9ac9e1299707271a5467544d2e09a849cb Mon Sep 17 00:00:00 2001 +From cdd8f7ab211aef03e0aea6f9ee4bcb36ad3100c2 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 7 Aug 2019 16:21:12 +0300 Subject: disable ebx on x86. diff --git a/configure b/configure -index 927857f..9248007 100755 +index 5ee289f..1a6dedb 100755 --- a/configure +++ b/configure @@ -6923,6 +6923,7 @@ case $target_os in @@ -17,10 +17,10 @@ index 927857f..9248007 100755 *-dos|freedos|opendos) if test_cpp_condition sys/version.h "defined(__DJGPP__) && __DJGPP__ == 2 && __DJGPP_MINOR__ == 5"; then -- -2.36.1 +2.37.3 -From 97105db6c1fc57cf2ba5528a7969cef161daa41a Mon Sep 17 00:00:00 2001 +From 46e77d96555e44c8404c344ca4585dab6e5e445b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 7 Aug 2019 16:21:32 +0300 Subject: Re-enable memalign for Haiku @@ -32,7 +32,7 @@ If there are still problems with it we should rather fix them on Haiku side. diff --git a/configure b/configure -index 9248007..00eca65 100755 +index 1a6dedb..c9d5f43 100755 --- a/configure +++ b/configure @@ -6921,8 +6921,6 @@ enabled avresample && warn "Building with deprecated library libavresample" @@ -45,5 +45,5 @@ index 9248007..00eca65 100755 ;; *-dos|freedos|opendos) -- -2.36.1 +2.37.3 diff --git a/media-video/ffmpeg/patches/ffmpeg-5.1.2.patchset b/media-video/ffmpeg/patches/ffmpeg-5.1.3.patchset similarity index 100% rename from media-video/ffmpeg/patches/ffmpeg-5.1.2.patchset rename to media-video/ffmpeg/patches/ffmpeg-5.1.3.patchset