From 267da6baf53a947b828be49a23899b40482739af Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 18 Apr 2020 13:56:09 +1000 Subject: [PATCH] gst_plugins: fix requires --- media-libs/gst_libav/gst_libav-1.16.2.recipe | 12 ++-- .../gst_plugins_bad-1.16.2.recipe | 65 ++++++++++--------- .../gst_plugins_good-1.16.2.recipe | 12 ++-- .../gst_plugins_ugly-1.16.2.recipe | 12 ++-- 4 files changed, 55 insertions(+), 46 deletions(-) diff --git a/media-libs/gst_libav/gst_libav-1.16.2.recipe b/media-libs/gst_libav/gst_libav-1.16.2.recipe index 195f4d547..6a89c2b87 100644 --- a/media-libs/gst_libav/gst_libav-1.16.2.recipe +++ b/media-libs/gst_libav/gst_libav-1.16.2.recipe @@ -6,7 +6,7 @@ HOMEPAGE="https://gstreamer.freedesktop.org/" COPYRIGHT="Erik Walthinsen" LICENSE="GNU LGPL v2 GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-$portVersion.tar.xz" CHECKSUM_SHA256="c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2" SOURCE_DIR="gst-libav-$portVersion" @@ -14,6 +14,8 @@ SOURCE_DIR="gst-libav-$portVersion" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" +libVersion="0.1602.0" + PROVIDES=" gst_libav$secondaryArchSuffix = $portVersion " @@ -39,10 +41,10 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix - devel:libgstapp_1.0$secondaryArchSuffix - devel:libgstaudio_1.0$secondaryArchSuffix - devel:libgstreamer_1.0$secondaryArchSuffix - devel:libgstvideo_1.0$secondaryArchSuffix + devel:libgstapp_1.0$secondaryArchSuffix >= $libVersion + devel:libgstaudio_1.0$secondaryArchSuffix >= $libVersion + devel:libgstreamer_1.0$secondaryArchSuffix >= $libVersion + devel:libgstvideo_1.0$secondaryArchSuffix >= $libVersion devel:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:liborc_0.4$secondaryArchSuffix diff --git a/media-libs/gst_plugins_bad/gst_plugins_bad-1.16.2.recipe b/media-libs/gst_plugins_bad/gst_plugins_bad-1.16.2.recipe index 12a94b6c1..5b1fb3d47 100644 --- a/media-libs/gst_plugins_bad/gst_plugins_bad-1.16.2.recipe +++ b/media-libs/gst_plugins_bad/gst_plugins_bad-1.16.2.recipe @@ -5,7 +5,7 @@ code review, some documentation, a set of tests, a real live maintainer, or some HOMEPAGE="https://gstreamer.freedesktop.org/" COPYRIGHT="Erik Walthinsen" LICENSE="GNU LGPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-$portVersion.tar.xz" CHECKSUM_SHA256="f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74" SOURCE_DIR="gst-plugins-bad-$portVersion" @@ -13,22 +13,25 @@ SOURCE_DIR="gst-plugins-bad-$portVersion" ARCHITECTURES="!x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" +libVersion="0.1602.0" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" gst_plugins_bad$secondaryArchSuffix = $portVersion - lib:libgstadaptivedemux_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - lib:libgstbadallocators_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - lib:libgstbadaudio_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - lib:libgstbadbase_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - lib:libgstbasecamerabinsrc_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - lib:libgstcodecparsers_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - lib:libgstinsertbin_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - lib:libgstisoff_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - lib:libgstmpegts_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - lib:libgstphotography_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - lib:libgstplayer_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - lib:libgstsctp_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - lib:libgsturidownloader_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - lib:libgstwebrtc_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 + lib:libgstadaptivedemux_1.0$secondaryArchSuffix = $libVersionCompat + lib:libgstbadallocators_1.0$secondaryArchSuffix = $libVersionCompat + lib:libgstbadaudio_1.0$secondaryArchSuffix = $libVersionCompat + lib:libgstbadbase_1.0$secondaryArchSuffix = $libVersionCompat + lib:libgstbasecamerabinsrc_1.0$secondaryArchSuffix = $libVersionCompat + lib:libgstcodecparsers_1.0$secondaryArchSuffix = $libVersionCompat + lib:libgstinsertbin_1.0$secondaryArchSuffix = $libVersionCompat + lib:libgstisoff_1.0$secondaryArchSuffix = $libVersionCompat + lib:libgstmpegts_1.0$secondaryArchSuffix = $libVersionCompat + lib:libgstphotography_1.0$secondaryArchSuffix = $libVersionCompat + lib:libgstplayer_1.0$secondaryArchSuffix = $libVersionCompat + lib:libgstsctp_1.0$secondaryArchSuffix = $libVersionCompat + lib:libgsturidownloader_1.0$secondaryArchSuffix = $libVersionCompat + lib:libgstwebrtc_1.0$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -69,18 +72,18 @@ SUPPLEMENTS=" PROVIDES_devel=" gst_plugins_bad${secondaryArchSuffix}_devel = $portVersion - devel:libgstadaptivedemux_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - devel:libgstbadaudio_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - devel:libgstbasecamerabinsrc_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - devel:libgstcodecparsers_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - devel:libgstinsertbin_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - devel:libgstisoff_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - devel:libgstmpegts_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - devel:libgstphotography_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - devel:libgstplayer_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - devel:libgstsctp_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - devel:libgsturidownloader_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 - devel:libgstwebrtc_1.0$secondaryArchSuffix = 0.1602.0 compat >= 0 + devel:libgstadaptivedemux_1.0$secondaryArchSuffix = $libVersionCompat + devel:libgstbadaudio_1.0$secondaryArchSuffix = $libVersionCompat + devel:libgstbasecamerabinsrc_1.0$secondaryArchSuffix = $libVersionCompat + devel:libgstcodecparsers_1.0$secondaryArchSuffix = $libVersionCompat + devel:libgstinsertbin_1.0$secondaryArchSuffix = $libVersionCompat + devel:libgstisoff_1.0$secondaryArchSuffix = $libVersionCompat + devel:libgstmpegts_1.0$secondaryArchSuffix = $libVersionCompat + devel:libgstphotography_1.0$secondaryArchSuffix = $libVersionCompat + devel:libgstplayer_1.0$secondaryArchSuffix = $libVersionCompat + devel:libgstsctp_1.0$secondaryArchSuffix = $libVersionCompat + devel:libgsturidownloader_1.0$secondaryArchSuffix = $libVersionCompat + devel:libgstwebrtc_1.0$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" gst_plugins_bad${secondaryArchSuffix} == $portVersion base @@ -97,10 +100,10 @@ BUILD_REQUIRES=" devel:libfreetype$secondaryArchSuffix devel:libgcrypt$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix - devel:libgstapp_1.0$secondaryArchSuffix - devel:libgstaudio_1.0$secondaryArchSuffix - devel:libgstreamer_1.0$secondaryArchSuffix - devel:libgstvideo_1.0$secondaryArchSuffix + devel:libgstapp_1.0$secondaryArchSuffix >= $libVersion + devel:libgstaudio_1.0$secondaryArchSuffix >= $libVersion + devel:libgstreamer_1.0$secondaryArchSuffix >= $libVersion + devel:libgstvideo_1.0$secondaryArchSuffix >= $libVersion devel:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix diff --git a/media-libs/gst_plugins_good/gst_plugins_good-1.16.2.recipe b/media-libs/gst_plugins_good/gst_plugins_good-1.16.2.recipe index 97fcac33e..445465964 100644 --- a/media-libs/gst_plugins_good/gst_plugins_good-1.16.2.recipe +++ b/media-libs/gst_plugins_good/gst_plugins_good-1.16.2.recipe @@ -5,7 +5,7 @@ for the supporting library)." HOMEPAGE="https://gstreamer.freedesktop.org/" COPYRIGHT="Erik Walthinsen" LICENSE="GNU LGPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$portVersion.tar.xz" CHECKSUM_SHA256="40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319" SOURCE_DIR="gst-plugins-good-$portVersion" @@ -18,6 +18,8 @@ SOURCE_DIR_2="gsthaikuaudiosink-$sinkVersion" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" +libVersion="0.1602.0" + PROVIDES=" gst_plugins_good$secondaryArchSuffix = $portVersion " @@ -59,10 +61,10 @@ BUILD_REQUIRES=" devel:libflac$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix - devel:libgstapp_1.0$secondaryArchSuffix - devel:libgstaudio_1.0$secondaryArchSuffix - devel:libgstreamer_1.0$secondaryArchSuffix - devel:libgstvideo_1.0$secondaryArchSuffix + devel:libgstapp_1.0$secondaryArchSuffix >= libVersion + devel:libgstaudio_1.0$secondaryArchSuffix >= libVersion + devel:libgstreamer_1.0$secondaryArchSuffix >= libVersion + devel:libgstvideo_1.0$secondaryArchSuffix >= libVersion devel:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix diff --git a/media-libs/gst_plugins_ugly/gst_plugins_ugly-1.16.2.recipe b/media-libs/gst_plugins_ugly/gst_plugins_ugly-1.16.2.recipe index d9c107805..7b40b3f3f 100644 --- a/media-libs/gst_plugins_ugly/gst_plugins_ugly-1.16.2.recipe +++ b/media-libs/gst_plugins_ugly/gst_plugins_ugly-1.16.2.recipe @@ -6,7 +6,7 @@ code might be widely known to present patent problems." HOMEPAGE="https://gstreamer.freedesktop.org/" COPYRIGHT="Erik Walthinsen" LICENSE="GNU LGPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-$portVersion.tar.xz" CHECKSUM_SHA256="5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca" SOURCE_DIR="gst-plugins-ugly-$portVersion" @@ -14,6 +14,8 @@ SOURCE_DIR="gst-plugins-ugly-$portVersion" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" +libVersion="0.1602.0" + PROVIDES=" gst_plugins_ugly$secondaryArchSuffix = $portVersion " @@ -48,10 +50,10 @@ BUILD_REQUIRES=" devel:libcurl$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix - devel:libgstapp_1.0$secondaryArchSuffix - devel:libgstaudio_1.0$secondaryArchSuffix - devel:libgstreamer_1.0$secondaryArchSuffix - devel:libgstvideo_1.0$secondaryArchSuffix + devel:libgstapp_1.0$secondaryArchSuffix >= $libVersion + devel:libgstaudio_1.0$secondaryArchSuffix >= $libVersion + devel:libgstreamer_1.0$secondaryArchSuffix >= $libVersion + devel:libgstvideo_1.0$secondaryArchSuffix >= $libVersion devel:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix