From nobody Sat Sep 28 15:14:45 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 4XG9qT3Fz9z5XT3J; Sat, 28 Sep 2024 15:14:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XG9qT2Z2kz4fQn; Sat, 28 Sep 2024 15:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727536485; 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=G/IiDO5pVDTDZj2B3xRanLTjzISvyAZ/BRveTdXWufk=; b=leJi4bxS64+m1sV73IlM8e/KZczsOKNRKKHfSFIcxdPuxrMjFcl7qNQYSKOH8hTouxYdyz 4hZnBmU0UOn//3lhB8Myhpsy75EpobuuOWCuuaD1TS1le3PGAhgiLieP8viE4R47bKgUic GYkqI51tZCBt2J3pfBzqK/C/0RrsGkiyLgeE1uxYgRc7m1Y+Fun75xHIKR2GufYw3HVfgL yTfkH8CqQ96rQuVB7GI+SwileCO8pSrUUyPdm7us7OBggeis5/tIxuepAMdSsh19JRRK58 cEq4mqimw27zJyBrzGTp8rOUddSAWzlXfsfR8Q9CBqiGp+JWGEAdZyj8Hx8RmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727536485; 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=G/IiDO5pVDTDZj2B3xRanLTjzISvyAZ/BRveTdXWufk=; b=FVdksemM9SXZR/FK20tAz7It5JNCd/1PU01ezitvZUS3rSf7Zv5/Mi9OcrxZs6lVF4qqoS OCUhUpOaviG1vgD4KoF82Q/7NEVzKE7w0WBFm3vJNHnM7zTjcWezfHZGHx4KLwnGnw/e+x u1tI7BwESXNVsI6Wq8zehfvJ6SDNf0mNCz43rK1t4aK8b+4jkPNeEJ2uT89PGDu/n2JsLg jaKsZ5rfNdT26Dfy5xELZ/iRxzdMDMDm7bEBbI5XbnvgRJTbVqA5OlQOUVSg0ltPHjxjsD QFesBiImJYyfWQudOJ6CHBK4vK4d6VYA0+rHRic67VsGwTEjI1GOnkmv9b9DGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727536485; a=rsa-sha256; cv=none; b=cE6JEge67KWyhA3cf4yOkbfrgmyK+KRwJsqUQsIcNxOl7af521spvNMTEeyHWAE/7eladD JhPXuFlXEYx7pjQQY+KX6NUWjFBz8KdcXHcJRAKxa7XLqCCYydUEafjuOeUtJBTdaJM8Pl myVwBoOIUX299zLYtxwhGYYOHZKxTrBLERiSeaucO8W+KeKc6UY6Nzl/j8rSy4cZTrnG0d ZiCk1f0MPz99KJ/Tyt+oorrqxDpCk14BaGNlQK9eUEUZX9uzVBWclz1nIibaBn0kviLbOG QNUsBitz3rUePtGblCCN4DX3WjkbY5OhXsv0LwlOuQ+QjhzZm3EUaczpQ7cIzg== 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 4XG9qT25lwzVSv; Sat, 28 Sep 2024 15:14:45 +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 48SFEj2s073512; Sat, 28 Sep 2024 15:14:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48SFEjhL073509; Sat, 28 Sep 2024 15:14:45 GMT (envelope-from git) Date: Sat, 28 Sep 2024 15:14:45 GMT Message-Id: <202409281514.48SFEjhL073509@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: 42e66af6b5a8 - main - multimedia/pipewire: Update to 1.2.5 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: 42e66af6b5a81b6e2b1a8e45cc4629ca9e4992f5 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=42e66af6b5a81b6e2b1a8e45cc4629ca9e4992f5 commit 42e66af6b5a81b6e2b1a8e45cc4629ca9e4992f5 Author: Gleb Popov AuthorDate: 2024-09-28 15:14:26 +0000 Commit: Gleb Popov 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 - #include - -+#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 - #include - #include -+#ifdef __FreeBSD__ -+#include -+#endif - - #include - #include 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 -+ - #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