FFMPEG: bump (#4065)

This commit is contained in:
miqlas
2019-08-10 17:46:13 +02:00
committed by waddlesplash
parent 1692dfc2b0
commit 99ba8eed70
2 changed files with 353 additions and 0 deletions

View File

@@ -0,0 +1,304 @@
SUMMARY="Audio and video recording, conversion, and streaming library"
DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert \
and stream audio and video. It includes libavcodec - the leading audio/video \
codec library."
HOMEPAGE="https://ffmpeg.org/"
COPYRIGHT="2000-2003 Fabrice Bellard
2003-2019 the FFmpeg developers"
LICENSE="GNU LGPL v3
GNU GPL v3"
REVISION="1"
SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
CHECKSUM_SHA256="f1f049a82fcfbf156564e73a3935d7e750891fab2abf302e735104fd4050a7e1"
PATCHES="ffmpeg-$portVersion.patchset"
ADDITIONAL_FILES="gcc_runtime.c"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
ffmpegLibs="\
libavcodec \
libavdevice \
libavfilter \
libavformat \
libavresample \
libavutil \
libpostproc \
libswresample \
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"
libavresampleVersion="4.0.0"
libswscaleVersion="5.3.100"
libswresampleVersion="3.3.100"
libpostprocVersion="55.3.100"
portVersionCompat="$portVersion compat >= 4"
for i in $ffmpegLibs; do
eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\""
done
PROVIDES="
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
lib:libbz2$secondaryArchSuffix
lib:libogg$secondaryArchSuffix
lib:libopenmpt$secondaryArchSuffix
lib:libspeex$secondaryArchSuffix
lib:libtheoradec$secondaryArchSuffix
lib:libtheoraenc$secondaryArchSuffix
lib:libvorbis$secondaryArchSuffix
lib:libvorbisenc$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
REQUIRES+="
lib:libvpx$secondaryArchSuffix
lib:libgnutls$secondaryArchSuffix
"
fi
CONFLICTS="
ffmpeg_legacy$secondaryArchSuffix
ffmpeg${secondaryArchSuffix}_bin
ffmpeg2${secondaryArchSuffix}_bin
"
PROVIDES_avdevice="
ffmpeg${secondaryArchSuffix}_avdevice = $portVersionCompat
lib:libavdevice$secondaryArchSuffix = $libavdeviceVersionCompat
"
REQUIRES_avdevice="
haiku$secondaryArchSuffix
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}_tools = $portVersion
cmd:ffmpeg = $portVersionCompat
cmd:ffplay = $portVersionCompat
cmd:ffprobe = $portVersionCompat
"
REQUIRES_tools="
haiku$secondaryArchSuffix
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 = $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
ffmpeg${secondaryArchSuffix}_avdevice == $portVersion
devel:libspeex$secondaryArchSuffix
"
CONFLICTS_devel="
ffmpeg_legacy${secondaryArchSuffix}_devel
ffmpeg${secondaryArchSuffix}_devel
ffmpeg2${secondaryArchSuffix}_devel
"
# -- HACK! --
# ffmpeg ~0.10 has perpetually had & caused problems when compiled with GCC 2.
# (Later versions do not compile with GCC 2 at all.) So instead, we now compile
# FFmpeg for x86_gcc2 with a modern GCC.
#
# This works because GCC's C ABI has not changed between 2 and 7; only the C++
# ABI has, and no BeOS applications expect a system FFmpeg at all, so we can
# break its ABI all we like.
if [ "$effectiveTargetArchitecture" = x86_gcc2 ] && \
[ "$targetArchitecture" = x86_gcc2 ]; then
gccSuffix="_x86"
elif [ "$effectiveTargetArchitecture" = x86_gcc2 ] && \
[ "$targetArchitecture" = x86 ]; then
gccSuffix=""
else
gccSuffix="$secondaryArchSuffix"
fi
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libbz2$secondaryArchSuffix
devel:libogg$secondaryArchSuffix
devel:libopenmpt$secondaryArchSuffix
devel:libsdl2$secondaryArchSuffix
devel:libspeex$secondaryArchSuffix
devel:libtheora$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
BUILD_REQUIRES+="
devel:libvpx$secondaryArchSuffix
devel:libgnutls$secondaryArchSuffix
"
fi
BUILD_PREREQUIRES="
cmd:awk
cmd:cmp
cmd:gcc$gccSuffix >= 7
cmd:g++$secondaryArchSuffix
cmd:ld$gccSuffix
cmd:grep
cmd:make
cmd:perl
cmd:pkg_config$secondaryArchSuffix
cmd:sed
cmd:texi2html
cmd:yasm
"
PATCH()
{
# patch hard-coded paths to perl
sed -i "s,/usr/bin/perl,$portPackageLinksDir/cmd~perl/bin/perl," \
doc/Doxyfile \
doc/texi2pod.pl
# force no-undefined-symbols
if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
sed -i "s/SHFLAGS='-shared/SHFLAGS='-shared -Wl,--no-undefined/g" \
configure
fi
}
defineDebugInfoPackage ffmpeg$secondaryArchSuffix \
$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 \
"$(getPackagePrefix avdevice)/$relativeLibDir"/libavdevice.so.$libavdeviceVersion \
"$(getPackagePrefix tools)/$relativeBinDir"/ffmpeg \
"$(getPackagePrefix tools)/$relativeBinDir"/ffplay \
"$(getPackagePrefix tools)/$relativeBinDir"/ffprobe
BUILD()
{
ccArgs=""
extraArgs=""
if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
cc="gcc${gccSuffix/_/-}"
ccArgs="--cc=$cc --cxx=g++${secondaryArchSuffix/_/-}
--ld=gcc${secondaryArchSuffix/_/-}
--host-ld=gcc${secondaryArchSuffix/_/-}"
# Hack up base headers to make them think we're on GCC2 ABI
mkdir -p include_hacks include_hacks/os include_hacks/config
pushd include_hacks
rm -f os/BeBuild.h config/HaikuConfig.h
cp /system/develop/headers/os/BeBuild.h os
cp /system/develop/headers/config/HaikuConfig.h config
sed -i 's/__GNUC__ == 2/1/g' os/BeBuild.h config/HaikuConfig.h
popd
# Compile gcc_runtime.c (subset of libgcc that GCC 7 utilizes here)
$cc -fvisibility=hidden -c $portDir/additional-files/gcc_runtime.c \
-o gcc_runtime.o
baseLDFLAGS="-B/system/bin/${gccSuffix/_/}"
ccArgs="$ccArgs --host-ldflags=\"${baseLDFLAGS}\""
export CFLAGS="-isystem$(pwd) -isystem$(pwd)/os -isystem$(pwd)/config"
export LDFLAGS="$baseLDFLAGS $(pwd)/gcc_runtime.o"
else
extraArgs="--enable-libvpx --enable-gnutls"
fi
# not an autotools configure
./configure \
$ccArgs \
--prefix=$prefix \
--bindir=$binDir \
--datadir=$dataDir/$portName \
--incdir=$includeDir \
--libdir=$libDir \
--shlibdir=$libDir \
--mandir=$manDir \
--disable-debug \
--disable-stripping \
--enable-gpl \
--enable-version3 \
--enable-shared \
--disable-static \
--enable-libvorbis \
--enable-libspeex \
--enable-libtheora \
--enable-avresample \
--enable-libopenmpt \
$extraArgs
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLibs $ffmpegLibs
fixPkgconfig
# The pkgconfig file reference other libraries using the wrong paths, which
# creates a lot of confusion. Fix them so correct paths are used.
local develPackageName="${portName}_devel-$portFullVersion"
local packageLinksDir=$(dirname $portPackageLinksDir)
local linksDir="$packageLinksDir/${develPackageName}/devel~libspeex$secondaryArchSuffix/$relativeDevelopLibDir"
sed -i -e "s,^\(Libs.private.*\)-L.*speex.* \(-lspeex.*\),\1-L$linksDir \2," \
$developLibDir/pkgconfig/libavcodec.pc \
$developLibDir/pkgconfig/libavdevice.pc \
$developLibDir/pkgconfig/libavfilter.pc \
$developLibDir/pkgconfig/libavformat.pc
# Move html docs to the right place.
mkdir -p $docDir
mv $prefix/share/doc/ffmpeg $docDir
rm -r $prefix/share
# Split out libs and executables which need libSDL
packageEntries tools $binDir
packageEntries avdevice $libDir/libavdevice*
# devel package
packageEntries devel \
$dataDir/ffmpeg$secondaryArchSuffix/examples \
$manDir/man3 \
$docDir \
$developDir
}
TEST()
{
make check
}

View File

@@ -0,0 +1,49 @@
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
Subject: disable ebx on x86.
diff --git a/configure b/configure
index 7310b96..e754f1a 100755
--- a/configure
+++ b/configure
@@ -6785,6 +6785,7 @@ enabled avresample && warn "Building with deprecated library libavresample"
if test $target_os = "haiku"; then
disable memalign
disable posix_memalign
+ enabled x86_32 && enabled shared && disable ebx_available
fi
flatten_extralibs(){
--
2.19.1
From eea5a92a4edbc3b9343c668d19051dda3f223f32 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 2 Feb 2018 11:39:47 +0100
Subject: Re-enable memalign for Haiku
This had been disabled in 2011:
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 e754f1a..31131ab 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"
if test $target_os = "haiku"; then
- disable memalign
- disable posix_memalign
enabled x86_32 && enabled shared && disable ebx_available
fi
--
2.19.1