From 5793a9f8fee40e9659225b3ea4e1a74053689e45 Mon Sep 17 00:00:00 2001 From: unfairscheduler Date: Mon, 5 Sep 2022 17:42:33 -0400 Subject: [PATCH] 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 --- common/shlibs | 10 +-- ...ession-with-side-effect-in-pa_assert.patch | 79 ------------------- srcpkgs/pulseaudio/template | 8 +- 3 files changed, 8 insertions(+), 89 deletions(-) delete mode 100644 srcpkgs/pulseaudio/patches/fix-expression-with-side-effect-in-pa_assert.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" -Date: Thu, 30 Sep 2021 08:40:35 +0300 -Subject: [PATCH] Fix expression with side effect in pa_assert - -Part-of: ---- - 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/template b/srcpkgs/pulseaudio/template index 685154e8c0e1..777bdbd7ff5d 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 " 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"