From: Good Guy Date: Tue, 6 May 2025 16:02:16 +0000 (-0600) Subject: Credit Andrew - Slackware needed quotes in new Blend plugins Makefile and libsndfile... X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=5664abb7e9dda610b8dd4ab58172b3a1229304b5;p=goodguy%2Fcinelerra.git Credit Andrew - Slackware needed quotes in new Blend plugins Makefile and libsndfile patch required for latest update of Arch --- diff --git a/cinelerra-5.1/plugins/blendalgebra/Makefile b/cinelerra-5.1/plugins/blendalgebra/Makefile index 4db95d7b..50619852 100644 --- a/cinelerra-5.1/plugins/blendalgebra/Makefile +++ b/cinelerra-5.1/plugins/blendalgebra/Makefile @@ -61,7 +61,7 @@ $(OBJDIR)/blendalgebra.o: blendalgebra.C blendalgebra.h %.ba.so: %.ba $(FRONT) $(HELPER) rm -f $@ - CIN_CC=$(CC) CIN_DAT= ./$(HELPER) -noapi -compile -opt -warn $< + CIN_CC="$(CC)" CIN_DAT= ./$(HELPER) -noapi -compile -opt -warn $< all:: $(OUTPUT) $(BA_OBJS) diff --git a/cinelerra-5.1/plugins/blendprogram/Makefile b/cinelerra-5.1/plugins/blendprogram/Makefile index 4a7cdc0b..bb8a66aa 100644 --- a/cinelerra-5.1/plugins/blendprogram/Makefile +++ b/cinelerra-5.1/plugins/blendprogram/Makefile @@ -33,7 +33,7 @@ $(OBJDIR)/blendprogram.o: blendprogram.C blendprogram.h %.bp.so: %.bp $(FRONT) $(HELPER) rm -f $@ - CIN_CC=$(CC) CIN_DAT= ./$(HELPER) -noapi -compile -opt -warn $< + CIN_CC="$(CC)" CIN_DAT= ./$(HELPER) -noapi -compile -opt -warn $< all:: $(OUTPUT) $(BP_OBJS) diff --git a/cinelerra-5.1/thirdparty/src/libsndfile-1.2.2.patch0 b/cinelerra-5.1/thirdparty/src/libsndfile-1.2.2.patch0 new file mode 100644 index 00000000..679716aa --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/libsndfile-1.2.2.patch0 @@ -0,0 +1,49 @@ +diff --git a/src/ALAC/alac_decoder.c b/src/ALAC/alac_decoder.c +index 978919a70..417645316 100644 +--- a/src/ALAC/alac_decoder.c ++++ b/src/ALAC/alac_decoder.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + #include "alac_codec.h" +@@ -40,11 +41,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 29012f3f4..c9395b1d5 100644 +--- a/src/ALAC/alac_encoder.c ++++ b/src/ALAC/alac_encoder.c +@@ -32,6 +32,7 @@ + + #include + #include ++#include + #include + + #include "sfendian.h" +@@ -46,12 +47,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) ;