summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2022-06-07 17:57:13 +0000
committerwiz <wiz@pkgsrc.org>2022-06-07 17:57:13 +0000
commit02d8883d0e0d1460b75eaea1dccb3f243f4bd87e (patch)
tree99a9a153333c9014cc01772c05fe278043598490 /multimedia
parent20d5cca4f9847eb40f74b986f2a54be079b275cc (diff)
downloadpkgsrc-02d8883d0e0d1460b75eaea1dccb3f243f4bd87e.tar.gz
gstreamer1: remove introspection option, enabling it by default
It was default-on, but this commit also makes gobject-introspection a build dependency, so bump PKGREVISION.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/gstreamer1/Makefile7
-rw-r--r--multimedia/gstreamer1/PLIST22
-rw-r--r--multimedia/gstreamer1/options.mk16
3 files changed, 15 insertions, 30 deletions
diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile
index 5cc69135dbf..d1ac3b1da25 100644
--- a/multimedia/gstreamer1/Makefile
+++ b/multimedia/gstreamer1/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2022/05/24 18:18:18 nia Exp $
+# $NetBSD: Makefile,v 1.57 2022/06/07 17:57:13 wiz Exp $
DISTNAME= gstreamer-1.20.2
PKGNAME= ${DISTNAME:S/gstreamer/gstreamer1/}
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= https://gstreamer.freedesktop.org/src/gstreamer/
EXTRACT_SUFX= .tar.xz
@@ -17,8 +18,6 @@ FLEX_REQD= 2.5.31
LDFLAGS.SunOS+= -lsocket -lnsl -lrt
-.include "options.mk"
-
PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer-controller.pc.in
PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer-check.pc.in
PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer-net.pc.in
@@ -51,6 +50,8 @@ MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gst:${WRKSRC}/output/libs/gst/check
BUILDLINK_DEPMETHOD.check= build
.include "../../devel/check/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection= build
+.include "../../devel/gobject-introspection/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gstreamer1/PLIST b/multimedia/gstreamer1/PLIST
index f1b689b406f..cafb75d12c5 100644
--- a/multimedia/gstreamer1/PLIST
+++ b/multimedia/gstreamer1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2022/05/26 07:17:33 nia Exp $
+@comment $NetBSD: PLIST,v 1.23 2022/06/07 17:57:13 wiz Exp $
bin/gst-inspect-1.0
bin/gst-launch-1.0
bin/gst-stats-1.0
@@ -126,11 +126,11 @@ include/gstreamer-1.0/gst/net/gstnetutils.h
include/gstreamer-1.0/gst/net/gstptpclock.h
include/gstreamer-1.0/gst/net/net-prelude.h
include/gstreamer-1.0/gst/net/net.h
-${PLIST.introspection}lib/girepository-1.0/Gst-1.0.typelib
-${PLIST.introspection}lib/girepository-1.0/GstBase-1.0.typelib
-${PLIST.introspection}lib/girepository-1.0/GstCheck-1.0.typelib
-${PLIST.introspection}lib/girepository-1.0/GstController-1.0.typelib
-${PLIST.introspection}lib/girepository-1.0/GstNet-1.0.typelib
+lib/girepository-1.0/Gst-1.0.typelib
+lib/girepository-1.0/GstBase-1.0.typelib
+lib/girepository-1.0/GstCheck-1.0.typelib
+lib/girepository-1.0/GstController-1.0.typelib
+lib/girepository-1.0/GstNet-1.0.typelib
lib/gstreamer-1.0/libgstcoreelements.so
lib/gstreamer-1.0/libgstcoretracers.so
lib/libgstbase-1.0.so
@@ -163,11 +163,11 @@ man/man1/gst-stats-1.0.1
man/man1/gst-typefind-1.0.1
share/aclocal/gst-element-check-1.0.m4
share/gdb/auto-load${LOCALBASE}/lib/libgstreamer-1.0.so.0.2002.0-gdb.py
-${PLIST.introspection}share/gir-1.0/Gst-1.0.gir
-${PLIST.introspection}share/gir-1.0/GstBase-1.0.gir
-${PLIST.introspection}share/gir-1.0/GstCheck-1.0.gir
-${PLIST.introspection}share/gir-1.0/GstController-1.0.gir
-${PLIST.introspection}share/gir-1.0/GstNet-1.0.gir
+share/gir-1.0/Gst-1.0.gir
+share/gir-1.0/GstBase-1.0.gir
+share/gir-1.0/GstCheck-1.0.gir
+share/gir-1.0/GstController-1.0.gir
+share/gir-1.0/GstNet-1.0.gir
share/gstreamer-1.0/gdb/glib_gobject_helper.py
share/gstreamer-1.0/gdb/gst_gdb.py
share/locale/af/LC_MESSAGES/gstreamer-1.0.mo
diff --git a/multimedia/gstreamer1/options.mk b/multimedia/gstreamer1/options.mk
deleted file mode 100644
index afc44c573f4..00000000000
--- a/multimedia/gstreamer1/options.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: options.mk,v 1.10 2021/11/15 22:01:21 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.gstreamer1
-PKG_SUPPORTED_OPTIONS= introspection
-PKG_SUGGESTED_OPTIONS= introspection
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+= introspection
-
-.if !empty(PKG_OPTIONS:Mintrospection)
-.include "../../devel/gobject-introspection/buildlink3.mk"
-PLIST.introspection= yes
-.else
-MESON_ARGS+= -D introspection=disabled
-.endif