From a727e47fdd3b63536106bf72e40cd8c639393ff3 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 24 May 2015 21:51:46 +0000 Subject: [PATCH] ffmpeg: rename 2.6 recipe to ffmpeg26. * enable to install along the system libs. * bump version. --- ...peg-2.6.2.recipe => ffmpeg26-2.6.3.recipe} | 37 ++++++++++++------- 1 file changed, 23 insertions(+), 14 deletions(-) rename media-video/ffmpeg/{ffmpeg-2.6.2.recipe => ffmpeg26-2.6.3.recipe} (82%) diff --git a/media-video/ffmpeg/ffmpeg-2.6.2.recipe b/media-video/ffmpeg/ffmpeg26-2.6.3.recipe similarity index 82% rename from media-video/ffmpeg/ffmpeg-2.6.2.recipe rename to media-video/ffmpeg/ffmpeg26-2.6.3.recipe index d4da80a8b..93539eb28 100644 --- a/media-video/ffmpeg/ffmpeg-2.6.2.recipe +++ b/media-video/ffmpeg/ffmpeg26-2.6.3.recipe @@ -12,7 +12,7 @@ COPYRIGHT=" 2003-2015 the FFmpeg developers " SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-$portVersion.tar.bz2" -CHECKSUM_SHA256="889e3aa069b724dc95cbfc79ef83322a8a39d9f6225f39fad1b47294fc1f29ba" +CHECKSUM_SHA256="59eb98c1b5896ac29abc0385f7c875d1b4942d695818818d418ee71eea1e0cfb" REVISION="1" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -25,10 +25,10 @@ fi SECONDARY_ARCHITECTURES="x86" PROVIDES=" - ffmpeg$secondaryArchSuffix = $portVersion compat >= 2.6 - cmd:ffmpeg = $portVersion compat >= 2.6 - cmd:ffprobe = $portVersion compat >= 2.6 - cmd:ffserver = $portVersion compat >= 2.6 + ffmpeg26$secondaryArchSuffix = $portVersion compat >= 2.6 + cmd:ffmpeg_26 = $portVersion compat >= 2.6 + cmd:ffprobe_26 = $portVersion compat >= 2.6 + cmd:ffserver_26 = $portVersion compat >= 2.6 lib:libavutil$secondaryArchSuffix = 54.20.100 compat >= 54 lib:libavcodec$secondaryArchSuffix = 56.26.100 compat >= 56 lib:libavformat$secondaryArchSuffix = 56.25.101 compat >= 56 @@ -82,22 +82,25 @@ GLOBAL_WRITABLE_FILES=" " PROVIDES_devel=" - ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 2.4 - devel:libavutil$secondaryArchSuffix = 54.7.100 compat >= 54 - devel:libavcodec$secondaryArchSuffix = 56.1.100 compat >= 56 - devel:libavformat$secondaryArchSuffix = 56.4.101 compat >= 56 - devel:libavdevice$secondaryArchSuffix = 56.0.100 compat >= 56 - devel:libavfilter$secondaryArchSuffix = 5.1.100 compat >= 5 + ffmpeg26${secondaryArchSuffix}_devel = $portVersion compat >= 2.4 + devel:libavutil$secondaryArchSuffix = 54.20.100 compat >= 54 + devel:libavcodec$secondaryArchSuffix = 56.26.100 compat >= 56 + devel:libavformat$secondaryArchSuffix = 56.25.101 compat >= 56 + devel:libavdevice$secondaryArchSuffix = 56.4.100 compat >= 56 + devel:libavfilter$secondaryArchSuffix = 5.11.102 compat >= 5 devel:libavresample$secondaryArchSuffix = 2.1.0 compat >= 2 devel:libswscale$secondaryArchSuffix = 3.1.101 compat >= 3 devel:libswresample$secondaryArchSuffix = 1.1.100 compat >= 1 - devel:libpostproc$secondaryArchSuffix = 53.0.100 compat >= 53 + devel:libpostproc$secondaryArchSuffix = 53.3.100 compat >= 53 " REQUIRES_devel=" - ffmpeg$secondaryArchSuffix == $portVersion base + ffmpeg26$secondaryArchSuffix == $portVersion base devel:libspeex$secondaryArchSuffix " +CONFLICTS_devel=" + ffmpeg${secondaryArchSuffix}_devel + " PATCH() { @@ -112,6 +115,8 @@ PATCH() doc/texi2pod.pl } +SOURCE_DIR="ffmpeg-$portVersion" + BUILD() { # not an autotools configure @@ -130,7 +135,8 @@ BUILD() --enable-libtheora \ --enable-libvpx \ --enable-gpl \ - --enable-avresample + --enable-avresample \ + --progs-suffix=-26 if [ $targetArchitecture = x86_64 ]; then cflags="-fPIC -std=c99" @@ -178,6 +184,9 @@ INSTALL() # devel package packageEntries devel \ + $dataDir/ffmpeg26/examples \ + $manDir/man3 \ + $docDir \ $developDir }