multimedia/pipewire: Update to 0.3.25

Reported by:	portscout!

4 files changed, 18 insertions, 25 deletions

diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile
index 766d7e464534..d312ca8631a6 100644
--- a/multimedia/pipewire/Makefile
+++ b/multimedia/pipewire/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	pipewire
-DISTVERSION=	0.3.23
-PORTREVISION=	1
+DISTVERSION=	0.3.25
 CATEGORIES=	multimedia
 
 MAINTAINER=	arrowd@FreeBSD.org
@@ -21,12 +20,12 @@ USES=		compiler:c11 gnome meson pkgconfig
 
 OPTIONS_DEFINE=	GSTREAMER VULKAN
 
-GSTREAMER_MESON_TRUE=	gstreamer
+GSTREAMER_MESON_ENABLED=gstreamer
 GSTREAMER_LIB_DEPENDS=	libgstreamer-1.0.so:multimedia/gstreamer1 \
 			libgstaudio-1.0.so:multimedia/gstreamer1-plugins
 
-VULKAN_DESC=	Enable Vulkan integration
-VULKAN_MESON_TRUE=	vulkan
+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
 
@@ -36,12 +35,10 @@ USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	PipeWire
 
-MESON_ARGS=	-D gstreamer=false \
-		-Dalsa=false -Dpipewire-alsa=false \
-		-D bluez5=false \
-		-D jack=false -D pipewire-jack=false \
-		-D pipewire-pulseaudio=false \
-		-D systemd=false
+MESON_ARGS=	-Dalsa=disabled -Dpipewire-alsa=disabled \
+		-D bluez5=disabled \
+		-D jack=disabled -D pipewire-jack=disabled \
+		-D systemd=disabled
 
 OPTIONS_SUB=	yes
 
diff --git a/multimedia/pipewire/distinfo b/multimedia/pipewire/distinfo
index bd5117bc2b18..09766faf1079 100644
--- a/multimedia/pipewire/distinfo
+++ b/multimedia/pipewire/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615387377
-SHA256 (PipeWire-pipewire-0.3.23_GH0.tar.gz) = e9a9030032ba8f3b6f9e300dbf755ab439340cd4cbeb3e1bba6f1a18d2c9da92
-SIZE (PipeWire-pipewire-0.3.23_GH0.tar.gz) = 1318156
+TIMESTAMP = 1617876143
+SHA256 (PipeWire-pipewire-0.3.25_GH0.tar.gz) = fb6d5a0cbde621659ffd67622f19744dd6c8da8745b060cb1951c3d2045e5166
+SIZE (PipeWire-pipewire-0.3.25_GH0.tar.gz) = 1351257
diff --git a/multimedia/pipewire/files/patch-src_daemon_pipewire.c b/multimedia/pipewire/files/patch-src_daemon_pipewire.c
deleted file mode 100644
index 9c935a8fc31e..000000000000
--- a/multimedia/pipewire/files/patch-src_daemon_pipewire.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/daemon/pipewire.c.orig	2021-03-04 15:21:21 UTC
-+++ src/daemon/pipewire.c
-@@ -25,6 +25,7 @@
- #include <limits.h>
- #include <signal.h>
- #include <getopt.h>
-+#include <libgen.h>
- 
- #include <spa/utils/result.h>
- #include <pipewire/pipewire.h>
diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist
index 8ec372abe924..155f184cd0d1 100644
--- a/multimedia/pipewire/pkg-plist
+++ b/multimedia/pipewire/pkg-plist
@@ -3,6 +3,7 @@ bin/pipewire-pulse
 bin/pw-cli
 bin/pw-dot
 bin/pw-dump
+bin/pw-loopback
 bin/pw-metadata
 bin/pw-mididump
 bin/pw-mon
@@ -105,6 +106,8 @@ include/spa-0.2/spa/param/audio/format.h
 include/spa-0.2/spa/param/audio/layout.h
 include/spa-0.2/spa/param/audio/raw.h
 include/spa-0.2/spa/param/audio/type-info.h
+include/spa-0.2/spa/param/bluetooth/audio.h
+include/spa-0.2/spa/param/bluetooth/type-info.h
 include/spa-0.2/spa/param/format-utils.h
 include/spa-0.2/spa/param/format.h
 include/spa-0.2/spa/param/param.h
@@ -149,7 +152,7 @@ include/spa-0.2/spa/utils/type.h
 %%GSTREAMER%%lib/gstreamer-1.0/libgstpipewire.so
 lib/libpipewire-0.3.so
 lib/libpipewire-0.3.so.0
-lib/libpipewire-0.3.so.0.323.0
+lib/libpipewire-0.3.so.0.325.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
@@ -168,11 +171,14 @@ lib/pipewire-0.3/libpipewire-module-spa-node-factory.so
 lib/pipewire-0.3/libpipewire-module-spa-node.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
 lib/spa-0.2/control/libspa-control.so
 lib/spa-0.2/support/libspa-dbus.so
 lib/spa-0.2/support/libspa-support.so
 lib/spa-0.2/v4l2/libspa-v4l2.so
 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
 libdata/pkgconfig/libpipewire-0.3.pc
 libdata/pkgconfig/libspa-0.2.pc