Date: Wed, 4 May 2022 13:02:40 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e4a6ad6d3fa3 - main - multimedia/pipewire: Update to 0.3.51 Message-ID: <202205041302.244D2eN3044403@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e4a6ad6d3fa3c4e024d99b9dc67c05a1a31db62e commit e4a6ad6d3fa3c4e024d99b9dc67c05a1a31db62e Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2022-05-04 13:01:53 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2022-05-04 13:02:19 +0000 multimedia/pipewire: Update to 0.3.51 --- multimedia/pipewire/Makefile | 3 +-- multimedia/pipewire/distinfo | 6 ++--- .../files/patch-spa_tests_stress-ringbuffer.c | 12 ---------- .../files/patch-src_pipewire_pipewire_init | 20 ++++++++-------- .../pipewire/files/patch-test_test-functional.c | 10 ++++++++ multimedia/pipewire/pkg-plist | 27 ++++++++++++++++------ 6 files changed, 43 insertions(+), 35 deletions(-) diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile index 7de8055db808..16bbf701cc16 100644 --- a/multimedia/pipewire/Makefile +++ b/multimedia/pipewire/Makefile @@ -1,6 +1,5 @@ PORTNAME= pipewire -DISTVERSION= 0.3.43 -PORTREVISION= 1 +DISTVERSION= 0.3.51 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 diff --git a/multimedia/pipewire/distinfo b/multimedia/pipewire/distinfo index 7412818861d0..8dea6a720eb2 100644 --- a/multimedia/pipewire/distinfo +++ b/multimedia/pipewire/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1642959837 +TIMESTAMP = 1651152242 SHA256 (media-session-0.4.1.tar.gz) = 119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975 SIZE (media-session-0.4.1.tar.gz) = 123224 -SHA256 (PipeWire-pipewire-0.3.43_GH0.tar.gz) = 87f692a2cb5b14ee900e102502b5e078a0cd3f7836f03a2e7cb30690ead37b50 -SIZE (PipeWire-pipewire-0.3.43_GH0.tar.gz) = 1713131 +SHA256 (PipeWire-pipewire-0.3.51_GH0.tar.gz) = f18e7a2cd2fcd75482c3df4e736e01435bd20779ddf63da63b0a086d3a9735ac +SIZE (PipeWire-pipewire-0.3.51_GH0.tar.gz) = 1789070 diff --git a/multimedia/pipewire/files/patch-spa_tests_stress-ringbuffer.c b/multimedia/pipewire/files/patch-spa_tests_stress-ringbuffer.c deleted file mode 100644 index 7302c91e2c6b..000000000000 --- a/multimedia/pipewire/files/patch-spa_tests_stress-ringbuffer.c +++ /dev/null @@ -1,12 +0,0 @@ ---- spa/tests/stress-ringbuffer.c.orig 2022-01-05 10:25:04 UTC -+++ spa/tests/stress-ringbuffer.c -@@ -13,7 +13,8 @@ - - #ifdef __FreeBSD__ - #include <sys/param.h> --#if __FreeBSD_version < 1400043 -+#if (__FreeBSD_version >= 1400000 && __FreeBSD_version < 1400043) \ -+ || (__FreeBSD_version < 1300523) - static int sched_getcpu(void) { return -1; }; - #endif - #endif diff --git a/multimedia/pipewire/files/patch-src_pipewire_pipewire_init b/multimedia/pipewire/files/patch-src_pipewire_pipewire_init index 3f94963d19c0..fc8bb0b65e0e 100644 --- a/multimedia/pipewire/files/patch-src_pipewire_pipewire_init +++ b/multimedia/pipewire/files/patch-src_pipewire_pipewire_init @@ -4,10 +4,10 @@ conflict, rename the PipeWire init function into "pipewire_init". Upstream issue: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819 ---- src/pipewire/pipewire.c.orig 2021-11-11 12:21:29 UTC +--- src/pipewire/pipewire.c.orig 2022-04-27 17:59:21 UTC +++ src/pipewire/pipewire.c -@@ -583,7 +583,7 @@ out: - * +@@ -580,7 +580,7 @@ SPA_EXPORT + * This function can be called multiple times. */ SPA_EXPORT -void pw_init(int *argc, char **argv[]) @@ -15,18 +15,16 @@ Upstream issue: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819 { const char *str; struct spa_dict_item items[6]; -@@ -672,8 +672,9 @@ done: - pthread_mutex_unlock(&init_lock); - } - -+ +@@ -683,7 +683,7 @@ SPA_EXPORT + * used again after being deinitialized with a new pw_init() call. + */ SPA_EXPORT -void pw_deinit(void) +void pipewire_deinit(void) { struct support *support = &global_support; struct registry *registry = &support->registry; -@@ -696,6 +697,21 @@ void pw_deinit(void) +@@ -712,6 +712,21 @@ done: pthread_mutex_unlock(&init_lock); } @@ -48,9 +46,9 @@ Upstream issue: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819 /** Check if a debug category is enabled * ---- src/pipewire/pipewire.h.orig 2021-11-11 12:21:29 UTC +--- src/pipewire/pipewire.h.orig 2022-04-27 17:59:21 UTC +++ src/pipewire/pipewire.h -@@ -69,9 +69,12 @@ extern "C" { +@@ -69,9 +69,12 @@ void * \{ */ void diff --git a/multimedia/pipewire/files/patch-test_test-functional.c b/multimedia/pipewire/files/patch-test_test-functional.c new file mode 100644 index 000000000000..4ce37f2cb4ce --- /dev/null +++ b/multimedia/pipewire/files/patch-test_test-functional.c @@ -0,0 +1,10 @@ +--- test/test-functional.c.orig 2022-04-27 17:59:21 UTC ++++ test/test-functional.c +@@ -22,6 +22,7 @@ + * DEALINGS IN THE SOFTWARE. + */ + ++#include <sys/wait.h> + + #include "config.h" + diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist index 6b9a8ffdbb13..19692e87f767 100644 --- a/multimedia/pipewire/pkg-plist +++ b/multimedia/pipewire/pkg-plist @@ -40,7 +40,7 @@ include/pipewire-0.3/pipewire/extensions/protocol-native.h include/pipewire-0.3/pipewire/extensions/session-manager.h include/pipewire-0.3/pipewire/extensions/session-manager/impl-interfaces.h include/pipewire-0.3/pipewire/extensions/session-manager/interfaces.h -%%VULKAN%%include/pipewire-0.3/pipewire/extensions/session-manager/introspect-funcs.h +include/pipewire-0.3/pipewire/extensions/session-manager/introspect-funcs.h include/pipewire-0.3/pipewire/extensions/session-manager/introspect.h include/pipewire-0.3/pipewire/extensions/session-manager/keys.h include/pipewire-0.3/pipewire/factory.h @@ -89,11 +89,13 @@ include/spa-0.2/spa/control/type-info.h include/spa-0.2/spa/debug/buffer.h include/spa-0.2/spa/debug/dict.h include/spa-0.2/spa/debug/format.h +include/spa-0.2/spa/debug/log.h include/spa-0.2/spa/debug/mem.h include/spa-0.2/spa/debug/node.h include/spa-0.2/spa/debug/pod.h include/spa-0.2/spa/debug/types.h include/spa-0.2/spa/graph/graph.h +include/spa-0.2/spa/interfaces/audio/aec.h include/spa-0.2/spa/monitor/device.h include/spa-0.2/spa/monitor/event.h include/spa-0.2/spa/monitor/type-info.h @@ -132,6 +134,7 @@ include/spa-0.2/spa/param/video/type-info.h include/spa-0.2/spa/pod/builder.h include/spa-0.2/spa/pod/command.h include/spa-0.2/spa/pod/compare.h +include/spa-0.2/spa/pod/dynamic.h include/spa-0.2/spa/pod/event.h include/spa-0.2/spa/pod/filter.h include/spa-0.2/spa/pod/iter.h @@ -151,7 +154,9 @@ include/spa-0.2/spa/support/thread.h include/spa-0.2/spa/utils/ansi.h include/spa-0.2/spa/utils/defs.h include/spa-0.2/spa/utils/dict.h +include/spa-0.2/spa/utils/dll.h include/spa-0.2/spa/utils/hook.h +include/spa-0.2/spa/utils/json-pod.h include/spa-0.2/spa/utils/json.h include/spa-0.2/spa/utils/keys.h include/spa-0.2/spa/utils/list.h @@ -166,21 +171,22 @@ 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.343.0 +lib/libpipewire-0.3.so.0.351.0 %%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjack.so %%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjack.so.0 -%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjack.so.0.343.0 +%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjack.so.0.351.0 %%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjacknet.so %%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjacknet.so.0 -%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjacknet.so.0.343.0 +%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjacknet.so.0.351.0 %%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjackserver.so %%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjackserver.so.0 -%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjackserver.so.0.343.0 +%%PIPEWIRE_JACK%%lib/pipewire-0.3/jack/libjackserver.so.0.351.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-fallback-sink.so lib/pipewire-0.3/libpipewire-module-filter-chain.so lib/pipewire-0.3/libpipewire-module-link-factory.so lib/pipewire-0.3/libpipewire-module-loopback.so @@ -193,6 +199,7 @@ lib/pipewire-0.3/libpipewire-module-protocol-simple.so %%PULSEAUDIO%%lib/pipewire-0.3/libpipewire-module-pulse-tunnel.so %%PULSEAUDIO%%lib/pipewire-0.3/libpipewire-module-raop-discover.so lib/pipewire-0.3/libpipewire-module-raop-sink.so +lib/pipewire-0.3/libpipewire-module-rt.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 @@ -200,6 +207,8 @@ 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 %%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 @@ -215,16 +224,18 @@ lib/spa-0.2/volume/libspa-volume.so @comment lib/udev/rules.d/90-pipewire-alsa.rules libdata/pkgconfig/libpipewire-0.3.pc libdata/pkgconfig/libspa-0.2.pc -%%MANPAGES%%%%PULSEAUDIO%%man/man1/pipewire-pulse.1.gz +%%MANPAGES%%man/man1/pipewire-pulse.1.gz %%MANPAGES%%man/man1/pipewire.1.gz %%MANPAGES%%man/man1/pw-cat.1.gz %%MANPAGES%%man/man1/pw-cli.1.gz %%MANPAGES%%man/man1/pw-dot.1.gz %%MANPAGES%%%%PIPEWIRE_JACK%%man/man1/pw-jack.1.gz +%%MANPAGES%%man/man1/pw-link.1.gz %%MANPAGES%%man/man1/pw-metadata.1.gz %%MANPAGES%%man/man1/pw-mididump.1.gz %%MANPAGES%%man/man1/pw-mon.1.gz %%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 @@ -272,7 +283,6 @@ libdata/pkgconfig/libspa-0.2.pc %%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 @@ -376,6 +386,7 @@ share/locale/pl/LC_MESSAGES/pipewire.mo share/locale/pt/LC_MESSAGES/pipewire.mo %%MEDIASESSION%%share/locale/pt_BR/LC_MESSAGES/media-session.mo share/locale/pt_BR/LC_MESSAGES/pipewire.mo +share/locale/ro/LC_MESSAGES/pipewire.mo %%MEDIASESSION%%share/locale/ru/LC_MESSAGES/media-session.mo share/locale/ru/LC_MESSAGES/pipewire.mo %%MEDIASESSION%%share/locale/si/LC_MESSAGES/media-session.mo @@ -403,6 +414,7 @@ share/locale/zh_TW/LC_MESSAGES/pipewire.mo %%DATADIR%%/client-rt.conf %%DATADIR%%/client.conf %%DATADIR%%/filter-chain/demonic.conf +%%DATADIR%%/filter-chain/duplicate-FL.conf %%DATADIR%%/filter-chain/sink-dolby-surround.conf %%DATADIR%%/filter-chain/sink-eq6.conf %%DATADIR%%/filter-chain/sink-matrix-spatialiser.conf @@ -416,5 +428,6 @@ share/locale/zh_TW/LC_MESSAGES/pipewire.mo %%MEDIASESSION%%%%DATADIR%%/media-session.d/v4l2-monitor.conf %%MEDIASESSION%%%%DATADIR%%/media-session.d/with-jack %%MEDIASESSION%%%%DATADIR%%/media-session.d/with-pulseaudio +%%DATADIR%%/minimal.conf %%DATADIR%%/pipewire-pulse.conf %%DATADIR%%/pipewire.conf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205041302.244D2eN3044403>