From: Mirko Vogt <redacted>
Date: Fri, 11 Sep 2026 11:23:31 +0000 (+0000)
Subject: pulseaudio: switch to git snapshot
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7d479353dd78a5ba9e38aea4b7acf1171038d28d;p=openwrt-packages.git

pulseaudio: switch to git snapshot

The last release, 17.0, dates from January 2024. Master has since
accumulated fixes not available in any release, among them the SAP
port byte order in module-rtp-recv, an out-of-bounds access in
stream_get_timing_info_callback, multichannel processing in
module-echo-cancel and several JSON UTF-8 handling fixes. Switch to
the current master head.

The snapshot tarball carries neither a .git directory nor the
.tarball-version file of a release tarball, so git-version-gen has no
source for the version string and meson would fail parsing the empty
result. Write .tarball-version in Build/Prepare from the last release
tag reachable from the snapshot plus the abbreviated commit, so the
library version and the libpulsecommon file name derive from 17.0 as
the build's own git describe would.

Keep PKG_VERSION at 17.0 instead of the date-derived default, so the
package version matches what the libraries and binaries report, the
CI version check finds it in the --version output, and a later switch
back to a release tarball still sorts as an upgrade. PKG_SOURCE_DATE
and PKG_SOURCE_VERSION identify the snapshot, and the repacked tarball
carries both in its name so that a later snapshot does not collide with
this one in the download directory and on the source mirror.

Upstream turned the doxygen and tests options into feature options;
pass disabled instead of false. Normalise the indentation of the last
three MESON_ARGS entries while touching them.

Signed-off-by: Mirko Vogt <redacted>
---

diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile
index 91eb1ff45..d6c27bbaa 100644
--- a/sound/pulseaudio/Makefile
+++ b/sound/pulseaudio/Makefile
@@ -8,12 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pulseaudio
+# last release tag reachable from PKG_SOURCE_VERSION
 PKG_VERSION:=17.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://freedesktop.org/software/pulseaudio/releases
-PKG_HASH:=053794d6671a3e397d849e478a80b82a63cb9d8ca296bd35b73317bb5ceb87b5
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
+PKG_SOURCE_DATE:=2026-09-01
+PKG_SOURCE_VERSION:=77d25a1e613095bdf87a1d13b65e7c330565077a
+PKG_MIRROR_HASH:=69b0c6c5b291eaa2a696f2fb9b31ca8cf16a3c591767d5b996ba8eca2fed89e6
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION)).tar.zst
 
 PKG_MAINTAINER:=Peter Wagner <tripolar@gmx.at>
 PKG_LICENSE:=LGPL-2.1-or-later
@@ -97,7 +101,7 @@ MESON_ARGS += \
 	-Db_lto=true \
 	-Dgcov=false \
 	-Dman=false \
-	-Dtests=false \
+	-Dtests=disabled \
 	-Dsystem_user=pulse \
 	-Dsystem_group=pulse \
 	-Daccess_group=audio \
@@ -131,9 +135,9 @@ MESON_ARGS += \
 	-Dx11=disabled \
 	-Dadrian-aec=true \
 	-Dwebrtc-aec=disabled \
-        -Ddoxygen=false \
-        -Dtcpwrap=disabled \
-        -Dbluez5-gstreamer=disabled 
+	-Ddoxygen=disabled \
+	-Dtcpwrap=disabled \
+	-Dbluez5-gstreamer=disabled
 
 ifeq ($(BUILD_VARIANT),avahi)
 MESON_ARGS += \
@@ -151,6 +155,10 @@ TARGET_LDFLAGS += -Wl,--gc-sections $(if $(INTL_FULL),-lintl)
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
+	# the git snapshot carries neither .git nor .tarball-version, so
+	# git-version-gen cannot determine a version on its own
+	echo "$(PKG_VERSION)-git$(call version_abbrev,$(PKG_SOURCE_VERSION))" \
+		> $(PKG_BUILD_DIR)/.tarball-version
 ifneq ($(findstring arm,$(CONFIG_ARCH)),)
 ifeq ($(findstring neon,$(CONFIG_CPU_TYPE)),)
 	$(SED) '/remap_neon\.c/d' $(PKG_BUILD_DIR)/src/pulsecore/meson.build