Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Nov 2024 16:52:26 GMT
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: e0c9badbe99d - main - multimedia/pipewire: Do not install gschema file to resolve a conflict with pulseaudio
Message-ID:  <202411011652.4A1GqQEo058707@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e0c9badbe99da82762acf7cbc6a38fb33be94f94

commit e0c9badbe99da82762acf7cbc6a38fb33be94f94
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-11-01 16:51:35 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-11-01 16:52:07 +0000

    multimedia/pipewire: Do not install gschema file to resolve a conflict with pulseaudio
    
    PR:             282452
---
 multimedia/pipewire/Makefile  | 3 +++
 multimedia/pipewire/pkg-plist | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile
index c027bd66384c..2224ae6f9745 100644
--- a/multimedia/pipewire/Makefile
+++ b/multimedia/pipewire/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pipewire
 DISTVERSION=	1.2.6
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	arrowd@FreeBSD.org
@@ -52,6 +53,7 @@ LV2_DESC=		Support lv2-based audio plugins via lilv
 LV2_LIB_DEPENDS=	liblilv-0.so:audio/lilv
 LV2_MESON_ENABLED=	lv2
 
+PULSEAUDIO_DESC=		Enable PulseAudio emulation
 PULSEAUDIO_MESON_ENABLED=	libpulse
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 
@@ -85,6 +87,7 @@ MESON_ARGS=	-D pw-cat=enabled \
 		-D libmysofa=disabled \
 		-D libffado=disabled \
 		-D snap=disabled \
+		-D gsettings-pulse-schema=disabled \
 		-D udevrulesdir="${LOCALBASE}/lib/udev/rules.d"
 
 PORTDOCS=	*
diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist
index b9d062df1139..71bfb36805b9 100644
--- a/multimedia/pipewire/pkg-plist
+++ b/multimedia/pipewire/pkg-plist
@@ -304,7 +304,6 @@ lib/spa-0.2/videotestsrc/libspa-videotestsrc.so
 %%VULKAN%%lib/spa-0.2/vulkan/libspa-vulkan.so
 libdata/pkgconfig/libpipewire-0.3.pc
 libdata/pkgconfig/libspa-0.2.pc
-share/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml
 share/locale/af/LC_MESSAGES/pipewire.mo
 share/locale/as/LC_MESSAGES/pipewire.mo
 share/locale/be/LC_MESSAGES/pipewire.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411011652.4A1GqQEo058707>