From 6285fbb16f13bb54fea82aeef15c9616db27634d Mon Sep 17 00:00:00 2001 From: Kridsada Thanabulpong Date: Sat, 28 Mar 2020 16:23:52 +0900 Subject: [PATCH 1/3] pipewire: update to 0.3.2 --- common/shlibs | 2 +- srcpkgs/alsa-pipewire | 1 + srcpkgs/libjack-pipewire | 1 + srcpkgs/libpulseaudio-pipewire | 1 + srcpkgs/pipewire/template | 71 ++++++++++++++++++++++++++-------- 5 files changed, 59 insertions(+), 17 deletions(-) create mode 120000 srcpkgs/alsa-pipewire create mode 120000 srcpkgs/libjack-pipewire create mode 120000 srcpkgs/libpulseaudio-pipewire diff --git a/common/shlibs b/common/shlibs index 53a59b7303b..7f23af47ca9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3201,7 +3201,7 @@ libarcan_shmif_ext.so.0.11 arcan-0.5.4.3_1 libarcan_shmif_server.so.0.11 arcan-0.5.4.3_1 libarcan_tui.so.0.11 arcan-0.5.4.3_1 liblwipv6.so.2 lwipv6-1.5a_1 -libpipewire-0.2.so.1 libpipewire-0.2.2_1 +libpipewire-0.3.so.0 libpipewire-0.3.2_1 libvolk.so.2.2.1 volk-2.2.1_1 libgnuradio-runtime.so.3.8.0 gnuradio-3.8.0.0_1 libgnuradio-pmt.so.3.8.0 gnuradio-3.8.0.0_1 diff --git a/srcpkgs/alsa-pipewire b/srcpkgs/alsa-pipewire new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/alsa-pipewire @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/libjack-pipewire b/srcpkgs/libjack-pipewire new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/libjack-pipewire @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/libpulseaudio-pipewire b/srcpkgs/libpulseaudio-pipewire new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/libpulseaudio-pipewire @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 7f646dad11d..697c20c0347 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,26 +1,39 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.2.7 +version=0.3.2 revision=1 build_style=meson -configure_args="-Dman=true -Dgstreamer=enabled -Ddocs=true -Dsystemd=false" +configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false + -Dbluez5=true -Dffmpeg=true -Dpipewire-alsa=true -Dpipewire-jack=true + -Dpipewire-pulseaudio=true" hostmakedepends="doxygen graphviz pkg-config xmltoman" makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel - sbc-devel v4l-utils-devel libva-devel" + sbc-devel v4l-utils-devel libva-devel libbluetooth-devel" short_desc="Server and user space API to deal with multimedia pipelines" maintainer="Orphaned " -#Next release will probably change to MIT, currently listed in master -license="LGPL-2.1-only, GPL-2.0-only " +license="MIT" homepage="https://pipewire.org/" -changelog="https://raw.githubusercontent.com/PipeWire/pipewire/master/NEWS" -distfiles="https://github.com/PipeWire/pipewire/archive/${version}.tar.gz" -checksum=bfaa0f6ae6c0791e2e0b59234d399753bf24f1b33dbf587682363a8463dd8df1 +changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS" +distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz" +checksum=fd1bb2ae65997d921d6c18e1828f23251dac3145bbe5031c324afeb39f9b26fb conf_files="/etc/pipewire/pipewire.conf" +CFLAGS+="-Wformat" + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + LDFLAGS+=" -latomic" +fi + +post_install() { + vlicense LICENSE +} + libpipewire_package() { short_desc+=" - pipewire library" pkg_install() { - vmove "usr/lib/libpipewire-0.2.so.*" + vmove "usr/lib/libpipewire-0.3.so.*" + vmove usr/lib/pipewire-0.3 } } @@ -28,25 +41,25 @@ pipewire-devel_package() { depends="libpipewire-${version}_${revision}" short_desc+=" - pipewire and libspa development files" pkg_install() { - vmove usr/include/pipewire - vmove usr/include/spa - vmove usr/lib/pkgconfig/libpipewire-0.2.pc - vmove usr/lib/pkgconfig/libspa-0.1.pc - vmove usr/lib/libpipewire-0.2.so + vmove usr/include/pipewire-0.3 + vmove usr/include/spa-0.2 + vmove usr/lib/pkgconfig/libpipewire-0.3.pc + vmove usr/lib/pkgconfig/libspa-0.2.pc + vmove usr/lib/libpipewire-0.3.so } } libspa-ffmpeg_package() { short_desc+=" - ffmpeg plugins" pkg_install() { - vmove usr/lib/spa/ffmpeg + vmove usr/lib/spa-0.2/ffmpeg } } libspa-bluetooth_package() { short_desc+=" - bluetooth plugins" pkg_install() { - vmove usr/lib/spa/bluez5 + vmove usr/lib/spa-0.2/bluez5 } } @@ -57,6 +70,32 @@ gstreamer1-pipewire_package() { } } +libpulseaudio-pipewire_package() { + depends="libpipewire-${version}_${revision}" + short_desc+=" - PulseAudio client library" + pkg_install() { + vmove "usr/lib/libpulse-mainloop-glib-pw.so*" + vmove "usr/lib/libpulse-pw.so*" + vmove "usr/lib/libpulse-simple-pw.so*" + } +} + +alsa-pipewire_package() { + depends="libpipewire-${version}_${revision}" + short_desc+=" - ALSA client library" + pkg_install() { + vmove "usr/lib/alsa-lib" + } +} + +libjack-pipewire_package() { + depends="libpipewire-${version}_${revision}" + short_desc+=" - JACK client library" + pkg_install() { + vmove "usr/lib/libjack-pw.so*" + } +} + pipewire-doc_package() { archs=noarch short_desc+=" - documentation" From 40e6e8398cdb1034a339189d09e82889210e27b2 Mon Sep 17 00:00:00 2001 From: Kridsada Thanabulpong Date: Sat, 28 Mar 2020 16:24:26 +0900 Subject: [PATCH 2/3] xdg-desktop-portal: update to 1.7.2 --- srcpkgs/xdg-desktop-portal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template index eb8a4602f5d..25b821f0b69 100644 --- a/srcpkgs/xdg-desktop-portal/template +++ b/srcpkgs/xdg-desktop-portal/template @@ -1,6 +1,6 @@ # Template file for 'xdg-desktop-portal' pkgname=xdg-desktop-portal -version=1.6.0 +version=1.7.2 revision=1 build_style=gnu-configure configure_args="--enable-pipewire --enable-geoclue --disable-libportal" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="LGPL-2.1-or-later" homepage="https://github.com/flatpak/xdg-desktop-portal" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=883c9c9a925e48af54812b5347f546dd776ec2e27076a83d5a8126af6bafb9da +checksum=2f2bffa93107d905b9939b844eb6c46f37267c37dc27146ab13ae429f03e629f post_install() { rm -rf "${DESTDIR}/usr/lib/systemd" From 770d6085921e1eb046e35d0f1454a1c1c35f2989 Mon Sep 17 00:00:00 2001 From: Kridsada Thanabulpong Date: Sat, 28 Mar 2020 16:24:46 +0900 Subject: [PATCH 3/3] xdg-desktop-portal-kde: rebuild for pipewire-0.3 --- srcpkgs/xdg-desktop-portal-kde/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template index f26057d323a..9519abc19f6 100644 --- a/srcpkgs/xdg-desktop-portal-kde/template +++ b/srcpkgs/xdg-desktop-portal-kde/template @@ -1,7 +1,7 @@ # Template file for 'xdg-desktop-portal-kde' pkgname=xdg-desktop-portal-kde version=5.18.4.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons gettext" makedepends="glib-devel kio-devel kwayland-devel libepoxy-devel pipewire-devel