ffmpeg, add version 6.0 (#9577)

This commit is contained in:
Schrijvers Luc
2023-10-06 06:40:24 +00:00
committed by GitHub
parent 20816fa266
commit 0707a0645f
2 changed files with 425 additions and 0 deletions

View File

@@ -0,0 +1,346 @@
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-2023 the FFmpeg developers"
LICENSE="GNU LGPL v3"
REVISION="1"
SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
CHECKSUM_SHA256="57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082"
PATCHES="ffmpeg-$portVersion.patchset"
SOURCE_DIR="ffmpeg-$portVersion"
ADDITIONAL_FILES="gcc_runtime.c"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
ffmpegLibs="\
libavcodec \
libavdevice \
libavfilter \
libavformat \
libavutil \
libswresample \
libswscale \
"
# Do not sort alphabetically
libavutilVersion="58.2.100"
libavcodecVersion="60.3.100"
libavformatVersion="60.3.100"
libavdeviceVersion="60.1.100"
libavfilterVersion="9.3.100"
libswscaleVersion="7.1.100"
libswresampleVersion="4.10.100"
portVersionCompat="$portVersion compat >= 5"
for i in $ffmpegLibs; do
eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\""
done
PROVIDES="
ffmpeg6$secondaryArchSuffix = $portVersionCompat
lib:libavcodec$secondaryArchSuffix = $libavcodecVersionCompat
lib:libavfilter$secondaryArchSuffix = $libavfilterVersionCompat
lib:libavformat$secondaryArchSuffix = $libavformatVersionCompat
lib:libavutil$secondaryArchSuffix = $libavutilVersionCompat
lib:libswresample$secondaryArchSuffix = $libswresampleVersionCompat
lib:libswscale$secondaryArchSuffix = $libswscaleVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libmp3lame$secondaryArchSuffix
lib:libogg$secondaryArchSuffix
lib:libopus$secondaryArchSuffix
lib:libspeex$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
lib:libtheoradec$secondaryArchSuffix
lib:libtheoraenc$secondaryArchSuffix
lib:libvorbis$secondaryArchSuffix
lib:libvorbisenc$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
REQUIRES+="
lib:libass$secondaryArchSuffix
lib:libdav1d$secondaryArchSuffix
lib:libfdk_aac$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libfribidi$secondaryArchSuffix
lib:libgme$secondaryArchSuffix
lib:libgmp$secondaryArchSuffix
lib:libopenjp2$secondaryArchSuffix
lib:libopenmpt$secondaryArchSuffix
lib:libsnappy$secondaryArchSuffix
lib:libsoxr$secondaryArchSuffix
lib:libvpx$secondaryArchSuffix
lib:libwebp$secondaryArchSuffix
# lib:libx264$secondaryArchSuffix
# lib:libx265$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
lib:liblzma$secondaryArchSuffix
"
fi
PROVIDES_avdevice="
ffmpeg6${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="
ffmpeg6${secondaryArchSuffix}_tools = $portVersion
cmd:ffmpeg$secondaryArchSuffix = $portVersionCompat
cmd:ffplay$secondaryArchSuffix = $portVersionCompat
cmd:ffprobe$secondaryArchSuffix = $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
"
CONFLICTS_tools="
ffmpeg${secondaryArchSuffix}_tools
ffmpeg5${secondaryArchSuffix}_tools
"
PROVIDES_devel="
ffmpeg6${secondaryArchSuffix}_devel = $portVersionCompat
devel:libavcodec$secondaryArchSuffix = $libavcodecVersionCompat
devel:libavdevice$secondaryArchSuffix = $libavdeviceVersionCompat
devel:libavfilter$secondaryArchSuffix = $libavfilterVersionCompat
devel:libavformat$secondaryArchSuffix = $libavformatVersionCompat
devel:libavutil$secondaryArchSuffix = $libavutilVersionCompat
devel:libswresample$secondaryArchSuffix = $libswresampleVersionCompat
devel:libswscale$secondaryArchSuffix = $libswscaleVersionCompat
"
REQUIRES_devel="
ffmpeg6$secondaryArchSuffix == $portVersion base
ffmpeg6${secondaryArchSuffix}_avdevice == $portVersion
devel:libspeex$secondaryArchSuffix
"
CONFLICTS_devel="
ffmpeg${secondaryArchSuffix}_devel
ffmpeg5${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 13; 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:libiconv$secondaryArchSuffix
devel:libmp3lame$secondaryArchSuffix
devel:libogg$secondaryArchSuffix
devel:libopus$secondaryArchSuffix
devel:libsdl2$secondaryArchSuffix
devel:libspeex$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libtheora$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
BUILD_REQUIRES+="
devel:libass$secondaryArchSuffix
devel:libdav1d$secondaryArchSuffix
devel:libfdk_aac$secondaryArchSuffix
devel:libfontconfig$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libfribidi$secondaryArchSuffix
devel:libgme$secondaryArchSuffix
devel:libgmp$secondaryArchSuffix
devel:libopenjp2$secondaryArchSuffix
devel:libopenmpt$secondaryArchSuffix
devel:libsnappy$secondaryArchSuffix
devel:libsoxr$secondaryArchSuffix
devel:libvpx$secondaryArchSuffix
devel:libwebp$secondaryArchSuffix
# devel:libx264$secondaryArchSuffix
# devel:libx265$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:liblzma$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 ffmpeg6$secondaryArchSuffix \
$libDir/libavcodec.so.$libavcodecVersion \
$libDir/libavfilter.so.$libavfilterVersion \
$libDir/libavformat.so.$libavformatVersion \
$libDir/libavutil.so.$libavutilVersion \
$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 13 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-libass \
--enable-libdav1d \
--enable-libfdk-aac \
--enable-fontconfig \
--enable-libfreetype \
--enable-libfribidi \
--enable-libgme \
--enable-gmp \
--enable-libopenjpeg \
--enable-libopenmpt \
--enable-libsnappy \
--enable-libsoxr \
--enable-libvpx \
--enable-libwebp \
--enable-libxml2 \
--enable-lzma"
fi
# not an autotools configure
./configure \
$ccArgs \
--prefix=$prefix \
--bindir=$binDir \
--datadir=$dataDir/$portName \
--incdir=$includeDir \
--libdir=$libDir \
--shlibdir=$libDir \
--mandir=$manDir \
--disable-asm \
--disable-debug \
--disable-stripping \
--disable-static \
--enable-shared \
--enable-version3 \
--enable-libmp3lame \
--enable-libopus \
--enable-openssl \
--enable-libspeex \
--enable-libtheora \
--enable-libvorbis \
$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/ffmpeg6$secondaryArchSuffix/examples \
$manDir/man3 \
$docDir \
$developDir
}
TEST()
{
make check
}

View File

@@ -0,0 +1,79 @@
From a7bd418338b555b6a1d5e9cf0c11eebae5a51896 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 7 Aug 2019 16:21:12 +0300
Subject: disable ebx on x86.
diff --git a/configure b/configure
index b6616f0..8c13b3a 100755
--- a/configure
+++ b/configure
@@ -7374,6 +7374,7 @@ case $target_os in
haiku)
disable memalign
disable posix_memalign
+ enabled x86_32 && enabled shared && disable ebx_available
;;
*-dos|freedos|opendos)
if test_cpp_condition sys/version.h "defined(__DJGPP__) && __DJGPP__ == 2 && __DJGPP_MINOR__ == 5"; then
--
2.37.3
From 7106e536332325e4c659149de029fc7d21e94010 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 7 Aug 2019 16:21:32 +0300
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 8c13b3a..a7014d4 100755
--- a/configure
+++ b/configure
@@ -7372,8 +7372,6 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
case $target_os in
haiku)
- disable memalign
- disable posix_memalign
enabled x86_32 && enabled shared && disable ebx_available
;;
*-dos|freedos|opendos)
--
2.37.3
From c2ec672ced34f60445c23c4c2f31779ce957f8f0 Mon Sep 17 00:00:00 2001
From: Ken Mays <kmays2000@gmail.com>
Date: Sat, 13 Aug 2022 05:01:14 +0300
Subject: Check for SSSE3
diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c
index 6754062..9ad4f20 100644
--- a/libswscale/x86/yuv2rgb.c
+++ b/libswscale/x86/yuv2rgb.c
@@ -70,6 +70,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
#if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags();
+#if HAVE_SSSE3
if (EXTERNAL_SSSE3(cpu_flags)) {
switch (c->dstFormat) {
case AV_PIX_FMT_RGB32:
@@ -98,6 +99,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
return yuv420_rgb15_ssse3;
}
}
+#endif
if (EXTERNAL_MMXEXT(cpu_flags)) {
switch (c->dstFormat) {
--
2.37.3