diff --git a/media-video/ffmpeg/ffmpeg-4.1.recipe b/media-video/ffmpeg/ffmpeg-4.1.1.recipe similarity index 99% rename from media-video/ffmpeg/ffmpeg-4.1.recipe rename to media-video/ffmpeg/ffmpeg-4.1.1.recipe index df8a67c5c..c403d653a 100644 --- a/media-video/ffmpeg/ffmpeg-4.1.recipe +++ b/media-video/ffmpeg/ffmpeg-4.1.1.recipe @@ -9,7 +9,7 @@ LICENSE="GNU LGPL v3 GNU GPL v3" REVISION="1" SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz" -CHECKSUM_SHA256="a38ec4d026efb58506a99ad5cd23d5a9793b4bf415f2c4c2e9c1bb444acd1994" +CHECKSUM_SHA256="373749824dfd334d84e55dff406729edfd1606575ee44dd485d97d45ea4d2d86" PATCHES="ffmpeg-$portVersion.patchset" ADDITIONAL_FILES="gcc_runtime.c" diff --git a/media-video/ffmpeg/patches/ffmpeg-4.1.patchset b/media-video/ffmpeg/patches/ffmpeg-4.1.1.patchset similarity index 76% rename from media-video/ffmpeg/patches/ffmpeg-4.1.patchset rename to media-video/ffmpeg/patches/ffmpeg-4.1.1.patchset index 2f1510eda..04d52dfa8 100644 --- a/media-video/ffmpeg/patches/ffmpeg-4.1.patchset +++ b/media-video/ffmpeg/patches/ffmpeg-4.1.1.patchset @@ -1,14 +1,14 @@ -From 6ed8a346799f20ba114b314d1054a30add1c4044 Mon Sep 17 00:00:00 2001 +From b23b1b46b089645399db6650af4494cc845d8320 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 16 Oct 2017 18:31:07 +0200 Subject: disable ebx on x86. diff --git a/configure b/configure -index dee507c..f0d0c09 100755 +index 7310b96..e754f1a 100755 --- a/configure +++ b/configure -@@ -6678,6 +6678,7 @@ enabled avresample && warn "Building with deprecated library libavresample" +@@ -6785,6 +6785,7 @@ enabled avresample && warn "Building with deprecated library libavresample" if test $target_os = "haiku"; then disable memalign disable posix_memalign @@ -17,10 +17,10 @@ index dee507c..f0d0c09 100755 flatten_extralibs(){ -- -2.16.2 +2.19.1 -From f449ce0153359ef24e5afbf49144c539be92f789 Mon Sep 17 00:00:00 2001 +From eea5a92a4edbc3b9343c668d19051dda3f223f32 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 2 Feb 2018 11:39:47 +0100 Subject: Re-enable memalign for Haiku @@ -31,12 +31,11 @@ https://lists.ffmpeg.org/pipermail/ffmpeg-cvslog/2011-June/038362.html If there are still problems with it we should rather fix them on Haiku side. - diff --git a/configure b/configure -index f0d0c09..cd5dbf3 100755 +index e754f1a..31131ab 100755 --- a/configure +++ b/configure -@@ -6676,8 +6676,6 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt +@@ -6783,8 +6783,6 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt enabled avresample && warn "Building with deprecated library libavresample" if test $target_os = "haiku"; then @@ -46,5 +45,5 @@ index f0d0c09..cd5dbf3 100755 fi -- -2.16.2 +2.19.1