From fdf3e956f9c835e0e2ff42097534481c2d55cf02 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 17 Nov 2022 19:19:35 +1000 Subject: [PATCH] gstreamer: bump version --- ...-1.18.5.recipe => gstreamer-1.20.4.recipe} | 23 +++++++-------- .../patches/gstreamer-1.20.4.patchset | 28 +++++++++++++++++++ 2 files changed, 40 insertions(+), 11 deletions(-) rename media-libs/gstreamer/{gstreamer-1.18.5.recipe => gstreamer-1.20.4.recipe} (75%) create mode 100644 media-libs/gstreamer/patches/gstreamer-1.20.4.patchset diff --git a/media-libs/gstreamer/gstreamer-1.18.5.recipe b/media-libs/gstreamer/gstreamer-1.20.4.recipe similarity index 75% rename from media-libs/gstreamer/gstreamer-1.18.5.recipe rename to media-libs/gstreamer/gstreamer-1.20.4.recipe index a2b8bfc30..4b1b3035d 100644 --- a/media-libs/gstreamer/gstreamer-1.18.5.recipe +++ b/media-libs/gstreamer/gstreamer-1.20.4.recipe @@ -7,7 +7,8 @@ COPYRIGHT="Erik Walthinsen" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$portVersion.tar.xz" -CHECKSUM_SHA256="55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a" +CHECKSUM_SHA256="67c1edf8c3c339cda5dde85f4f7b953bb9607c2d13ae970e2491c5c4c055ef5f" +PATCHES="gstreamer-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -19,11 +20,11 @@ PROVIDES=" cmd:gst_stats_1.0$secondaryArchSuffix = $portVersion cmd:gst_tester_1.0$secondaryArchSuffix = $portVersion cmd:gst_typefind_1.0$secondaryArchSuffix = $portVersion - lib:libgstbase_1.0$secondaryArchSuffix = 0.1805.0 compat >= 0 - lib:libgstcheck_1.0$secondaryArchSuffix = 0.1805.0 compat >= 0 - lib:libgstcontroller_1.0$secondaryArchSuffix = 0.1805.0 compat >= 0 - lib:libgstnet_1.0$secondaryArchSuffix = 0.1805.0 compat >= 0 - lib:libgstreamer_1.0$secondaryArchSuffix = 0.1805.0 compat >= 0 + lib:libgstbase_1.0$secondaryArchSuffix = 0.2004.0 compat >= 0 + lib:libgstcheck_1.0$secondaryArchSuffix = 0.2004.0 compat >= 0 + lib:libgstcontroller_1.0$secondaryArchSuffix = 0.2004.0 compat >= 0 + lib:libgstnet_1.0$secondaryArchSuffix = 0.2004.0 compat >= 0 + lib:libgstreamer_1.0$secondaryArchSuffix = 0.2004.0 compat >= 0 " REQUIRES=" haiku$secondaryArchSuffix @@ -36,11 +37,11 @@ REQUIRES=" PROVIDES_devel=" gstreamer${secondaryArchSuffix}_devel = $portVersion - devel:libgstbase_1.0$secondaryArchSuffix = 0.1805.0 compat >= 0 - devel:libgstcheck_1.0$secondaryArchSuffix = 0.1805.0 compat >= 0 - devel:libgstcontroller_1.0$secondaryArchSuffix = 0.1805.0 compat >= 0 - devel:libgstnet_1.0$secondaryArchSuffix = 0.1805.0 compat >= 0 - devel:libgstreamer_1.0$secondaryArchSuffix = 0.1805.0 compat >= 0 + devel:libgstbase_1.0$secondaryArchSuffix = 0.2004.0 compat >= 0 + devel:libgstcheck_1.0$secondaryArchSuffix = 0.2004.0 compat >= 0 + devel:libgstcontroller_1.0$secondaryArchSuffix = 0.2004.0 compat >= 0 + devel:libgstnet_1.0$secondaryArchSuffix = 0.2004.0 compat >= 0 + devel:libgstreamer_1.0$secondaryArchSuffix = 0.2004.0 compat >= 0 " REQUIRES_devel=" gstreamer$secondaryArchSuffix == $portVersion base diff --git a/media-libs/gstreamer/patches/gstreamer-1.20.4.patchset b/media-libs/gstreamer/patches/gstreamer-1.20.4.patchset new file mode 100644 index 000000000..b1a5c4f28 --- /dev/null +++ b/media-libs/gstreamer/patches/gstreamer-1.20.4.patchset @@ -0,0 +1,28 @@ +From f6b247bb72d99c8f8533cab6569cada1fd2f0591 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Thu, 10 Nov 2022 15:35:14 +1000 +Subject: Disable pthread_setname_np for Haiku + + +diff --git a/meson.build b/meson.build +index d312f2b..d2f194e 100644 +--- a/meson.build ++++ b/meson.build +@@ -279,12 +279,14 @@ if cc.has_function('localtime_r', prefix : '#include') + cdata.set('HAVE_DECL_LOCALTIME_R', 1) + endif + ++if host_system != 'haiku' + if cc.links('''#include + int main() { + pthread_setname_np("example"); return 0; + }''', name : 'pthread_setname_np(const char*)') + cdata.set('HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID', 1) + endif ++endif + if cc.has_header_symbol('pthread.h', 'pthread_condattr_setclock') + cdata.set('HAVE_PTHREAD_CONDATTR_SETCLOCK', 1) + endif +-- +2.37.3 +