From nobody Wed Oct 11 17:06:00 2023 X-Original-To: dev-commits-ports-all@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 4S5K0m5J6Cz4wQM9; Wed, 11 Oct 2023 17:06:00 +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 4S5K0m4nNpz4LcK; Wed, 11 Oct 2023 17:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697043960; 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=RzMcdwDUFE9VT44utxKMkmUF0Yb9m1Qre8IcOPZsyTQ=; b=yd4V+HRnOYzRTrDFx7l8FobWySxRWTKCsmQyvrKX43gxb0l3/3lXwTXI5AmqVeejqKh7Yv 8RhSrdGcFD2fcsm1o5xr6E6CYnibLcG5sKNi3RUYIjOloKVckcxz5+kB/4N5cMh3r3Lvkt pMN+7Z/ZS0bT6BT0rLGARavAGMtnsLtEfCPHNd/ZJ/Np3JhPJUQzghWPkslthNP0j5wYFO kEJe72x2F+4G086A1k6hSM51hp1ULE/WoDHbAphtz/BaoaaeACl3JGAasKC2rE77ca1HfK Q01x6DCJJgV6wThxBXGLecPmJp5YMAwzWxwmXV5XM0j3VVKSZKNs7WxlQRHdwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697043960; a=rsa-sha256; cv=none; b=LfxYx0qzusMCS5RuvqvWz3utYyII28p986stNJ75eSwal23oQSW5VAUcwX3MUnJErNlAYF FBmL0k9HzYuFiFjchHywPV0j0tp0CrCFPTypRB0CXLYx1HvC63XJDBF6vgkcETHA5KyBzh PO6BGuMe0w2pMqFd86jCL48cUR+n4AB0LFZf2ejsPSkWemrVcJnyqgIyMFPP4UxwzxdCXV qTeyl3E96TvxMAC0TDAUMVOrXj6popkR7hrb9cKFWQbCrGP30HAFa99jDxIGj/itevrNba pXQXXM53Tv6UpjVwysnUnxun7Sd5qehITl4jfzqJiMu63CfXXojCufVbYGb+IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697043960; 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=RzMcdwDUFE9VT44utxKMkmUF0Yb9m1Qre8IcOPZsyTQ=; b=Gkn/vvnJpoF3nbvyaDyLpr4z9iya+O8CK4HT4zbcbwivm0+CVXGe6PHqQIc7zFQZgi8O43 r4AcVbJI/itv+pSkFKp+oanTa6+dKu5CbeqcDXUBe4eNQGxSY6draIqveBbIK+ENR+kuay 4zuLLUWKl4yUgdbnZpMFhS9iGzaE2YJTRPe1wYyJvVWDUvuy9RxKgX4RWra/H4QHLDlFXI YKuEyI5gyBf3yQ3pzzg0rAEC1fDWwOBqbNKJY3P8HdFxbGoMSfYHLd43cNikg6ZJPW24JZ b7/PgfnDeysUnRS0EvcI2NeNVcsYiWCZVim0/IqeQNw3W1WyAXQ7j9xi4zBzdg== 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 4S5K0m3jqrzVRq; Wed, 11 Oct 2023 17:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39BH603l057784; Wed, 11 Oct 2023 17:06:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BH602B057781; Wed, 11 Oct 2023 17:06:00 GMT (envelope-from git) Date: Wed, 11 Oct 2023 17:06:00 GMT Message-Id: <202310111706.39BH602B057781@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: d26cd48207f1 - main - multimedia/pipewire: unbreak MEDIASESSION after ea9c61f86374 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d26cd48207f1d50401c130539a650e91e6f150b2 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d26cd48207f1d50401c130539a650e91e6f150b2 commit d26cd48207f1d50401c130539a650e91e6f150b2 Author: Jan Beich AuthorDate: 2023-10-11 16:57:25 +0000 Commit: Jan Beich CommitDate: 2023-10-11 17:05:10 +0000 multimedia/pipewire: unbreak MEDIASESSION after ea9c61f86374 $ daemon -f pipewire $ /usr/local/libexec/xdg-desktop-portal-wlr [ERROR] - pipewire: couldn't connect to context [ERROR] - xdpw: failed to initialize screencast 'impl->enter_count > 0' failed at ../spa/plugins/support/loop.c:362 loop_leave() PR: 273258 Regressed by: https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/01096bf6695a --- multimedia/pipewire/Makefile | 2 + .../pipewire/files/patch-spa_plugins_meson.build | 8 +++ multimedia/pipewire/pkg-plist | 77 ++++++++++++++++++++++ 3 files changed, 87 insertions(+) diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile index e13d2ddbcf2a..fb37bef94710 100644 --- a/multimedia/pipewire/Makefile +++ b/multimedia/pipewire/Makefile @@ -1,5 +1,6 @@ PORTNAME= pipewire DISTVERSION= 0.3.81 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${MEDIA_SESSION_VERSION}/:media_session DISTFILES= media-session-${MEDIA_SESSION_VERSION}${EXTRACT_SUFX}:media_session @@ -71,6 +72,7 @@ MESON_ARGS= -D pw-cat=enabled \ -D raop=enabled \ -D avb=disabled \ -D bluez5=disabled \ + -D compress-offload=disabled \ -D jack=disabled \ -D libcamera=disabled \ -D libcanberra=disabled \ diff --git a/multimedia/pipewire/files/patch-spa_plugins_meson.build b/multimedia/pipewire/files/patch-spa_plugins_meson.build new file mode 100644 index 000000000000..45a68c3c3101 --- /dev/null +++ b/multimedia/pipewire/files/patch-spa_plugins_meson.build @@ -0,0 +1,8 @@ +--- spa/plugins/meson.build.orig 2023-10-06 09:37:06 UTC ++++ spa/plugins/meson.build +@@ -1,4 +1,4 @@ +-if alsa_dep.found() and host_machine.system() == 'linux' ++if alsa_dep.found() + subdir('alsa') + endif + if get_option('avb').require(host_machine.system() == 'linux', error_message: 'AVB support is only available on Linux').allowed() diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist index 6780de9bfb9f..c75ca06a5978 100644 --- a/multimedia/pipewire/pkg-plist +++ b/multimedia/pipewire/pkg-plist @@ -24,6 +24,7 @@ bin/pw-profiler bin/pw-record bin/pw-reserve bin/pw-top +%%MEDIASESSION%%bin/spa-acp-tool bin/spa-inspect bin/spa-json-dump bin/spa-monitor @@ -285,6 +286,7 @@ lib/pipewire-0.3/libpipewire-module-vban-send.so %%PULSEAUDIO%%lib/pipewire-0.3/libpipewire-module-zeroconf-discover.so lib/spa-0.2/aec/libspa-aec-null.so lib/spa-0.2/aec/libspa-aec-webrtc.so +%%MEDIASESSION%%lib/spa-0.2/alsa/libspa-alsa.so lib/spa-0.2/audioconvert/libspa-audioconvert.so lib/spa-0.2/audiomixer/libspa-audiomixer.so lib/spa-0.2/audiotestsrc/libspa-audiotestsrc.so @@ -295,6 +297,7 @@ lib/spa-0.2/v4l2/libspa-v4l2.so lib/spa-0.2/videoconvert/libspa-videoconvert.so lib/spa-0.2/videotestsrc/libspa-videotestsrc.so %%VULKAN%%lib/spa-0.2/vulkan/libspa-vulkan.so +@comment lib/udev/rules.d/90-pipewire-alsa.rules libdata/pkgconfig/libpipewire-0.3.pc libdata/pkgconfig/libspa-0.2.pc %%MANPAGES%%man/man1/pipewire-pulse.1.gz @@ -311,6 +314,80 @@ libdata/pkgconfig/libspa-0.2.pc %%MANPAGES%%man/man1/pw-profiler.1.gz %%MANPAGES%%man/man1/pw-top.1.gz %%MANPAGES%%man/man5/pipewire.conf.5.gz +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-aux.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-dock-mic.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-fm.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-front-mic.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-headphone-mic.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-headset-mic.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-internal-mic-always.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-internal-mic.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-linein.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-mic-line.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-mic.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-mic.conf.common +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-rear-mic.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-tvtuner.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input-video.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-input.conf.common +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output-chat.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output-headphones-2.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output-headphones.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output-lineout.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output-mono.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output-speaker-always.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output-speaker.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/analog-output.conf.common +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/audigy-analog-output-mirror.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/audigy-analog-output.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-0.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-1.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-10.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-2.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-3.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-4.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-5.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-6.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-7.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-8.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/hdmi-output-9.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/iec958-stereo-input.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/iec958-stereo-output.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/steelseries-arctis-output-chat-common.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/steelseries-arctis-output-game-common.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/usb-gaming-headset-input.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/usb-gaming-headset-output-mono.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/usb-gaming-headset-output-stereo.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/paths/virtual-surround-7.1.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/9999-custom.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/analog-only.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/asus-xonar-se.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/audigy.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/cmedia-high-speed-true-hdaudio.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/default.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/dell-dock-tb16-usb-audio.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/force-speaker-and-int-mic.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/force-speaker.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/hp-tbt-dock-120w-g2.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/hp-tbt-dock-audio-module.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/kinect-audio.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/maudio-fasttrack-pro.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-audio4dj.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-audio8dj.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-komplete-audio6.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-korecontroller.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-traktor-audio10.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-traktor-audio2.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-traktor-audio6.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/sb-omni-surround-5.1.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/sennheiser-gsx.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/simple-headphones-mic.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/steelseries-arctis-common-usb-audio.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/texas-instruments-pcm2902.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/usb-gaming-headset.conf %%MEDIASESSION%%share/alsa/alsa.conf.d/50-pipewire.conf %%MEDIASESSION%%share/alsa/alsa.conf.d/99-pipewire-default.conf %%MEDIASESSION%%share/locale/af/LC_MESSAGES/media-session.mo