From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 07 Feb 2022 18:40:53 +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 1nH80T-008T0X-Ts for lore@lore.pengutronix.de; Mon, 07 Feb 2022 18:40:53 +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 1nH80S-0007Zv-PZ; Mon, 07 Feb 2022 18:40:52 +0100 Received: from mail-eopbgr80059.outbound.protection.outlook.com ([40.107.8.59] helo=EUR04-VI1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nH7zm-0007WA-BW for ptxdist@pengutronix.de; Mon, 07 Feb 2022 18:40:11 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PVGJv+LZnSTH2pNaYkUPJGabcGE48qHQC4MIIQfo2DdYMYqYXHm8d5FkXeW2pDp9RhM4IB/46eL0xZ5uKyvodU/ThCoCWNeHNjaHVNq/SxTIdLduV2elV0znhpAUIuFdZxW68Q75rqpw1bmW1aPBC70aCxi1VjOaVPFx3bn/92uCdVMfcKrkhltwVUdNEWYuyM5vC3JPU72HDN/sZyr265y3/7oprKhUqHDtqioayblCQABVpSbAiIlWmhhEx7+FWuQpBDXoW9tdHW5F5OjKAQKsDN8knSlPauGmr67Gbo1IT3jlq4HNvU+sUEjhz2XAQECpCGS6Y12VzD3Ov2a9lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/5pPvwa31/dV8bMKYfHeyp2d5SGeN1dlWo/0PCR5kbI=; b=klBios94ZDQ7Wbr/c3YyexLgor5nzxT9P8CYF7dWaCtsZ9dltlOXySemPO0dJ7FZVcohv5cPoVZaPan2gHtUmktctwk2eZgi5WrdzqRwm/wcY3V372eRdlYnE6+zQ3Wcf9cM6Mhr/e7dCcadGMs4yJeRQ7VIr81XqLlSWk/BrRAZ9MNBaLBJJlCC8614EgY3Z3jzZYGZDVuBHoLa5Lb7IkL6bzgahetrYXIxOU/5iy3a0fQI0qkEfxaes53F9SIJ7FKDpiO5p5sDoNIIjvHZeFuxCzM+18fzP5x+dIOWnxR9pzul3NIdcyvWb9Z/6zI0v9Xl81Llo/ltSTpD7iLs7A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/5pPvwa31/dV8bMKYfHeyp2d5SGeN1dlWo/0PCR5kbI=; b=ForTYwTjGDu6yo7TgDna6bzJGwh6Qdq5EQVnCoznlOBrrf9I8GI+2WO1RZ3xBladulLEKsd4E+EFFPE2DmZusTlJwWdB2h7NZBBMzvGs5DYeLSvy9kKkW6pJeGP2w8iKnobPDibBMnj7g8pLJiBU1HUuREBifjrqun0rWxWc2J8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by PAXP251MB0469.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:276::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.18; Mon, 7 Feb 2022 17:40:07 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::10ab:30da:9dfb:56fe]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::10ab:30da:9dfb:56fe%4]) with mapi id 15.20.4951.018; Mon, 7 Feb 2022 17:40:07 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Mon, 7 Feb 2022 18:40:00 +0100 Message-Id: <20220207174000.100683-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: GV3P280CA0095.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:8::6) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1f51f83f-5e3c-42f4-dee2-08d9ea60e15b X-MS-TrafficTypeDiagnostic: PAXP251MB0469:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:229; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LybWRYcT6H6trIW7gTf7lB0SU63lOV+27nr5pEJpT4GH2eDq1zqC6vtgHyRkjwJ3iSowLjNGDYn1V2F7PWp9E8FrEdGF/6VIfCw9omyUen4mii7UPpypiZZX3aEx64WBUByPyu68DUWqe4y+UGB+w3E1Tb+q8Kz82uDQoGGufawXJ4sIMhRaeb4eXognUuAd6OXdJsK3JvgUxuU9EoV4up6UfCTZK673Y39mWMOCIt0bK/b8shGa4s3ywfHcLve03u1lX08AWD0GKw8xU4rAkvhqLQ/BMeG4XP6mf9ODvmElRGMZ42a/xkHfgSh9iRrZrpPJ00PsGWVqvjybeb417PK3VNNPfVRQwfOKK1rLihHim29F8dazXb89vhMmBBl6b2WZ+gWvhAfOycln9K4ya34+QyWUlDUe/uXj9HxndETHOo11ii2Jkrzh4U9CM2a8nHQ6kcmZBWt+rAw1p56NiSnY+3t2gtYudGHK90YN7nbug6+pqS3pG4qv/6cdy4OQCZWNn6eHrMpGrsvE0Jz0YatBXhDxE5XJGWh0PEWeriSLIb6Zb0dDfPFQQ7GohDH3L2KJuqunTgpRuX0FviRHroH2mq6FgVlJslDCSHCMNy6DWcVXqPynfSBP4Cw7DWNf3kFjWetHPH4o3H29x9BNsTLYnkmtzSg3m50e1ZGn0ysC9EpQS/WO3zWr8ryvikXFtBJDWC4/FezoHDGfqDin6wS371UBINVuewUODWEdwtILZrrP3R30JWMWOVCIBL7lgU9W+qUuIqnmjBqHppymTTvCxmlsIsCBpnXzNjKDxjNpM5cDYk0UxO5gnY75ZaOn X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230001)(376002)(346002)(396003)(136003)(366004)(39830400003)(2906002)(2616005)(1076003)(6486002)(966005)(26005)(186003)(38100700002)(38350700002)(86362001)(508600001)(5660300002)(6512007)(66556008)(52116002)(6916009)(316002)(6666004)(66476007)(66946007)(8936002)(8676002)(44832011)(83380400001)(36756003)(6506007)(156284005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Z0BQAYjTHhA4cVUbWyqLqzowSM4u9v7wW9SBBZo2f8ifdadS3iQjdFloYThQ?= =?us-ascii?Q?MIN7lWV9OhPenW1ddXaqRMiHAfDvS8MWk3+YEPNtNmsGZsT14ou0bdp7g2Ki?= =?us-ascii?Q?FepAacfIg/LEZQ5YUZTLqwoCfpxj/4iPOmrGi8Xr+VqMTkUjM9W9mbZey0sO?= =?us-ascii?Q?SADO2QhOQI8nzQc8kfRBQMajRRy9qt5HzLJevtccwZm4wgzCt7Dzbn8CvYfK?= =?us-ascii?Q?l3RP48yFZLC90hfRkHDonMk0fwJq+zMUD19X2ib37fkwgL42TA6vEstYvFrt?= =?us-ascii?Q?wROcMorxgq8sy7pzhrirNQqHGBGqmxyg8QJ2MfNnoYlgtKzoG2ZRucNjemwR?= =?us-ascii?Q?psAYozObGE/rmE3MuDUFHELk7e1grU+/YuKTP/0Yc4ezMa3/s+l9jzdzTSDR?= =?us-ascii?Q?isMoJkoonEsWySsxKitNB8zijGidaRuNOcD9cwCcgG9L49Qyf3P6POM76qLq?= =?us-ascii?Q?NMZVFgg9dZVARfpHI8H0lEOdgfuj9gjrzGI2G3RuMwKOm4a8wMgf1SXdhJdG?= =?us-ascii?Q?74ZZ324H9h3WcUJ02Bbm680rcSqL/ZX/1+2a0LoNMHV9iL+q9tYlhgnyxVTb?= =?us-ascii?Q?64WAbqAAuuEH5LUnFy+2N6abCOTELIc05vdxh/0fgOdPM7Yy6yB3ZcfJCVTg?= =?us-ascii?Q?yVK+GTmh4Fk8rkT3mQHgI1iWKhA2joSI0yuffldmBEeWj87Gtn3cNhiKErvV?= =?us-ascii?Q?8qXbM9da5BLZX+TMRU2FRXAm4E0uG6V3SKP2NvdN9a5tNiP/eRqizo8BgZfg?= =?us-ascii?Q?H5nbByOkbkiYUYOZ4lzxEhVT/qnKS8/tjw+bNFlXLkC4bX8TPjU9vcLtiBq5?= =?us-ascii?Q?pc1rNKFWCmC4/BtIu4F8URFRzNq8gdnZqPMqwlRbS48gSehKWXhaTpTA1jcp?= =?us-ascii?Q?nxtQY5mbPBq5PujSZs9hE8jOhjwMjXHDSU6bdcdrJLJtxJgD/TBcOkoiRpR+?= =?us-ascii?Q?CWI6t/fNMLgKDHRgApf2/K/X87rUI4FJX5vTwxVP0FCqNWCO66Xl40o5JV7H?= =?us-ascii?Q?l1uhxe9uOpGg4N9r0cXi5wSwH7/9qzobFIFvEDVePjCCv6WFikiNn9EuouCq?= =?us-ascii?Q?kjC0yb0BJ5RK7SH3D7xji3Mff8HImKhqtk64iGaAOmFuOmU3FM6g4XaHaI1o?= =?us-ascii?Q?pN5jNz31HoxHHOie1kguk9boOJAoPlNDGlHF+sTHxVTuzXrwIhe0Z4ABmro3?= =?us-ascii?Q?h2s74MsPF9ZV6GrO4XkgX36CqBhDAMES8WzhkuZbDnAciywXDi0tQGGN+OqR?= =?us-ascii?Q?KeYw9w2biBhAd3Gyl0qF9MSgx+xx2IOiNApQu63T08DBopgQ3oxGO3oPF2s0?= =?us-ascii?Q?1lFQULEvrFpJt7NqypONwCnZcdqCngn19ruVfx/3/XE4Vq2p2kUKT+ujrTBL?= =?us-ascii?Q?oOrbLRpDC8DOWsNANqrO6aaN9a16nXt3tiFI7vfbtCxGIjYcmf7UdS7I6kfQ?= =?us-ascii?Q?dw/sHntB9T49s6EU4OR0y3+rtp/IWkfVGyhH4/labqneRaDzSqH4lLakZOvR?= =?us-ascii?Q?JGPRthKnYEIvzMJQJyDVzG/FwkTfZtmNeK15B44M580zYQZnJEkwNF6GG5mA?= =?us-ascii?Q?8FNhZ0ILBafMyPmaR1mJzKl/ZkwU24LUe1bggu4vSTIfncA/e09tXymDSnyE?= =?us-ascii?Q?QIfs5CSDAQBgO0FO+eLsdrbVZtpMUC2N3iljBg06IZxRjnDT3mEsVndFyWWV?= =?us-ascii?Q?90gxHpS98vAqPdn06WraSwI/rUY=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f51f83f-5e3c-42f4-dee2-08d9ea60e15b X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2022 17:40:07.0945 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5JVi2OOfwnIEJZJjfFtvJRW0mL2LnJKnX8rGq6QqJbemH6YrPcxmLe5muf0d+4S6y7aopDzb1qZ33oRPzndO7Dbn9vThFthIe9cVDIbMLYI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXP251MB0469 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v3] pulseaudio: Version bump. 13.0 -> 15.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 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 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 --- ...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)" -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/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 +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