Re: [PR PATCH] [Updated] pulseaudio: Update to 16.1

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

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

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

https://github.com/unfairscheduler/void-packages master
https://github.com/void-linux/void-packages/pull/39120

pulseaudio: Update to 16.1
- Bump shlibs
- Remove patches folder as patch merged (https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/e1899245703f1dfa3220af465046c287a5f1c2ba)
- Remove `make_check=yes` flag from template


#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


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

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

From 1d2bcc9e04ebbd458fba39fbd98c2d49aa85d963 Mon Sep 17 00:00:00 2001
From: unfairscheduler <unfairscheduler@gmail.com>
Date: Mon, 5 Sep 2022 17:42:33 -0400
Subject: [PATCH 1/3] pulseaudio: Update to 16.1

- Bump shlibs
- Remove merged patch
- Remove make_check=yes flag from template
- Add patch to disable four failing tests (which are bound to fail)
- Remove pre_configure vsed
---
 common/shlibs                                 | 10 +--
 ...ession-with-side-effect-in-pa_assert.patch | 79 -------------------
 .../remove_test_replace_fail_1234.patch       | 60 ++++++++++++++
 srcpkgs/pulseaudio/template                   | 15 +---
 4 files changed, 68 insertions(+), 96 deletions(-)
 delete mode 100644 srcpkgs/pulseaudio/patches/fix-expression-with-side-effect-in-pa_assert.patch
 create mode 100644 srcpkgs/pulseaudio/patches/remove_test_replace_fail_1234.patch

diff --git a/common/shlibs b/common/shlibs
index 8b4edbd9ce66..a9573ced4ecf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -736,11 +736,11 @@ libsndfile.so.1 libsndfile-1.0.20_1
 libspeex.so.1 libspeex-1.1_1
 libspeexdsp.so.1 speexdsp-1.2rc2_1
 libasyncns.so.0 libasyncns-0.8_1
-libpulse.so.0 libpulseaudio-15.0_1
-libpulse-mainloop-glib.so.0 libpulseaudio-15.0_1
-libpulse-simple.so.0 libpulseaudio-15.0_1
-libpulsecommon-15.0.so libpulseaudio-15.0_1
-libpulsecore-15.0.so libpulseaudio-15.0_1
+libpulse.so.0 libpulseaudio-16.1_1
+libpulse-mainloop-glib.so.0 libpulseaudio-16.1_1
+libpulse-simple.so.0 libpulseaudio-16.1_1
+libpulsecommon-16.1.so libpulseaudio-16.1_1
+libpulsecore-16.1.so libpulseaudio-16.1_1
 libprojectM.so.3 projectM-3.1.7_2
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
diff --git a/srcpkgs/pulseaudio/patches/fix-expression-with-side-effect-in-pa_assert.patch b/srcpkgs/pulseaudio/patches/fix-expression-with-side-effect-in-pa_assert.patch
deleted file mode 100644
index eff6b1c1406c..000000000000
--- a/srcpkgs/pulseaudio/patches/fix-expression-with-side-effect-in-pa_assert.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From e1899245703f1dfa3220af465046c287a5f1c2ba Mon Sep 17 00:00:00 2001
-From: "Igor V. Kovalenko" <igor.v.kovalenko@gmail.com>
-Date: Thu, 30 Sep 2021 08:40:35 +0300
-Subject: [PATCH] Fix expression with side effect in pa_assert
-
-Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/641>
----
- src/modules/bluetooth/module-bluez5-device.c | 4 ++--
- src/pulsecore/card.c                         | 4 ++--
- src/pulsecore/core.c                         | 4 ++--
- src/pulsecore/dbus-util.c                    | 2 +-
- 4 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c
-index 9774be5cc..afbb7e3fa 100644
---- a/src/modules/bluetooth/module-bluez5-device.c
-+++ b/src/modules/bluetooth/module-bluez5-device.c
-@@ -2513,10 +2513,10 @@ static int bluez5_device_message_handler(const char *object_path, const char *me
-     pa_bluetooth_profile_t profile;
-     const pa_a2dp_endpoint_conf *endpoint_conf;
-     const char *codec_name;
--    struct userdata *u;
-+    struct userdata *u = userdata;
-     bool is_a2dp_sink;
- 
--    pa_assert(u = (struct userdata *)userdata);
-+    pa_assert(u);
-     pa_assert(message);
-     pa_assert(response);
- 
-diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c
-index 23b347b59..4f5997d2c 100644
---- a/src/pulsecore/card.c
-+++ b/src/pulsecore/card.c
-@@ -467,10 +467,10 @@ int pa_card_suspend(pa_card *c, bool suspend, pa_suspend_cause_t cause) {
- }
- 
- static int card_message_handler(const char *object_path, const char *message, const pa_json_object *parameters, char **response, void *userdata) {
--    pa_card *c;
-+    pa_card *c = userdata;
-     char *message_handler_path;
- 
--    pa_assert(c = (pa_card *) userdata);
-+    pa_assert(c);
-     pa_assert(message);
-     pa_assert(response);
- 
-diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
-index 174d0650e..132f08bbb 100644
---- a/src/pulsecore/core.c
-+++ b/src/pulsecore/core.c
-@@ -86,9 +86,9 @@ static char *message_handler_list(pa_core *c) {
- }
- 
- static int core_message_handler(const char *object_path, const char *message, const pa_json_object *parameters, char **response, void *userdata) {
--    pa_core *c;
-+    pa_core *c = userdata;
- 
--    pa_assert(c = (pa_core *) userdata);
-+    pa_assert(c);
-     pa_assert(message);
-     pa_assert(response);
-     pa_assert(pa_safe_streq(object_path, "/core"));
-diff --git a/src/pulsecore/dbus-util.c b/src/pulsecore/dbus-util.c
-index 7d550204e..466a882d8 100644
---- a/src/pulsecore/dbus-util.c
-+++ b/src/pulsecore/dbus-util.c
-@@ -737,7 +737,7 @@ pa_proplist *pa_dbus_get_proplist_arg(DBusConnection *c, DBusMessage *msg, DBusM
-     pa_assert(msg);
-     pa_assert(iter);
- 
--    pa_assert(signature = dbus_message_iter_get_signature(iter));
-+    pa_assert_se(signature = dbus_message_iter_get_signature(iter));
-     pa_assert_se(pa_streq(signature, "a{say}"));
- 
-     dbus_free(signature);
--- 
-GitLab
-
diff --git a/srcpkgs/pulseaudio/patches/remove_test_replace_fail_1234.patch b/srcpkgs/pulseaudio/patches/remove_test_replace_fail_1234.patch
new file mode 100644
index 000000000000..c57025c12a96
--- /dev/null
+++ b/srcpkgs/pulseaudio/patches/remove_test_replace_fail_1234.patch
@@ -0,0 +1,60 @@
+https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1286
+core-util-test.c would fail unless assertions are enabled. Credits to Igor Kovalenko for pointing this out.
+The below patch disables the four failing tests.
+diff --git a/src/tests/core-util-test.c b/src/tests/core-util-test.c
+index 49aa4ab..8cdad19 100644
+--- a/src/tests/core-util-test.c
++++ b/src/tests/core-util-test.c
+@@ -262,20 +262,26 @@ START_TEST (test_replace) {
+ }
+ END_TEST
+ 
++/*
+ START_TEST (test_replace_fail_1) {
+     pa_replace(NULL, "b", "bab");
+ }
+ END_TEST
++*/
+ 
++/*
+ START_TEST (test_replace_fail_2) {
+     pa_replace("abe", NULL, "bab");
+ }
+ END_TEST
++*/
+ 
++/*
+ START_TEST (test_replace_fail_3) {
+     pa_replace("abcde", "b", NULL);
+ }
+ END_TEST
++*/
+ 
+ START_TEST (test_escape) {
+     char* value;
+@@ -294,10 +300,12 @@ START_TEST (test_escape) {
+ }
+ END_TEST
+ 
++/*
+ START_TEST (test_replace_fail_4) {
+     pa_replace("abe", "", "bab");
+ }
+ END_TEST
++*/
+ 
+ START_TEST (test_unescape) {
+     char* value;
+@@ -334,10 +342,12 @@ int main(int argc, char *argv[]) {
+     tcase_add_test(tc, test_atoi64);
+     tcase_add_test(tc, test_atod);
+     tcase_add_test(tc, test_replace);
++    /*
+     tcase_add_test_raise_signal(tc, test_replace_fail_1, SIGABRT);
+     tcase_add_test_raise_signal(tc, test_replace_fail_2, SIGABRT);
+     tcase_add_test_raise_signal(tc, test_replace_fail_3, SIGABRT);
+     tcase_add_test_raise_signal(tc, test_replace_fail_4, SIGABRT);
++    */
+     tcase_add_test(tc, test_escape);
+     tcase_add_test(tc, test_unescape);
+ 
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 685154e8c0e1..3d94c9c64c1d 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
-version=15.0
-revision=3
+version=16.1
+revision=1
 build_style=meson
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
  -Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
@@ -23,10 +23,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/PulseAudio"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
-checksum=a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0
+checksum=8eef32ce91d47979f95fd9a935e738cd7eb7463430dabc72863251751e504ae4
 python_version=3
-# FIXME: core-util-test fails
-make_check=yes
 
 system_groups="pulse-access"
 system_accounts="pulse"
@@ -44,13 +42,6 @@ case "$XBPS_TARGET_MACHINE" in
 	arm*) configure_args+=" -Db_lto=false"
 esac
 
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		# Disable neon optimizations for the arm* architectures
-		arm*) vsed -e '/  neon/d' -i src/pulsecore/meson.build ;;
-	esac
-}
-
 post_install() {
 	rm ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
 	vsv pulseaudio

From e324c58e412764c24f928b9f5cb9f88700e551d1 Mon Sep 17 00:00:00 2001
From: unfairscheduler <unfairscheduler@gmail.com>
Date: Tue, 6 Sep 2022 11:00:27 -0400
Subject: [PATCH 2/3] pulsemixer: revbump due to pulseaudio 16.1 update

---
 srcpkgs/pulsemixer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pulsemixer/template b/srcpkgs/pulsemixer/template
index 09db5515bd84..110a4da0a61d 100644
--- a/srcpkgs/pulsemixer/template
+++ b/srcpkgs/pulsemixer/template
@@ -1,7 +1,7 @@
 # Template file for 'pulsemixer'
 pkgname=pulsemixer
 version=1.5.1
-revision=2
+revision=3
 depends="python3 libpulseaudio"
 short_desc="CLI and curses mixer for Pulseaudio"
 maintainer="Dean Thomson <mrrobot@fsociety.info>"

From afb60f428df23875b82fb58a5a7ac1d34dc5c687 Mon Sep 17 00:00:00 2001
From: unfairscheduler <unfairscheduler@gmail.com>
Date: Tue, 6 Sep 2022 11:01:07 -0400
Subject: [PATCH 3/3] pulseaudio-module-sndio: revbump due to pulseaudio 16.1
 update

---
 srcpkgs/pulseaudio-module-sndio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pulseaudio-module-sndio/template b/srcpkgs/pulseaudio-module-sndio/template
index cbe6fd42caaf..59b16a338d38 100644
--- a/srcpkgs/pulseaudio-module-sndio/template
+++ b/srcpkgs/pulseaudio-module-sndio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio-module-sndio'
 pkgname=pulseaudio-module-sndio
 version=13.0
-revision=4
+revision=5
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pulseaudio pkg-config"