CVS commit: pkgsrc/multimedia/gstreamer1

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Thu Dec  1 11:08:56 UTC 2016

Modified Files:
        pkgsrc/multimedia/gstreamer1: Makefile PLIST options.mk

Log Message:
Add an introspection option


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/multimedia/gstreamer1/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/gstreamer1/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/gstreamer1/options.mk

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

Modified files:

Index: pkgsrc/multimedia/gstreamer1/Makefile
diff -u pkgsrc/multimedia/gstreamer1/Makefile:1.26 pkgsrc/multimedia/gstreamer1/Makefile:1.27
--- pkgsrc/multimedia/gstreamer1/Makefile:1.26  Wed Nov 16 12:08:26 2016
+++ pkgsrc/multimedia/gstreamer1/Makefile       Thu Dec  1 11:08:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/11/16 12:08:26 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2016/12/01 11:08:56 martin Exp $
 
 DISTNAME=      gstreamer-1.10.0
 PKGNAME=       ${DISTNAME:S/gstreamer/gstreamer1/}
@@ -27,5 +27,4 @@ PKGCONFIG_OVERRIDE+=  pkgconfig/gstreamer
 PKGCONFIG_OVERRIDE+=   pkgconfig/gstreamer-base.pc.in
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/gstreamer1/PLIST
diff -u pkgsrc/multimedia/gstreamer1/PLIST:1.8 pkgsrc/multimedia/gstreamer1/PLIST:1.9
--- pkgsrc/multimedia/gstreamer1/PLIST:1.8      Wed Nov 16 12:08:26 2016
+++ pkgsrc/multimedia/gstreamer1/PLIST  Thu Dec  1 11:08:56 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2016/11/16 12:08:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2016/12/01 11:08:56 martin Exp $
 bin/gst-inspect-1.0
 bin/gst-launch-1.0
 bin/gst-stats-1.0
@@ -114,11 +114,11 @@ include/gstreamer-1.0/gst/net/gstnettime
 include/gstreamer-1.0/gst/net/gstnettimeprovider.h
 include/gstreamer-1.0/gst/net/gstptpclock.h
 include/gstreamer-1.0/gst/net/net.h
-lib/girepository-1.0/Gst-1.0.typelib
-lib/girepository-1.0/GstBase-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/Gst-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstBase-1.0.typelib
 ${PLIST.gstcheck}lib/girepository-1.0/GstCheck-1.0.typelib
-lib/girepository-1.0/GstController-1.0.typelib
-lib/girepository-1.0/GstNet-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstController-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstNet-1.0.typelib
 lib/gstreamer-1.0/libgstcoreelements.la
 lib/gstreamer-1.0/libgstcoretracers.la
 lib/libgstbase-1.0.la
@@ -141,11 +141,11 @@ share/bash-completion/completions/gst-in
 share/bash-completion/completions/gst-launch-1.0
 share/bash-completion/helpers/gst
 share/bash-completion/helpers/gst-completion-helper-1.0
-share/gir-1.0/Gst-1.0.gir
-share/gir-1.0/GstBase-1.0.gir
+${PLIST.introspection}share/gir-1.0/Gst-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstBase-1.0.gir
 ${PLIST.gstcheck}share/gir-1.0/GstCheck-1.0.gir
-share/gir-1.0/GstController-1.0.gir
-share/gir-1.0/GstNet-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstController-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstNet-1.0.gir
 share/gtk-doc/html/gstreamer-1.0/GstAllocator.html
 share/gtk-doc/html/gstreamer-1.0/GstBin.html
 share/gtk-doc/html/gstreamer-1.0/GstBuffer.html

Index: pkgsrc/multimedia/gstreamer1/options.mk
diff -u pkgsrc/multimedia/gstreamer1/options.mk:1.4 pkgsrc/multimedia/gstreamer1/options.mk:1.5
--- pkgsrc/multimedia/gstreamer1/options.mk:1.4 Wed Nov 18 12:04:16 2015
+++ pkgsrc/multimedia/gstreamer1/options.mk     Thu Dec  1 11:08:56 2016
@@ -1,11 +1,12 @@
-# $NetBSD: options.mk,v 1.4 2015/11/18 12:04:16 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2016/12/01 11:08:56 martin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gstreamer
-PKG_SUPPORTED_OPTIONS= gstreamer-gstcheck
+PKG_SUPPORTED_OPTIONS= gstreamer-gstcheck introspection
+PKG_SUGGESTED_OPTIONS= introspection
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   gstcheck
+PLIST_VARS+=   gstcheck introspection
 .if !empty(PKG_OPTIONS:Mgstreamer-gstcheck)
 .include "../../devel/check/buildlink3.mk"
 PLIST.gstcheck=        yes
@@ -15,3 +16,9 @@ TEST_TARGET=  check-torture
 .else
 CONFIGURE_ARGS+=--disable-check
 .endif
+.if !empty(PKG_OPTIONS:Mintrospection)
+.include "../../devel/gobject-introspection/buildlink3.mk"
+PLIST.introspection=yes
+.else
+CONFIGURE_ARGS+=--disable-introspection
+.endif