On Fri, May 15, 2026 at 09:08:07AM +0200, Matthieu Herrb wrote:
> Fixes errors now caught by llvm 22.
>
> ok ?
OK
>
> Index: Makefile
> ===================================================================
> RCS file: /local/cvs/ports/audio/pulseaudio/Makefile,v
> diff -u -p -u -r1.134 Makefile
> --- Makefile 28 Jan 2025 14:38:28 -0000 1.134
> +++ Makefile 15 May 2026 06:58:50 -0000
> @@ -5,7 +5,7 @@ COMMENT= cross-platform networked sound
> VERSION= 17.0
> DISTNAME= pulseaudio-${VERSION}
> EXTRACT_SUFX= .tar.xz
> -REVISION= 3
> +REVISION= 4
>
> SHARED_LIBS += pulse 7.2 # 0.24.3
> SHARED_LIBS += pulse-simple 1.2 # 0.1.1
> Index: patches/patch-src_modules_dbus_iface-stream_c
> ===================================================================
> RCS file: patches/patch-src_modules_dbus_iface-stream_c
> diff -N patches/patch-src_modules_dbus_iface-stream_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_modules_dbus_iface-stream_c 15 May 2026 06:58:50
> -0000
> @@ -0,0 +1,23 @@
> +Fix for llvm 22 build. Don't mix usigned long long and unsigned long
> +
> +Index: src/modules/dbus/iface-stream.c
> +--- src/modules/dbus/iface-stream.c.orig
> ++++ src/modules/dbus/iface-stream.c
> +@@ -466,7 +466,7 @@ static void handle_get_buffer_latency(DBusConnection *
> +
> + static void handle_get_device_latency(DBusConnection *conn, DBusMessage
> *msg, void *userdata) {
> + pa_dbusiface_stream *s = userdata;
> +- dbus_uint64_t device_latency = 0;
> ++ pa_usec_t device_latency = 0;
> +
> + pa_assert(conn);
> + pa_assert(msg);
> +@@ -526,7 +526,7 @@ static void handle_get_all(DBusConnection *conn, DBusM
> + dbus_uint32_t channels[PA_CHANNELS_MAX];
> + dbus_uint32_t volume[PA_CHANNELS_MAX];
> + dbus_uint64_t buffer_latency = 0;
> +- dbus_uint64_t device_latency = 0;
> ++ pa_usec_t device_latency = 0;
> + const char *resample_method = NULL;
> + unsigned i = 0;
> +
> Index: patches/patch-src_pulse_util_c
> ===================================================================
> RCS file: /local/cvs/ports/audio/pulseaudio/patches/patch-src_pulse_util_c,v
> diff -u -p -u -r1.12 patch-src_pulse_util_c
> --- patches/patch-src_pulse_util_c 11 Mar 2022 18:20:27 -0000 1.12
> +++ patches/patch-src_pulse_util_c 15 May 2026 06:58:50 -0000
> @@ -30,7 +30,7 @@ Index: src/pulse/util.c
> + if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1)
> + return NULL;
> +
> -+ buf = (char *) pa_xmalloc(len);
> ++ buf = (char **) pa_xmalloc(len);
> +
> + if (sysctl(mib, 4, buf, &len, NULL, 0) == 0) {
> + pa_strlcpy(s, basename(*buf), l);
>
> --
> Matthieu Herrb
>
--
Antoine
