From owner-dev-commits-ports-main@freebsd.org Fri Jun 4 20:02:08 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DC685653C5F; Fri, 4 Jun 2021 20:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FxYZS5mgqz4lfy; Fri, 4 Jun 2021 20:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AB36023711; Fri, 4 Jun 2021 20:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 154K280V075343; Fri, 4 Jun 2021 20:02:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 154K28ls075342; Fri, 4 Jun 2021 20:02:08 GMT (envelope-from git) Date: Fri, 4 Jun 2021 20:02:08 GMT Message-Id: <202106042002.154K28ls075342@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 9f6ccfbfaf7b - main - audio/pulseaudio: Add X11 option. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f6ccfbfaf7b949f339cc2ff31155218fcfce9eb Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2021 20:02:08 -0000 The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f6ccfbfaf7b949f339cc2ff31155218fcfce9eb commit 9f6ccfbfaf7b949f339cc2ff31155218fcfce9eb Author: Evgeniy Khramtsov AuthorDate: 2021-06-04 19:55:00 +0000 Commit: Gleb Popov CommitDate: 2021-06-04 20:01:38 +0000 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