diff --git a/media-video/ffmpeg/ffmpeg-3.0.1.recipe b/media-video/ffmpeg/ffmpeg-3.0.2.recipe similarity index 93% rename from media-video/ffmpeg/ffmpeg-3.0.1.recipe rename to media-video/ffmpeg/ffmpeg-3.0.2.recipe index 1f198e3c6..14eb1c438 100644 --- a/media-video/ffmpeg/ffmpeg-3.0.1.recipe +++ b/media-video/ffmpeg/ffmpeg-3.0.2.recipe @@ -2,18 +2,19 @@ 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" +HOMEPAGE="https://ffmpeg.org/" COPYRIGHT="2000-2003 Fabrice Bellard 2003-2016 the FFmpeg developers" -SOURCE_URI="http://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz" -CHECKSUM_SHA256="c389ca5e3c29e758dd82ee6981130fe79e73b06e26db1a3aa971daea63598bc1" +LICENSE="GNU LGPL v2.1 + GNU GPL v2" REVISION="1" -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" +SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz" +CHECKSUM_SHA256="82943cc7b0c4d14b612404de0dd7b24cd8ca3511d51e4fd3ae36b2d71bb95223" PATCHES="ffmpeg-$portVersion.patchset" +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" + PROVIDES=" ffmpeg$secondaryArchSuffix = $portVersion compat >= 3.0 cmd:ffmpeg = $portVersion compat >= 3.0 @@ -45,6 +46,7 @@ REQUIRES=" " CONFLICTS=" ffmpeg_legacy$secondaryArchSuffix + ffmpeg2${secondaryArchSuffix}_bin " PROVIDES_devel=" @@ -64,7 +66,8 @@ REQUIRES_devel=" devel:libspeex$secondaryArchSuffix " CONFLICTS_devel=" - ffmpeg${secondaryArchSuffix}_devel + ffmpeg_legacy${secondaryArchSuffix}_devel + ffmpeg2${secondaryArchSuffix}_devel " BUILD_REQUIRES=" @@ -82,6 +85,7 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix >= 5 cmd:ld$secondaryArchSuffix cmd:awk + cmd:cmp cmd:grep cmd:make cmd:perl @@ -89,7 +93,6 @@ BUILD_PREREQUIRES=" cmd:sed cmd:texi2html cmd:yasm - cmd:cmp " GLOBAL_WRITABLE_FILES=" diff --git a/media-video/ffmpeg/ffmpeg2-2.6.3.recipe b/media-video/ffmpeg/ffmpeg2-2.6.3.recipe deleted file mode 100644 index dadff6961..000000000 --- a/media-video/ffmpeg/ffmpeg2-2.6.3.recipe +++ /dev/null @@ -1,173 +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-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_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - ffmpeg2$secondaryArchSuffix = $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 - lib:libavdevice$secondaryArchSuffix = 56.4.100 compat >= 56 - lib:libavfilter$secondaryArchSuffix = 5.11.102 compat >= 5 - lib:libavresample$secondaryArchSuffix = 2.1.0 compat >= 2 - lib:libswscale$secondaryArchSuffix = 3.1.101 compat >= 3 - lib:libswresample$secondaryArchSuffix = 1.1.100 compat >= 1 - lib:libpostproc$secondaryArchSuffix = 53.3.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 - " -CONFLICTS=" - ffmpeg_legacy$secondaryArchSuffix - " - -PROVIDES_devel=" - ffmpeg2${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=" - ffmpeg2$secondaryArchSuffix == $portVersion base - devel:libspeex$secondaryArchSuffix - " -CONFLICTS_devel=" - ffmpeg_legacy${secondaryArchSuffix}_devel - ffmpeg${secondaryArchSuffix}_devel - " - -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 - " - -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 \ - --progs-suffix=-26 - - 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 - - rm -rf $prefix/share $binDir $manDir $dataDir - - # devel package - packageEntries devel \ - $developDir -} - -TEST() -{ - make check -} diff --git a/media-video/ffmpeg/ffmpeg2-2.7.2.recipe b/media-video/ffmpeg/ffmpeg2-2.7.2.recipe deleted file mode 100644 index eff8819e6..000000000 --- a/media-video/ffmpeg/ffmpeg2-2.7.2.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-2015 the FFmpeg developers" -SOURCE_URI="http://www.ffmpeg.org/releases/ffmpeg-$portVersion.tar.bz2" -CHECKSUM_SHA256="7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2" -SOURCE_DIR="ffmpeg-$portVersion" -REVISION="1" -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - ffmpeg2$secondaryArchSuffix = $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 - lib:libavdevice$secondaryArchSuffix = 56.4.100 compat >= 56 - lib:libavfilter$secondaryArchSuffix = 5.16.101 compat >= 5 - lib:libavresample$secondaryArchSuffix = 2.1.0 compat >= 2 - lib:libswscale$secondaryArchSuffix = 3.1.101 compat >= 3 - lib:libswresample$secondaryArchSuffix = 1.2.100 compat >= 1 - lib:libpostproc$secondaryArchSuffix = 53.3.100 compat >= 53 - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix - lib:libogg$secondaryArchSuffix - lib:libspeex$secondaryArchSuffix - lib:libmodplug$secondaryArchSuffix - lib:libtheoradec$secondaryArchSuffix - lib:libtheoraenc$secondaryArchSuffix - lib:libvorbis$secondaryArchSuffix - lib:libvorbisenc$secondaryArchSuffix - lib:libvpx$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " -CONFLICTS=" - ffmpeg_legacy$secondaryArchSuffix - " - -PROVIDES_devel=" - ffmpeg2${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=" - ffmpeg2$secondaryArchSuffix == $portVersion base - devel:libspeex$secondaryArchSuffix - " -CONFLICTS_devel=" - ffmpeg_legacy${secondaryArchSuffix}_devel - ffmpeg${secondaryArchSuffix}_devel - " - -BUILD_REQUIRES=" - devel:libbz2$secondaryArchSuffix - devel:libmodplug$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 - " - -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-libmodplug \ - --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 - - rm -rf $prefix/share $binDir $manDir $dataDir - - # devel package - packageEntries devel \ - $developDir -} - -TEST() -{ - make check -} diff --git a/media-video/ffmpeg/ffmpeg2-2.8.6.recipe b/media-video/ffmpeg/ffmpeg2-2.8.7.recipe similarity index 86% rename from media-video/ffmpeg/ffmpeg2-2.8.6.recipe rename to media-video/ffmpeg/ffmpeg2-2.8.7.recipe index 0bdf1d794..8be99b60b 100644 --- a/media-video/ffmpeg/ffmpeg2-2.8.6.recipe +++ b/media-video/ffmpeg/ffmpeg2-2.8.7.recipe @@ -2,19 +2,20 @@ 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" +HOMEPAGE="https://ffmpeg.org/" COPYRIGHT="2000-2003 Fabrice Bellard 2003-2016 the FFmpeg developers" -SOURCE_URI="http://www.ffmpeg.org/releases/ffmpeg-$portVersion.tar.bz2" -CHECKSUM_SHA256="40611e329bc354592c6f8f1deb033c31b91f80e91f5707ca4f9afceca78d8e62" -SOURCE_DIR="ffmpeg-$portVersion" +LICENSE="GNU LGPL v2.1 + GNU GPL v2" REVISION="1" -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" +SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz" +CHECKSUM_SHA256="97be8a6c1cab2c52015544f76d40f6fd0babcb1b40cf601b4e57fb818564157c" +SOURCE_DIR="ffmpeg-$portVersion" PATCHES="ffmpeg-$portVersion.patchset" +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" + PROVIDES=" ffmpeg2$secondaryArchSuffix = $portVersion compat >= 2.8 lib:libavutil$secondaryArchSuffix = 54.31.100 compat >= 54 @@ -40,9 +41,6 @@ REQUIRES=" lib:libvpx$secondaryArchSuffix lib:libz$secondaryArchSuffix " -CONFLICTS=" - ffmpeg_legacy$secondaryArchSuffix - " PROVIDES_devel=" ffmpeg2${secondaryArchSuffix}_devel = $portVersion compat >= 2.4 @@ -65,6 +63,22 @@ CONFLICTS_devel=" ffmpeg${secondaryArchSuffix}_devel " +SUMMARY_bin="Command line tools for ffmpeg-2.8.x" +PROVIDES_bin=" + ffmpeg2${secondaryArchSuffix}_bin = $portVersion compat >= 2.8 + cmd:ffmpeg = $portVersion compat >= 2.8 + cmd:ffprobe = $portVersion compat >= 2.8 + cmd:ffserver = $portVersion compat >= 2.8 + " +REQUIRES_bin=" + haiku$secondaryArchSuffix + ffmpeg2$secondaryArchSuffix == $portVersion base + " +CONFLICTS_bin=" + ffmpeg_legacy$secondaryArchSuffix + ffmpeg$secondaryArchSuffix + " + BUILD_REQUIRES=" devel:libbz2$secondaryArchSuffix devel:libmodplug$secondaryArchSuffix @@ -80,6 +94,7 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:awk + cmd:cmp cmd:grep cmd:make cmd:perl @@ -87,7 +102,6 @@ BUILD_PREREQUIRES=" cmd:sed cmd:texi2html cmd:yasm - cmd:cmp " GLOBAL_WRITABLE_FILES=" @@ -164,11 +178,17 @@ INSTALL() $developLibDir/pkgconfig/libavfilter.pc \ $developLibDir/pkgconfig/libavformat.pc - rm -rf $prefix/share $binDir $manDir $dataDir + rm -rf $prefix/share $dataDir + + # bin package + packageEntries bin \ + $prefix/bin \ + $manDir/man1 # devel package packageEntries devel \ - $developDir + $developDir \ + $manDir } TEST() diff --git a/media-video/ffmpeg/patches/ffmpeg-2.8.6.patchset b/media-video/ffmpeg/patches/ffmpeg-2.8.7.patchset similarity index 89% rename from media-video/ffmpeg/patches/ffmpeg-2.8.6.patchset rename to media-video/ffmpeg/patches/ffmpeg-2.8.7.patchset index 05dc29cae..eb828000d 100644 --- a/media-video/ffmpeg/patches/ffmpeg-2.8.6.patchset +++ b/media-video/ffmpeg/patches/ffmpeg-2.8.7.patchset @@ -8,7 +8,7 @@ diff --git a/configure b/configure index 475c087..5a95b97 100755 --- a/configure +++ b/configure -@@ -6052,6 +6052,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt +@@ -5783,6 +5783,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt if test $target_os = "haiku"; then disable memalign disable posix_memalign diff --git a/media-video/ffmpeg/patches/ffmpeg-3.0.1.patchset b/media-video/ffmpeg/patches/ffmpeg-3.0.2.patchset similarity index 89% rename from media-video/ffmpeg/patches/ffmpeg-3.0.1.patchset rename to media-video/ffmpeg/patches/ffmpeg-3.0.2.patchset index 05dc29cae..c5a00684e 100644 --- a/media-video/ffmpeg/patches/ffmpeg-3.0.1.patchset +++ b/media-video/ffmpeg/patches/ffmpeg-3.0.2.patchset @@ -8,7 +8,7 @@ diff --git a/configure b/configure index 475c087..5a95b97 100755 --- a/configure +++ b/configure -@@ -6052,6 +6052,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt +@@ -6040,6 +6040,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt if test $target_os = "haiku"; then disable memalign disable posix_memalign