[PR PATCH] pipewire: update to 0.3.18

[PR PATCH] pipewire: update to 0.3.18

[st3r4g]

[-- Attachment #1: Type: text/plain, Size: 615 bytes --]

There is a new pull request by st3r4g against master on the void-packages repository

https://github.com/st3r4g/void-packages pipewire-0.3.18
https://github.com/void-linux/void-packages/pull/27279

pipewire: update to 0.3.18
* Add deps on core plugins (so that it works without having to manually install a bunch of non-obvious `libspa-`)
we may want to directly include them in the main `pipewire` package, but we can do it later
* Remove libpulseaudio-pipewire (deprecated)

Tested pulse and jack backends on `x86_64`

A patch file from https://github.com/void-linux/void-packages/pull/27279.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-0.3.18-27279.patch --]
[-- Type: text/x-diff, Size: 2503 bytes --]

From 39ccd766d237bdf68122c4c968e48dc591c1fbe9 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Sat, 19 Dec 2020 19:24:15 +0100
Subject: [PATCH] pipewire: update to 0.3.18

* Add deps on core plugins
* Remove libpulseaudio-pipewire
---
 srcpkgs/libpulseaudio-pipewire |  1 -
 srcpkgs/pipewire/template      | 16 ++++------------
 2 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/libpulseaudio-pipewire

diff --git a/srcpkgs/libpulseaudio-pipewire b/srcpkgs/libpulseaudio-pipewire
deleted file mode 120000
index c9c97cf6707..00000000000
--- a/srcpkgs/libpulseaudio-pipewire
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 0469af7990e..781cfc0fe70 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,21 +1,22 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.17
+version=0.3.18
 revision=1
 build_style=meson
 configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
  -Dbluez5=true -Dffmpeg=true -Dpipewire-alsa=true -Dpipewire-jack=true
- -Dpipewire-pulseaudio=true -Dudevrulesdir=/usr/lib/udev/rules.d"
+ -Dudevrulesdir=/usr/lib/udev/rules.d"
 hostmakedepends="doxygen graphviz pkg-config xmltoman"
 makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
  sbc-devel v4l-utils-devel libva-devel libbluetooth-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 <sirn@ogsite.net>"
 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=46d2f597506ef56b0be54498ab26b58bacdd7cae30f87f47836f1f717a0d05ac
+checksum=a7317de8e54f57190a2e2fe5f469ed332b9a12151fade03bf984765a55e5e24b
 conf_files="/etc/pipewire/pipewire.conf"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -124,15 +125,6 @@ gstreamer1-pipewire_package() {
 	}
 }
 
-libpulseaudio-pipewire_package() {
-	depends="libpipewire-${version}_${revision}"
-	short_desc+=" - PulseAudio client library"
-	pkg_install() {
-		vmove usr/lib/pipewire-0.3/pulse
-		vmove usr/bin/pw-pulse
-	}
-}
-
 alsa-pipewire_package() {
 	depends="libpipewire-${version}_${revision}"
 	short_desc+=" - ALSA client library"

Re: pipewire: update to 0.3.18

[st3r4g]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by st3r4g on void-packages repository

https://github.com/void-linux/void-packages/pull/27279#issuecomment-748510146

Comment:
What was the correct way to remove a package? Maybe I need a `replace=`

Re: pipewire: update to 0.3.18

[st3r4g]

[-- Attachment #1: Type: text/plain, Size: 262 bytes --]

New comment by st3r4g on void-packages repository

https://github.com/void-linux/void-packages/pull/27279#issuecomment-748510146

Comment:
What was the correct way to remove a package? I probably need to add `replace=libpulseaudio-pipewire` to `pipewire` right?

Re: pipewire: update to 0.3.18

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 173 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27279#issuecomment-748548087

Comment:
You need `replaces="package>=0"`

Re: [PR PATCH] [Updated] pipewire: update to 0.3.18

[st3r4g]

[-- Attachment #1: Type: text/plain, Size: 623 bytes --]

There is an updated pull request by st3r4g against master on the void-packages repository

https://github.com/st3r4g/void-packages pipewire-0.3.18
https://github.com/void-linux/void-packages/pull/27279

pipewire: update to 0.3.18
* Add deps on core plugins (so that it works without having to manually install a bunch of non-obvious `libspa-`)
we may want to merge them in the main `pipewire` package, but we can do it later
* Remove libpulseaudio-pipewire (deprecated)

Tested briefly as pulse and jack replacement on `x86_64`

A patch file from https://github.com/void-linux/void-packages/pull/27279.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-0.3.18-27279.patch --]
[-- Type: text/x-diff, Size: 2602 bytes --]

From 34f80ea4da8a4950aa7870e7f01f855fc4efadf1 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Sat, 19 Dec 2020 19:24:15 +0100
Subject: [PATCH] pipewire: update to 0.3.18

* Add deps on core plugins
* Remove libpulseaudio-pipewire
---
 srcpkgs/libpulseaudio-pipewire |  1 -
 srcpkgs/pipewire/template      | 18 ++++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/libpulseaudio-pipewire

diff --git a/srcpkgs/libpulseaudio-pipewire b/srcpkgs/libpulseaudio-pipewire
deleted file mode 120000
index c9c97cf6707..00000000000
--- a/srcpkgs/libpulseaudio-pipewire
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 0469af7990e..bd2bafdada7 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,23 +1,26 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.17
+version=0.3.18
 revision=1
 build_style=meson
 configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
  -Dbluez5=true -Dffmpeg=true -Dpipewire-alsa=true -Dpipewire-jack=true
- -Dpipewire-pulseaudio=true -Dudevrulesdir=/usr/lib/udev/rules.d"
+ -Dudevrulesdir=/usr/lib/udev/rules.d"
 hostmakedepends="doxygen graphviz pkg-config xmltoman"
 makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
  sbc-devel v4l-utils-devel libva-devel libbluetooth-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 <sirn@ogsite.net>"
 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=46d2f597506ef56b0be54498ab26b58bacdd7cae30f87f47836f1f717a0d05ac
+checksum=a7317de8e54f57190a2e2fe5f469ed332b9a12151fade03bf984765a55e5e24b
 conf_files="/etc/pipewire/pipewire.conf"
 
+replaces="libpulseaudio-pipewire>=0"
+
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	LDFLAGS+=" -latomic"
@@ -124,15 +127,6 @@ gstreamer1-pipewire_package() {
 	}
 }
 
-libpulseaudio-pipewire_package() {
-	depends="libpipewire-${version}_${revision}"
-	short_desc+=" - PulseAudio client library"
-	pkg_install() {
-		vmove usr/lib/pipewire-0.3/pulse
-		vmove usr/bin/pw-pulse
-	}
-}
-
 alsa-pipewire_package() {
 	depends="libpipewire-${version}_${revision}"
 	short_desc+=" - ALSA client library"

Re: pipewire: update to 0.3.18

[st3r4g]

[-- Attachment #1: Type: text/plain, Size: 195 bytes --]

New comment by st3r4g on void-packages repository

https://github.com/void-linux/void-packages/pull/27279#issuecomment-748602506

Comment:
Done and tested that the replacement happens correctly.

Re: [PR PATCH] [Merged]: pipewire: update to 0.3.18

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 461 bytes --]

There's a merged pull request on the void-packages repository

pipewire: update to 0.3.18
https://github.com/void-linux/void-packages/pull/27279

Description:
* Add deps on core plugins (so that it works without having to manually install a bunch of non-obvious `libspa-`)
we may want to merge them in the main `pipewire` package, but we can do it later
* Remove libpulseaudio-pipewire (deprecated)

Tested briefly as pulse and jack replacement on `x86_64`