From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 07 Feb 2022 08:55:00 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nGyrU-0083PA-Jh for lore@lore.pengutronix.de; Mon, 07 Feb 2022 08:55:00 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nGyrT-0001lC-Ny; Mon, 07 Feb 2022 08:54:59 +0100 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nGyrF-0001l2-66; Mon, 07 Feb 2022 08:54:45 +0100 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1nGyrE-0002vu-P8; Mon, 07 Feb 2022 08:54:44 +0100 Date: Mon, 7 Feb 2022 08:54:44 +0100 From: Michael Olbrich To: Christian Melki Message-ID: <20220207075444.GS11273@pengutronix.de> Mail-Followup-To: Christian Melki , ptxdist@pengutronix.de References: <20220205230718.2518022-1-christian.melki@t2data.com> <20220205230718.2518022-5-christian.melki@t2data.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220205230718.2518022-5-christian.melki@t2data.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 08:54:11 up 58 days, 16:39, 70 users, load average: 0.17, 0.14, 0.11 User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [ptxdist] [PATCH] pulseaudio: Version bump. 13.0 -> 1.5.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false On Sun, Feb 06, 2022 at 12:07:18AM +0100, Christian Melki wrote: > 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. Why is this necessary? Michael > * Remove old patches > * Correct configuration flag for the new version. > * Disable doxygen usage. > > Signed-off-by: Christian Melki > --- > ...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)" > -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: > ---- > - 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 > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de