diff --git a/media-video/ffmpeg/ffmpeg-4.2.recipe b/media-video/ffmpeg/ffmpeg-4.2.recipe index e7d6739fc..e9e3aa4cb 100644 --- a/media-video/ffmpeg/ffmpeg-4.2.recipe +++ b/media-video/ffmpeg/ffmpeg-4.2.recipe @@ -5,9 +5,8 @@ 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" +LICENSE="GNU LGPL v3" +REVISION="2" SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz" CHECKSUM_SHA256="023f10831a97ad93d798f53a3640e55cd564abfeba807ecbe8524dac4fedecd5" PATCHES="ffmpeg-$portVersion.patchset" @@ -22,7 +21,6 @@ ffmpegLibs="\ libavfilter \ libavformat \ libavutil \ - libpostproc \ libswresample \ libswscale \ " @@ -34,7 +32,6 @@ 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%%.*}\"" @@ -46,7 +43,6 @@ PROVIDES=" lib:libavfilter$secondaryArchSuffix = $libavfilterVersionCompat lib:libavformat$secondaryArchSuffix = $libavformatVersionCompat lib:libavutil$secondaryArchSuffix = $libavutilVersionCompat - lib:libpostproc$secondaryArchSuffix = $libpostprocVersionCompat lib:libswresample$secondaryArchSuffix = $libswresampleVersionCompat lib:libswscale$secondaryArchSuffix = $libswscaleVersionCompat " @@ -55,6 +51,7 @@ REQUIRES=" lib:libbz2$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libspeex$secondaryArchSuffix + lib:libssl$secondaryArchSuffix lib:libtheoradec$secondaryArchSuffix lib:libtheoraenc$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix @@ -63,7 +60,6 @@ REQUIRES=" " if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then REQUIRES+=" - lib:libgnutls$secondaryArchSuffix lib:libopenmpt$secondaryArchSuffix lib:libvpx$secondaryArchSuffix " @@ -110,7 +106,6 @@ PROVIDES_devel=" devel:libavfilter$secondaryArchSuffix = $libavfilterVersionCompat devel:libavformat$secondaryArchSuffix = $libavformatVersionCompat devel:libavutil$secondaryArchSuffix = $libavutilVersionCompat - devel:libpostproc$secondaryArchSuffix = $libpostprocVersionCompat devel:libswresample$secondaryArchSuffix = $libswresampleVersionCompat devel:libswscale$secondaryArchSuffix = $libswscaleVersionCompat " @@ -149,13 +144,13 @@ BUILD_REQUIRES=" devel:libogg$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:libgnutls$secondaryArchSuffix devel:libopenmpt$secondaryArchSuffix devel:libvpx$secondaryArchSuffix " @@ -193,7 +188,6 @@ defineDebugInfoPackage ffmpeg$secondaryArchSuffix \ $libDir/libavfilter.so.$libavfilterVersion \ $libDir/libavformat.so.$libavformatVersion \ $libDir/libavutil.so.$libavutilVersion \ - $libDir/libpostproc.so.$libpostprocVersion \ $libDir/libswresample.so.$libswresampleVersion \ $libDir/libswscale.so.$libswscaleVersion \ "$(getPackagePrefix avdevice)/$relativeLibDir"/libavdevice.so.$libavdeviceVersion \ @@ -229,7 +223,7 @@ BUILD() export CFLAGS="-isystem$(pwd) -isystem$(pwd)/os -isystem$(pwd)/config" export LDFLAGS="$baseLDFLAGS $(pwd)/gcc_runtime.o" else - extraArgs="--enable-libvpx --enable-gnutls --enable-libopenmpt" + extraArgs="--enable-libvpx --enable-libopenmpt" fi # not an autotools configure @@ -244,10 +238,10 @@ BUILD() --mandir=$manDir \ --disable-debug \ --disable-stripping \ - --enable-gpl \ - --enable-version3 \ - --enable-shared \ --disable-static \ + --enable-shared \ + --enable-version3 \ + --enable-openssl \ --enable-libvorbis \ --enable-libspeex \ --enable-libtheora \