CVS commit: pkgsrc/multimedia/gst-plugins1-base

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia/gst-plugins1-base
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sat, 23 Aug 2025 12:45:42 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Aug 23 12:45:42 UTC 2025

Modified Files:
        pkgsrc/multimedia/gst-plugins1-base: Makefile.common distinfo
        pkgsrc/multimedia/gst-plugins1-base/files: base-deps.meson
            only-build-extensions.awk
Added Files:
        pkgsrc/multimedia/gst-plugins1-base/patches:
            patch-gst-libs_gst_gl_meson.build

Log Message:
gst-plugins1-base: allow building of gl extension


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 \
    pkgsrc/multimedia/gst-plugins1-base/Makefile.common
cvs rdiff -u -r1.76 -r1.77 pkgsrc/multimedia/gst-plugins1-base/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/multimedia/gst-plugins1-base/files/base-deps.meson \
    pkgsrc/multimedia/gst-plugins1-base/files/only-build-extensions.awk
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/multimedia/gst-plugins1-base/patches/patch-gst-libs_gst_gl_meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/gst-plugins1-base/Makefile.common
diff -u pkgsrc/multimedia/gst-plugins1-base/Makefile.common:1.50 pkgsrc/multimedia/gst-plugins1-base/Makefile.common:1.51
--- pkgsrc/multimedia/gst-plugins1-base/Makefile.common:1.50    Tue Aug 20 13:58:33 2024
+++ pkgsrc/multimedia/gst-plugins1-base/Makefile.common Sat Aug 23 12:45:41 2025
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.common,v 1.50 2024/08/20 13:58:33 adam Exp $
+# $NetBSD: Makefile.common,v 1.51 2025/08/23 12:45:41 adam Exp $
 # used by audio/gst-plugins1-alsa/Makefile
 # used by audio/gst-plugins1-cdparanoia/Makefile
 # used by audio/gst-plugins1-libvisual/Makefile
 # used by audio/gst-plugins1-opus/Makefile
 # used by audio/gst-plugins1-vorbis/Makefile
 # used by devel/gst-plugins1-pango/Makefile
+# used by graphics/gst-plugins1-gl/Makefile
 # used by multimedia/gst-plugins1-ogg/Makefile
 # used by multimedia/gst-plugins1-theora/Makefile
 # used by x11/gst-plugins1-x11/Makefile
@@ -16,7 +17,6 @@ MASTER_SITES= https://gstreamer.freedesk
 EXTRACT_SUFX=  .tar.xz
 
 USE_LANGUAGES= c c++
-
 USE_TOOLS+=    pkg-config
 
 # "error: 'for' loop initial declarations are only allowed in C99 mode"
@@ -104,8 +104,7 @@ MESON_ARGS+=        -D${i}=disabled
 GST_EXT_BASEDIR?=      ext
 GST_PLUGIN_DIRS?=      ${GST_PLUGINS}
 
-pre-configure: fix-subdirs
-
+.PHONY: fix-subdirs
 fix-subdirs:
        ${AWK} -f ${.CURDIR}/../../multimedia/gst-plugins1-base/files/only-build-extensions.awk \
            -v basedir=${GST_EXT_BASEDIR} ${WRKSRC}/meson.build > ${WRKSRC}/meson.build.new
@@ -114,20 +113,24 @@ fix-subdirs:
        # libraries which -base itself builds...
 .  for ext in ${GST_PLUGIN_DIRS}
        ${CAT} ${.CURDIR}/../../multimedia/gst-plugins1-base/files/base-deps.meson \
-           ${WRKSRC}/${GST_EXT_BASEDIR}/${ext}/meson.build > \
-                   ${WRKSRC}/${GST_EXT_BASEDIR}/${ext}/meson.build.new
+               ${WRKSRC}/${GST_EXT_BASEDIR}/${ext}/meson.build > \
+               ${WRKSRC}/${GST_EXT_BASEDIR}/${ext}/meson.build.new
        ${MV} ${WRKSRC}/${GST_EXT_BASEDIR}/${ext}/meson.build.new \
-           ${WRKSRC}/${GST_EXT_BASEDIR}/${ext}/meson.build
+               ${WRKSRC}/${GST_EXT_BASEDIR}/${ext}/meson.build
 .  endfor
        # ... this is a bit nasty compared to BUILD_DIRS...
+       # This is a hack to correctly build 'gl' extension.
+       ${ECHO} "subdir('gl')" > ${WRKSRC}/gst-libs/gst/meson.build
+
+pre-configure: fix-subdirs
 
 post-install:
        ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/gstreamer-plugins-base-1.0.pc
 .endif
 
 .include "../../devel/meson/build.mk"
-.include "../../lang/python/tool.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/iso-codes/buildlink3.mk"
+.include "../../lang/python/tool.mk"
 BUILDLINK_API_DEPENDS.gstreamer1+=     gstreamer1>=1.20.0
 .include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"

Index: pkgsrc/multimedia/gst-plugins1-base/distinfo
diff -u pkgsrc/multimedia/gst-plugins1-base/distinfo:1.76 pkgsrc/multimedia/gst-plugins1-base/distinfo:1.77
--- pkgsrc/multimedia/gst-plugins1-base/distinfo:1.76   Tue Aug 12 10:33:58 2025
+++ pkgsrc/multimedia/gst-plugins1-base/distinfo        Sat Aug 23 12:45:41 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.76 2025/08/12 10:33:58 adam Exp $
+$NetBSD: distinfo,v 1.77 2025/08/23 12:45:41 adam Exp $
 
 BLAKE2s (gst-plugins-base-1.26.5.tar.xz) = 6db258a0d0b856afef8ca8881a122fc9e8368959667277d329c3ea6cf3db9f21
 SHA512 (gst-plugins-base-1.26.5.tar.xz) = 23b437aa118d8f8a0cd66f2a624d4ee76ec6c935653ed63eae5a146526a347f6a3a1e564192d6ec135b2d6acf17103c9134ad32a6359af715bc773632418fd5d
 Size (gst-plugins-base-1.26.5.tar.xz) = 2486588 bytes
 SHA1 (patch-ext_cdparanoia_gstcdparanoiasrc.h) = 5325f27c81cd9dc2f998bcb7733ef6b0c9a902e8
+SHA1 (patch-gst-libs_gst_gl_meson.build) = 1c7f2afff218d46c390c36549c7f4b6ffddfd4c4
 SHA1 (patch-gst_tcp_gsttcpsrcstats.c) = 8ac4a34c5c2636aeb0d1fdb4dbfa5c5eba03484d
-SHA1 (patch-meson.build) = 0fae465ac873b12103f693e3812b3bfc6b1f6971

Index: pkgsrc/multimedia/gst-plugins1-base/files/base-deps.meson
diff -u pkgsrc/multimedia/gst-plugins1-base/files/base-deps.meson:1.1 pkgsrc/multimedia/gst-plugins1-base/files/base-deps.meson:1.2
--- pkgsrc/multimedia/gst-plugins1-base/files/base-deps.meson:1.1       Mon Nov 15 22:01:57 2021
+++ pkgsrc/multimedia/gst-plugins1-base/files/base-deps.meson   Sat Aug 23 12:45:41 2025
@@ -1,7 +1,8 @@
 gst_dep = dependency('gstreamer-1.0', version : gst_req)
 gst_base_dep = dependency('gstreamer-base-1.0', version : gst_req)
-pbutils_dep = dependency('gstreamer-pbutils-1.0', version : gst_req)
+allocators_dep = dependency('gstreamer-allocators-1.0', version : gst_req)
 audio_dep = dependency('gstreamer-audio-1.0', version : gst_req)
+pbutils_dep = dependency('gstreamer-pbutils-1.0', version : gst_req)
 riff_dep = dependency('gstreamer-riff-1.0', version : gst_req)
 tag_dep = dependency('gstreamer-tag-1.0', version : gst_req)
 video_dep = dependency('gstreamer-video-1.0', version : gst_req)
Index: pkgsrc/multimedia/gst-plugins1-base/files/only-build-extensions.awk
diff -u pkgsrc/multimedia/gst-plugins1-base/files/only-build-extensions.awk:1.1 pkgsrc/multimedia/gst-plugins1-base/files/only-build-extensions.awk:1.2
--- pkgsrc/multimedia/gst-plugins1-base/files/only-build-extensions.awk:1.1     Mon Nov 15 22:01:57 2021
+++ pkgsrc/multimedia/gst-plugins1-base/files/only-build-extensions.awk Sat Aug 23 12:45:41 2025
@@ -1,4 +1,8 @@
-!/subdir([a-zA-Z0-9_-]*)/ {
+!/subdir\('[a-zA-Z0-9_-]*'\)/ {
+       print
+}
+
+/subdir\('gst-libs'\)/ {
        print
 }
 

Added files:

Index: pkgsrc/multimedia/gst-plugins1-base/patches/patch-gst-libs_gst_gl_meson.build
diff -u /dev/null pkgsrc/multimedia/gst-plugins1-base/patches/patch-gst-libs_gst_gl_meson.build:1.4
--- /dev/null   Sat Aug 23 12:45:42 2025
+++ pkgsrc/multimedia/gst-plugins1-base/patches/patch-gst-libs_gst_gl_meson.build       Sat Aug 23 12:45:41 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-gst-libs_gst_gl_meson.build,v 1.4 2025/08/23 12:45:41 adam Exp $
+
+To build stand-alone gl.
+
+--- gst-libs/gst/gl/meson.build.orig   2025-08-23 09:55:31.084095801 +0000
++++ gst-libs/gst/gl/meson.build
+@@ -1140,7 +1140,7 @@ if build_gstgl
+   library_def = {'lib': gstgl}
+   pkg_name = 'gstreamer-gl-1.0'
+   pkgconfig.generate(gstgl,
+-    libraries : [gstvideo, gst_base_dep, gst_dep],
++    libraries : [gst_base_dep, gst_dep],
+     variables : pkgconfig_variables + pkgconfig_gl_variables,
+     uninstalled_variables : pkgconfig_gl_variables,
+     subdirs : pkgconfig_subdirs,

Prev by Date: CVS commit: pkgsrc/graphics
Next by Date: CVS commit: pkgsrc/multimedia/gst-plugins1-bad
Previous by Thread: CVS commit: pkgsrc/graphics
Next by Thread: CVS commit: pkgsrc/multimedia/gst-plugins1-bad
Indexes:

Home | Main Index | Thread Index | Old Index