summaryrefslogtreecommitdiff
path: root/multimedia/gst-plugins1-base
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/gst-plugins1-base')
-rw-r--r--multimedia/gst-plugins1-base/Makefile3
-rw-r--r--multimedia/gst-plugins1-base/Makefile.common15
-rw-r--r--multimedia/gst-plugins1-base/PLIST25
-rw-r--r--multimedia/gst-plugins1-base/distinfo11
-rw-r--r--multimedia/gst-plugins1-base/patches/patch-gst-libs_gst_gl_meson.build46
-rw-r--r--multimedia/gst-plugins1-base/patches/patch-gst_tcp_gstmultifdsink.c18
-rw-r--r--multimedia/gst-plugins1-base/patches/patch-meson.build16
7 files changed, 94 insertions, 40 deletions
diff --git a/multimedia/gst-plugins1-base/Makefile b/multimedia/gst-plugins1-base/Makefile
index 5090fc06efe..a18051cba81 100644
--- a/multimedia/gst-plugins1-base/Makefile
+++ b/multimedia/gst-plugins1-base/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2021/12/08 16:02:23 adam Exp $
+# $NetBSD: Makefile,v 1.30 2022/04/18 12:36:08 nia Exp $
PKGNAME= ${DISTNAME:S/plugins/plugins1/}
-PKGREVISION= 1
CATEGORIES= multimedia gnome
COMMENT= Open source multimedia framework - base plugins
diff --git a/multimedia/gst-plugins1-base/Makefile.common b/multimedia/gst-plugins1-base/Makefile.common
index 2087f7824bb..8b5975d5d8c 100644
--- a/multimedia/gst-plugins1-base/Makefile.common
+++ b/multimedia/gst-plugins1-base/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.40 2021/12/23 20:34:37 nia Exp $
+# $NetBSD: Makefile.common,v 1.41 2022/04/18 12:36:08 nia Exp $
-DISTNAME= gst-plugins-base-1.18.5
+DISTNAME= gst-plugins-base-1.20.1
MASTER_SITES= https://gstreamer.freedesktop.org/src/gst-plugins-base/
EXTRACT_SUFX= .tar.xz
@@ -22,6 +22,10 @@ PKGCONFIG_OVERRIDE_STAGE= pre-install
PYTHON_VERSIONS_INCOMPATIBLE= 27
PYTHON_FOR_BUILD_ONLY= tool
+# grep '^option' meson_options.txt | grep feature | \
+# sed -e "s/',.*//g" -e "s/option('//g" | \
+# xargs printf 'GST_PLUGINS_SET+=\t%s\n'
+GST_PLUGINS_SET+= iso-codes
GST_PLUGINS_SET+= gl
GST_PLUGINS_SET+= gl-graphene
GST_PLUGINS_SET+= gl-jpeg
@@ -65,8 +69,10 @@ GST_PLUGINS_SET+= examples
GST_PLUGINS_SET+= tests
GST_PLUGINS_SET+= tools
GST_PLUGINS_SET+= introspection
-GST_PLUGINS_SET+= orc
GST_PLUGINS_SET+= nls
+GST_PLUGINS_SET+= orc
+GST_PLUGINS_SET+= qt5
+GST_PLUGINS_SET+= doc
.for i in ${GST_PLUGINS_SET}
. if !empty(GST_PLUGINS:M${i})
@@ -100,6 +106,9 @@ fix-subdirs:
${WRKSRC}/${GST_EXT_BASEDIR}/${ext}/meson.build
. endfor
# ... this is a bit nasty compared to BUILD_DIRS...
+
+post-install:
+ ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/gstreamer-plugins-base-1.0.pc
.endif
.include "../../devel/meson/build.mk"
diff --git a/multimedia/gst-plugins1-base/PLIST b/multimedia/gst-plugins1-base/PLIST
index e89fc4b61d8..587b9f86a97 100644
--- a/multimedia/gst-plugins1-base/PLIST
+++ b/multimedia/gst-plugins1-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2021/11/15 22:01:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2022/04/18 12:36:08 nia Exp $
bin/gst-device-monitor-1.0
bin/gst-discoverer-1.0
bin/gst-play-1.0
@@ -100,6 +100,7 @@ include/gstreamer-1.0/gst/video/colorbalance.h
include/gstreamer-1.0/gst/video/colorbalancechannel.h
include/gstreamer-1.0/gst/video/gstvideoaffinetransformationmeta.h
include/gstreamer-1.0/gst/video/gstvideoaggregator.h
+include/gstreamer-1.0/gst/video/gstvideocodecalphameta.h
include/gstreamer-1.0/gst/video/gstvideodecoder.h
include/gstreamer-1.0/gst/video/gstvideoencoder.h
include/gstreamer-1.0/gst/video/gstvideofilter.h
@@ -164,37 +165,37 @@ lib/gstreamer-1.0/libgstvideotestsrc.so
lib/gstreamer-1.0/libgstvolume.so
lib/libgstallocators-1.0.so
lib/libgstallocators-1.0.so.0
-lib/libgstallocators-1.0.so.0.1805.0
+lib/libgstallocators-1.0.so.0.2001.0
lib/libgstapp-1.0.so
lib/libgstapp-1.0.so.0
-lib/libgstapp-1.0.so.0.1805.0
+lib/libgstapp-1.0.so.0.2001.0
lib/libgstaudio-1.0.so
lib/libgstaudio-1.0.so.0
-lib/libgstaudio-1.0.so.0.1805.0
+lib/libgstaudio-1.0.so.0.2001.0
lib/libgstfft-1.0.so
lib/libgstfft-1.0.so.0
-lib/libgstfft-1.0.so.0.1805.0
+lib/libgstfft-1.0.so.0.2001.0
lib/libgstpbutils-1.0.so
lib/libgstpbutils-1.0.so.0
-lib/libgstpbutils-1.0.so.0.1805.0
+lib/libgstpbutils-1.0.so.0.2001.0
lib/libgstriff-1.0.so
lib/libgstriff-1.0.so.0
-lib/libgstriff-1.0.so.0.1805.0
+lib/libgstriff-1.0.so.0.2001.0
lib/libgstrtp-1.0.so
lib/libgstrtp-1.0.so.0
-lib/libgstrtp-1.0.so.0.1805.0
+lib/libgstrtp-1.0.so.0.2001.0
lib/libgstrtsp-1.0.so
lib/libgstrtsp-1.0.so.0
-lib/libgstrtsp-1.0.so.0.1805.0
+lib/libgstrtsp-1.0.so.0.2001.0
lib/libgstsdp-1.0.so
lib/libgstsdp-1.0.so.0
-lib/libgstsdp-1.0.so.0.1805.0
+lib/libgstsdp-1.0.so.0.2001.0
lib/libgsttag-1.0.so
lib/libgsttag-1.0.so.0
-lib/libgsttag-1.0.so.0.1805.0
+lib/libgsttag-1.0.so.0.2001.0
lib/libgstvideo-1.0.so
lib/libgstvideo-1.0.so.0
-lib/libgstvideo-1.0.so.0.1805.0
+lib/libgstvideo-1.0.so.0.2001.0
lib/pkgconfig/gstreamer-allocators-1.0.pc
lib/pkgconfig/gstreamer-app-1.0.pc
lib/pkgconfig/gstreamer-audio-1.0.pc
diff --git a/multimedia/gst-plugins1-base/distinfo b/multimedia/gst-plugins1-base/distinfo
index 2066466c2fb..683609d9f2d 100644
--- a/multimedia/gst-plugins1-base/distinfo
+++ b/multimedia/gst-plugins1-base/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.43 2021/11/18 20:25:45 nia Exp $
+$NetBSD: distinfo,v 1.44 2022/04/18 12:36:08 nia Exp $
-BLAKE2s (gst-plugins-base-1.18.5.tar.xz) = a0a795afe1a0cd2d7edce7b18c9d6051ec6f95719d5bbedd4e2e5b2b3c0a3c66
-SHA512 (gst-plugins-base-1.18.5.tar.xz) = b336cf3a3a5357429f3ae2bcfa9e4c367646360a1d7a74f8f2458703d232b5a5f6dcf865ba27a15c7e8e1e1cbde08b8c345104f792d16232f5833f52767a08b4
-Size (gst-plugins-base-1.18.5.tar.xz) = 3176212 bytes
+BLAKE2s (gst-plugins-base-1.20.1.tar.xz) = 5119ee161501df82815eb52559ee73c3edbaeb6df436c27a0e29203c3d2daf5e
+SHA512 (gst-plugins-base-1.20.1.tar.xz) = 679a0eee1973fa9612e2e24978e2c2d9d8fdc5732e1699b4a87712881f1549d0811719a13ff4fe77b91322ca4425c39623b371703f6b3a36fb7238b977d3e541
+Size (gst-plugins-base-1.20.1.tar.xz) = 3290068 bytes
SHA1 (patch-ext_cdparanoia_gstcdparanoiasrc.h) = 5325f27c81cd9dc2f998bcb7733ef6b0c9a902e8
-SHA1 (patch-gst_tcp_gstmultifdsink.c) = 43715806cc0801388550126a1f7a0b301b895620
+SHA1 (patch-gst-libs_gst_gl_meson.build) = 642a96d5c659f9ac0ece878c8fa4d66ee4639a74
+SHA1 (patch-meson.build) = 0fae465ac873b12103f693e3812b3bfc6b1f6971
diff --git a/multimedia/gst-plugins1-base/patches/patch-gst-libs_gst_gl_meson.build b/multimedia/gst-plugins1-base/patches/patch-gst-libs_gst_gl_meson.build
new file mode 100644
index 00000000000..61c3f1218ba
--- /dev/null
+++ b/multimedia/gst-plugins1-base/patches/patch-gst-libs_gst_gl_meson.build
@@ -0,0 +1,46 @@
+$NetBSD: patch-gst-libs_gst_gl_meson.build,v 1.1 2022/04/18 12:36:08 nia Exp $
+
+build_gstgl must be defined in the root meson.build so it's available
+when we are building plugins independently.
+
+--- gst-libs/gst/gl/meson.build.orig 2022-03-14 11:33:40.000000000 +0000
++++ gst-libs/gst/gl/meson.build
+@@ -1,10 +1,3 @@
+-if get_option('gl').disabled()
+- message('GStreamer OpenGL integration disabled via options.')
+- gstgl_dep = dependency('', required: false)
+- build_gstgl = false
+- subdir_done()
+-endif
+-
+ gl_sources = files([
+ 'gstglapi.c',
+ 'gstglbasefilter.c',
+@@ -952,18 +945,24 @@ if egl_dep.found()
+ endif
+ endif
+
+-build_gstgl = true
+ if enabled_gl_apis.length() == 0
+ message('No OpenGL API libraries found or requested')
+ build_gstgl = false
+ endif
+-if enabled_gl_platforms.length() == 0
++elif enabled_gl_platforms.length() == 0
+ message('No OpenGL Platforms found or requested')
+ build_gstgl = false
+ endif
+-if enabled_gl_winsys.length() == 0
++elif enabled_gl_winsys.length() == 0
+ message('No OpenGL Window systems found or requested')
+ build_gstgl = false
++elif not get_option('gl').disabled()
++ build_gstgl = true
++else
++ message('GStreamer OpenGL integration disabled via options.')
++ gstgl_dep = dependency('', required: false)
++ build_gstgl = false
++ subdir_done()
+ endif
+
+ gstgl_dep = dependency('', required : false)
diff --git a/multimedia/gst-plugins1-base/patches/patch-gst_tcp_gstmultifdsink.c b/multimedia/gst-plugins1-base/patches/patch-gst_tcp_gstmultifdsink.c
deleted file mode 100644
index 3193c40bb85..00000000000
--- a/multimedia/gst-plugins1-base/patches/patch-gst_tcp_gstmultifdsink.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-gst_tcp_gstmultifdsink.c,v 1.1 2021/11/18 20:25:45 nia Exp $
-
-PR pkg/56509 gstreamer1 build issues on Solaris (and SmartOS) after
-upgrade to 1.18.5
-
---- gst/tcp/gstmultifdsink.c.orig 2021-09-08 19:02:22.195757900 +0000
-+++ gst/tcp/gstmultifdsink.c
-@@ -121,6 +121,10 @@
-
- #include "gstmultifdsink.h"
-
-+#if !defined(FIONREAD) && defined(__sun)
-+#include <sys/filio.h>
-+#endif
-+
- #define NOT_IMPLEMENTED 0
-
- GST_DEBUG_CATEGORY_STATIC (multifdsink_debug);
diff --git a/multimedia/gst-plugins1-base/patches/patch-meson.build b/multimedia/gst-plugins1-base/patches/patch-meson.build
new file mode 100644
index 00000000000..17064f10c43
--- /dev/null
+++ b/multimedia/gst-plugins1-base/patches/patch-meson.build
@@ -0,0 +1,16 @@
+$NetBSD: patch-meson.build,v 1.1 2022/04/18 12:36:08 nia Exp $
+
+build_gstgl must be defined in the root meson.build so it's available
+when we are building plugins independently.
+
+--- meson.build.orig 2022-03-14 11:33:40.000000000 +0000
++++ meson.build
+@@ -4,6 +4,8 @@ project('gst-plugins-base', 'c',
+ default_options : [ 'warning_level=1',
+ 'buildtype=debugoptimized' ])
+
++build_gstgl = false
++
+ gst_version = meson.project_version()
+ version_arr = gst_version.split('.')
+ gst_version_major = version_arr[0].to_int()
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 23:56:55 +0000