[pkgsrc/trunk]: pkgsrc/multimedia/gstreamer1 gstreamer1: remove introspection...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/361eb90763da
branches:  trunk
changeset: 380501:361eb90763da
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Jun 07 17:57:13 2022 +0000

description:
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:

 multimedia/gstreamer1/Makefile   |   7 ++++---
 multimedia/gstreamer1/PLIST      |  22 +++++++++++-----------
 multimedia/gstreamer1/options.mk |  16 ----------------
 3 files changed, 15 insertions(+), 30 deletions(-)

diffs (94 lines):

diff -r c1db61191718 -r 361eb90763da multimedia/gstreamer1/Makefile
--- a/multimedia/gstreamer1/Makefile    Tue Jun 07 17:56:13 2022 +0000
+++ b/multimedia/gstreamer1/Makefile    Tue Jun 07 17:57:13 2022 +0000
@@ -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 @@
 
 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 @@
 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 -r c1db61191718 -r 361eb90763da multimedia/gstreamer1/PLIST
--- a/multimedia/gstreamer1/PLIST       Tue Jun 07 17:56:13 2022 +0000
+++ b/multimedia/gstreamer1/PLIST       Tue Jun 07 17:57:13 2022 +0000
@@ -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/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-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 -r c1db61191718 -r 361eb90763da multimedia/gstreamer1/options.mk
--- a/multimedia/gstreamer1/options.mk  Tue Jun 07 17:56:13 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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