From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 07 Feb 2022 13:02:20 +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 1nH2iq-008EJO-Jd for lore@lore.pengutronix.de; Mon, 07 Feb 2022 13:02:20 +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 1nH2ip-0003Qn-K6; Mon, 07 Feb 2022 13:02:19 +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 1nH2ib-0003Qe-Qv; Mon, 07 Feb 2022 13:02:05 +0100 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1nH2ib-0007et-FG; Mon, 07 Feb 2022 13:02:05 +0100 Date: Mon, 7 Feb 2022 13:02:05 +0100 From: Michael Olbrich To: Christian Melki Message-ID: <20220207120205.GW11273@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> <20220207075444.GS11273@pengutronix.de> <99479c50-8b79-554d-2f29-4d6a617513b9@t2data.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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: 12:55:33 up 58 days, 20:41, 85 users, load average: 0.09, 0.10, 0.09 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="iso-8859-1" Content-Transfer-Encoding: quoted-printable 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 Mon, Feb 07, 2022 at 11:30:51AM +0100, Christian Melki wrote: > = > = > On 2/7/22 9:05 AM, Christian Melki wrote: > > = > > = > > On 2/7/22 8:54 AM, Michael Olbrich wrote: > > > 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 > > > = > > = > > Hmm. Maybe I misread it. I interpreted configuration whine as GLIB > > dependency. But when checking closer, I really can't see a strict one. > > I can disable it again. > > = > = > Well. It became rather obvious soon after alright. > Sorry about my goldfish style memory.. :) :-) > ... > Run-time dependency gio-2.0 found: NO (tried pkgconfig) > = > ../pulseaudio-15.0/meson.build:617:0: ERROR: Dependency "gio-2.0" not fou= nd, > tried pkgconfig > ... > = > Which was discussed in mr-654. > https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/654 > = > I don't know if the suggested fix made it back, but I applied the diff and > could disable glib properly. "required : false" is correct as the commenter noted. Please use that. Michael > Regards, > Christian > = > > > > * Remove old patches > > > > * Correct configuration flag for the new version. > > > > * Disable doxygen usage. > > > > = > > > > Signed-off-by: Christian Melki > > > > --- > > > > =A0 ...ld-sys-meson-Add-missing-include-dir.patch | 30 ------------= ------- > > > > =A0 patches/pulseaudio-13.0/series=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0=A0=A0=A0 |=A0 4 --- > > > > =A0 rules/pulseaudio.in=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 |=A0 1 + > > > > =A0 rules/pulseaudio.make=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 | 11 +++---- > > > > =A0 4 files changed, 7 insertions(+), 39 deletions(-) > > > > =A0 delete mode 100644 patches/pulseaudio-13.0/0001-build-sys-meson= -Add-missing-include-dir.patch > > > > = > > > > =A0 delete mode 100644 patches/pulseaudio-13.0/series > > > > = > > > > diff --git a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missi= ng-include-dir.patch b/patches/pulseaudio-13.0/0001-build-sys-meson-Add-mis= sing-include-dir.patch > > > > = > > > > deleted file mode 100644 > > > > index f88efd824..000000000 > > > > --- a/patches/pulseaudio-13.0/0001-build-sys-meson-Add-missing-incl= ude-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: > > > > - > > > > -=A0=A0=A0 FAILED: > > > > src/modules/module-echo-cancel.so.p/echo-cancel_adrian-aec.c.o > > > > -=A0=A0=A0 cc -Isrc/modules/module-echo-cancel.so.p -I. > > > > -I../pulseaudio -Isrc -I../pulseaudio/src -I/usr/include/orc-0.4 > > > > -flto=3Dauto -fdiagnostics-color=3Dalways -D_FILE_OFFSET_BITS=3D64 > > > > -Wall -Winvalid-pch -std=3Dgnu11 -march=3Dx86-64 -mtune=3Dgeneric -= O2 > > > > -p> > > > > -=A0=A0=A0 ../pulseaudio/src/modules/echo-cancel/adrian-aec.c:30:10: > > > > fatal error: adrian-aec-orc-gen.h: No such file or directory > > > > -=A0=A0=A0=A0=A0=A0 30 | #include "adrian-aec-orc-gen.h" > > > > -=A0=A0=A0=A0=A0=A0=A0=A0=A0 |=A0=A0=A0=A0=A0=A0=A0=A0=A0 ^~~~~~~~~= ~~~~~~~~~~~~~ > > > > - > > > > -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 > > > > -=A0=A0 mod =3D shared_module(name, > > > > -=A0=A0=A0=A0 sources, > > > > -=A0=A0=A0=A0 headers, > > > > --=A0=A0=A0 include_directories : [configinc, topinc], > > > > -+=A0=A0=A0 include_directories : [configinc, topinc, > > > > include_directories('.')], > > > > -=A0=A0=A0=A0 c_args : [pa_c_args, server_c_args, '-DPA_MODULE_NAME= =3D' + > > > > name.underscorify()] + extra_flags, > > > > -=A0=A0=A0=A0 install : true, > > > > -=A0=A0=A0=A0 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=A0 - 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 > > > > =A0=A0=A0=A0=A0 select LIBC_M > > > > =A0=A0=A0=A0=A0 select LIBC_RT > > > > =A0=A0=A0=A0=A0 select LIBC_PTHREAD > > > > +=A0=A0=A0 select GLIB > > > > =A0=A0=A0=A0=A0 select ALSA_LIB > > > > =A0=A0=A0=A0=A0 select ALSA_LIB_MIXER > > > > =A0=A0=A0=A0=A0 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) +=3D pulseaudio > > > > =A0 # > > > > =A0 # Paths and names > > > > =A0 # > > > > -PULSEAUDIO_VERSION=A0=A0=A0 :=3D 13.0 > > > > -PULSEAUDIO_MD5=A0=A0=A0=A0=A0=A0=A0 :=3D e41d606f90254ed45c90520fa= f83d95c > > > > +PULSEAUDIO_VERSION=A0=A0=A0 :=3D 15.0 > > > > +PULSEAUDIO_MD5=A0=A0=A0=A0=A0=A0=A0 :=3D bb888e7747b778c1c487c63b5= 82ddf40 > > > > =A0 PULSEAUDIO=A0=A0=A0=A0=A0=A0=A0 :=3D pulseaudio-$(PULSEAUDIO_VE= RSION) > > > > =A0 PULSEAUDIO_SUFFIX=A0=A0=A0 :=3D tar.xz > > > > =A0 PULSEAUDIO_URL=A0=A0=A0=A0=A0=A0=A0 :=3D http://freedesktop.org= /software/pulseaudio/releases/$(PULSEAUDIO).$(PULSEAUDIO_SUFFIX) > > > > = > > > > @@ -50,14 +50,14 @@ PULSEAUDIO_CONF_OPT=A0=A0=A0 :=3D \ > > > > =A0=A0=A0=A0=A0 -Datomic-arm-linux-helpers=3Dtrue \ > > > > =A0=A0=A0=A0=A0 -Datomic-arm-memory-barrier=3Dtrue \ > > > > =A0=A0=A0=A0=A0 -Davahi=3Ddisabled \ > > > > -=A0=A0=A0 -Dbluez5=3D$(call ptx/truefalse, PTXCONF_PULSEAUDIO_BLUE= TOOTH) \ > > > > +=A0=A0=A0 -Dbluez5=3D$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUETOOT= H)d \ > > > > =A0=A0=A0=A0=A0 -Dbluez5-native-headset=3D$(call ptx/truefalse, > > > > PTXCONF_PULSEAUDIO_BLUETOOTH) \ > > > > =A0=A0=A0=A0=A0 -Dbluez5-ofono-headset=3Dfalse \ > > > > =A0=A0=A0=A0=A0 -Ddatabase=3Dsimple \ > > > > =A0=A0=A0=A0=A0 -Ddbus=3D$(call ptx/endis, PTXCONF_PULSEAUDIO_BLUET= OOTH)d \ > > > > =A0=A0=A0=A0=A0 -Dfftw=3Ddisabled \ > > > > =A0=A0=A0=A0=A0 -Dgcov=3Dfalse \ > > > > -=A0=A0=A0 -Dglib=3Ddisabled \ > > > > +=A0=A0=A0 -Dglib=3Denabled \ > > > > =A0=A0=A0=A0=A0 -Dgsettings=3Ddisabled \ > > > > =A0=A0=A0=A0=A0 -Dgtk=3Ddisabled \ > > > > =A0=A0=A0=A0=A0 -Dhal-compat=3Dfalse \ > > > > @@ -84,7 +84,8 @@ PULSEAUDIO_CONF_OPT=A0=A0=A0 :=3D \ > > > > =A0=A0=A0=A0=A0 -Dudevrulesdir=3D/lib/udev/rules.d \ > > > > =A0=A0=A0=A0=A0 -Dwebrtc-aec=3D$(call ptx/endis, PTXCONF_PULSEAUDIO= _WEBRTC_AEC)d \ > > > > =A0=A0=A0=A0=A0 -Dx11=3Ddisabled \ > > > > -=A0=A0=A0 -Dzshcompletiondir=3D > > > > +=A0=A0=A0 -Dzshcompletiondir=3D \ > > > > +=A0=A0=A0 -Ddoxygen=3Dfalse > > > > =A0 PULSEAUDIO_LDFLAGS=A0=A0=A0 :=3D -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 > > > > = > > > = > > = > > _______________________________________________ > > 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@p= engutronix.de