gst-plugins1-base: add missing dependencies, add more options

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gst-plugins1-base: add missing dependencies, add more options
From: nia <nia%NetBSD.org@localhost>
Date: Mon, 08 Nov 2021 20:57:45 +0000
Module Name:	pkgsrc-wip
Committed By:	nia <nia%NetBSD.org@localhost>
Pushed By:	nee
Date:		Mon Nov 8 21:57:45 2021 +0100
Changeset:	0c96b358193d76907bdc64f729ea6b58a9fa3f13

Modified Files:
	gst-plugins1-base/Makefile
	gst-plugins1-base/PLIST
	gst-plugins1-base/options.mk
Added Files:
	gst-plugins1-base/TODO

Log Message:
gst-plugins1-base: add missing dependencies, add more options

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0c96b358193d76907bdc64f729ea6b58a9fa3f13

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

diffstat:
 gst-plugins1-base/Makefile   |   9 ++-
 gst-plugins1-base/PLIST      | 151 ++++++++++++++++++++++---------------------
 gst-plugins1-base/TODO       |   1 +
 gst-plugins1-base/options.mk |  48 ++++++++++++--
 4 files changed, 127 insertions(+), 82 deletions(-)

diffs:
diff --git a/gst-plugins1-base/Makefile b/gst-plugins1-base/Makefile
index 264722430d..4159e3aae3 100644
--- a/gst-plugins1-base/Makefile
+++ b/gst-plugins1-base/Makefile
@@ -13,14 +13,15 @@ LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	c c++
 
-USE_TOOLS+=		pkg-config perl:run
+USE_TOOLS+=	pkg-config perl:run xgettext
 
 PKGCONFIG_OVERRIDE=		output/pkgconfig/*.pc
 PKGCONFIG_OVERRIDE_STAGE=	pre-install
 
 PYTHON_FOR_BUILD_ONLY=		tool
 
-MESON_ARGS+=	-D gl_winsys=x11
+MESON_ARGS+=	-D examples=disabled
+MESON_ARGS+=	-D tremor=disabled
 
 .include "options.mk"
 
@@ -43,9 +44,11 @@ MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/gst-libs/gst/tag:${WRKSRC}/output/gs
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../devel/orc/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../wip/gstreamer1/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/gst-plugins1-base/PLIST b/gst-plugins1-base/PLIST
index cc87c17408..41d436eb8e 100644
--- a/gst-plugins1-base/PLIST
+++ b/gst-plugins1-base/PLIST
@@ -45,64 +45,64 @@ include/gstreamer-1.0/gst/fft/gstfftf32.h
 include/gstreamer-1.0/gst/fft/gstfftf64.h
 include/gstreamer-1.0/gst/fft/gstffts16.h
 include/gstreamer-1.0/gst/fft/gstffts32.h
-include/gstreamer-1.0/gst/gl/egl/egl.h
-include/gstreamer-1.0/gst/gl/egl/gstegl.h
-include/gstreamer-1.0/gst/gl/egl/gsteglimage.h
-include/gstreamer-1.0/gst/gl/egl/gstgldisplay_egl.h
-include/gstreamer-1.0/gst/gl/egl/gstgldisplay_egl_device.h
-include/gstreamer-1.0/gst/gl/egl/gstglmemoryegl.h
-include/gstreamer-1.0/gst/gl/gl-enumtypes.h
-include/gstreamer-1.0/gst/gl/gl-prelude.h
-include/gstreamer-1.0/gst/gl/gl.h
-include/gstreamer-1.0/gst/gl/glprototypes/all_functions.h
-include/gstreamer-1.0/gst/gl/glprototypes/base.h
-include/gstreamer-1.0/gst/gl/glprototypes/blending.h
-include/gstreamer-1.0/gst/gl/glprototypes/buffers.h
-include/gstreamer-1.0/gst/gl/glprototypes/debug.h
-include/gstreamer-1.0/gst/gl/glprototypes/eglimage.h
-include/gstreamer-1.0/gst/gl/glprototypes/fbo.h
-include/gstreamer-1.0/gst/gl/glprototypes/fixedfunction.h
-include/gstreamer-1.0/gst/gl/glprototypes/gles.h
-include/gstreamer-1.0/gst/gl/glprototypes/gstgl_compat.h
-include/gstreamer-1.0/gst/gl/glprototypes/gstgl_gles2compat.h
-include/gstreamer-1.0/gst/gl/glprototypes/opengl.h
-include/gstreamer-1.0/gst/gl/glprototypes/query.h
-include/gstreamer-1.0/gst/gl/glprototypes/shaders.h
-include/gstreamer-1.0/gst/gl/glprototypes/sync.h
-include/gstreamer-1.0/gst/gl/glprototypes/vao.h
-include/gstreamer-1.0/gst/gl/gstgl_enums.h
-include/gstreamer-1.0/gst/gl/gstgl_fwd.h
-include/gstreamer-1.0/gst/gl/gstglapi.h
-include/gstreamer-1.0/gst/gl/gstglbasefilter.h
-include/gstreamer-1.0/gst/gl/gstglbasememory.h
-include/gstreamer-1.0/gst/gl/gstglbasesrc.h
-include/gstreamer-1.0/gst/gl/gstglbuffer.h
-include/gstreamer-1.0/gst/gl/gstglbufferpool.h
-include/gstreamer-1.0/gst/gl/gstglcolorconvert.h
-include/gstreamer-1.0/gst/gl/gstglcontext.h
-include/gstreamer-1.0/gst/gl/gstgldebug.h
-include/gstreamer-1.0/gst/gl/gstgldisplay.h
-include/gstreamer-1.0/gst/gl/gstglfeature.h
-include/gstreamer-1.0/gst/gl/gstglfilter.h
-include/gstreamer-1.0/gst/gl/gstglformat.h
-include/gstreamer-1.0/gst/gl/gstglframebuffer.h
-include/gstreamer-1.0/gst/gl/gstglfuncs.h
-include/gstreamer-1.0/gst/gl/gstglmemory.h
-include/gstreamer-1.0/gst/gl/gstglmemorypbo.h
-include/gstreamer-1.0/gst/gl/gstgloverlaycompositor.h
-include/gstreamer-1.0/gst/gl/gstglquery.h
-include/gstreamer-1.0/gst/gl/gstglrenderbuffer.h
-include/gstreamer-1.0/gst/gl/gstglshader.h
-include/gstreamer-1.0/gst/gl/gstglshaderstrings.h
-include/gstreamer-1.0/gst/gl/gstglsl.h
-include/gstreamer-1.0/gst/gl/gstglslstage.h
-include/gstreamer-1.0/gst/gl/gstglsyncmeta.h
-include/gstreamer-1.0/gst/gl/gstglupload.h
-include/gstreamer-1.0/gst/gl/gstglutils.h
-include/gstreamer-1.0/gst/gl/gstglviewconvert.h
-include/gstreamer-1.0/gst/gl/gstglwindow.h
-include/gstreamer-1.0/gst/gl/x11/gstgldisplay_x11.h
-include/gstreamer-1.0/gst/gl/x11/x11.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/egl/egl.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/egl/gstegl.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/egl/gsteglimage.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/egl/gstgldisplay_egl.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/egl/gstgldisplay_egl_device.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/egl/gstglmemoryegl.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gl-enumtypes.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gl-prelude.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gl.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/all_functions.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/base.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/blending.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/buffers.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/debug.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/eglimage.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/fbo.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/fixedfunction.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/gles.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/gstgl_compat.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/gstgl_gles2compat.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/opengl.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/query.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/shaders.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/sync.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/glprototypes/vao.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstgl_enums.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstgl_fwd.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglapi.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglbasefilter.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglbasememory.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglbasesrc.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglbuffer.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglbufferpool.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglcolorconvert.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglcontext.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstgldebug.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstgldisplay.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglfeature.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglfilter.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglformat.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglframebuffer.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglfuncs.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglmemory.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglmemorypbo.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstgloverlaycompositor.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglquery.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglrenderbuffer.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglshader.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglshaderstrings.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglsl.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglslstage.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglsyncmeta.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglupload.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglutils.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglviewconvert.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/gstglwindow.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/x11/gstgldisplay_x11.h
+${PLIST.opengl}include/gstreamer-1.0/gst/gl/x11/x11.h
 include/gstreamer-1.0/gst/pbutils/codec-utils.h
 include/gstreamer-1.0/gst/pbutils/descriptions.h
 include/gstreamer-1.0/gst/pbutils/encoding-profile.h
@@ -192,17 +192,18 @@ include/gstreamer-1.0/gst/video/videooverlay.h
 ${PLIST.introspection}lib/girepository-1.0/GstAllocators-1.0.typelib
 ${PLIST.introspection}lib/girepository-1.0/GstApp-1.0.typelib
 ${PLIST.introspection}lib/girepository-1.0/GstAudio-1.0.typelib
-${PLIST.introspection}lib/girepository-1.0/GstGL-1.0.typelib
-${PLIST.introspection}lib/girepository-1.0/GstGLEGL-1.0.typelib
-${PLIST.introspection}lib/girepository-1.0/GstGLX11-1.0.typelib
+${PLIST.opengl}${PLIST.introspection}lib/girepository-1.0/GstGL-1.0.typelib
+${PLIST.opengl}${PLIST.introspection}lib/girepository-1.0/GstGLEGL-1.0.typelib
+${PLIST.opengl}${PLIST.introspection}lib/girepository-1.0/GstGLX11-1.0.typelib
 ${PLIST.introspection}lib/girepository-1.0/GstPbutils-1.0.typelib
 ${PLIST.introspection}lib/girepository-1.0/GstRtp-1.0.typelib
 ${PLIST.introspection}lib/girepository-1.0/GstRtsp-1.0.typelib
 ${PLIST.introspection}lib/girepository-1.0/GstSdp-1.0.typelib
 ${PLIST.introspection}lib/girepository-1.0/GstTag-1.0.typelib
 ${PLIST.introspection}lib/girepository-1.0/GstVideo-1.0.typelib
-lib/gstreamer-1.0/include/gst/gl/gstglconfig.h
+${PLIST.opengl}lib/gstreamer-1.0/include/gst/gl/gstglconfig.h
 lib/gstreamer-1.0/libgstadder.so
+${PLIST.alsa}lib/gstreamer-1.0/libgstalsa.so
 lib/gstreamer-1.0/libgstapp.so
 lib/gstreamer-1.0/libgstaudioconvert.so
 lib/gstreamer-1.0/libgstaudiomixer.so
@@ -215,7 +216,7 @@ lib/gstreamer-1.0/libgstencoding.so
 lib/gstreamer-1.0/libgstgio.so
 lib/gstreamer-1.0/libgstlibvisual.so
 lib/gstreamer-1.0/libgstogg.so
-lib/gstreamer-1.0/libgstopengl.so
+${PLIST.opengl}lib/gstreamer-1.0/libgstopengl.so
 lib/gstreamer-1.0/libgstopus.so
 lib/gstreamer-1.0/libgstoverlaycomposition.so
 lib/gstreamer-1.0/libgstpango.so
@@ -232,8 +233,8 @@ lib/gstreamer-1.0/libgstvideoscale.so
 lib/gstreamer-1.0/libgstvideotestsrc.so
 lib/gstreamer-1.0/libgstvolume.so
 lib/gstreamer-1.0/libgstvorbis.so
-lib/gstreamer-1.0/libgstximagesink.so
-lib/gstreamer-1.0/libgstxvimagesink.so
+${PLIST.x11}lib/gstreamer-1.0/libgstximagesink.so
+${PLIST.x11}lib/gstreamer-1.0/libgstxvimagesink.so
 lib/libgstallocators-1.0.so
 lib/libgstallocators-1.0.so.0
 lib/libgstallocators-1.0.so.0.1805.0
@@ -246,9 +247,9 @@ lib/libgstaudio-1.0.so.0.1805.0
 lib/libgstfft-1.0.so
 lib/libgstfft-1.0.so.0
 lib/libgstfft-1.0.so.0.1805.0
-lib/libgstgl-1.0.so
-lib/libgstgl-1.0.so.0
-lib/libgstgl-1.0.so.0.1805.0
+${PLIST.opengl}lib/libgstgl-1.0.so
+${PLIST.opengl}lib/libgstgl-1.0.so.0
+${PLIST.opengl}lib/libgstgl-1.0.so.0.1805.0
 lib/libgstpbutils-1.0.so
 lib/libgstpbutils-1.0.so.0
 lib/libgstpbutils-1.0.so.0.1805.0
@@ -274,10 +275,10 @@ lib/pkgconfig/gstreamer-allocators-1.0.pc
 lib/pkgconfig/gstreamer-app-1.0.pc
 lib/pkgconfig/gstreamer-audio-1.0.pc
 lib/pkgconfig/gstreamer-fft-1.0.pc
-lib/pkgconfig/gstreamer-gl-1.0.pc
-lib/pkgconfig/gstreamer-gl-egl-1.0.pc
-lib/pkgconfig/gstreamer-gl-prototypes-1.0.pc
-lib/pkgconfig/gstreamer-gl-x11-1.0.pc
+${PLIST.opengl}lib/pkgconfig/gstreamer-gl-1.0.pc
+${PLIST.opengl}lib/pkgconfig/gstreamer-gl-egl-1.0.pc
+${PLIST.opengl}lib/pkgconfig/gstreamer-gl-prototypes-1.0.pc
+${PLIST.opengl}lib/pkgconfig/gstreamer-gl-x11-1.0.pc
 lib/pkgconfig/gstreamer-pbutils-1.0.pc
 lib/pkgconfig/gstreamer-plugins-base-1.0.pc
 lib/pkgconfig/gstreamer-riff-1.0.pc
@@ -292,9 +293,9 @@ man/man1/gst-play-1.0.1
 ${PLIST.introspection}share/gir-1.0/GstAllocators-1.0.gir
 ${PLIST.introspection}share/gir-1.0/GstApp-1.0.gir
 ${PLIST.introspection}share/gir-1.0/GstAudio-1.0.gir
-${PLIST.introspection}share/gir-1.0/GstGL-1.0.gir
-${PLIST.introspection}share/gir-1.0/GstGLEGL-1.0.gir
-${PLIST.introspection}share/gir-1.0/GstGLX11-1.0.gir
+${PLIST.opengl}${PLIST.introspection}share/gir-1.0/GstGL-1.0.gir
+${PLIST.opengl}${PLIST.introspection}share/gir-1.0/GstGLEGL-1.0.gir
+${PLIST.opengl}${PLIST.introspection}share/gir-1.0/GstGLX11-1.0.gir
 ${PLIST.introspection}share/gir-1.0/GstPbutils-1.0.gir
 ${PLIST.introspection}share/gir-1.0/GstRtp-1.0.gir
 ${PLIST.introspection}share/gir-1.0/GstRtsp-1.0.gir
diff --git a/gst-plugins1-base/TODO b/gst-plugins1-base/TODO
new file mode 100644
index 0000000000..bef291b92a
--- /dev/null
+++ b/gst-plugins1-base/TODO
@@ -0,0 +1 @@
+OpenGL plugin downloads gl-headers from git during build
diff --git a/gst-plugins1-base/options.mk b/gst-plugins1-base/options.mk
index b85b3d6875..a904a33fdf 100644
--- a/gst-plugins1-base/options.mk
+++ b/gst-plugins1-base/options.mk
@@ -1,16 +1,56 @@
 # $NetBSD: options.mk,v 1.9 2019/10/03 20:45:19 nia Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gst-plugins1-base
-PKG_SUPPORTED_OPTIONS=	introspection
-PKG_SUGGESTED_OPTIONS=	introspection
+PKG_OPTIONS_VAR=		PKG_OPTIONS.gst-plugins1-base
+PKG_SUPPORTED_OPTIONS=		alsa introspection x11
+
+PKG_SUGGESTED_OPTIONS=		introspection
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+PKG_SUGGESTED_OPTIONS+=		alsa x11
+.elif ${OPSYS} != "Darwin"
+PKG_SUGGESTED_OPTIONS+=		x11
+.endif
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	introspection
+PLIST_VARS+=	alsa
+.if !empty(PKG_OPTIONS:Malsa)
+.include "../../audio/alsa-lib/buildlink3.mk"
+PLIST.alsa=		yes
+.else
+MESON_ARGS+=		-D alsa=disabled
+.endif
 
+PLIST_VARS+=	introspection
 .if !empty(PKG_OPTIONS:Mintrospection)
 .include "../../devel/gobject-introspection/buildlink3.mk"
 PLIST.introspection=	yes
 .else
 MESON_ARGS+=		-D introspection=disabled
 .endif
+
+PLIST_VARS+=	opengl
+.if !empty(PKG_OPTIONS:Mopengl)
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/graphene/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+PLIST.opengl=		yes
+MESON_ARGS+=		-D gl_winsys=x11
+.else
+MESON_ARGS+=		-D gl=disabled
+.endif
+
+PLIST_VARS+=	x11
+.if !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+PLIST.x11=		yes
+.else
+MESON_ARGS+=		-D xshm=disabled
+MESON_ARGS+=		-D xvideo=disabled
+MESON_ARGS+=		-D x11=disabled
+.endif
Prev by Date: gstreamer1: remove ALTERNATIVES file
Next by Date: gst-plugin1-base: add CONFLICTS/SUPERSEDES
Previous by Thread: gstreamer1: remove ALTERNATIVES file
Next by Thread: gst-plugin1-base: add CONFLICTS/SUPERSEDES
Indexes:
Home | Main Index | Thread Index | Old Index