From nobody Fri Nov 01 16:52:26 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xg6NV6qWLz5c5f3; Fri, 01 Nov 2024 16:52:26 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xg6NV6Bp4z440R; Fri, 1 Nov 2024 16:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730479946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+w4juo8rZij8OKS0J5Gegp5ou4R17Wc1ehlCffEsyoo=; b=L+wdZr6v7eSbvwLalP/w06E9O4XJNrypIqu0Dv2iD3LU1EgcoDtqMYLbCgaV8x6sZT1wWT 3/ElAiq9e3+gid1zyfwEIrvwjl8XYv8bcpATzx1W71wnoF4eJksfHlrcYQF+HKNIFAaxjc sZdByLian/+ezqeo13llUrHfVAsXj8n5/o18sU4oTufqbfniySRhGk7pzDy0VPPQHkQEpa hZWfKCsIoMYEF16vUAjjLQyVCggndmJo9JLv3TUVp6ewV3ZOIBiPEbwaPYCg1Dnjp/k106 VDN06gBqtEfKkO8b1Qcznuv/T4sdymtdqUbWUP8NAyEJXf0SWOLodauGScjwMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730479946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+w4juo8rZij8OKS0J5Gegp5ou4R17Wc1ehlCffEsyoo=; b=K2DviEEAwUxXu64YLJ2vI1GxgQhbuOksXwhKosGJ8RbZzaLF5+eTF09NLo9IaoxKNeyDrs QTU4sNOBWLQozoJkRRMv0XBVeDaazmR13Aq19bblURE/5xqxwPxqPQhz+N3nujP6aHahaE eg2eXVeQw+9azjN375WYgCQNM8Y3SsLFhYK61ec0iVCPfkjK2PRdcOKi5tfmg6YZdxM1zg Gs572L+iLN1PnRI7CDEjJc+UGk0xbXja1l3GvT3hYj6tPzLkEbY3h3vOnZ0MxafXYB5mQv jz7U5Qb+D7t/PMmWs4OrxsrQ9PeVpKCaZtSx7cWMrcLKdcRFUduzjpgU1V7QZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730479946; a=rsa-sha256; cv=none; b=oVF4ulGHMWFyWZRItS4UtGSKo2KXoQtWRomQAXxzsNgeltFHh1dbS7OErWIepp46GMwPRs soCVXwseIEDM1G6qXWDKBWNqP54RzZyocgLT0fx4BNR0YOS1Dxz6ZpkHWSJ3ASrh+8Jvqe EShYsOf/OApGj5fCQLqk6T57vADucFUjzHKnKVeGEGePzgpHNZfiTV11UezsAW5N8gnuks vkteckiUOfH7i5pNu369zX+FcABBiRiCCdFIeN62zIpxSoDS4ga/OpRRoZcysgLk8CnL4/ uJTX9FpBx4dB87aauThMZY8PZzg5PiqQFzr9OP4scRVnqUwkYqsRvRgPDz3h6A== 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 4Xg6NV5pN2zShl; Fri, 1 Nov 2024 16:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A1GqQpw058710; Fri, 1 Nov 2024 16:52:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A1GqQEo058707; Fri, 1 Nov 2024 16:52:26 GMT (envelope-from git) Date: Fri, 1 Nov 2024 16:52:26 GMT Message-Id: <202411011652.4A1GqQEo058707@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: e0c9badbe99d - main - multimedia/pipewire: Do not install gschema file to resolve a conflict with pulseaudio List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org 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: e0c9badbe99da82762acf7cbc6a38fb33be94f94 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0c9badbe99da82762acf7cbc6a38fb33be94f94 commit e0c9badbe99da82762acf7cbc6a38fb33be94f94 Author: Gleb Popov AuthorDate: 2024-11-01 16:51:35 +0000 Commit: Gleb Popov 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