Attachment 225029 Details for Bug 255944 – patch

[patch] patch

pipewire.diff (text/plain), 14.00 KB, created by Evgenii Khramtsov on 2021-05-17 14:00:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Evgenii Khramtsov

Created: 2021-05-17 14:00:52 UTC

Size: 14.00 KB

patch

obsolete

>diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile
>index d312ca8631a6..523c8dd9a6f8 100644
>--- a/multimedia/pipewire/Makefile
>+++ b/multimedia/pipewire/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	pipewire
>-DISTVERSION=	0.3.25
>+DISTVERSION=	0.3.27
> CATEGORIES=	multimedia
> 
> MAINTAINER=	arrowd@FreeBSD.org
>@@ -16,31 +16,34 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
> 		libepoll-shim.so:devel/libepoll-shim \
> 		libudev.so:devel/libudev-devd
> 
>-USES=		compiler:c11 gnome meson pkgconfig
>+USES=		compiler:c11 gettext-tools gnome localbase:ldflags meson pkgconfig
>+USE_GNOME=	glib20
>+USE_LDCONFIG=	yes
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	PipeWire
> 
>-OPTIONS_DEFINE=	GSTREAMER VULKAN
>+OPTIONS_DEFINE=	GSTREAMER MEDIASESSION VULKAN
>+OPTIONS_SUB=	yes
> 
> GSTREAMER_MESON_ENABLED=gstreamer
> GSTREAMER_LIB_DEPENDS=	libgstreamer-1.0.so:multimedia/gstreamer1 \
> 			libgstaudio-1.0.so:multimedia/gstreamer1-plugins
> 
>+MEDIASESSION_DESC=	Session manager support
>+MEDIASESSION_MESON_ENABLED=	alsa pipewire-alsa media-session pw-cat
>+MEDIASESSION_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
>+
> VULKAN_DESC=		Enable Vulkan integration
> VULKAN_MESON_ENABLED=	vulkan
> VULKAN_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
> VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
> 
>-USE_GNOME=	glib20
>-USE_LDCONFIG=	yes
>-
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	PipeWire
>-
>-MESON_ARGS=	-Dalsa=disabled -Dpipewire-alsa=disabled \
>-		-D bluez5=disabled \
>+MESON_ARGS=	-D bluez5=disabled \
> 		-D jack=disabled -D pipewire-jack=disabled \
>-		-D systemd=disabled
>-
>-OPTIONS_SUB=	yes
>+		-D systemd=disabled \
>+		-D sdl2=disabled \
>+		-D udevrulesdir="${LOCALBASE}/lib/udev/rules.d"
> 
> post-install:
> 	${MV} ${STAGEDIR}${ETCDIR}/pipewire.conf ${STAGEDIR}${ETCDIR}/pipewire.conf.sample
>diff --git a/multimedia/pipewire/distinfo b/multimedia/pipewire/distinfo
>index 09766faf1079..fd469e2fb762 100644
>--- a/multimedia/pipewire/distinfo
>+++ b/multimedia/pipewire/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1617876143
>-SHA256 (PipeWire-pipewire-0.3.25_GH0.tar.gz) = fb6d5a0cbde621659ffd67622f19744dd6c8da8745b060cb1951c3d2045e5166
>-SIZE (PipeWire-pipewire-0.3.25_GH0.tar.gz) = 1351257
>+TIMESTAMP = 1621254922
>+SHA256 (PipeWire-pipewire-0.3.27_GH0.tar.gz) = 657db1b9a29ae17a9f1d9782a45bda2ba5a893fef55e1ca26453e8f7f2d4e64e
>+SIZE (PipeWire-pipewire-0.3.27_GH0.tar.gz) = 1459913
>diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist
>index 155f184cd0d1..d6f726eea3be 100644
>--- a/multimedia/pipewire/pkg-plist
>+++ b/multimedia/pipewire/pkg-plist
>@@ -1,26 +1,35 @@
> bin/pipewire
>+%%MEDIASESSION%%bin/pipewire-media-session
> bin/pipewire-pulse
>+%%MEDIASESSION%%bin/pw-cat
> bin/pw-cli
> bin/pw-dot
> bin/pw-dump
>+bin/pw-link
> bin/pw-loopback
> bin/pw-metadata
> bin/pw-mididump
>+%%MEDIASESSION%%bin/pw-midiplay
>+%%MEDIASESSION%%bin/pw-midirecord
> bin/pw-mon
>+%%MEDIASESSION%%bin/pw-play
> bin/pw-profiler
>+%%MEDIASESSION%%bin/pw-record
> bin/pw-reserve
>+%%MEDIASESSION%%bin/spa-acp-tool
> bin/spa-inspect
> bin/spa-json-dump
> bin/spa-monitor
>+%%MEDIASESSION%%bin/spa-resample
> %%ETCDIR%%/client-rt.conf
> %%ETCDIR%%/client.conf
> %%ETCDIR%%/jack.conf
>-%%ETCDIR%%/media-session.d/alsa-monitor.conf
>-%%ETCDIR%%/media-session.d/bluez-monitor.conf
>-%%ETCDIR%%/media-session.d/media-session.conf
>-%%ETCDIR%%/media-session.d/v4l2-monitor.conf
>-%%ETCDIR%%/media-session.d/with-jack
>-%%ETCDIR%%/media-session.d/with-pulseaudio
>+%%MEDIASESSION%%%%ETCDIR%%/media-session.d/alsa-monitor.conf
>+%%MEDIASESSION%%%%ETCDIR%%/media-session.d/bluez-monitor.conf
>+%%MEDIASESSION%%%%ETCDIR%%/media-session.d/media-session.conf
>+%%MEDIASESSION%%%%ETCDIR%%/media-session.d/v4l2-monitor.conf
>+%%MEDIASESSION%%%%ETCDIR%%/media-session.d/with-jack
>+%%MEDIASESSION%%%%ETCDIR%%/media-session.d/with-pulseaudio
> %%ETCDIR%%/pipewire-pulse.conf
> @sample %%ETCDIR%%/pipewire.conf.sample
> include/pipewire-0.3/pipewire/array.h
>@@ -45,6 +54,7 @@ include/pipewire-0.3/pipewire/extensions/session-manager/keys.h
> include/pipewire-0.3/pipewire/factory.h
> include/pipewire-0.3/pipewire/filter.h
> include/pipewire-0.3/pipewire/global.h
>+include/pipewire-0.3/pipewire/i18n.h
> include/pipewire-0.3/pipewire/impl-client.h
> include/pipewire-0.3/pipewire/impl-core.h
> include/pipewire-0.3/pipewire/impl-device.h
>@@ -133,6 +143,7 @@ include/spa-0.2/spa/pod/pod.h
> include/spa-0.2/spa/pod/vararg.h
> include/spa-0.2/spa/support/cpu.h
> include/spa-0.2/spa/support/dbus.h
>+include/spa-0.2/spa/support/i18n.h
> include/spa-0.2/spa/support/log-impl.h
> include/spa-0.2/spa/support/log.h
> include/spa-0.2/spa/support/loop.h
>@@ -149,26 +160,32 @@ include/spa-0.2/spa/utils/result.h
> include/spa-0.2/spa/utils/ringbuffer.h
> include/spa-0.2/spa/utils/type-info.h
> include/spa-0.2/spa/utils/type.h
>+%%MEDIASESSION%%lib/alsa-lib/libasound_module_ctl_pipewire.so
>+%%MEDIASESSION%%lib/alsa-lib/libasound_module_pcm_pipewire.so
> %%GSTREAMER%%lib/gstreamer-1.0/libgstpipewire.so
> lib/libpipewire-0.3.so
> lib/libpipewire-0.3.so.0
>-lib/libpipewire-0.3.so.0.325.0
>+lib/libpipewire-0.3.so.0.327.0
> lib/pipewire-0.3/libpipewire-module-access.so
> lib/pipewire-0.3/libpipewire-module-adapter.so
> lib/pipewire-0.3/libpipewire-module-client-device.so
> lib/pipewire-0.3/libpipewire-module-client-node.so
>+lib/pipewire-0.3/libpipewire-module-echo-cancel.so
> lib/pipewire-0.3/libpipewire-module-link-factory.so
>+lib/pipewire-0.3/libpipewire-module-loopback.so
> lib/pipewire-0.3/libpipewire-module-metadata.so
> lib/pipewire-0.3/libpipewire-module-portal.so
> lib/pipewire-0.3/libpipewire-module-profiler.so
> lib/pipewire-0.3/libpipewire-module-protocol-native.so
> lib/pipewire-0.3/libpipewire-module-protocol-pulse.so
>+lib/pipewire-0.3/libpipewire-module-protocol-simple.so
> lib/pipewire-0.3/libpipewire-module-rtkit.so
> lib/pipewire-0.3/libpipewire-module-session-manager.so
> lib/pipewire-0.3/libpipewire-module-spa-device-factory.so
> lib/pipewire-0.3/libpipewire-module-spa-device.so
> lib/pipewire-0.3/libpipewire-module-spa-node-factory.so
> lib/pipewire-0.3/libpipewire-module-spa-node.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
>@@ -180,5 +197,126 @@ lib/spa-0.2/videoconvert/libspa-videoconvert.so
> lib/spa-0.2/videotestsrc/libspa-videotestsrc.so
> lib/spa-0.2/volume/libspa-volume.so
> %%VULKAN%%lib/spa-0.2/vulkan/libspa-vulkan.so
>+%%MEDIASESSION%%lib/udev/rules.d/90-pipewire-alsa.rules
> libdata/pkgconfig/libpipewire-0.3.pc
> libdata/pkgconfig/libspa-0.2.pc
>+%%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/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/audigy.conf
>+%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/behringer-umc22.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-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/usb-gaming-headset.conf
>+%%MEDIASESSION%%share/alsa/alsa.conf.d/50-pipewire.conf
>+%%MEDIASESSION%%share/alsa/alsa.conf.d/99-pipewire-default.conf
>+share/locale/af/LC_MESSAGES/pipewire.mo
>+share/locale/as/LC_MESSAGES/pipewire.mo
>+share/locale/be/LC_MESSAGES/pipewire.mo
>+share/locale/bg/LC_MESSAGES/pipewire.mo
>+share/locale/bn_IN/LC_MESSAGES/pipewire.mo
>+share/locale/ca/LC_MESSAGES/pipewire.mo
>+share/locale/cs/LC_MESSAGES/pipewire.mo
>+share/locale/da/LC_MESSAGES/pipewire.mo
>+share/locale/de/LC_MESSAGES/pipewire.mo
>+share/locale/de_CH/LC_MESSAGES/pipewire.mo
>+share/locale/el/LC_MESSAGES/pipewire.mo
>+share/locale/eo/LC_MESSAGES/pipewire.mo
>+share/locale/es/LC_MESSAGES/pipewire.mo
>+share/locale/fi/LC_MESSAGES/pipewire.mo
>+share/locale/fr/LC_MESSAGES/pipewire.mo
>+share/locale/gl/LC_MESSAGES/pipewire.mo
>+share/locale/gu/LC_MESSAGES/pipewire.mo
>+share/locale/he/LC_MESSAGES/pipewire.mo
>+share/locale/hi/LC_MESSAGES/pipewire.mo
>+share/locale/hr/LC_MESSAGES/pipewire.mo
>+share/locale/hu/LC_MESSAGES/pipewire.mo
>+share/locale/id/LC_MESSAGES/pipewire.mo
>+share/locale/it/LC_MESSAGES/pipewire.mo
>+share/locale/ja/LC_MESSAGES/pipewire.mo
>+share/locale/kk/LC_MESSAGES/pipewire.mo
>+share/locale/kn/LC_MESSAGES/pipewire.mo
>+share/locale/ko/LC_MESSAGES/pipewire.mo
>+share/locale/lt/LC_MESSAGES/pipewire.mo
>+share/locale/ml/LC_MESSAGES/pipewire.mo
>+share/locale/mr/LC_MESSAGES/pipewire.mo
>+share/locale/nl/LC_MESSAGES/pipewire.mo
>+share/locale/nn/LC_MESSAGES/pipewire.mo
>+share/locale/oc/LC_MESSAGES/pipewire.mo
>+share/locale/or/LC_MESSAGES/pipewire.mo
>+share/locale/pa/LC_MESSAGES/pipewire.mo
>+share/locale/pl/LC_MESSAGES/pipewire.mo
>+share/locale/pt/LC_MESSAGES/pipewire.mo
>+share/locale/pt_BR/LC_MESSAGES/pipewire.mo
>+share/locale/ru/LC_MESSAGES/pipewire.mo
>+share/locale/si/LC_MESSAGES/pipewire.mo
>+share/locale/sk/LC_MESSAGES/pipewire.mo
>+share/locale/sr/LC_MESSAGES/pipewire.mo
>+share/locale/sr@latin/LC_MESSAGES/pipewire.mo
>+share/locale/sv/LC_MESSAGES/pipewire.mo
>+share/locale/ta/LC_MESSAGES/pipewire.mo
>+share/locale/te/LC_MESSAGES/pipewire.mo
>+share/locale/tr/LC_MESSAGES/pipewire.mo
>+share/locale/uk/LC_MESSAGES/pipewire.mo
>+share/locale/zh_CN/LC_MESSAGES/pipewire.mo
>+share/locale/zh_TW/LC_MESSAGES/pipewire.mo

Actions: View | Diff

Attachments on bug 255944: 225029