diff --git a/media-video/ffmpeg/ffmpeg-2.3.recipe b/media-video/ffmpeg/ffmpeg-2.3.recipe deleted file mode 100644 index dfa999910..000000000 --- a/media-video/ffmpeg/ffmpeg-2.3.recipe +++ /dev/null @@ -1,175 +0,0 @@ -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="http://www.ffmpeg.org" -LICENSE=" - GNU LGPL v2.1 - GNU GPL v2 - " -COPYRIGHT=" - 2000-2003 Fabrice Bellard - 2003-2014 the FFmpeg developers - " -SOURCE_URI="http://www.ffmpeg.org/releases/ffmpeg-2.3.tar.bz2" -CHECKSUM_SHA256="6b3dbb64e20951480bfd64bcbe305f6ee9031e5fccfd3b3e94cc5055525f809e" -REVISION="1" -ARCHITECTURES="x86 x86_64" -if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - # x86_gcc2 is fine as primary target architecture as long as we're building - # for a different secondary architecture. - ARCHITECTURES="$ARCHITECTURES x86_gcc2" -else - ARCHITECTURES="$ARCHITECTURES !x86_gcc2" -fi -SECONDARY_ARCHITECTURES="x86" - -PATCHES="ffmpeg-2.3.patch" - -PROVIDES=" - ffmpeg$secondaryArchSuffix = $portVersion compat >= 2.3 - cmd:ffmpeg = $portVersion compat >= 2.3 - cmd:ffprobe = $portVersion compat >= 2.3 - cmd:ffserver = $portVersion compat >= 2.3 - lib:libavutil$secondaryArchSuffix = 52.92.100 compat >= 52 - lib:libavcodec$secondaryArchSuffix = 55.69.100 compat >= 55 - lib:libavformat$secondaryArchSuffix = 55.47.100 compat >= 55 - lib:libavdevice$secondaryArchSuffix = 55.13.100 compat >= 55 - lib:libavfilter$secondaryArchSuffix = 4.10.100 compat >= 4 - lib:libavresample$secondaryArchSuffix = 1.3.0 compat >= 1 - lib:libswscale$secondaryArchSuffix = 2.6.100 compat >= 2 - lib:libswresample$secondaryArchSuffix = 0.19.100 compat >= 0 - lib:libpostproc$secondaryArchSuffix = 52.3.100 compat >= 52 - " - -REQUIRES=" - haiku$secondaryArchSuffix - lib:libbz2$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 - " - -BUILD_REQUIRES=" - devel:libbz2$secondaryArchSuffix - devel:libogg$secondaryArchSuffix - devel:libspeex$secondaryArchSuffix - devel:libtheora$secondaryArchSuffix - devel:libvorbis$secondaryArchSuffix - devel:libvpx$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " - -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:awk - cmd:make - cmd:perl - cmd:pkg_config$secondaryArchSuffix - cmd:texi2html - cmd:yasm - " - -GLOBAL_WRITABLE_FILES=" - settings/ffserver.conf - " - -PROVIDES_devel=" - ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 2.3 - devel:libavutil$secondaryArchSuffix = 52.92.100 compat >= 52 - devel:libavcodec$secondaryArchSuffix = 55.69.100 compat >= 55 - devel:libavformat$secondaryArchSuffix = 55.47.100 compat >= 55 - devel:libavdevice$secondaryArchSuffix = 55.13.100 compat >= 55 - devel:libavresample$secondaryArchSuffix = 1.3.0 compat >= 1 - devel:libavfilter$secondaryArchSuffix = 4.10.100 compat >= 4 - devel:libswscale$secondaryArchSuffix = 2.6.100 compat >= 2 - devel:libswresample$secondaryArchSuffix = 0.19.100 compat >= 0 - devel:libpostproc$secondaryArchSuffix = 52.3.100 compat >= 52 - " - -REQUIRES_devel=" - ffmpeg$secondaryArchSuffix == $portVersion base - " - -PATCH() -{ - # patch hard-coded config file path - sed -i "s,/etc/ffserver.conf,$sysconfDir/ffserver.conf," \ - ffserver.c \ - doc/ffserver.texi - - # patch hard-coded paths to perl - sed -i "s,/usr/bin/perl,$portPackageLinksDir/cmd~perl/bin/perl," \ - doc/Doxyfile \ - doc/texi2pod.pl -} - -BUILD() -{ - # not an autotools configure - ./configure \ - --prefix=$prefix \ - --bindir=$prefix/bin \ - --datadir=$dataDir/$portName \ - --incdir=$includeDir \ - --libdir=$libDir \ - --shlibdir=$libDir \ - --mandir=$manDir \ - --disable-debug \ - --enable-shared \ - --enable-libvorbis \ - --enable-libspeex \ - --enable-libtheora \ - --enable-libvpx \ - --enable-gpl \ - --enable-avresample - - if [ $targetArchitecture = x86_64 ]; then - cflags="-fPIC -std=c99" - else - cflags="-fno-PIC -std=c99" - fi - - make $jobArgs CFLAGS="$cflags" -} - -INSTALL() -{ - make install - - prepareInstalledDevelLibs \ - libavcodec \ - libavdevice \ - libavfilter \ - libavformat \ - libavresample \ - libavutil \ - libswresample \ - libswscale \ - libpostproc - fixPkgconfig - - # include the documented ffserver.conf - mkdir -p $docDir - cp doc/ffserver.conf $docDir - - # Move html docs to the right place. - mv $prefix/share/doc/ffmpeg $docDir - rm -r $prefix/share - - # devel package - packageEntries devel \ - $developDir -} - -TEST() -{ - make check -} diff --git a/media-video/ffmpeg/ffmpeg-2.4.2.recipe b/media-video/ffmpeg/ffmpeg-2.4.2.recipe deleted file mode 100644 index 3be88a025..000000000 --- a/media-video/ffmpeg/ffmpeg-2.4.2.recipe +++ /dev/null @@ -1,189 +0,0 @@ -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="http://www.ffmpeg.org" -LICENSE=" - GNU LGPL v2.1 - GNU GPL v2 - " -COPYRIGHT=" - 2000-2003 Fabrice Bellard - 2003-2014 the FFmpeg developers - " -SOURCE_URI="http://www.ffmpeg.org/releases/ffmpeg-$portVersion.tar.bz2" -CHECKSUM_SHA256="974f90a9d7bde835213ab970c2190402e5d6566e47a7bb657d756ee92540fa7e" -REVISION="1" -ARCHITECTURES="x86 x86_64" -if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - # x86_gcc2 is fine as primary target architecture as long as we're building - # for a different secondary architecture. - ARCHITECTURES="$ARCHITECTURES x86_gcc2" -else - ARCHITECTURES="$ARCHITECTURES !x86_gcc2" -fi -SECONDARY_ARCHITECTURES="x86" - -#PATCHES="ffmpeg-2.3.patch" - -PROVIDES=" - ffmpeg$secondaryArchSuffix = $portVersion compat >= 2.4 - cmd:ffmpeg = $portVersion compat >= 2.4 - cmd:ffprobe = $portVersion compat >= 2.4 - cmd:ffserver = $portVersion compat >= 2.4 - lib:libavutil$secondaryArchSuffix = 54.7.100 compat >= 54 - lib:libavcodec$secondaryArchSuffix = 56.1.100 compat >= 56 - lib:libavformat$secondaryArchSuffix = 56.4.101 compat >= 56 - lib:libavdevice$secondaryArchSuffix = 56.0.100 compat >= 56 - lib:libavfilter$secondaryArchSuffix = 5.1.100 compat >= 5 - lib:libavresample$secondaryArchSuffix = 2.1.0 compat >= 2 - lib:libswscale$secondaryArchSuffix = 3.0.100 compat >= 3 - lib:libswresample$secondaryArchSuffix = 1.1.100 compat >= 1 - lib:libpostproc$secondaryArchSuffix = 53.0.100 compat >= 53 - " - -REQUIRES=" - haiku$secondaryArchSuffix - lib:libbz2$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 - " - -BUILD_REQUIRES=" - devel:libbz2$secondaryArchSuffix - devel:libogg$secondaryArchSuffix - devel:libspeex$secondaryArchSuffix - devel:libtheora$secondaryArchSuffix - devel:libvorbis$secondaryArchSuffix - devel:libvpx$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " - -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:awk - cmd:grep - cmd:make - cmd:perl - cmd:pkg_config$secondaryArchSuffix - cmd:sed - cmd:texi2html - cmd:yasm - " - -GLOBAL_WRITABLE_FILES=" - settings/ffserver.conf - " - -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 - devel:libavresample$secondaryArchSuffix = 2.1.0 compat >= 2 - devel:libswscale$secondaryArchSuffix = 3.0.100 compat >= 3 - devel:libswresample$secondaryArchSuffix = 1.1.100 compat >= 1 - devel:libpostproc$secondaryArchSuffix = 53.0.100 compat >= 53 - " - -REQUIRES_devel=" - ffmpeg$secondaryArchSuffix == $portVersion base - devel:libspeex$secondaryArchSuffix - " - -PATCH() -{ - # patch hard-coded config file path - sed -i "s,/etc/ffserver.conf,$sysconfDir/ffserver.conf," \ - ffserver.c \ - doc/ffserver.texi - - # patch hard-coded paths to perl - sed -i "s,/usr/bin/perl,$portPackageLinksDir/cmd~perl/bin/perl," \ - doc/Doxyfile \ - doc/texi2pod.pl -} - -BUILD() -{ - # not an autotools configure - ./configure \ - --prefix=$prefix \ - --bindir=$prefix/bin \ - --datadir=$dataDir/$portName \ - --incdir=$includeDir \ - --libdir=$libDir \ - --shlibdir=$libDir \ - --mandir=$manDir \ - --disable-debug \ - --enable-shared \ - --enable-libvorbis \ - --enable-libspeex \ - --enable-libtheora \ - --enable-libvpx \ - --enable-gpl \ - --enable-avresample - - if [ $targetArchitecture = x86_64 ]; then - cflags="-fPIC -std=c99" - else - cflags="-fno-PIC -std=c99" - fi - - make $jobArgs CFLAGS="$cflags" -} - -INSTALL() -{ - make install - - prepareInstalledDevelLibs \ - libavcodec \ - libavdevice \ - libavfilter \ - libavformat \ - libavresample \ - libavutil \ - libswresample \ - libswscale \ - libpostproc - 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 - - # include the documented ffserver.conf - mkdir -p $docDir - cp doc/ffserver.conf $docDir - - # Move html docs to the right place. - mv $prefix/share/doc/ffmpeg $docDir - rm -r $prefix/share - - # devel package - packageEntries devel \ - $developDir -} - -TEST() -{ - make check -} diff --git a/media-video/ffmpeg/ffmpeg26-2.6.3.recipe b/media-video/ffmpeg/ffmpeg-2.6.3.recipe similarity index 90% rename from media-video/ffmpeg/ffmpeg26-2.6.3.recipe rename to media-video/ffmpeg/ffmpeg-2.6.3.recipe index f82e6e586..c089ecb27 100644 --- a/media-video/ffmpeg/ffmpeg26-2.6.3.recipe +++ b/media-video/ffmpeg/ffmpeg-2.6.3.recipe @@ -3,16 +3,13 @@ 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="http://www.ffmpeg.org" -LICENSE=" - GNU LGPL v2.1 - GNU GPL v2 - " -COPYRIGHT=" - 2000-2003 Fabrice Bellard - 2003-2015 the FFmpeg developers - " +LICENSE="GNU LGPL v2.1 + GNU GPL v2" +COPYRIGHT="2000-2003 Fabrice Bellard + 2003-2015 the FFmpeg developers" SOURCE_URI="http://www.ffmpeg.org/releases/ffmpeg-$portVersion.tar.bz2" CHECKSUM_SHA256="59eb98c1b5896ac29abc0385f7c875d1b4942d695818818d418ee71eea1e0cfb" +SOURCE_DIR="ffmpeg-$portVersion" REVISION="1" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -25,10 +22,10 @@ fi SECONDARY_ARCHITECTURES="x86" PROVIDES=" - 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 + ffmpeg$secondaryArchSuffix = $portVersion compat >= 2.6 + cmd:ffmpeg = $portVersion compat >= 2.6 + cmd:ffprobe = $portVersion compat >= 2.6 + cmd:ffserver = $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 @@ -39,7 +36,6 @@ PROVIDES=" lib:libswresample$secondaryArchSuffix = 1.1.100 compat >= 1 lib:libpostproc$secondaryArchSuffix = 53.3.100 compat >= 53 " - REQUIRES=" haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix @@ -52,6 +48,29 @@ REQUIRES=" lib:libvpx$secondaryArchSuffix lib:libz$secondaryArchSuffix " +CONFLICTS=" + ffmpeg_legacy$secondaryArchSuffix + " + +PROVIDES_devel=" + ffmpeg${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.3.100 compat >= 53 + " +REQUIRES_devel=" + ffmpeg$secondaryArchSuffix == $portVersion base + devel:libspeex$secondaryArchSuffix + " +CONFLICTS_devel=" + ffmpeg_legacy${secondaryArchSuffix}_devel + " BUILD_REQUIRES=" devel:libbz2$secondaryArchSuffix @@ -62,7 +81,6 @@ BUILD_REQUIRES=" devel:libvpx$secondaryArchSuffix devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix @@ -81,27 +99,6 @@ GLOBAL_WRITABLE_FILES=" settings/ffserver.conf " -PROVIDES_devel=" - 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.3.100 compat >= 53 - " - -REQUIRES_devel=" - ffmpeg26$secondaryArchSuffix == $portVersion base - devel:libspeex$secondaryArchSuffix - " -CONFLICTS_devel=" - ffmpeg${secondaryArchSuffix}_devel - " - PATCH() { # patch hard-coded config file path @@ -115,8 +112,6 @@ PATCH() doc/texi2pod.pl } -SOURCE_DIR="ffmpeg-$portVersion" - BUILD() { # not an autotools configure @@ -143,14 +138,14 @@ BUILD() else cflags="-fno-PIC -std=c99" fi - + make $jobArgs CFLAGS="$cflags" } INSTALL() { make install - + prepareInstalledDevelLibs \ libavcodec \ libavdevice \ @@ -162,7 +157,7 @@ INSTALL() libswscale \ libpostproc 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" @@ -184,7 +179,7 @@ INSTALL() # devel package packageEntries devel \ - $dataDir/ffmpeg26$secondaryArchSuffix/examples \ + $dataDir/ffmpeg$secondaryArchSuffix/examples \ $manDir/man3 \ $docDir \ $developDir diff --git a/media-video/ffmpeg/ffmpeg27-2.7.1.recipe b/media-video/ffmpeg/ffmpeg-2.7.2.recipe similarity index 90% rename from media-video/ffmpeg/ffmpeg27-2.7.1.recipe rename to media-video/ffmpeg/ffmpeg-2.7.2.recipe index faa87ca26..aeac1692f 100644 --- a/media-video/ffmpeg/ffmpeg27-2.7.1.recipe +++ b/media-video/ffmpeg/ffmpeg-2.7.2.recipe @@ -3,16 +3,13 @@ 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="http://www.ffmpeg.org" -LICENSE=" - GNU LGPL v2.1 - GNU GPL v2 - " -COPYRIGHT=" - 2000-2003 Fabrice Bellard - 2003-2015 the FFmpeg developers - " +LICENSE="GNU LGPL v2.1 + GNU GPL v2" +COPYRIGHT="2000-2003 Fabrice Bellard + 2003-2015 the FFmpeg developers" SOURCE_URI="http://www.ffmpeg.org/releases/ffmpeg-$portVersion.tar.bz2" CHECKSUM_SHA256="7e07b97d2415feeae9c9b5595e35e7b7aab33207e81bf9f8c0d1eece43f7f720" +SOURCE_DIR="ffmpeg-$portVersion" REVISION="1" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -25,10 +22,10 @@ fi SECONDARY_ARCHITECTURES="x86" PROVIDES=" - ffmpeg27$secondaryArchSuffix = $portVersion compat >= 2.7 - cmd:ffmpeg_27 = $portVersion compat >= 2.7 - cmd:ffprobe_27 = $portVersion compat >= 2.7 - cmd:ffserver_27 = $portVersion compat >= 2.7 + ffmpeg$secondaryArchSuffix = $portVersion compat >= 2.7 + cmd:ffmpeg = $portVersion compat >= 2.7 + cmd:ffprobe = $portVersion compat >= 2.7 + cmd:ffserver = $portVersion compat >= 2.7 lib:libavutil$secondaryArchSuffix = 54.27.100 compat >= 54 lib:libavcodec$secondaryArchSuffix = 56.41.100 compat >= 56 lib:libavformat$secondaryArchSuffix = 56.36.100 compat >= 56 @@ -39,7 +36,6 @@ PROVIDES=" lib:libswresample$secondaryArchSuffix = 1.2.100 compat >= 1 lib:libpostproc$secondaryArchSuffix = 53.3.100 compat >= 53 " - REQUIRES=" haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix @@ -52,6 +48,29 @@ REQUIRES=" lib:libvpx$secondaryArchSuffix lib:libz$secondaryArchSuffix " +CONFLICTS=" + ffmpeg_legacy$secondaryArchSuffix + " + +PROVIDES_devel=" + ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 2.4 + devel:libavutil$secondaryArchSuffix = 54.27.100 compat >= 54 + devel:libavcodec$secondaryArchSuffix = 56.51.100 compat >= 56 + devel:libavformat$secondaryArchSuffix = 56.36.100 compat >= 56 + devel:libavdevice$secondaryArchSuffix = 56.4.100 compat >= 56 + devel:libavfilter$secondaryArchSuffix = 5.16.101 compat >= 5 + devel:libavresample$secondaryArchSuffix = 2.1.0 compat >= 2 + devel:libswscale$secondaryArchSuffix = 3.1.101 compat >= 3 + devel:libswresample$secondaryArchSuffix = 1.2.100 compat >= 1 + devel:libpostproc$secondaryArchSuffix = 53.3.100 compat >= 53 + " +REQUIRES_devel=" + ffmpeg$secondaryArchSuffix == $portVersion base + devel:libspeex$secondaryArchSuffix + " +CONFLICTS_devel=" + ffmpeg${secondaryArchSuffix}_devel + " BUILD_REQUIRES=" devel:libbz2$secondaryArchSuffix @@ -62,7 +81,6 @@ BUILD_REQUIRES=" devel:libvpx$secondaryArchSuffix devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix @@ -81,27 +99,6 @@ GLOBAL_WRITABLE_FILES=" settings/ffserver.conf " -PROVIDES_devel=" - ffmpeg27${secondaryArchSuffix}_devel = $portVersion compat >= 2.4 - devel:libavutil$secondaryArchSuffix = 54.27.100 compat >= 54 - devel:libavcodec$secondaryArchSuffix = 56.51.100 compat >= 56 - devel:libavformat$secondaryArchSuffix = 56.36.100 compat >= 56 - devel:libavdevice$secondaryArchSuffix = 56.4.100 compat >= 56 - devel:libavfilter$secondaryArchSuffix = 5.16.101 compat >= 5 - devel:libavresample$secondaryArchSuffix = 2.1.0 compat >= 2 - devel:libswscale$secondaryArchSuffix = 3.1.101 compat >= 3 - devel:libswresample$secondaryArchSuffix = 1.2.100 compat >= 1 - devel:libpostproc$secondaryArchSuffix = 53.3.100 compat >= 53 - " - -REQUIRES_devel=" - ffmpeg27$secondaryArchSuffix == $portVersion base - devel:libspeex$secondaryArchSuffix - " -CONFLICTS_devel=" - ffmpeg${secondaryArchSuffix}_devel - " - PATCH() { # patch hard-coded config file path @@ -115,8 +112,6 @@ PATCH() doc/texi2pod.pl } -SOURCE_DIR="ffmpeg-$portVersion" - BUILD() { # not an autotools configure @@ -143,14 +138,14 @@ BUILD() else cflags="-fno-PIC -std=c99" fi - + make $jobArgs CFLAGS="$cflags" } INSTALL() { make install - + prepareInstalledDevelLibs \ libavcodec \ libavdevice \ @@ -162,7 +157,7 @@ INSTALL() libswscale \ libpostproc 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" @@ -184,7 +179,7 @@ INSTALL() # devel package packageEntries devel \ - $dataDir/ffmpeg27$secondaryArchSuffix/examples \ + $dataDir/ffmpeg$secondaryArchSuffix/examples \ $manDir/man3 \ $docDir \ $developDir diff --git a/media-video/ffmpeg/ffmpeg-0.10.14.recipe b/media-video/ffmpeg/ffmpeg_legacy-0.10.14.recipe similarity index 77% rename from media-video/ffmpeg/ffmpeg-0.10.14.recipe rename to media-video/ffmpeg/ffmpeg_legacy-0.10.14.recipe index ed2ff021d..2f9e0dd35 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.14.recipe +++ b/media-video/ffmpeg/ffmpeg_legacy-0.10.14.recipe @@ -4,26 +4,19 @@ 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="http://www.ffmpeg.org" -LICENSE=" - GNU LGPL v2.1 - GNU GPL v2 - " -COPYRIGHT=" - 2000-2003 Fabrice Bellard - 2003-2012 the FFmpeg developers - " +LICENSE="GNU LGPL v2.1 + GNU GPL v2" +COPYRIGHT="2000-2003 Fabrice Bellard + 2003-2012 the FFmpeg developers" SOURCE_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.14.tar.bz2" CHECKSUM_SHA256="1ef77533f3803b8630403df413005c1c41b18c50b16895815182fd70d2f833bb" -REVISION="3" -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -if [ $effectiveTargetArchitecture == x86_gcc2 ]; then - PATCHES="ffmpeg-0.10.14-gcc2.patch" -fi +REVISION="1" +ARCHITECTURES="x86_gcc2 !x86 !x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 !x86" +PATCHES="ffmpeg-0.10.14-gcc2.patch" PROVIDES=" - ffmpeg$secondaryArchSuffix = $portVersion compat >= 0.10 + ffmpeg_legacy$secondaryArchSuffix = $portVersion compat >= 0.10 lib:libavutil$secondaryArchSuffix = 51.35.100 compat >= 51 lib:libavcodec$secondaryArchSuffix = 53.61.100 compat >= 53 lib:libavformat$secondaryArchSuffix = 53.32.100 compat >= 53 @@ -33,14 +26,6 @@ PROVIDES=" lib:libswscale$secondaryArchSuffix = 2.1.100 compat >= 2 lib:libswresample$secondaryArchSuffix = 0.6.100 compat >= 0 " -if [ -z "$secondaryArchSuffix" ]; then - PROVIDES="$PROVIDES - cmd:ffmpeg = $portVersion compat >= 0.10 - cmd:ffprobe = $portVersion compat >= 0.10 - cmd:ffserver = $portVersion compat >= 0.10 - " -fi - REQUIRES=" haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix @@ -53,6 +38,22 @@ REQUIRES=" lib:libvpx$secondaryArchSuffix lib:libz$secondaryArchSuffix " + +PROVIDES_devel=" + ffmpeg_legacy${secondaryArchSuffix}_devel = $portVersion compat >= 0.10 + devel:libavcodec$secondaryArchSuffix = 53.61.100 compat >= 53 + devel:libavdevice$secondaryArchSuffix = 53.4.100 compat >= 53 + devel:libavfilter$secondaryArchSuffix = 2.61.100 compat >= 2 + devel:libavformat$secondaryArchSuffix = 53.32.100 compat >= 53 + devel:libavutil$secondaryArchSuffix = 51.35.100 compat >= 51 + devel:libpostproc$secondaryArchSuffix = 52.0.100 compat >= 52 + devel:libswresample$secondaryArchSuffix = 0.6.100 compat >= 0 + devel:libswscale$secondaryArchSuffix = 2.1.100 compat >= 2 + " +REQUIRES_devel=" + ffmpeg_legacy$secondaryArchSuffix == $portVersion + " + BUILD_REQUIRES=" devel:libbz2$secondaryArchSuffix devel:libogg$secondaryArchSuffix @@ -117,10 +118,6 @@ INSTALL() { make install - if [ $effectiveTargetArchitecture == x86_gcc2 ]; then - rm $binDir/ffprobe - fi - prepareInstalledDevelLibs \ libavcodec \ libavdevice \ @@ -140,26 +137,5 @@ INSTALL() packageEntries devel \ $developDir - # Remove stuff we don't need in the secondary architecture base package. - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $prefix/bin - rm -rf $documentationDir - fi + rm -rf $prefix/bin } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 0.10 - devel:libavcodec$secondaryArchSuffix = 53.61.100 compat >= 53 - devel:libavdevice$secondaryArchSuffix = 53.4.100 compat >= 53 - devel:libavfilter$secondaryArchSuffix = 2.61.100 compat >= 2 - devel:libavformat$secondaryArchSuffix = 53.32.100 compat >= 53 - devel:libavutil$secondaryArchSuffix = 51.35.100 compat >= 51 - devel:libpostproc$secondaryArchSuffix = 52.0.100 compat >= 52 - devel:libswresample$secondaryArchSuffix = 0.6.100 compat >= 0 - devel:libswscale$secondaryArchSuffix = 2.1.100 compat >= 2 - " -REQUIRES_devel=" - ffmpeg$secondaryArchSuffix == $portVersion - " diff --git a/media-video/ffmpeg/ffmpeg-0.11.5.recipe b/media-video/ffmpeg/ffmpeg_legacy-0.11.5.recipe similarity index 76% rename from media-video/ffmpeg/ffmpeg-0.11.5.recipe rename to media-video/ffmpeg/ffmpeg_legacy-0.11.5.recipe index f9f2d7f3c..c74aaca04 100644 --- a/media-video/ffmpeg/ffmpeg-0.11.5.recipe +++ b/media-video/ffmpeg/ffmpeg_legacy-0.11.5.recipe @@ -3,14 +3,10 @@ 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="http://www.ffmpeg.org" -LICENSE=" - GNU LGPL v2.1 - GNU GPL v2 - " -COPYRIGHT=" - 2000-2003 Fabrice Bellard - 2003-2014 the FFmpeg developers - " +LICENSE="GNU LGPL v2.1 + GNU GPL v2" +COPYRIGHT="2000-2003 Fabrice Bellard + 2003-2014 the FFmpeg developers" SOURCE_URI="http://www.ffmpeg.org/releases/ffmpeg-0.11.5.tar.bz2" CHECKSUM_SHA256="9492991f44d6757080f457c0aef83e68884dbfb925666806c7f7ea0389e5b8c0" REVISION="2" @@ -19,7 +15,7 @@ REVISION="2" # ffmpeg version 0.10. Do not unmark this as broken until the runtime issues are # actually fixed. ARCHITECTURES="!x86_gcc2 ?x86 x86_64" -SECONDARY_ARCHITECTURES="!x86_gcc2 x86" +SECONDARY_ARCHITECTURES="!x86_gcc2 !x86" if [ $effectiveTargetArchitecture == x86_gcc2 ]; then PATCHES="ffmpeg-0.11.5-gcc2.patch" @@ -28,7 +24,7 @@ else fi PROVIDES=" - ffmpeg$secondaryArchSuffix = $portVersion compat >= 0.11 + ffmpeg_legacy$secondaryArchSuffix = $portVersion compat >= 0.11 lib:libavutil$secondaryArchSuffix = 51.54.100 compat >= 51 lib:libavcodec$secondaryArchSuffix = 54.23.100 compat >= 54 lib:libavformat$secondaryArchSuffix = 54.6.100 compat >= 54 @@ -38,16 +34,6 @@ PROVIDES=" lib:libswresample$secondaryArchSuffix = 0.15.100 compat >= 0 " -# on x86_gcc2hybrid, the tools should be placed in $prefix/bin but -# compiled with GCC4, as the GCC2 version of FFmpeg cannot use SSE and -# other acceleration features even if the user's machine has them. -if [ -z "$secondaryArchSuffix" ] && [ "$effectiveTargetArchitecture" != "x86_gcc2" ]; then - PROVIDES="$PROVIDES - cmd:ffmpeg = $portVersion compat >= 0.11 - cmd:ffprobe = $portVersion compat >= 0.11 - cmd:ffserver = $portVersion compat >= 0.11 - " -fi REQUIRES=" haiku$secondaryArchSuffix @@ -62,6 +48,20 @@ REQUIRES=" lib:libz$secondaryArchSuffix " +PROVIDES_devel=" + ffmpeg_legacy${secondaryArchSuffix}_devel = $portVersion compat >= 0.11 + devel:libavutil$secondaryArchSuffix = 51.54.100 compat >= 51 + devel:libavcodec$secondaryArchSuffix = 54.23.100 compat >= 54 + devel:libavformat$secondaryArchSuffix = 54.6.100 compat >= 54 + devel:libavdevice$secondaryArchSuffix = 54.0.100 compat >= 54 + devel:libavfilter$secondaryArchSuffix = 2.77.100 compat >= 2 + devel:libswscale$secondaryArchSuffix = 2.1.100 compat >= 2 + devel:libswresample$secondaryArchSuffix = 0.15.100 compat >= 0 + " +REQUIRES_devel=" + ffmpeg_legacy$secondaryArchSuffix == $portVersion + " + BUILD_REQUIRES=" devel:libbz2$secondaryArchSuffix devel:libogg$secondaryArchSuffix @@ -71,7 +71,6 @@ BUILD_REQUIRES=" devel:libvpx$secondaryArchSuffix devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix @@ -137,12 +136,6 @@ INSTALL() if [ "$effectiveTargetArchitecture" == "x86_gcc2" ]; then rm -rf $prefix/bin fi - - rm -f $prefix/bin/ffprobe - # TODO: Determine and fix what is wrong with ffprobe! The executable - # seems to be broken. The NEEDED entries in the dynamic section look - # weird and the runtime loader fails relocating with "Operation not - # allowed". prepareInstalledDevelLibs \ libavcodec \ @@ -162,25 +155,5 @@ INSTALL() packageEntries devel \ $developDir - # Remove stuff we don't need in the secondary architecture base package. - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $prefix/bin - rm -rf $documentationDir - fi + rm -rf $prefix/bin } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 0.11 - devel:libavutil$secondaryArchSuffix = 51.54.100 compat >= 51 - devel:libavcodec$secondaryArchSuffix = 54.23.100 compat >= 54 - devel:libavformat$secondaryArchSuffix = 54.6.100 compat >= 54 - devel:libavdevice$secondaryArchSuffix = 54.0.100 compat >= 54 - devel:libavfilter$secondaryArchSuffix = 2.77.100 compat >= 2 - devel:libswscale$secondaryArchSuffix = 2.1.100 compat >= 2 - devel:libswresample$secondaryArchSuffix = 0.15.100 compat >= 0 - " -REQUIRES_devel=" - ffmpeg$secondaryArchSuffix == $portVersion - " diff --git a/media-video/ffmpeg/patches/ffmpeg-2.3.patch b/media-video/ffmpeg/patches/ffmpeg-2.3.patch deleted file mode 100644 index 3772ad52f..000000000 --- a/media-video/ffmpeg/patches/ffmpeg-2.3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b44fcd01d625972a8a4ee18cb72be1d0bd4cde38 Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Mon, 28 Jul 2014 15:54:14 -0400 -Subject: [PATCH] configure: remove invalid option. From a StackOverflow post. - ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 4ed43a0..6a81e3b 100755 ---- a/configure -+++ b/configure -@@ -4297,7 +4297,7 @@ void foo(void) { __asm__ volatile ("" ::); } - EOF - - _restrict= --for restrict_keyword in restrict __restrict__ __restrict; do -+for restrict_keyword in __restrict__ __restrict; do - check_cc <