diff --git a/media-libs/gstreamer/gstreamer-1.20.4.recipe b/media-libs/gstreamer/gstreamer-1.22.0.recipe similarity index 72% rename from media-libs/gstreamer/gstreamer-1.20.4.recipe rename to media-libs/gstreamer/gstreamer-1.22.0.recipe index 4b908b467..661f3278d 100644 --- a/media-libs/gstreamer/gstreamer-1.20.4.recipe +++ b/media-libs/gstreamer/gstreamer-1.22.0.recipe @@ -5,10 +5,9 @@ to complex audio (mixing) and video (non-linear editing) processing." HOMEPAGE="https://gstreamer.freedesktop.org/" COPYRIGHT="Erik Walthinsen" LICENSE="GNU LGPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$portVersion.tar.xz" -CHECKSUM_SHA256="67c1edf8c3c339cda5dde85f4f7b953bb9607c2d13ae970e2491c5c4c055ef5f" -PATCHES="gstreamer-$portVersion.patchset" +CHECKSUM_SHA256="78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -20,11 +19,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.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 + lib:libgstbase_1.0$secondaryArchSuffix = 0.2200.0 compat >= 0 + lib:libgstcheck_1.0$secondaryArchSuffix = 0.2200.0 compat >= 0 + lib:libgstcontroller_1.0$secondaryArchSuffix = 0.2200.0 compat >= 0 + lib:libgstnet_1.0$secondaryArchSuffix = 0.2200.0 compat >= 0 + lib:libgstreamer_1.0$secondaryArchSuffix = 0.2200.0 compat >= 0 " REQUIRES=" haiku$secondaryArchSuffix @@ -38,11 +37,11 @@ REQUIRES=" PROVIDES_devel=" gstreamer${secondaryArchSuffix}_devel = $portVersion - 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 + devel:libgstbase_1.0$secondaryArchSuffix = 0.2200.0 compat >= 0 + devel:libgstcheck_1.0$secondaryArchSuffix = 0.2200.0 compat >= 0 + devel:libgstcontroller_1.0$secondaryArchSuffix = 0.2200.0 compat >= 0 + devel:libgstnet_1.0$secondaryArchSuffix = 0.2200.0 compat >= 0 + devel:libgstreamer_1.0$secondaryArchSuffix = 0.2200.0 compat >= 0 " REQUIRES_devel=" gstreamer$secondaryArchSuffix == $portVersion base @@ -74,7 +73,8 @@ BUILD_PREREQUIRES=" BUILD() { - export CFLAGS="-lnetwork" + export CFLAGS="-D_GNU_SOURCE -D_BSD_SOURCE" + export LDFLAGS="-lbsd -lgnu -lnetwork" meson build \ --buildtype=release \ @@ -100,9 +100,6 @@ INSTALL() libgstcontroller-1.0 libgstnet-1.0 fixPkgconfig - mv -f $includeDir/gstreamer-1.0/gst $includeDir/ - rm -rf $includeDir/gstreamer-1.0 - # devel package packageEntries devel $developDir } diff --git a/media-libs/gstreamer/patches/gstreamer-1.20.4.patchset b/media-libs/gstreamer/patches/gstreamer-1.20.4.patchset deleted file mode 100644 index b1a5c4f28..000000000 --- a/media-libs/gstreamer/patches/gstreamer-1.20.4.patchset +++ /dev/null @@ -1,28 +0,0 @@ -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 -