From 713a4530e361aeba83ca69a98f7d759fc0ca775e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 18 Feb 2016 22:44:58 +0000 Subject: [PATCH] ffmpeg: renamed 2.x recipes.. * to maintain compatibility with packages built with such versions. * remove commands, docs, data. --- ...mpeg-2.6.3.recipe => ffmpeg2-2.6.3.recipe} | 21 +++++-------------- ...mpeg-2.7.2.recipe => ffmpeg2-2.7.2.recipe} | 21 +++++-------------- ...mpeg-2.8.6.recipe => ffmpeg2-2.8.6.recipe} | 21 +++++-------------- 3 files changed, 15 insertions(+), 48 deletions(-) rename media-video/ffmpeg/{ffmpeg-2.6.3.recipe => ffmpeg2-2.6.3.recipe} (89%) rename media-video/ffmpeg/{ffmpeg-2.7.2.recipe => ffmpeg2-2.7.2.recipe} (89%) rename media-video/ffmpeg/{ffmpeg-2.8.6.recipe => ffmpeg2-2.8.6.recipe} (89%) diff --git a/media-video/ffmpeg/ffmpeg-2.6.3.recipe b/media-video/ffmpeg/ffmpeg2-2.6.3.recipe similarity index 89% rename from media-video/ffmpeg/ffmpeg-2.6.3.recipe rename to media-video/ffmpeg/ffmpeg2-2.6.3.recipe index dc7f96dac..dadff6961 100644 --- a/media-video/ffmpeg/ffmpeg-2.6.3.recipe +++ b/media-video/ffmpeg/ffmpeg2-2.6.3.recipe @@ -15,10 +15,7 @@ ARCHITECTURES="!x86_gcc2 x86 x86_64" 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 + 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 @@ -46,7 +43,7 @@ CONFLICTS=" " PROVIDES_devel=" - ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 2.4 + 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 @@ -58,11 +55,12 @@ PROVIDES_devel=" devel:libpostproc$secondaryArchSuffix = 53.3.100 compat >= 53 " REQUIRES_devel=" - ffmpeg$secondaryArchSuffix == $portVersion base + ffmpeg2$secondaryArchSuffix == $portVersion base devel:libspeex$secondaryArchSuffix " CONFLICTS_devel=" ffmpeg_legacy${secondaryArchSuffix}_devel + ffmpeg${secondaryArchSuffix}_devel " BUILD_REQUIRES=" @@ -162,19 +160,10 @@ INSTALL() $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 + rm -rf $prefix/share $binDir $manDir $dataDir # devel package packageEntries devel \ - $dataDir/ffmpeg$secondaryArchSuffix/examples \ - $manDir/man3 \ - $docDir \ $developDir } diff --git a/media-video/ffmpeg/ffmpeg-2.7.2.recipe b/media-video/ffmpeg/ffmpeg2-2.7.2.recipe similarity index 89% rename from media-video/ffmpeg/ffmpeg-2.7.2.recipe rename to media-video/ffmpeg/ffmpeg2-2.7.2.recipe index cd42bdca5..eff8819e6 100644 --- a/media-video/ffmpeg/ffmpeg-2.7.2.recipe +++ b/media-video/ffmpeg/ffmpeg2-2.7.2.recipe @@ -15,10 +15,7 @@ ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" - ffmpeg$secondaryArchSuffix = $portVersion compat >= 2.7 - cmd:ffmpeg = $portVersion compat >= 2.7 - cmd:ffprobe = $portVersion compat >= 2.7 - cmd:ffserver = $portVersion compat >= 2.7 + 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 @@ -47,7 +44,7 @@ CONFLICTS=" " PROVIDES_devel=" - ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 2.4 + 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 @@ -59,10 +56,11 @@ PROVIDES_devel=" devel:libpostproc$secondaryArchSuffix = 53.3.100 compat >= 53 " REQUIRES_devel=" - ffmpeg$secondaryArchSuffix == $portVersion base + ffmpeg2$secondaryArchSuffix == $portVersion base devel:libspeex$secondaryArchSuffix " CONFLICTS_devel=" + ffmpeg_legacy${secondaryArchSuffix}_devel ffmpeg${secondaryArchSuffix}_devel " @@ -164,19 +162,10 @@ INSTALL() $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 + rm -rf $prefix/share $binDir $manDir $dataDir # devel package packageEntries devel \ - $dataDir/ffmpeg$secondaryArchSuffix/examples \ - $manDir/man3 \ - $docDir \ $developDir } diff --git a/media-video/ffmpeg/ffmpeg-2.8.6.recipe b/media-video/ffmpeg/ffmpeg2-2.8.6.recipe similarity index 89% rename from media-video/ffmpeg/ffmpeg-2.8.6.recipe rename to media-video/ffmpeg/ffmpeg2-2.8.6.recipe index 0640a04c9..f72dc3081 100644 --- a/media-video/ffmpeg/ffmpeg-2.8.6.recipe +++ b/media-video/ffmpeg/ffmpeg2-2.8.6.recipe @@ -15,10 +15,7 @@ ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" - ffmpeg$secondaryArchSuffix = $portVersion compat >= 2.8 - cmd:ffmpeg = $portVersion compat >= 2.8 - cmd:ffprobe = $portVersion compat >= 2.8 - cmd:ffserver = $portVersion compat >= 2.8 + ffmpeg2$secondaryArchSuffix = $portVersion compat >= 2.8 lib:libavutil$secondaryArchSuffix = 54.31.100 compat >= 54 lib:libavcodec$secondaryArchSuffix = 56.60.100 compat >= 56 lib:libavformat$secondaryArchSuffix = 56.40.101 compat >= 56 @@ -47,7 +44,7 @@ CONFLICTS=" " PROVIDES_devel=" - ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 2.4 + ffmpeg2${secondaryArchSuffix}_devel = $portVersion compat >= 2.4 devel:libavutil$secondaryArchSuffix = 54.31.100 compat >= 54 devel:libavcodec$secondaryArchSuffix = 56.60.100 compat >= 56 devel:libavformat$secondaryArchSuffix = 56.40.101 compat >= 56 @@ -59,10 +56,11 @@ PROVIDES_devel=" devel:libpostproc$secondaryArchSuffix = 53.3.100 compat >= 53 " REQUIRES_devel=" - ffmpeg$secondaryArchSuffix == $portVersion base + ffmpeg2$secondaryArchSuffix == $portVersion base devel:libspeex$secondaryArchSuffix " CONFLICTS_devel=" + ffmpeg_legacy${secondaryArchSuffix}_devel ffmpeg${secondaryArchSuffix}_devel " @@ -165,19 +163,10 @@ INSTALL() $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 + rm -rf $prefix/share $binDir $manDir $dataDir # devel package packageEntries devel \ - $dataDir/ffmpeg$secondaryArchSuffix/examples \ - $manDir/man3 \ - $docDir \ $developDir }