From 9f6ccfbfaf7b949f339cc2ff31155218fcfce9eb Mon Sep 17 00:00:00 2001
From: Evgeniy Khramtsov <evgeniy@khramtsov.org>
Date: Fri, 4 Jun 2021 22:55:00 +0300
Subject: [PATCH] audio/pulseaudio: Add X11 option.

PR:		255093
Tested by:	arrowd
---
 audio/pulseaudio/Makefile  | 10 ++++++----
 audio/pulseaudio/pkg-plist | 18 +++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 649ae556d34c..186d626bdab1 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -23,10 +23,9 @@ LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
 		libck-connector.so:sysutils/consolekit2
 
 USES=		compiler:c11 cpe gettext gmake gnome iconv libtool localbase:ldflags \
-		pathfix pkgconfig python:run shebangfix ssl tar:xz xorg
+		pathfix pkgconfig python:run shebangfix ssl tar:xz
 
 USE_GNOME=	glib20
-USE_XORG=	ice sm x11 xcb xtst
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread" \
@@ -57,8 +56,8 @@ USERS=		pulse
 GROUPS=		pulse pulse-access pulse-rt
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	AVAHI GCONF GSETTINGS SIMD TEST
-OPTIONS_DEFAULT=AVAHI SIMD SIMPLE SOXR SPEEX WEBRTC_AEC
+OPTIONS_DEFINE=	AVAHI GCONF GSETTINGS SIMD TEST X11
+OPTIONS_DEFAULT=AVAHI SIMD SIMPLE SOXR SPEEX WEBRTC_AEC X11
 AVAHI_CONFIGURE_ENABLE=	avahi
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 GCONF_CONFIGURE_ENABLE=	gconf
@@ -71,6 +70,9 @@ SIMD_LIB_DEPENDS=	liborc-0.4.so:devel/orc
 TEST_TEST_TARGET=	check
 TEST_CONFIGURE_ENABLE=	tests default-build-tests
 TEST_BUILD_DEPENDS=	check>0:devel/check
+X11_CONFIGURE_ENABLE=	x11
+X11_USES=	xorg
+X11_USE=	XORG=ice,sm,x11,xcb,xtst
 
 OPTIONS_GROUP=	AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA JACK SOXR SPEEX WEBRTC_AEC
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index 0cac604707db..41df8865651c 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -8,16 +8,16 @@ bin/paplay
 bin/parec
 bin/parecord
 bin/pasuspender
-bin/pax11publish
+%%X11%%bin/pax11publish
 bin/pulseaudio
 bin/qpaeq
-bin/start-pulseaudio-x11
+%%X11%%bin/start-pulseaudio-x11
 etc/dbus-1/system.d/pulseaudio-system.conf
 @sample etc/pulse/client.conf.sample
 @sample etc/pulse/daemon.conf.sample
 @sample etc/pulse/default.pa.sample
 @sample etc/pulse/system.pa.sample
-etc/xdg/autostart/pulseaudio.desktop
+%%X11%%etc/xdg/autostart/pulseaudio.desktop
 include/pulse/cdecl.h
 include/pulse/channelmap.h
 include/pulse/context.h
@@ -141,10 +141,10 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-sink.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-source.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-surround-sink.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-cork-request.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-xsmp.so
+%%X11%%lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.so
+%%X11%%lib/pulse-%%PULSE_VERSION%%/modules/module-x11-cork-request.so
+%%X11%%lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.so
+%%X11%%lib/pulse-%%PULSE_VERSION%%/modules/module-x11-xsmp.so
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-discover.so
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.so
 lib/pulseaudio/libpulsecommon-%%PULSE_VERSION%%.so
@@ -164,9 +164,9 @@ man/man1/paplay.1.gz
 man/man1/parec.1.gz
 man/man1/parecord.1.gz
 man/man1/pasuspender.1.gz
-man/man1/pax11publish.1.gz
+%%X11%%man/man1/pax11publish.1.gz
 man/man1/pulseaudio.1.gz
-man/man1/start-pulseaudio-x11.1.gz
+%%X11%%man/man1/start-pulseaudio-x11.1.gz
 man/man5/default.pa.5.gz
 man/man5/pulse-cli-syntax.5.gz
 man/man5/pulse-client.conf.5.gz