pcc_hacks2_eb92703b.diff (4,835 bytes)

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index 30f5e2c..1c9241b 100644
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -434,10 +434,14 @@ endif
 LIBS := $(LIBRARIES)
 
 ifeq ($(WANT_CIN_3RDPARTY),no)
-LIBS += -lavcodec -lavdevice -lavfilter -lavformat -lavutil
+LIBS += -L/root/ffmpeg-4.4/
+LIBS += -lavfilter -lavformat -lavcodec -lavdevice  -lavutil
 LIBS += -lswresample -lswscale
-LIBS += -lintl -liconv
-LIBS += -lexecinfo
+LIBS += -latomic -ljpeg -ltiff -lFLAC -luuid -lsndfile
+LIBS += -l:libtheoraenc.a -l:libtheoradec.a
+LIBS += -lmp3lame -ltwolame
+#LIBS += -lintl -liconv
+#LIBS += -lexecinfo
 
 LIBS += $(shared_libs)
 LIBS += $(system_libs)
@@ -518,7 +522,7 @@ all:	$(OUTPUT) $(CUTADS) $(BDWRITE) $(LV2UI)
 $(OUTPUT): $(OBJS) $(THEME_DATA) $(DCRAW) $(LIBRARIES)
 	$(LINKER) `cat $(OBJDIR)/objs`
 	$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(OUTPUT) $(OUTPUT_G))
-	$(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
+	# $(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
 	ln -f -s ../bin/$(WANT_CIN) ci
 
 ifneq ($(WANT_COMMERCIAL),no)
diff --git a/cinelerra-5.1/cinelerra/ci b/cinelerra-5.1/cinelerra/ci
index bc98783..2285898 120000
--- a/cinelerra-5.1/cinelerra/ci
+++ b/cinelerra-5.1/cinelerra/ci
@@ -1 +1 @@
-../bin/cinelerra
\ No newline at end of file
+../bin/cin
\ No newline at end of file
diff --git a/cinelerra-5.1/cinelerra/file.C b/cinelerra-5.1/cinelerra/file.C
index 07cddec..1b18c3a 100644
--- a/cinelerra-5.1/cinelerra/file.C
+++ b/cinelerra-5.1/cinelerra/file.C
@@ -387,7 +387,9 @@ const char *File::default_probes[] = {
 	"PNG",
 	"PPM",
 	"JPEG",
+#if 0
 	"GIF",
+#endif
 	"DPX",
 #ifdef HAVE_OPENEXR
 	"EXR",
@@ -465,6 +467,7 @@ int File::probe()
 			file = new FileJPEG(this->asset, this);
 			return FILE_OK;
 		}
+#if 0
 		if( !strcmp(pref->name,"GIF") ) { // GIF file
 			if( FileGIFList::check_sig(this->asset) )
 				file = new FileGIFList(this->asset, this);
@@ -473,6 +476,7 @@ int File::probe()
 			else continue;
 			return FILE_OK;
 		}
+#endif
 #ifdef HAVE_LIBDPX
 		if( !strcmp(pref->name,"DPX") ) { // DPX file
 			if( !FileDPX::check_sig(this->asset, data) ) continue;
@@ -599,13 +603,14 @@ int File::open_file(Preferences *preferences,
 	case FILE_JPEG_LIST:
 		file = new FileJPEG(this->asset, this);
 		break;
-
+#if 0
 	case FILE_GIF:
 		file = new FileGIF(this->asset, this);
 		break;
 	case FILE_GIF_LIST:
 		file = new FileGIFList(this->asset, this);
 		break;
+#endif
 #ifdef HAVE_LIBDPX
 	case FILE_DPX:
 	case FILE_DPX_LIST:
@@ -1640,7 +1645,7 @@ const char* File::get_prefix(int format)
 	case FILE_FFMPEG:	return "FFMPEG";
 	case FILE_SCENE:	return "SCENE";
 	case FILE_CR2_LIST:	return "CR2_LIST";
-	case FILE_GIF_LIST:	return "GIF_LIST";
+	case FILE_GIF_LIST:	return "ODGIF_LIST";
 	case FILE_DB:		return "DB";
 	case FILE_REF:		return "REF";
 	}
diff --git a/cinelerra-5.1/cinelerra/filegif.C b/cinelerra-5.1/cinelerra/filegif.C
index b80f741..3060219 100644
--- a/cinelerra-5.1/cinelerra/filegif.C
+++ b/cinelerra-5.1/cinelerra/filegif.C
@@ -1,4 +1,4 @@
-
+#if 0
 /*
  * CINELERRA
  * Copyright (C) 2014 Adam Williams <broadcast at earthling dot net>
@@ -572,3 +572,4 @@ GIFUnit::~GIFUnit()
 	delete temp_frame;
 }
 
+#endif
\ No newline at end of file
diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile
index 57cfb21..1ad9c34 100644
--- a/cinelerra-5.1/guicast/Makefile
+++ b/cinelerra-5.1/guicast/Makefile
@@ -20,6 +20,17 @@ ifeq ($(OBJDIR), aarch64)
 BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B aarch64 -I binary -O elf64-littleaarch64\""
 endif
 
+ifeq ($(OBJDIR), ppc64)
+BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B powerpc -I binary -O elf64-powerpc\""
+endif
+
+ifeq ($(OBJDIR), ppc)
+BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B powerpc -I binary -O elf32-powerpc\""
+endif
+
+
+
+
 $(shell mkdir -p $(OBJDIR) )
 
 OBJS = \
@@ -96,7 +107,7 @@ OUTPUT = $(OBJDIR)/libguicast.a
 UTILS = $(OBJDIR)/bootstrap $(OBJDIR)/pngtoh $(OBJDIR)/pngtoraw
 BCXFER = xfer/$(OBJDIR)/xfer.stamp
 
-CFLAGS += $(static_incs)
+CFLAGS += $(static_incs) -g -fno-strict-aliasing -Wcast-align
 
 $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
 $(shell echo $(OBJS) > $(OBJDIR)/objs)
diff --git a/cinelerra-5.1/guicast/vframe.C b/cinelerra-5.1/guicast/vframe.C
index 8e90cca..19f9cab 100644
--- a/cinelerra-5.1/guicast/vframe.C
+++ b/cinelerra-5.1/guicast/vframe.C
@@ -82,6 +82,9 @@ VFramePng::VFramePng(unsigned char *png_data, double s)
 		((long)png_data[0] << 24) | ((long)png_data[1] << 16) |
 		((long)png_data[2] << 8)  |  (long)png_data[3];
 	if( !s ) s = BC_WindowBase::get_resources()->icon_scale;
+printf("image size in vframe_png %d \n", image_size);
+//	if (image_size !=0)
+	printf("png_data %s\n", png_data+4);
 	read_png(png_data+4, image_size, s, s);
 }