From 10734d5f10404d1548dafd5c59091cc1ce20dbcf Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Sat, 30 Jun 2018 12:54:40 -0400 Subject: [PATCH] ffmpeg: Bump to 4.0.1. Signed-off-by: Augustin Cavalier _x86 fixes by me. Also enabled -version3. --- media-video/ffmpeg/ffmpeg-4.0.1.recipe | 240 ++++++++++++++++++ .../ffmpeg/patches/ffmpeg-4.0.1.patchset | 50 ++++ 2 files changed, 290 insertions(+) create mode 100644 media-video/ffmpeg/ffmpeg-4.0.1.recipe create mode 100644 media-video/ffmpeg/patches/ffmpeg-4.0.1.patchset diff --git a/media-video/ffmpeg/ffmpeg-4.0.1.recipe b/media-video/ffmpeg/ffmpeg-4.0.1.recipe new file mode 100644 index 000000000..32b552ef0 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-4.0.1.recipe @@ -0,0 +1,240 @@ +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-2018 the FFmpeg developers" +LICENSE="GNU LGPL v3 + GNU GPL v3" +REVISION="1" +SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz" +CHECKSUM_SHA256="605f5c01c60db35d3b617a79cabb2c7032412be243554602eeed1b628125c0ee" +PATCHES="ffmpeg-$portVersion.patchset" + +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.14.100" +libavcodecVersion="58.18.100" +libavformatVersion="58.12.100" +libavdeviceVersion="58.3.100" +libavfilterVersion="7.16.100" +libavresampleVersion="4.0.0" +libswscaleVersion="5.1.100" +libswresampleVersion="3.1.100" +libpostprocVersion="55.1.100" +portVersionCompat="$portVersion compat >= 4" +for i in $ffmpegLibs; do + eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\"" +done + +PROVIDES=" + ffmpeg4$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:libgnutls$secondaryArchSuffix + lib:libmodplug$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libspeex$secondaryArchSuffix + lib:libtheoradec$secondaryArchSuffix + lib:libtheoraenc$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libvorbisenc$secondaryArchSuffix + lib:libvpx$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +CONFLICTS=" + ffmpeg_legacy$secondaryArchSuffix + ffmpeg${secondaryArchSuffix}_bin + ffmpeg2${secondaryArchSuffix}_bin + " + +PROVIDES_avdevice=" + ffmpeg4${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=" + ffmpeg4${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=" + ffmpeg4${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=" + ffmpeg4$secondaryArchSuffix == $portVersion base + devel:libspeex$secondaryArchSuffix + " +CONFLICTS_devel=" + ffmpeg_legacy${secondaryArchSuffix}_devel + ffmpeg${secondaryArchSuffix}_devel + ffmpeg2${secondaryArchSuffix}_devel + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libbz2$secondaryArchSuffix + devel:libgnutls$secondaryArchSuffix + devel:libmodplug$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libsdl2$secondaryArchSuffix + devel:libspeex$secondaryArchSuffix + devel:libtheora$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libvpx$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:awk + cmd:cmp + cmd:gcc$secondaryArchSuffix >= 7 + cmd:grep + cmd:ld$secondaryArchSuffix + 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 +} + +defineDebugInfoPackage ffmpeg4$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)/bin"/ffmpeg \ + "$(getPackagePrefix tools)/bin"/ffplay \ + "$(getPackagePrefix tools)/bin"/ffprobe + +BUILD() +{ + # not an autotools configure + ./configure \ + --prefix=$prefix \ + --bindir=$prefix/bin \ + --datadir=$dataDir/$portName \ + --incdir=$includeDir \ + --libdir=$libDir \ + --shlibdir=$libDir \ + --mandir=$manDir \ + --disable-debug \ + --disable-stripping \ + --enable-gpl \ + --enable-version3 \ + --enable-shared \ + --enable-libmodplug \ + --enable-libvorbis \ + --enable-libspeex \ + --enable-libtheora \ + --enable-libvpx \ + --enable-avresample \ + --enable-gnutls + + 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 $prefix/bin + packageEntries avdevice $libDir/libavdevice* + + # devel package + packageEntries devel \ + $dataDir/ffmpeg$secondaryArchSuffix/examples \ + $manDir/man3 \ + $docDir \ + $developDir +} + +TEST() +{ + make check +} diff --git a/media-video/ffmpeg/patches/ffmpeg-4.0.1.patchset b/media-video/ffmpeg/patches/ffmpeg-4.0.1.patchset new file mode 100644 index 000000000..2f1510eda --- /dev/null +++ b/media-video/ffmpeg/patches/ffmpeg-4.0.1.patchset @@ -0,0 +1,50 @@ +From 6ed8a346799f20ba114b314d1054a30add1c4044 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Mon, 16 Oct 2017 18:31:07 +0200 +Subject: disable ebx on x86. + + +diff --git a/configure b/configure +index dee507c..f0d0c09 100755 +--- a/configure ++++ b/configure +@@ -6678,6 +6678,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.16.2 + + +From f449ce0153359ef24e5afbf49144c539be92f789 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +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 f0d0c09..cd5dbf3 100755 +--- a/configure ++++ b/configure +@@ -6676,8 +6676,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.16.2 +