From 406cc5a2cfc1aff1839c1bbd28067f2cbab2e336 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 9 Aug 2024 12:53:01 -0400 Subject: [PATCH] ffmpeg: Bump revisions and disable devel: provides of older versions. --- media-video/ffmpeg/ffmpeg-4.2.9.recipe | 16 ++++++++-------- media-video/ffmpeg/ffmpeg5-5.1.4.recipe | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.2.9.recipe b/media-video/ffmpeg/ffmpeg-4.2.9.recipe index 0157cbd53..eb726b1ad 100644 --- a/media-video/ffmpeg/ffmpeg-4.2.9.recipe +++ b/media-video/ffmpeg/ffmpeg-4.2.9.recipe @@ -6,7 +6,7 @@ HOMEPAGE="https://ffmpeg.org/" COPYRIGHT="2000-2003 Fabrice Bellard 2003-2023 the FFmpeg developers" LICENSE="GNU LGPL v3" -REVISION="3" +REVISION="4" SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz" CHECKSUM_SHA256="4974d62e7507ba3b26fa5f30af8ee36825917ddb4a1ad4118277698c1c8818cf" PATCHES="ffmpeg-$portVersion.patchset" @@ -120,13 +120,13 @@ REQUIRES_tools=" PROVIDES_devel=" ffmpeg${secondaryArchSuffix}_devel = $portVersionCompat - devel:libavcodec$secondaryArchSuffix = $libavcodecVersionCompat - devel:libavdevice$secondaryArchSuffix = $libavdeviceVersionCompat - devel:libavfilter$secondaryArchSuffix = $libavfilterVersionCompat - devel:libavformat$secondaryArchSuffix = $libavformatVersionCompat - devel:libavutil$secondaryArchSuffix = $libavutilVersionCompat - devel:libswresample$secondaryArchSuffix = $libswresampleVersionCompat - devel:libswscale$secondaryArchSuffix = $libswscaleVersionCompat +# devel:libavcodec$secondaryArchSuffix = $libavcodecVersionCompat +# devel:libavdevice$secondaryArchSuffix = $libavdeviceVersionCompat +# devel:libavfilter$secondaryArchSuffix = $libavfilterVersionCompat +# devel:libavformat$secondaryArchSuffix = $libavformatVersionCompat +# devel:libavutil$secondaryArchSuffix = $libavutilVersionCompat +# devel:libswresample$secondaryArchSuffix = $libswresampleVersionCompat +# devel:libswscale$secondaryArchSuffix = $libswscaleVersionCompat " REQUIRES_devel=" ffmpeg$secondaryArchSuffix == $portVersion base diff --git a/media-video/ffmpeg/ffmpeg5-5.1.4.recipe b/media-video/ffmpeg/ffmpeg5-5.1.4.recipe index ecacaf29f..48ba70d0d 100644 --- a/media-video/ffmpeg/ffmpeg5-5.1.4.recipe +++ b/media-video/ffmpeg/ffmpeg5-5.1.4.recipe @@ -6,7 +6,7 @@ HOMEPAGE="https://ffmpeg.org/" COPYRIGHT="2000-2003 Fabrice Bellard 2003-2023 the FFmpeg developers" LICENSE="GNU LGPL v3" -REVISION="2" +REVISION="3" SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz" CHECKSUM_SHA256="54383bb890a1cd62580e9f1eaa8081203196ed53bde9e98fb6b0004423f49063" PATCHES="ffmpeg-$portVersion.patchset" @@ -124,13 +124,13 @@ CONFLICTS_tools=" PROVIDES_devel=" ffmpeg5${secondaryArchSuffix}_devel = $portVersionCompat - devel:libavcodec$secondaryArchSuffix = $libavcodecVersionCompat - devel:libavdevice$secondaryArchSuffix = $libavdeviceVersionCompat - devel:libavfilter$secondaryArchSuffix = $libavfilterVersionCompat - devel:libavformat$secondaryArchSuffix = $libavformatVersionCompat - devel:libavutil$secondaryArchSuffix = $libavutilVersionCompat - devel:libswresample$secondaryArchSuffix = $libswresampleVersionCompat - devel:libswscale$secondaryArchSuffix = $libswscaleVersionCompat +# devel:libavcodec$secondaryArchSuffix = $libavcodecVersionCompat +# devel:libavdevice$secondaryArchSuffix = $libavdeviceVersionCompat +# devel:libavfilter$secondaryArchSuffix = $libavfilterVersionCompat +# devel:libavformat$secondaryArchSuffix = $libavformatVersionCompat +# devel:libavutil$secondaryArchSuffix = $libavutilVersionCompat +# devel:libswresample$secondaryArchSuffix = $libswresampleVersionCompat +# devel:libswscale$secondaryArchSuffix = $libswscaleVersionCompat " REQUIRES_devel=" ffmpeg5$secondaryArchSuffix == $portVersion base