[ptxdist] [PATCH] pulseaudio: Version bump. 13.0 -> 1.5.0

[Christian Melki <christian.melki@t2data.com>]

https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/14.0/
https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/

* Add GLIB as a dependency.
* Remove old patches
* Correct configuration flag for the new version.
* Disable doxygen usage.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 ...ld-sys-meson-Add-missing-include-dir.patch | 30 -------------------
 patches/pulseaudio-13.0/series                |  4 ---
 rules/pulseaudio.in                           |  1 +
 rules/pulseaudio.make                         | 11 +++----
 4 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
 delete mode 100644 patches/pulseaudio-13.0/series

diff --git a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch b/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
deleted file mode 100644
index f88efd824..000000000
--- a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-include-dir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Wed, 12 May 2021 21:10:54 +0200
-Subject: [PATCH] build-sys: meson: Add missing include dir
-
-Otherwise building module-echo-cancel fails here:
-
-    FAILED: src/modules/module-echo-cancel.so.p/echo-cancel_adrian-aec.c.o
-    cc -Isrc/modules/module-echo-cancel.so.p -I. -I../pulseaudio -Isrc -I../pulseaudio/src -I/usr/include/orc-0.4 -flto=auto -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=gnu11 -march=x86-64 -mtune=generic -O2 -p>
-    ../pulseaudio/src/modules/echo-cancel/adrian-aec.c:30:10: fatal error: adrian-aec-orc-gen.h: No such file or directory
-       30 | #include "adrian-aec-orc-gen.h"
-          |          ^~~~~~~~~~~~~~~~~~~~~~
-
-Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/552>
----
- src/modules/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/meson.build b/src/modules/meson.build
-index 92d5871f9966..83cb11a63ed1 100644
---- a/src/modules/meson.build
-+++ b/src/modules/meson.build
-@@ -279,7 +279,7 @@ foreach m : all_modules
-   mod = shared_module(name,
-     sources,
-     headers,
--    include_directories : [configinc, topinc],
-+    include_directories : [configinc, topinc, include_directories('.')],
-     c_args : [pa_c_args, server_c_args, '-DPA_MODULE_NAME=' + name.underscorify()] + extra_flags,
-     install : true,
-     install_rpath : rpath_dirs,
diff --git a/patches/pulseaudio-13.0/series b/patches/pulseaudio-13.0/series
deleted file mode 100644
index ff45a6029..000000000
--- a/patches/pulseaudio-13.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-build-sys-meson-Add-missing-include-dir.patch
-# d9287d7937841a165c1263a5c38c0ed7  - git-ptx-patches magic
diff --git a/rules/pulseaudio.in b/rules/pulseaudio.in
index 3c925f70f..e4dfff115 100644
--- a/rules/pulseaudio.in
+++ b/rules/pulseaudio.in
@@ -7,6 +7,7 @@ menuconfig PULSEAUDIO
 	select LIBC_M
 	select LIBC_RT
 	select LIBC_PTHREAD
+	select GLIB
 	select ALSA_LIB
 	select ALSA_LIB_MIXER
 	select ALSA_LIB_UCM
diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make
index 59a9fdda0..23d9a1a3b 100644
--- a/rules/pulseaudio.make
+++ b/rules/pulseaudio.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PULSEAUDIO) += pulseaudio
 #
 # Paths and names
 #
-PULSEAUDIO_VERSION	:= 13.0
-PULSEAUDIO_MD5		:= e41d606f90254ed45c90520faf83d95c
+PULSEAUDIO_VERSION	:= 15.0
+PULSEAUDIO_MD5		:= bb888e7747b778c1c487c63b582ddf40
 PULSEAUDIO		:= pulseaudio-$(PULSEAUDIO_VERSION)
 PULSEAUDIO_SUFFIX	:= tar.xz
 PULSEAUDIO_URL		:= http://freedesktop.org/software/pulseaudio/releases/$(PULSEAUDIO).$(PULSEAUDIO_SUFFIX)
@@ -50,14 +50,14 @@ PULSEAUDIO_CONF_OPT	:= \
 	-Datomic-arm-linux-helpers=true \
 	-Datomic-arm-memory-barrier=true \
 	-Davahi=disabled \
-	-Dbluez5=$(call ptx/truefalse, PTXCONF_PULSEAUDIO_BLUETOOTH) \
+	-Dbluez5=$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)d \
 	-Dbluez5-native-headset=$(call ptx/truefalse, PTXCONF_PULSEAUDIO_BLUETOOTH) \
 	-Dbluez5-ofono-headset=false \
 	-Ddatabase=simple \
 	-Ddbus=$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOTH)d \
 	-Dfftw=disabled \
 	-Dgcov=false \
-	-Dglib=disabled \
+	-Dglib=enabled \
 	-Dgsettings=disabled \
 	-Dgtk=disabled \
 	-Dhal-compat=false \
@@ -84,7 +84,8 @@ PULSEAUDIO_CONF_OPT	:= \
 	-Dudevrulesdir=/lib/udev/rules.d \
 	-Dwebrtc-aec=$(call ptx/endis, PTXCONF_PULSEAUDIO_WEBRTC_AEC)d \
 	-Dx11=disabled \
-	-Dzshcompletiondir=
+	-Dzshcompletiondir= \
+	-Ddoxygen=false
 
 PULSEAUDIO_LDFLAGS	:= -Wl,-rpath,/usr/lib/pulseaudio:/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules
 
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de