mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
ffmpeg: bump to 3.4.2, use custom variables. (#2227)
This commit is contained in:
fbrosson
GitHub
@@ -4,27 +4,53 @@ and stream audio and video. It includes libavcodec - the leading audio/video \
|
||||
codec library."
|
||||
HOMEPAGE="https://ffmpeg.org/"
|
||||
COPYRIGHT="2000-2003 Fabrice Bellard
|
||||
2003-2017 the FFmpeg developers"
|
||||
2003-2018 the FFmpeg developers"
|
||||
LICENSE="GNU LGPL v2.1
|
||||
GNU GPL v2"
|
||||
REVISION="4"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="5a77278a63741efa74e26bf197b9bb09ac6381b9757391b922407210f0f991c0"
|
||||
CHECKSUM_SHA256="2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740"
|
||||
PATCHES="ffmpeg-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86" #do we really need !x86_gcc2 in here?
|
||||
SECONDARY_ARCHITECTURES="?x86"
|
||||
|
||||
ffmpegLibs="\
|
||||
libavcodec \
|
||||
libavdevice \
|
||||
libavfilter \
|
||||
libavformat \
|
||||
libavresample \
|
||||
libavutil \
|
||||
libpostproc \
|
||||
libswresample \
|
||||
libswscale \
|
||||
"
|
||||
# Do not sort alphabetically
|
||||
libavutilVersion="55.78.100"
|
||||
libavcodecVersion="57.107.100"
|
||||
libavformatVersion="57.83.100"
|
||||
libavdeviceVersion="57.10.100"
|
||||
libavfilterVersion="6.107.100"
|
||||
libavresampleVersion="3.7.0"
|
||||
libswscaleVersion="4.8.100"
|
||||
libswresampleVersion="2.9.100"
|
||||
libpostprocVersion="54.7.100"
|
||||
portVersionCompat="$portVersion compat >= 3.2"
|
||||
for i in $ffmpegLibs; do
|
||||
eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\""
|
||||
done
|
||||
|
||||
PROVIDES="
|
||||
ffmpeg$secondaryArchSuffix = $portVersion compat >= 3.2
|
||||
lib:libavcodec$secondaryArchSuffix = 57.107.100 compat >= 57
|
||||
lib:libavfilter$secondaryArchSuffix = 6.107.100 compat >= 6
|
||||
lib:libavformat$secondaryArchSuffix = 57.83.100 compat >= 57
|
||||
lib:libavresample$secondaryArchSuffix = 3.7.0 compat >= 3
|
||||
lib:libavutil$secondaryArchSuffix = 55.78.100 compat >= 55
|
||||
lib:libpostproc$secondaryArchSuffix = 54.7.100 compat >= 54
|
||||
lib:libswresample$secondaryArchSuffix = 2.9.100 compat >= 2
|
||||
lib:libswscale$secondaryArchSuffix = 4.8.100 compat >= 4
|
||||
ffmpeg$secondaryArchSuffix = $portVersionCompat
|
||||
lib:libavcodec$secondaryArchSuffix = $libavcodecVersionCompat
|
||||
lib:libavfilter$secondaryArchSuffix = $libavfilterVersionCompat
|
||||
lib:libavformat$secondaryArchSuffix = $libavformatVersionCompat
|
||||
lib:libavresample$secondaryArchSuffix = $libavresampleVersionCompat
|
||||
lib:libavutil$secondaryArchSuffix = $libavutilVersionCompat
|
||||
lib:libpostproc$secondaryArchSuffix = $libpostprocVersionCompat
|
||||
lib:libswresample$secondaryArchSuffix = $libswresampleVersionCompat
|
||||
lib:libswscale$secondaryArchSuffix = $libswscaleVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -45,46 +71,46 @@ CONFLICTS="
|
||||
"
|
||||
|
||||
PROVIDES_avdevice="
|
||||
ffmpeg${secondaryArchSuffix}_avdevice = $portVersion compat >= 3.2
|
||||
lib:libavdevice$secondaryArchSuffix = 57.10.100 compat >= 57
|
||||
ffmpeg${secondaryArchSuffix}_avdevice = $portVersionCompat
|
||||
lib:libavdevice$secondaryArchSuffix = $libavdeviceVersionCompat
|
||||
"
|
||||
REQUIRES_avdevice="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libavcodec$secondaryArchSuffix == 57.107.100
|
||||
lib:libavfilter$secondaryArchSuffix == 6.107.100
|
||||
lib:libavformat$secondaryArchSuffix == 57.83.100
|
||||
lib:libavutil$secondaryArchSuffix == 55.78.100
|
||||
lib:libavcodec$secondaryArchSuffix == $libavcodecVersion
|
||||
lib:libavfilter$secondaryArchSuffix == $libavfilterVersion
|
||||
lib:libavformat$secondaryArchSuffix == $libavformatVersion
|
||||
lib:libavutil$secondaryArchSuffix == $libavutilVersion
|
||||
lib:libSDL2_2.0$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_tools="
|
||||
ffmpeg${secondaryArchSuffix}_ffplay = $portVersion
|
||||
cmd:ffmpeg = $portVersion compat >= 3.2
|
||||
cmd:ffplay = $portVersion compat >= 3.2
|
||||
cmd:ffprobe = $portVersion compat >= 3.2
|
||||
cmd:ffserver = $portVersion compat >= 3.2
|
||||
cmd:ffmpeg = $portVersionCompat
|
||||
cmd:ffplay = $portVersionCompat
|
||||
cmd:ffprobe = $portVersionCompat
|
||||
cmd:ffserver = $portVersionCompat
|
||||
"
|
||||
REQUIRES_tools="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libavcodec$secondaryArchSuffix == 57.107.100
|
||||
lib:libavdevice$secondaryArchSuffix == 57.10.100
|
||||
lib:libavfilter$secondaryArchSuffix == 6.107.100
|
||||
lib:libavformat$secondaryArchSuffix == 57.83.100
|
||||
lib:libavutil$secondaryArchSuffix == 55.78.100
|
||||
lib:libavcodec$secondaryArchSuffix == $libavcodecVersion
|
||||
lib:libavdevice$secondaryArchSuffix == $libavdeviceVersion
|
||||
lib:libavfilter$secondaryArchSuffix == $libavfilterVersion
|
||||
lib:libavformat$secondaryArchSuffix == $libavformatVersion
|
||||
lib:libavutil$secondaryArchSuffix == $libavutilVersion
|
||||
lib:libSDL2_2.0$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 3.2
|
||||
devel:libavcodec$secondaryArchSuffix = 57.107.100 compat >= 57
|
||||
devel:libavdevice$secondaryArchSuffix = 57.10.100 compat >= 57
|
||||
devel:libavfilter$secondaryArchSuffix = 6.107.100 compat >= 6
|
||||
devel:libavformat$secondaryArchSuffix = 57.83.100 compat >= 57
|
||||
devel:libavresample$secondaryArchSuffix = 3.7.0 compat >= 3
|
||||
devel:libavutil$secondaryArchSuffix = 55.78.100 compat >= 55
|
||||
devel:libpostproc$secondaryArchSuffix = 54.7.100 compat >= 54
|
||||
devel:libswresample$secondaryArchSuffix = 2.9.100 compat >= 2
|
||||
devel:libswscale$secondaryArchSuffix = 4.8.100 compat >= 4
|
||||
ffmpeg${secondaryArchSuffix}_devel = $portVersionCompat
|
||||
devel:libavcodec$secondaryArchSuffix = $libavcodecVersionCompat
|
||||
devel:libavdevice$secondaryArchSuffix = $libavdeviceVersionCompat
|
||||
devel:libavfilter$secondaryArchSuffix = $libavfilterVersionCompat
|
||||
devel:libavformat$secondaryArchSuffix = $libavformatVersionCompat
|
||||
devel:libavresample$secondaryArchSuffix = $libavresampleVersionCompat
|
||||
devel:libavutil$secondaryArchSuffix = $libavutilVersionCompat
|
||||
devel:libpostproc$secondaryArchSuffix = $libpostprocVersionCompat
|
||||
devel:libswresample$secondaryArchSuffix = $libswresampleVersionCompat
|
||||
devel:libswscale$secondaryArchSuffix = $libswscaleVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
ffmpeg$secondaryArchSuffix == $portVersion base
|
||||
@@ -139,18 +165,18 @@ PATCH()
|
||||
}
|
||||
|
||||
defineDebugInfoPackage ffmpeg$secondaryArchSuffix \
|
||||
$libDir/libavcodec.so.57.107.100 \
|
||||
$libDir/libavfilter.so.6.107.100 \
|
||||
$libDir/libavformat.so.57.83.100 \
|
||||
$libDir/libavresample.so.3.7.0 \
|
||||
$libDir/libavutil.so.55.78.100 \
|
||||
$libDir/libpostproc.so.54.7.100 \
|
||||
$libDir/libswresample.so.2.9.100 \
|
||||
$libDir/libswscale.so.4.8.100
|
||||
$libDir/libavcodec.so.$libavcodecVersion \
|
||||
$libDir/libavfilter.so.$libavfilterVersion \
|
||||
$libDir/libavformat.so.$libavformatVersion \
|
||||
$libDir/libavresample.so.$libavresampleVersion \
|
||||
$libDir/libavutil.so.$libavutilVersion \
|
||||
$libDir/libpostproc.so.$libpostprocVersion \
|
||||
$libDir/libswresample.so.$libswresampleVersion \
|
||||
$libDir/libswscale.so.$libswscaleVersion
|
||||
|
||||
# Can't get them working
|
||||
#defineDebugInfoPackage ffmpeg${secondaryArchSuffix}_avdevice \
|
||||
# $libDir/libavdevice.so.57.10.100
|
||||
# $libDir/libavdevice.so.$libavdeviceVersion
|
||||
|
||||
#defineDebugInfoPackage ffmpeg${secondaryArchSuffix}_tools \
|
||||
# $prefix/bin/ffmpeg \
|
||||
@@ -187,17 +213,7 @@ INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
prepareInstalledDevelLibs \
|
||||
libavcodec \
|
||||
libavdevice \
|
||||
libavfilter \
|
||||
libavformat \
|
||||
libavresample \
|
||||
libavutil \
|
||||
libpostproc \
|
||||
libswresample \
|
||||
libswscale
|
||||
|
||||
prepareInstalledDevelLibs $ffmpegLibs
|
||||
fixPkgconfig
|
||||
|
||||
# The pkgconfig file reference other libraries using the wrong paths, which
|
||||
@@ -5,7 +5,7 @@ Subject: disable ebx on x86.
|
||||
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 1797c5d..63ea916 100755
|
||||
index 231c6c3..404b93e 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -6595,6 +6595,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
|
||||
@@ -17,7 +17,7 @@ index 1797c5d..63ea916 100755
|
||||
|
||||
# add_dep lib dep
|
||||
--
|
||||
2.15.1
|
||||
2.16.1
|
||||
|
||||
|
||||
From 3780da8297339a332322d7c38e16f7dd42337bd9 Mon Sep 17 00:00:00 2001
|
||||
@@ -134,7 +134,7 @@ If there are still problems with it we should rather fix them on Haiku
|
||||
side.
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 63ea916..e8f55bf 100755
|
||||
index 404b93e..fcd5d55 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -6593,8 +6593,6 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
|
||||
@@ -147,5 +147,5 @@ index 63ea916..e8f55bf 100755
|
||||
fi
|
||||
|
||||
--
|
||||
2.15.1
|
||||
2.16.1
|
||||
|
||||
Reference in New Issue
Block a user