gnunet: attempt to adjust options + bl3 for gnunet-gtk

[nikita <nikita%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Mon Mar 21 16:47:24 2022 +0100
Changeset:	d219e1a1632124c642ceb21fca192e2568d81cfe

Modified Files:
	gnunet/buildlink3.mk
	gnunet/options.mk

Log Message:
gnunet: attempt to adjust options + bl3 for gnunet-gtk

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d219e1a1632124c642ceb21fca192e2568d81cfe

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

diffstat:
 gnunet/buildlink3.mk | 2 ++
 gnunet/options.mk    | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diffs:
diff --git a/gnunet/buildlink3.mk b/gnunet/buildlink3.mk
index 21015789f7..c6a3beaa59 100644
--- a/gnunet/buildlink3.mk
+++ b/gnunet/buildlink3.mk
@@ -33,6 +33,7 @@ pkgbase:= gnunet
 .include "../../mk/pgsql.buildlink3.mk"
 .endif
 
+.if !empty(PKG_BUILD_OPTIONS.gnunet:Maudio)
 .if !empty(PKG_BUILD_OPTIONS.gnunet:Mopus)
 .include "../../audio/libopus/buildlink3.mk"
 .endif
@@ -49,6 +50,7 @@ pkgbase:= gnunet
 .if !empty(PKG_BUILD_OPTIONS.gnunet:Mpulseaudio)
 .include "../../audio/pulseaudio/buildlink3.mk"
 .endif
+.endif
 
 .if !empty(PKG_BUILD_OPTIONS.gnunet:Mzbar)
 .include "../../graphics/zbar/buildlink3.mk"
diff --git a/gnunet/options.mk b/gnunet/options.mk
index 047e88aa20..69c5591fb8 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -4,11 +4,12 @@ PKG_OPTIONS_VAR=		PKG_OPTIONS.gnunet
 
 PKG_SUPPORTED_OPTIONS+=		doc mdoc idn mysql pgsql tests
 PKG_SUPPORTED_OPTIONS+=		experimental bluez pulseaudio
-PKG_SUPPORTED_OPTIONS+=		opus ogg sqlite3
+PKG_SUPPORTED_OPTIONS+=		opus ogg sqlite3 audio
 PKG_SUPPORTED_OPTIONS+=		gstreamer perl verbose-logging
 # Should we name this qrcode instead?
 PKG_SUPPORTED_OPTIONS+=		zbar
 PKG_SUGGESTED_OPTIONS+=		idn gstreamer doc sqlite3 opus ogg
+PKG_SUGGESTED_OPTIONS+=		audio
 
 # bluez is still in pkgsrc-wip, and I should test this
 # before claiming bluez from pkgsrc-wip on Linux works.
@@ -107,7 +108,10 @@ CONFIGURE_ARGS+=	--disable-experimental
 .endif
 
 # conversation submodule. if gstreamer + opus + ogg
-# exists, pulseaudio is not necessary.
+# exists, pulseaudio is not necessary. gnunet-gtk
+# conditionally builds a binary if the conversation
+# submodule is build by gnunet.
+.if !empty(PKG_OPTIONS:Maudio)
 .if !empty(PKG_OPTIONS:Mopus)
 .include "../../audio/libopus/buildlink3.mk"
 PLIST_SRC+=		PLIST.conversations
@@ -128,6 +132,7 @@ PLIST_SRC+=		PLIST.conversations
 .include "../../audio/pulseaudio/buildlink3.mk"
 PLIST_SRC+=		PLIST.conversations
 .endif
+.endif
 
 .if !empty(PKG_OPTIONS:Mzbar)
 .include "../../graphics/zbar/buildlink3.mk"