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

[cinerea0 <cinerea0@users.noreply.github.com>]

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

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

https://github.com/cinerea0/void-packages pipewire
https://github.com/void-linux/void-packages/pull/41846

pipewire: update to 0.3.64
#### Testing the changes
- I tested the changes in this PR: **YES**


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

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

From 3cc54b4dfffcaeb79c3a62c83706c3c16d6c1b73 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 27 Jan 2023 17:14:18 -0500
Subject: [PATCH 1/2] pipewire: update to 0.3.65

---
 srcpkgs/pipewire/INSTALL.msg                     |  4 ++++
 .../patches/install-module-combine-stream.patch  | 16 ++++++++++++++++
 srcpkgs/pipewire/template                        | 11 ++++++-----
 3 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/pipewire/INSTALL.msg
 create mode 100644 srcpkgs/pipewire/patches/install-module-combine-stream.patch

diff --git a/srcpkgs/pipewire/INSTALL.msg b/srcpkgs/pipewire/INSTALL.msg
new file mode 100644
index 000000000000..6293ff76f853
--- /dev/null
+++ b/srcpkgs/pipewire/INSTALL.msg
@@ -0,0 +1,4 @@
+The pipewire-media-session session manager has been abandoned upstream and
+will be removed from Void in a subsequent pipewire update. All users are
+encouraged to transition to wireplumber immediately to avoid unexpected loss
+of functionality in the future.
\ No newline at end of file
diff --git a/srcpkgs/pipewire/patches/install-module-combine-stream.patch b/srcpkgs/pipewire/patches/install-module-combine-stream.patch
new file mode 100644
index 000000000000..e75b72db0aa3
--- /dev/null
+++ b/srcpkgs/pipewire/patches/install-module-combine-stream.patch
@@ -0,0 +1,16 @@
+# Upstream patch, will be in 0.3.66+
+# https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/fba7083f8ceb210c7c20aceafeb5c9a8767cf705
+diff --git a/src/modules/meson.build b/src/modules/meson.build
+index 89e4233d9f742042d5fcacbb24a1d8b0fa44b8ef..1bfb03b4b02b63e29346b9a50451c590a5c686c6 100644
+--- a/src/modules/meson.build
++++ b/src/modules/meson.build
+@@ -139,7 +139,7 @@ pipewire_module_echo_cancel_sources = [
+ pipewire_module_combine_stream = shared_library('pipewire-module-combine-stream',
+   [ 'module-combine-stream.c' ],
+   include_directories : [configinc],
+-  install : false,
++  install : true,
+   install_dir : modules_install_dir,
+   install_rpath: modules_install_dir,
+   dependencies : [spa_dep, dl_lib, pipewire_dep],
+
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 5aa0d03d04b2..03398aa923c6 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,8 +1,8 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.63
+version=0.3.65
 revision=1
-_pms_version=0.4.1
+_pms_version=0.4.2
 create_wrksrc=yes
 build_wrksrc="${pkgname}-${version}"
 build_style=meson
@@ -20,7 +20,8 @@ configure_args="
  -Dbluez5-codec-lc3plus=disabled
  -Dsession-managers=media-session
 "
-hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext"
+hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext
+ glib-devel"
 makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
  sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel
  libfreeaptx-devel libusb-devel fdk-aac-devel libsndfile-devel Vulkan-Headers
@@ -37,8 +38,8 @@ 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
  https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="1c10cc15ae8889ff0ff1653c088561ba6d46e3b1e5d4e5aacc9b01e6c1bb64b1
- 119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975"
+checksum="bb76f938136d0ce8c35bffa99e002dc2dbaeab5e14c6c34154e7f750013d1d6b
+ 4cf8577d4431e08b0e6f29c1ad6bf8662765ab66986ea6f0151883101811c119"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
 patch_args="-Np1 --directory=${build_wrksrc}"

From d019e295eae141fa88bff4e62ef4fa96691c84f7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 27 Jan 2023 17:14:36 -0500
Subject: [PATCH 2/2] wireplumber: add desktop file

---
 srcpkgs/wireplumber/files/wireplumber.desktop | 8 ++++++++
 srcpkgs/wireplumber/template                  | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/wireplumber/files/wireplumber.desktop

diff --git a/srcpkgs/wireplumber/files/wireplumber.desktop b/srcpkgs/wireplumber/files/wireplumber.desktop
new file mode 100644
index 000000000000..38a3b2101844
--- /dev/null
+++ b/srcpkgs/wireplumber/files/wireplumber.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=WirePlumber
+Comment=Start WirePlumber
+Icon=pipewire
+Exec=wireplumber
+Terminal=false
+Type=Application
+NoDisplay=true
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 7f901a6ab2a0..fb9fa438c348 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.13
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -19,6 +19,7 @@ checksum=2c3cd85a743249d418a64b137adaea475e9d36a3bb31e4230da83458c4d99e48
 post_install() {
 	vlicense LICENSE
 	vsv wireplumber
+	vinstall "${FILESDIR}/wireplumber.desktop" 644 usr/share/applications
 }
 
 wireplumber-devel_package() {