haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 22:48:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

FFMPEG: bump (#3672)

Browse Source 
* FFMPEG: bump

* Patch resync
This commit is contained in:
miqlas
2019-03-04 18:40:04 +01:00
committed by Sergei Reznikov
parent 58e8b01f1d
commit 5de4218393
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-video/ffmpeg/ffmpeg-4.1.recipe → media-video/ffmpeg/ffmpeg-4.1.1.recipe
View File

@@ -9,7 +9,7 @@ LICENSE="GNU LGPL v3
GNU GPL v3" GNU GPL v3"
REVISION="1" REVISION="1"
SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz" SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
CHECKSUM_SHA256="a38ec4d026efb58506a99ad5cd23d5a9793b4bf415f2c4c2e9c1bb444acd1994" CHECKSUM_SHA256="373749824dfd334d84e55dff406729edfd1606575ee44dd485d97d45ea4d2d86"
PATCHES="ffmpeg-$portVersion.patchset" PATCHES="ffmpeg-$portVersion.patchset"
ADDITIONAL_FILES="gcc_runtime.c" ADDITIONAL_FILES="gcc_runtime.c"

17
media-video/ffmpeg/patches/ffmpeg-4.1.patchset → media-video/ffmpeg/patches/ffmpeg-4.1.1.patchset
View File

@@ -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 <jerome.duval@gmail.com> From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 16 Oct 2017 18:31:07 +0200 Date: Mon, 16 Oct 2017 18:31:07 +0200
Subject: disable ebx on x86. Subject: disable ebx on x86.
diff --git a/configure b/configure diff --git a/configure b/configure
index dee507c..f0d0c09 100755 index 7310b96..e754f1a 100755
--- a/configure --- a/configure
+++ b/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 if test $target_os = "haiku"; then
disable memalign disable memalign
disable posix_memalign disable posix_memalign
@@ -17,10 +17,10 @@ index dee507c..f0d0c09 100755
flatten_extralibs(){ 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 <pulkomandy@pulkomandy.tk> From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 2 Feb 2018 11:39:47 +0100 Date: Fri, 2 Feb 2018 11:39:47 +0100
Subject: Re-enable memalign for Haiku 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 If there are still problems with it we should rather fix them on Haiku
side. side.
diff --git a/configure b/configure diff --git a/configure b/configure
index f0d0c09..cd5dbf3 100755 index e754f1a..31131ab 100755
--- a/configure --- a/configure
+++ b/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" enabled avresample && warn "Building with deprecated library libavresample"
if test $target_os = "haiku"; then if test $target_os = "haiku"; then
@@ -46,5 +45,5 @@ index f0d0c09..cd5dbf3 100755
fi fi
-- --
2.16.2 2.19.1