Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/wxGTK28 wxGTK28: make gstreamer optional



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3faf69793657
branches:  trunk
changeset: 436404:3faf69793657
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Aug 01 17:19:46 2020 +0000

description:
wxGTK28: make gstreamer optional

diffstat:

 x11/wxGTK28/Makefile.common |   7 +++----
 x11/wxGTK28/PLIST           |   6 +++---
 x11/wxGTK28/options.mk      |  17 +++++++++++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)

diffs (76 lines):

diff -r 1a94ca29debe -r 3faf69793657 x11/wxGTK28/Makefile.common
--- a/x11/wxGTK28/Makefile.common       Sat Aug 01 17:11:11 2020 +0000
+++ b/x11/wxGTK28/Makefile.common       Sat Aug 01 17:19:46 2020 +0000
@@ -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_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 @@
        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"
diff -r 1a94ca29debe -r 3faf69793657 x11/wxGTK28/PLIST
--- a/x11/wxGTK28/PLIST Sat Aug 01 17:11:11 2020 +0000
+++ b/x11/wxGTK28/PLIST Sat Aug 01 17:19:46 2020 +0000
@@ -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}_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}_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
diff -r 1a94ca29debe -r 3faf69793657 x11/wxGTK28/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK28/options.mk    Sat Aug 01 17:19:46 2020 +0000
@@ -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



Home | Main Index | Thread Index | Old Index