mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
ffmpeg: bump version
This commit is contained in:
@@ -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="f1f049a82fcfbf156564e73a3935d7e750891fab2abf302e735104fd4050a7e1"
|
||||
CHECKSUM_SHA256="023f10831a97ad93d798f53a3640e55cd564abfeba807ecbe8524dac4fedecd5"
|
||||
PATCHES="ffmpeg-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="gcc_runtime.c"
|
||||
|
||||
@@ -27,14 +27,14 @@ ffmpegLibs="\
|
||||
libswscale \
|
||||
"
|
||||
# Do not sort alphabetically
|
||||
libavutilVersion="56.22.100"
|
||||
libavcodecVersion="58.35.100"
|
||||
libavformatVersion="58.20.100"
|
||||
libavdeviceVersion="58.5.100"
|
||||
libavfilterVersion="7.40.101"
|
||||
libswscaleVersion="5.3.100"
|
||||
libswresampleVersion="3.3.100"
|
||||
libpostprocVersion="55.3.100"
|
||||
libavutilVersion="56.31.100"
|
||||
libavcodecVersion="58.54.100"
|
||||
libavformatVersion="58.29.100"
|
||||
libavdeviceVersion="58.8.100"
|
||||
libavfilterVersion="7.57.100"
|
||||
libswscaleVersion="5.5.100"
|
||||
libswresampleVersion="3.5.100"
|
||||
libpostprocVersion="55.5.100"
|
||||
portVersionCompat="$portVersion compat >= 4"
|
||||
for i in $ffmpegLibs; do
|
||||
eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\""
|
||||
@@ -1,28 +1,28 @@
|
||||
From b23b1b46b089645399db6650af4494cc845d8320 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Mon, 16 Oct 2017 18:31:07 +0200
|
||||
Date: Wed, 7 Aug 2019 16:21:12 +0300
|
||||
Subject: disable ebx on x86.
|
||||
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 7310b96..e754f1a 100755
|
||||
index 34c2adb..ff4f783 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -6785,6 +6785,7 @@ enabled avresample && warn "Building with deprecated library libavresample"
|
||||
if test $target_os = "haiku"; then
|
||||
@@ -6923,6 +6923,7 @@ case $target_os in
|
||||
haiku)
|
||||
disable memalign
|
||||
disable posix_memalign
|
||||
+ enabled x86_32 && enabled shared && disable ebx_available
|
||||
fi
|
||||
|
||||
flatten_extralibs(){
|
||||
;;
|
||||
*-dos|freedos|opendos)
|
||||
if test_cpp_condition sys/version.h "defined(__DJGPP__) && __DJGPP__ == 2 && __DJGPP_MINOR__ == 5"; then
|
||||
--
|
||||
2.19.1
|
||||
2.21.0
|
||||
|
||||
|
||||
From eea5a92a4edbc3b9343c668d19051dda3f223f32 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Fri, 2 Feb 2018 11:39:47 +0100
|
||||
Date: Wed, 7 Aug 2019 16:21:32 +0300
|
||||
Subject: Re-enable memalign for Haiku
|
||||
|
||||
This had been disabled in 2011:
|
||||
@@ -32,18 +32,18 @@ If there are still problems with it we should rather fix them on Haiku
|
||||
side.
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index e754f1a..31131ab 100755
|
||||
index ff4f783..7ddfa31 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -6783,8 +6783,6 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
|
||||
enabled avresample && warn "Building with deprecated library libavresample"
|
||||
@@ -6921,8 +6921,6 @@ enabled avresample && warn "Building with deprecated library libavresample"
|
||||
|
||||
if test $target_os = "haiku"; then
|
||||
case $target_os in
|
||||
haiku)
|
||||
- disable memalign
|
||||
- disable posix_memalign
|
||||
enabled x86_32 && enabled shared && disable ebx_available
|
||||
fi
|
||||
|
||||
;;
|
||||
*-dos|freedos|opendos)
|
||||
--
|
||||
2.19.1
|
||||
2.21.0
|
||||
|
||||
Reference in New Issue
Block a user