From d64fb30cd8fa776a659aace6f45e84d6d26e8c36 Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Tue, 6 Apr 2021 17:25:47 +0200 Subject: [PATCH] pipewire: update to 0.3.25 * fix README.voidlinux going in pipewire-doc * disable SDL2 dep, only used in some examples we don't even ship * rm INSTALL.msg, configs should be stable now (also mark them in xbps) * ncursesw.patch is now upstream --- srcpkgs/pipewire/INSTALL.msg | 3 -- srcpkgs/pipewire/files/README.voidlinux | 2 + ...07864d3a1739b8dc1a5355057f29b9a37f78.patch | 52 +++++++++++++++++++ srcpkgs/pipewire/patches/ncursesw.patch | 11 ---- srcpkgs/pipewire/template | 18 ++++--- 5 files changed, 64 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/pipewire/INSTALL.msg create mode 100644 srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch delete mode 100644 srcpkgs/pipewire/patches/ncursesw.patch diff --git a/srcpkgs/pipewire/INSTALL.msg b/srcpkgs/pipewire/INSTALL.msg deleted file mode 100644 index 8475a2465b7b..000000000000 --- a/srcpkgs/pipewire/INSTALL.msg +++ /dev/null @@ -1,3 +0,0 @@ -WARNING: pipewire frequently changes the config file format. If -you edited /etc/pipewire/pipewire.conf you must recreate it from -/etc/pipewire/pipewire.conf.new-0.3.xx with your changes on top. diff --git a/srcpkgs/pipewire/files/README.voidlinux b/srcpkgs/pipewire/files/README.voidlinux index 7bcb761273b0..0c3d167f0aef 100644 --- a/srcpkgs/pipewire/files/README.voidlinux +++ b/srcpkgs/pipewire/files/README.voidlinux @@ -5,3 +5,5 @@ Optional dependencies: * `libjack-pipewire` for jack replacement * `libspa-bluetooth` for bluetooth support * `libspa-jack` for running pipewire and jack side-by-side +* `libspa-v4l2` for video camera support +* `rtkit` for realtime priority acquisition diff --git a/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch b/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch new file mode 100644 index 000000000000..a033bb5fee7f --- /dev/null +++ b/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch @@ -0,0 +1,52 @@ +From 59ed07864d3a1739b8dc1a5355057f29b9a37f78 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Fri, 9 Apr 2021 11:55:55 +0200 +Subject: [PATCH] media-session: log info when loading monitor fails + +Log info in all monitor plugins instead of an error. +--- + src/examples/media-session/alsa-monitor.c | 1 + + src/examples/media-session/bluez-monitor.c | 2 +- + src/examples/media-session/v4l2-monitor.c | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/examples/media-session/alsa-monitor.c b/src/examples/media-session/alsa-monitor.c +index d97a45a66..72696b772 100644 +--- src/examples/media-session/alsa-monitor.c ++++ src/examples/media-session/alsa-monitor.c +@@ -1061,6 +1061,7 @@ int sm_alsa_monitor_start(struct sm_media_session *session) + impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_ALSA_ENUM_UDEV, NULL); + if (impl->handle == NULL) { + res = -errno; ++ pw_log_info("can't load %s: %m", SPA_NAME_API_ALSA_ENUM_UDEV); + goto out_free; + } + +diff --git a/src/examples/media-session/bluez-monitor.c b/src/examples/media-session/bluez-monitor.c +index 9481d4472..5a4f30d48 100644 +--- src/examples/media-session/bluez-monitor.c ++++ src/examples/media-session/bluez-monitor.c +@@ -586,7 +586,7 @@ int sm_bluez5_monitor_start(struct sm_media_session *session) + impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_BLUEZ5_ENUM_DBUS, &impl->props->dict); + if (impl->handle == NULL) { + res = -errno; +- pw_log_error("can't load %s: %m", SPA_NAME_API_BLUEZ5_ENUM_DBUS); ++ pw_log_info("can't load %s: %m", SPA_NAME_API_BLUEZ5_ENUM_DBUS); + goto out_free; + } + if ((res = spa_handle_get_interface(impl->handle, SPA_TYPE_INTERFACE_Device, &iface)) < 0) { +diff --git a/src/examples/media-session/v4l2-monitor.c b/src/examples/media-session/v4l2-monitor.c +index ecb75d085..2b2a92ef3 100644 +--- src/examples/media-session/v4l2-monitor.c ++++ src/examples/media-session/v4l2-monitor.c +@@ -550,6 +550,7 @@ int sm_v4l2_monitor_start(struct sm_media_session *sess) + impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_V4L2_ENUM_UDEV, NULL); + if (impl->handle == NULL) { + res = -errno; ++ pw_log_info("can't load %s: %m", SPA_NAME_API_V4L2_ENUM_UDEV); + goto out_free; + } + +-- +GitLab + diff --git a/srcpkgs/pipewire/patches/ncursesw.patch b/srcpkgs/pipewire/patches/ncursesw.patch deleted file mode 100644 index 09b8f071c41c..000000000000 --- a/srcpkgs/pipewire/patches/ncursesw.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- meson.build.orig 2021-02-18 14:35:42.028024846 +0100 -+++ meson.build 2021-02-18 14:39:53.808039159 +0100 -@@ -311,7 +311,7 @@ - pthread_lib = dependency('threads') - dbus_dep = dependency('dbus-1') - sdl_dep = dependency('sdl2', required : get_option('sdl2')) --ncurses_dep = dependency('ncurses', required : false) -+ncurses_dep = dependency('ncursesw', required : false) - sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : get_option('sndfile')) - - if get_option('gstreamer') diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 9ab2c72fb8f7..3536c294cb35 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,15 +1,15 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.3.24 -revision=2 +version=0.3.25 +revision=1 build_style=meson configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d" hostmakedepends="doxygen graphviz pkg-config xmltoman gettext" -makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel - sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel - libopenaptx-devel fdk-aac-devel" +makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel + libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel fdk-aac-devel + libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)" depends="libspa-alsa libspa-audioconvert libspa-audiomixer libspa-control" short_desc="Server and user space API to deal with multimedia pipelines" maintainer="Kridsada Thanabulpong " @@ -17,8 +17,10 @@ license="MIT" homepage="https://pipewire.org/" changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS" distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz" -checksum=aeca2b44660c4f36eed29cc9c6ccb093ea2778fd0e4ed7665cdfc40b2a49873f -conf_files="/etc/pipewire/pipewire.conf" +checksum=fb6d5a0cbde621659ffd67622f19744dd6c8da8745b060cb1951c3d2045e5166 +conf_files="/etc/pipewire/*.conf /etc/pipewire/media-session.d/*.conf" + +build_options="sdl2" replaces="libpulseaudio-pipewire>=0" @@ -154,6 +156,6 @@ libjack-pipewire_package() { pipewire-doc_package() { short_desc+=" - documentation" pkg_install() { - vmove usr/share/doc + vmove usr/share/doc/pipewire/html } }