From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 14 May 2025 08:12:36 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uF5M4-005PoW-0u for lore@lore.pengutronix.de; Wed, 14 May 2025 08:12:36 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1uF5M4-0003DS-3O; Wed, 14 May 2025 08:12:36 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1uF5Hh-0006Fz-9g; Wed, 14 May 2025 08:08:05 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uF5Hg-002fBt-27; Wed, 14 May 2025 08:08:05 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1uF5Hh-0026YC-0A; Wed, 14 May 2025 08:08:05 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Wed, 14 May 2025 08:08:05 +0200 Message-Id: <20250514060805.501829-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250508183039.1884302-1-christian.melki@t2data.com> References: <20250508183039.1884302-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] libsndfile: Add upstream patch for gcc 15 build errors. 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: Christian Melki 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 9afd6187151001e401acd977b074b17dab0d9b31. Michael [sent from post-receive hook] On Wed, 14 May 2025 08:08:04 +0200, Christian Melki wrote: > * Adjust slightly with offsets to apply cleanly. > > Signed-off-by: Christian Melki > Message-Id: <20250508183039.1884302-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/libsndfile-1.2.2/0001-Include-stdbool.h-instead-of-redefining-bool-true-an.patch b/patches/libsndfile-1.2.2/0001-Include-stdbool.h-instead-of-redefining-bool-true-an.patch > new file mode 100644 > index 000000000000..a48e2e79da8e > --- /dev/null > +++ b/patches/libsndfile-1.2.2/0001-Include-stdbool.h-instead-of-redefining-bool-true-an.patch > @@ -0,0 +1,60 @@ > +From: Fabian Greffrath > +Date: Tue, 17 Dec 2024 10:38:47 +0100 > +Subject: [PATCH] Include instead of redefining `bool`, `true` and > + `false` keywords > + > +Fixes #1049 > +--- > + src/ALAC/alac_decoder.c | 6 +----- > + src/ALAC/alac_encoder.c | 7 +------ > + 2 files changed, 2 insertions(+), 11 deletions(-) > + > +diff --git a/src/ALAC/alac_decoder.c b/src/ALAC/alac_decoder.c > +index 46d3330607b3..1b4a87c08912 100644 > +--- a/src/ALAC/alac_decoder.c > ++++ b/src/ALAC/alac_decoder.c > +@@ -26,6 +26,7 @@ > + #include > + #include > + #include > ++#include > + #include > + > + #include "alac_codec.h" > +@@ -38,11 +39,6 @@ > + #include "ALACBitUtilities.h" > + #include "EndianPortable.h" > + > +-typedef enum > +-{ false = 0, > +- true = 1 > +-} bool ; > +- > + // constants/data > + const uint32_t kMaxBitDepth = 32 ; // max allowed bit depth is 32 > + > +diff --git a/src/ALAC/alac_encoder.c b/src/ALAC/alac_encoder.c > +index 599399afead9..f3033110ef76 100644 > +--- a/src/ALAC/alac_encoder.c > ++++ b/src/ALAC/alac_encoder.c > +@@ -30,6 +30,7 @@ > + // headers > + #include > + #include > ++#include > + #include > + > + #include "sfendian.h" > +@@ -44,12 +45,6 @@ > + #include "ALACAudioTypes.h" > + #include "EndianPortable.h" > + > +-typedef enum > +-{ > +- false = 0, > +- true = 1 > +-} bool ; > +- > + static void GetConfig (ALAC_ENCODER *p, ALACSpecificConfig * config) ; > + > + static int32_t EncodeStereo (ALAC_ENCODER *p, struct BitBuffer * bitstream, const int32_t * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples) ; > diff --git a/patches/libsndfile-1.2.2/series b/patches/libsndfile-1.2.2/series > new file mode 100644 > index 000000000000..ed9ff5a006da > --- /dev/null > +++ b/patches/libsndfile-1.2.2/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-Include-stdbool.h-instead-of-redefining-bool-true-an.patch > +# f491a1ef802e784a567bb3baa0ecc242 - git-ptx-patches magic