From: Christian Melki <christian.melki@t2data.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH v3] pulseaudio: Version bump. 13.0 -> 15.0
Date: Mon, 7 Feb 2022 18:40:00 +0100 [thread overview]
Message-ID: <20220207174000.100683-1-christian.melki@t2data.com> (raw)
https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/14.0/
https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/
* Remove old patches
* Add patch to disable gio/glib if gsettings is disabled.
* 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 ---
...-optional-when-gsettings-is-disabled.patch | 21 +++++++++++++
patches/pulseaudio-15.0/series | 4 +++
rules/pulseaudio.make | 9 +++---
5 files changed, 30 insertions(+), 38 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
create mode 100644 patches/pulseaudio-15.0/0001-Make-gio-2.0-optional-when-gsettings-is-disabled.patch
create mode 100644 patches/pulseaudio-15.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/patches/pulseaudio-15.0/0001-Make-gio-2.0-optional-when-gsettings-is-disabled.patch b/patches/pulseaudio-15.0/0001-Make-gio-2.0-optional-when-gsettings-is-disabled.patch
new file mode 100644
index 000000000..325e9cfd8
--- /dev/null
+++ b/patches/pulseaudio-15.0/0001-Make-gio-2.0-optional-when-gsettings-is-disabled.patch
@@ -0,0 +1,21 @@
+From: Yureka Lilian <yuka@yuka.dev>
+Date: Fri, 22 Oct 2021 09:09:55 +0000
+Subject: [PATCH] Make gio-2.0 optional when gsettings is disabled
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index d7e468cabec7..92f2d20bdca0 100644
+--- a/meson.build
++++ b/meson.build
+@@ -614,7 +614,7 @@ if dbus_dep.found()
+ cdata.set('HAVE_DBUS', 1)
+ endif
+
+-gio_dep = dependency('gio-2.0', version : '>= 2.26.0')
++gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
+ if get_option('gsettings').enabled()
+ assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)')
+ cdata.set('HAVE_GSETTINGS', 1)
diff --git a/patches/pulseaudio-15.0/series b/patches/pulseaudio-15.0/series
new file mode 100644
index 000000000..c35c4f4bf
--- /dev/null
+++ b/patches/pulseaudio-15.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Make-gio-2.0-optional-when-gsettings-is-disabled.patch
+# 8dc8cea3523d86737ae0b361f252f5d6 - git-ptx-patches magic
diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make
index 59a9fdda0..0dc6999a3 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,7 +50,7 @@ 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 \
@@ -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
next reply other threads:[~2022-02-07 17:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-07 17:40 Christian Melki [this message]
2022-02-14 12:43 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220207174000.100683-1-christian.melki@t2data.com \
--to=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox