Credit Andrew - Slackware needed quotes in new Blend plugins Makefile and libsndfile...

diff --git a/cinelerra-5.1/plugins/blendalgebra/Makefile b/cinelerra-5.1/plugins/blendalgebra/Makefile
index 4db95d7be5c09ae47a875ca14b875770179a13d8..506198527be32de852f16e83b2ac72bdd2d2926c 100644 (file)
--- 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 4a7cdc0b710393b7434423d593b5e469b4988bae..bb8a66aa8f033d6929d74c876959f6a07e3d2ba0 100644 (file)
--- 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 (file)
index 0000000..679716a
--- /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 <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
++#include <stdbool.h>
+ #include <string.h>
+ 
+ #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 <stdio.h>
+ #include <stdlib.h>
++#include <stdbool.h>
+ #include <string.h>
+ 
+ #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) ;