From 02f57d89d7377105552fa97271033a59d74ccf3f Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 17 Jul 2017 22:06:16 +1000 Subject: [PATCH] gstreamer and plugins: make plugins as suppliments --- media-libs/gst_libav/gst_libav-1.12.2.recipe | 17 +++++++++++------ .../gst_plugins_bad-1.12.2.recipe | 19 +++++++++++-------- .../gst_plugins_base-1.12.2.recipe | 9 +++++---- .../gst_plugins_good-1.12.2.recipe | 16 +++++++++++----- .../gst_plugins_ugly-1.12.2.recipe | 16 +++++++++++----- media-libs/gstreamer/gstreamer-1.12.2.recipe | 2 +- 6 files changed, 50 insertions(+), 29 deletions(-) diff --git a/media-libs/gst_libav/gst_libav-1.12.2.recipe b/media-libs/gst_libav/gst_libav-1.12.2.recipe index 2de4fd968..3bf65062b 100644 --- a/media-libs/gst_libav/gst_libav-1.12.2.recipe +++ b/media-libs/gst_libav/gst_libav-1.12.2.recipe @@ -5,9 +5,9 @@ conversion elements." HOMEPAGE="https://gstreamer.freedesktop.org/" COPYRIGHT="Erik Walthinsen" LICENSE="GNU LGPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-$portVersion.tar.xz" -CHECKSUM_SHA256="55d7823fdf63195de991adfef32db4b8a8bef3cafa46115a951e590dc18a5077" +CHECKSUM_SHA256="5bb735b9bb218b652ae4071ea6f6be8eaae55e9d3233aec2f36b882a27542db3" SOURCE_DIR="gst-libav-$portVersion" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -18,23 +18,29 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - gst_plugins_base_1.0$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix + lib:libgstapp_1.0$secondaryArchSuffix + lib:libgstaudio_1.0$secondaryArchSuffix lib:libgstreamer_1.0$secondaryArchSuffix + lib:libgstvideo_1.0$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:liborc_0.4$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix " - +SUPPLEMENTS=" + gstreamer_1.0$secondaryArchSuffix + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - gst_plugins_base_1.0${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:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:liborc_0.4$secondaryArchSuffix @@ -57,7 +63,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix cmd:python cmd:which -# cmd:yasm " BUILD() diff --git a/media-libs/gst_plugins_bad/gst_plugins_bad-1.12.2.recipe b/media-libs/gst_plugins_bad/gst_plugins_bad-1.12.2.recipe index 46171ef65..8e93a9ea8 100644 --- a/media-libs/gst_plugins_bad/gst_plugins_bad-1.12.2.recipe +++ b/media-libs/gst_plugins_bad/gst_plugins_bad-1.12.2.recipe @@ -5,9 +5,9 @@ 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="1" +REVISION="2" SOURCE_URI="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-$portVersion.tar.xz" -CHECKSUM_SHA256="7def8049d1c44e50199023159dfada60af58fd503ef58a020b79044bda705b97" +CHECKSUM_SHA256="9c2c7edde4f59d74eb414e0701c55131f562e5c605a3ce9b091754f106c09e37" SOURCE_DIR="gst-plugins-bad-$portVersion" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -30,14 +30,16 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - gst_plugins_base_1.0$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libfaad$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix + lib:libgstapp_1.0$secondaryArchSuffix + lib:libgstaudio_1.0$secondaryArchSuffix lib:libgstreamer_1.0$secondaryArchSuffix + lib:libgstvideo_1.0$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix @@ -48,7 +50,9 @@ REQUIRES=" lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix " - +SUPPLEMENTS=" + gstreamer_1.0$secondaryArchSuffix + " PROVIDES_devel=" gst_plugins_bad_1.0${secondaryArchSuffix}_devel = $portVersion devel:libgstadaptivedemux_1.0$secondaryArchSuffix = $portVersion @@ -64,22 +68,22 @@ PROVIDES_devel=" devel:libgstplayer_1.0$secondaryArchSuffix = $portVersion devel:libgsturidownloader_1.0$secondaryArchSuffix = $portVersion " - REQUIRES_devel=" haiku$secondaryArchSuffix gst_plugins_bad_1.0${secondaryArchSuffix} " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - gst_plugins_base_1.0${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix devel:libcurl$secondaryArchSuffix devel:libfaad$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:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix @@ -90,7 +94,6 @@ BUILD_REQUIRES=" devel:libxml2$secondaryArchSuffix devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf diff --git a/media-libs/gst_plugins_base/gst_plugins_base-1.12.2.recipe b/media-libs/gst_plugins_base/gst_plugins_base-1.12.2.recipe index df1726a8b..36f788aa3 100644 --- a/media-libs/gst_plugins_base/gst_plugins_base-1.12.2.recipe +++ b/media-libs/gst_plugins_base/gst_plugins_base-1.12.2.recipe @@ -7,9 +7,9 @@ filters are included." HOMEPAGE="https://gstreamer.freedesktop.org/" COPYRIGHT="Erik Walthinsen" LICENSE="GNU LGPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$portVersion.tar.xz" -CHECKSUM_SHA256="0cce9fadb574a840b3c9d31b69faf57aad6c5543c3b134a7b935de866c9e0465" +CHECKSUM_SHA256="5067dce3afe197a9536fea0107c77213fab536dff4a213b07fc60378d5510675" SOURCE_DIR="gst-plugins-base-$portVersion" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -47,7 +47,9 @@ REQUIRES=" lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix " - +SUPPLEMENTS=" + gstreamer_1.0$secondaryArchSuffix + " PROVIDES_devel=" gst_plugins_base_1.0${secondaryArchSuffix}_devel = $portVersion devel:libgstallocators_1.0$secondaryArchSuffix = $portVersion @@ -66,7 +68,6 @@ REQUIRES_devel=" gst_plugins_base_1.0$secondaryArchSuffix == $portVersion base haiku$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libfreetype$secondaryArchSuffix diff --git a/media-libs/gst_plugins_good/gst_plugins_good-1.12.2.recipe b/media-libs/gst_plugins_good/gst_plugins_good-1.12.2.recipe index 3c8464ded..610a49f05 100644 --- a/media-libs/gst_plugins_good/gst_plugins_good-1.12.2.recipe +++ b/media-libs/gst_plugins_good/gst_plugins_good-1.12.2.recipe @@ -5,9 +5,9 @@ for the supporting library)." HOMEPAGE="https://gstreamer.freedesktop.org/" COPYRIGHT="Erik Walthinsen" LICENSE="GNU LGPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$portVersion.tar.xz" -CHECKSUM_SHA256="121e8e46a7f0e622f09ec9be012607b89d737dd72d48b0f2f0680821ae2cf54b" +CHECKSUM_SHA256="5591ee7208ab30289a30658a82b76bf87169c927572d9b794f3a41ed48e1ee96" SOURCE_DIR="gst-plugins-good-$portVersion" gitCommit="c3a7bfbdd780e6adb8f4d5c5f7369586491a3250" @@ -23,12 +23,14 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - gst_plugins_base_1.0$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libflac$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix + lib:libgstapp_1.0$secondaryArchSuffix + lib:libgstaudio_1.0$secondaryArchSuffix lib:libgstreamer_1.0$secondaryArchSuffix + lib:libgstvideo_1.0$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix @@ -44,15 +46,19 @@ REQUIRES=" lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix " - +SUPPLEMENTS=" + gstreamer_1.0$secondaryArchSuffix + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - gst_plugins_base_1.0${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix 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:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix diff --git a/media-libs/gst_plugins_ugly/gst_plugins_ugly-1.12.2.recipe b/media-libs/gst_plugins_ugly/gst_plugins_ugly-1.12.2.recipe index 198ba056c..554aa1d44 100644 --- a/media-libs/gst_plugins_ugly/gst_plugins_ugly-1.12.2.recipe +++ b/media-libs/gst_plugins_ugly/gst_plugins_ugly-1.12.2.recipe @@ -6,9 +6,9 @@ code might be widely known to present patent problems." HOMEPAGE="https://gstreamer.freedesktop.org/" COPYRIGHT="Erik Walthinsen" LICENSE="GNU LGPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-$portVersion.tar.xz" -CHECKSUM_SHA256="8fc2123d059713a34fa5d0a26641fb8158f52f6766633d2db7a661adc88e1069" +CHECKSUM_SHA256="1cc3942bbf3ea87da3e35437d4e014e991b103db22a6174f62a98c89c3f5f466" SOURCE_DIR="gst-plugins-ugly-$portVersion" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -19,12 +19,14 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - gst_plugins_base_1.0$secondaryArchSuffix lib:liba52$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix + lib:libgstapp_1.0$secondaryArchSuffix + lib:libgstaudio_1.0$secondaryArchSuffix lib:libgstreamer_1.0$secondaryArchSuffix + lib:libgstvideo_1.0$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix @@ -36,15 +38,19 @@ REQUIRES=" lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix " - +SUPPLEMENTS=" + gstreamer_1.0$secondaryArchSuffix + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - gst_plugins_base_1.0${secondaryArchSuffix}_devel devel:liba52$secondaryArchSuffix 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:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix diff --git a/media-libs/gstreamer/gstreamer-1.12.2.recipe b/media-libs/gstreamer/gstreamer-1.12.2.recipe index 060dec6c3..0016f9353 100644 --- a/media-libs/gstreamer/gstreamer-1.12.2.recipe +++ b/media-libs/gstreamer/gstreamer-1.12.2.recipe @@ -5,7 +5,7 @@ to complex audio (mixing) and video (non-linear editing) processing." HOMEPAGE="https://gstreamer.freedesktop.org/" COPYRIGHT="Erik Walthinsen" LICENSE="GNU LGPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$portVersion.tar.xz" CHECKSUM_SHA256="9044b9d8b3ff44457fa9e36faa59c56684b587b34dee449bfe15ec0c32a3a6d2" PATCHES="gstreamer-$portVersion.patchset"