From 823cee89a063a6650002e5799aca38130338e0e5 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 * activate bluetooth support only when the bluetooth plugin is installed * 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 ++ srcpkgs/pipewire/patches/ncursesw.patch | 11 ---------- srcpkgs/pipewire/patches/with-bluetooth.patch | 19 ++++++++++++++++++ srcpkgs/pipewire/template | 20 +++++++++++-------- 5 files changed, 33 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/pipewire/INSTALL.msg delete mode 100644 srcpkgs/pipewire/patches/ncursesw.patch create mode 100644 srcpkgs/pipewire/patches/with-bluetooth.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/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/patches/with-bluetooth.patch b/srcpkgs/pipewire/patches/with-bluetooth.patch new file mode 100644 index 000000000000..3f6ef0c02fd2 --- /dev/null +++ b/srcpkgs/pipewire/patches/with-bluetooth.patch @@ -0,0 +1,19 @@ +Activate bluetooth support only when the bluetooth plugin is installed. +--- src/daemon/media-session.d/media-session.conf.orig 2021-04-06 17:05:05.935876278 +0200 ++++ src/daemon/media-session.d/media-session.conf 2021-04-06 17:06:16.599878154 +0200 +@@ -94,12 +94,14 @@ + with-alsa = [ + with-audio + ] ++ with-bluetooth = [ ++ bluez5 ++ ] + with-jack = [ + with-audio + ] + with-pulseaudio = [ + with-audio +- bluez5 + restore-stream + streams-follow-default + ] diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 9ab2c72fb8f7..2dc236638645 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 + 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" @@ -34,6 +36,7 @@ fi post_install() { vlicense LICENSE vdoc "${FILESDIR}/README.voidlinux" + touch "${DESTDIR}/etc/pipewire/media-session.d/with-bluetooth" } libpipewire_package() { @@ -81,6 +84,7 @@ libspa-bluetooth_package() { short_desc+=" - bluetooth plugins" pkg_install() { vmove usr/lib/spa-0.2/bluez5 + vmove etc/pipewire/media-session.d/with-bluetooth } } @@ -154,6 +158,6 @@ libjack-pipewire_package() { pipewire-doc_package() { short_desc+=" - documentation" pkg_install() { - vmove usr/share/doc + vmove usr/share/doc/pipewire/html } }