CVS commit: pkgsrc/x11/wxGTK28

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Aug  1 17:19:46 UTC 2020

Modified Files:
        pkgsrc/x11/wxGTK28: Makefile.common PLIST
Added Files:
        pkgsrc/x11/wxGTK28: options.mk

Log Message:
wxGTK28: make gstreamer optional


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/wxGTK28/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/wxGTK28/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/wxGTK28/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/x11/wxGTK28/Makefile.common
diff -u pkgsrc/x11/wxGTK28/Makefile.common:1.20 pkgsrc/x11/wxGTK28/Makefile.common:1.21
--- pkgsrc/x11/wxGTK28/Makefile.common:1.20     Sun Jan 26 17:32:27 2020
+++ pkgsrc/x11/wxGTK28/Makefile.common  Sat Aug  1 17:19:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2020/01/26 17:32:27 rillig Exp $
+# $NetBSD: Makefile.common,v 1.21 2020/08/01 17:19:46 tnn Exp $
 #
 # used by x11/wxGTK28/Makefile
 # used by x11/wxGTK28-contrib/Makefile
@@ -53,6 +53,8 @@ SUBST_SED.fix-paths=          -e 's,/usr/pkg/inc
 SUBST_VARS.fix-paths=          PREFIX
 SUBST_SED.fix-paths+=          -e 's,/usr/X11/,${X11BASE}/,g'
 
+.include "../../x11/wxGTK28/options.mk"
+
 pre-configure:
        mkdir ${WRKSRC}/build-non-unicode ${WRKSRC}/build-unicode
        printf '#!%s\n../configure --enable-unicode "$$@"' ${SH} \
@@ -60,9 +62,6 @@ pre-configure:
        printf '#!%s\n../configure --disable-unicode "$$@"' ${SH} \
            > ${WRKSRC}/build-non-unicode/configure
 
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"

Index: pkgsrc/x11/wxGTK28/PLIST
diff -u pkgsrc/x11/wxGTK28/PLIST:1.6 pkgsrc/x11/wxGTK28/PLIST:1.7
--- pkgsrc/x11/wxGTK28/PLIST:1.6        Tue Jan 19 04:18:35 2016
+++ pkgsrc/x11/wxGTK28/PLIST    Sat Aug  1 17:19:46 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2016/01/19 04:18:35 dbj Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/08/01 17:19:46 tnn Exp $
 bin/wx-config
 bin/wx-config-2.8
 bin/wxrc
@@ -553,7 +553,7 @@ lib/libwx_gtk2${DEBUG_LIB}_aui-2.8.la
 lib/libwx_gtk2${DEBUG_LIB}_core-2.8.la
 lib/libwx_gtk2${DEBUG_LIB}_gl-2.8.la
 lib/libwx_gtk2${DEBUG_LIB}_html-2.8.la
-lib/libwx_gtk2${DEBUG_LIB}_media-2.8.la
+${PLIST.gstreamer}lib/libwx_gtk2${DEBUG_LIB}_media-2.8.la
 lib/libwx_gtk2${DEBUG_LIB}_qa-2.8.la
 lib/libwx_gtk2${DEBUG_LIB}_richtext-2.8.la
 lib/libwx_gtk2${DEBUG_LIB}_xrc-2.8.la
@@ -562,7 +562,7 @@ lib/libwx_gtk2u${DEBUG_LIB}_aui-2.8.la
 lib/libwx_gtk2u${DEBUG_LIB}_core-2.8.la
 lib/libwx_gtk2u${DEBUG_LIB}_gl-2.8.la
 lib/libwx_gtk2u${DEBUG_LIB}_html-2.8.la
-lib/libwx_gtk2u${DEBUG_LIB}_media-2.8.la
+${PLIST.gstreamer}lib/libwx_gtk2u${DEBUG_LIB}_media-2.8.la
 lib/libwx_gtk2u${DEBUG_LIB}_qa-2.8.la
 lib/libwx_gtk2u${DEBUG_LIB}_richtext-2.8.la
 lib/libwx_gtk2u${DEBUG_LIB}_xrc-2.8.la

Added files:

Index: pkgsrc/x11/wxGTK28/options.mk
diff -u /dev/null pkgsrc/x11/wxGTK28/options.mk:1.1
--- /dev/null   Sat Aug  1 17:19:46 2020
+++ pkgsrc/x11/wxGTK28/options.mk       Sat Aug  1 17:19:46 2020
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2020/08/01 17:19:46 tnn Exp $
+
+PLIST_VARS+=  gstreamer
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.wxGTK28
+PKG_SUPPORTED_OPTIONS= gstreamer
+PKG_SUGGESTED_OPTIONS= gstreamer
+
+PLIST.gstreamer=       yes
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgstreamer)
+.include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
+.endif