git: 42e66af6b5a8 - main - multimedia/pipewire: Update to 1.2.5

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Sat, 28 Sep 2024 15:14:45 UTC
The branch main has been updated by arrowd:

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

commit 42e66af6b5a81b6e2b1a8e45cc4629ca9e4992f5
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-09-28 15:14:26 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-09-28 15:14:26 +0000

    multimedia/pipewire: Update to 1.2.5
---
 multimedia/pipewire/Makefile                             |  6 +++---
 multimedia/pipewire/distinfo                             |  6 +++---
 .../pipewire/files/patch-spa_plugins_support_loop.c      | 11 -----------
 .../pipewire/files/patch-spa_plugins_support_meson.build | 16 ----------------
 .../files/patch-src_modules_module-snapcast-discover.c   | 14 --------------
 .../pipewire/files/patch-src_modules_network-utils.h     | 13 -------------
 multimedia/pipewire/files/patch-src_pipewire_thread.c    | 12 ------------
 multimedia/pipewire/files/patch-test_meson.build         | 11 -----------
 multimedia/pipewire/files/patch-test_test-functional.c   | 11 -----------
 multimedia/pipewire/pkg-plist                            |  9 +++++----
 10 files changed, 11 insertions(+), 98 deletions(-)

diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile
index d67d8ecd6e87..0dfdbd1d788f 100644
--- a/multimedia/pipewire/Makefile
+++ b/multimedia/pipewire/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	pipewire
-DISTVERSION=	1.2.1
-PORTREVISION=	1
+DISTVERSION=	1.2.5
 CATEGORIES=	multimedia
 
 MAINTAINER=	arrowd@FreeBSD.org
@@ -20,7 +19,7 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libwebrtc_audio_processing.so:audio/webrtc-audio-processing0
 
 USES=		compiler:c11 gettext-tools gnome localbase:ldflags meson \
-		ncurses pkgconfig python:build shebangfix ssl
+		ncurses pkgconfig python:build readline shebangfix ssl
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
@@ -81,6 +80,7 @@ MESON_ARGS=	-D pw-cat=enabled \
 		-D sdl2=disabled \
 		-D selinux=disabled \
 		-D systemd=disabled \
+		-D logind=disabled \
 		-D pipewire-v4l2=disabled \
 		-D libmysofa=disabled \
 		-D libffado=disabled \
diff --git a/multimedia/pipewire/distinfo b/multimedia/pipewire/distinfo
index 9fde287b2886..c2a0ac94eee4 100644
--- a/multimedia/pipewire/distinfo
+++ b/multimedia/pipewire/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1721586613
-SHA256 (pipewire-1.2.1.tar.bz2) = f15be402ec3b69f36ee2cb0244b6c17fdd5e6374429ae9e3dc194313503dd5ad
-SIZE (pipewire-1.2.1.tar.bz2) = 1812153
+TIMESTAMP = 1727535361
+SHA256 (pipewire-1.2.5.tar.bz2) = 12426cdb90f3d6bd888f8617297fb82185e1ecb8da8dea3c6a60a4aba2b86e2f
+SIZE (pipewire-1.2.5.tar.bz2) = 1814091
diff --git a/multimedia/pipewire/files/patch-spa_plugins_support_loop.c b/multimedia/pipewire/files/patch-spa_plugins_support_loop.c
deleted file mode 100644
index d8466bdf91fb..000000000000
--- a/multimedia/pipewire/files/patch-spa_plugins_support_loop.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- spa/plugins/support/loop.c.orig	2024-07-12 07:24:23 UTC
-+++ spa/plugins/support/loop.c
-@@ -1157,7 +1157,7 @@ impl_init(const struct spa_handle_factory *factory,
- 		goto error_exit_free_poll;
- 	}
- 
--	if (tss_create(&impl->queue_tss_id, (tss_dtor_t)loop_queue_destroy) != 0) {
-+	if (tss_create(&impl->queue_tss_id, (tss_dtor_t)loop_queue_destroy) != thrd_success) {
- 		res = -errno;
- 		spa_log_error(impl->log, "%p: can't create tss: %m", impl);
- 		goto error_exit_free_wakeup;
diff --git a/multimedia/pipewire/files/patch-spa_plugins_support_meson.build b/multimedia/pipewire/files/patch-spa_plugins_support_meson.build
deleted file mode 100644
index 822da0de66ae..000000000000
--- a/multimedia/pipewire/files/patch-spa_plugins_support_meson.build
+++ /dev/null
@@ -1,16 +0,0 @@
---- spa/plugins/support/meson.build.orig	2024-07-12 07:24:23 UTC
-+++ spa/plugins/support/meson.build
-@@ -14,10 +14,12 @@ endif
-   simd_cargs += [sse_args, '-DHAVE_SSE']
- endif
- 
-+stdthreads_lib = cc.find_library('stdthreads', required: false)
-+
- spa_support_lib = shared_library('spa-support',
-   spa_support_sources,
-   c_args : [ simd_cargs ],
--  dependencies : [ spa_dep, pthread_lib, epoll_shim_dep, mathlib ],
-+  dependencies : [ spa_dep, pthread_lib, epoll_shim_dep, mathlib, stdthreads_lib ],
-   install : true,
-   install_dir : spa_plugindir / 'support')
- spa_support_dep = declare_dependency(link_with: spa_support_lib)
diff --git a/multimedia/pipewire/files/patch-src_modules_module-snapcast-discover.c b/multimedia/pipewire/files/patch-src_modules_module-snapcast-discover.c
deleted file mode 100644
index 194ffb203788..000000000000
--- a/multimedia/pipewire/files/patch-src_modules_module-snapcast-discover.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/modules/module-snapcast-discover.c.orig	2024-07-12 07:24:23 UTC
-+++ src/modules/module-snapcast-discover.c
-@@ -690,7 +690,11 @@ static void resolver_cb(AvahiServiceResolver *r, Avahi
- 	spa_zero(ifreq);
- 	fd = socket(family, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
- 	ifreq.ifr_ifindex = interface;
-+#ifndef __FreeBSD__
- 	ioctl(fd, SIOCGIFNAME, &ifreq, sizeof(ifreq));
-+#else
-+	if_indextoname(interface, ifreq.ifr_name);
-+#endif
- 	pw_properties_setf(props, "snapcast.ifname", "%s", ifreq.ifr_name);
- 	pw_properties_setf(props, "local.ifname", "%s", ifreq.ifr_name);
- 
diff --git a/multimedia/pipewire/files/patch-src_modules_network-utils.h b/multimedia/pipewire/files/patch-src_modules_network-utils.h
deleted file mode 100644
index 94afc824afed..000000000000
--- a/multimedia/pipewire/files/patch-src_modules_network-utils.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/modules/network-utils.h.orig	2024-07-22 08:00:23 UTC
-+++ src/modules/network-utils.h
-@@ -8,6 +8,10 @@
- #include <net/if.h>
- #include <errno.h>
- 
-+#ifdef __FreeBSD__
-+#define ifr_ifindex ifr_index
-+#endif
-+
- static inline int pw_net_parse_address(const char *address, uint16_t port,
- 		struct sockaddr_storage *addr, socklen_t *len)
- {
diff --git a/multimedia/pipewire/files/patch-src_pipewire_thread.c b/multimedia/pipewire/files/patch-src_pipewire_thread.c
deleted file mode 100644
index 9329e73bdf93..000000000000
--- a/multimedia/pipewire/files/patch-src_pipewire_thread.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/pipewire/thread.c.orig	2024-07-12 07:24:23 UTC
-+++ src/pipewire/thread.c
-@@ -6,6 +6,9 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <pthread.h>
-+#ifdef __FreeBSD__
-+#include <pthread_np.h>
-+#endif
- 
- #include <spa/utils/dict.h>
- #include <spa/utils/defs.h>
diff --git a/multimedia/pipewire/files/patch-test_meson.build b/multimedia/pipewire/files/patch-test_meson.build
deleted file mode 100644
index ca58e8385ff0..000000000000
--- a/multimedia/pipewire/files/patch-test_meson.build
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/meson.build.orig	2022-04-27 17:59:21 UTC
-+++ test/meson.build
-@@ -79,7 +79,7 @@ test('test-loop',
-     executable('test-loop',
-                'test-loop.c',
-                include_directories: pwtest_inc,
--               dependencies: [ spa_dep ],
-+               dependencies: [ spa_dep, epoll_shim_dep ],
-                link_with: pwtest_lib)
- )
- 
diff --git a/multimedia/pipewire/files/patch-test_test-functional.c b/multimedia/pipewire/files/patch-test_test-functional.c
deleted file mode 100644
index 23d9c2919445..000000000000
--- a/multimedia/pipewire/files/patch-test_test-functional.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/test-functional.c.orig	2023-10-06 09:37:06 UTC
-+++ test/test-functional.c
-@@ -4,6 +4,8 @@
- 
- #include "config.h"
- 
-+#include <sys/wait.h>
-+
- #include "pwtest.h"
- 
- PWTEST(openal_info_test)
diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist
index ac484eadb8e6..5950159d8a56 100644
--- a/multimedia/pipewire/pkg-plist
+++ b/multimedia/pipewire/pkg-plist
@@ -237,16 +237,16 @@ 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.1201.0
+lib/libpipewire-0.3.so.0.1205.0
 %%JACK%%lib/pipewire-0.3/jack/libjack.so
 %%JACK%%lib/pipewire-0.3/jack/libjack.so.0
-%%JACK%%lib/pipewire-0.3/jack/libjack.so.0.3.1201
+%%JACK%%lib/pipewire-0.3/jack/libjack.so.0.3.1205
 %%JACK%%lib/pipewire-0.3/jack/libjacknet.so
 %%JACK%%lib/pipewire-0.3/jack/libjacknet.so.0
-%%JACK%%lib/pipewire-0.3/jack/libjacknet.so.0.3.1201
+%%JACK%%lib/pipewire-0.3/jack/libjacknet.so.0.3.1205
 %%JACK%%lib/pipewire-0.3/jack/libjackserver.so
 %%JACK%%lib/pipewire-0.3/jack/libjackserver.so.0
-%%JACK%%lib/pipewire-0.3/jack/libjackserver.so.0.3.1201
+%%JACK%%lib/pipewire-0.3/jack/libjackserver.so.0.3.1205
 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
@@ -304,6 +304,7 @@ 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