Thanks, applied as 9afd6187151001e401acd977b074b17dab0d9b31. Michael
[sent from post-receive hook] On Wed, 14 May 2025 08:08:04 +0200, Christian Melki <[email protected]> wrote: > * Adjust slightly with offsets to apply cleanly. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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 <[email protected]> > +Date: Tue, 17 Dec 2024 10:38:47 +0100 > +Subject: [PATCH] Include <stdbool.h> 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 <stdio.h> > + #include <stdlib.h> > + #include <stddef.h> > ++#include <stdbool.h> > + #include <string.h> > + > + #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 <stdio.h> > + #include <stdlib.h> > ++#include <stdbool.h> > + #include <string.h> > + > + #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
