X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fblds%2Fcygwin.patch;h=561cddafa9bafa654493058ab05fdf0c2c5c2681;hb=bddf34d0b865e2a0df03926eae45caa038d4f787;hp=a984a7fea96ed1dbefa0a018c8ebde035122b554;hpb=9e3d90a964c0fbe97c0b58235336a47111932d5d;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/blds/cygwin.patch b/cinelerra-5.1/blds/cygwin.patch
index a984a7fe..561cddaf 100644
--- a/cinelerra-5.1/blds/cygwin.patch
+++ b/cinelerra-5.1/blds/cygwin.patch
@@ -1,50 +1,26 @@
 diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
-index 645b273..e482dcd 100644
+index a22a21a..fc6dfba 100644
 --- a/cinelerra-5.1/cinelerra/Makefile
 +++ b/cinelerra-5.1/cinelerra/Makefile
-@@ -428,13 +428,28 @@ LIBS := $(LIBRARIES)
- ifneq ($(WANT_CIN_3RDPARTY),no)
- LIBS += $(libraries)
- else
-+LIBS += -Wl,--export-all-symbols -g
-+LIBS += -Wl,--out-implib,$(OBJDIR)/lib$(WANT_CIN).exe.a
-+LIBS += -L$(FF_DIR)/lib
-+LIBS += -Wl,-rpath-link=:$(FF_DIR)/lib
-+LIBS += -Wl,--as-needed -Wl,--warn-common
-+LIBS += -lavdevice
-+LIBS += -lavfilter
-+LIBS += -lavformat
-+LIBS += -lavcodec
-+LIBS += -lswresample
-+LIBS += -lswscale
-+LIBS += -lavutil
-+
-+LIBS += -lvpx -lwebp -lwebpmux
-+LIBS += -ljpeg -lFLAC -lgif -lsndfile -ltiff
-+
-+LIBS += -lsecur32 -lole32 -luser32 -luser32 -lbcrypt -lshell32
+@@ -426,10 +426,13 @@ endif
+ LIBS := $(LIBRARIES)
  
- LIBS += -lpthread -lm -lbz2 -llzma -lz -lpng -luuid
--LIBS += -lX11 -lXau -lXdmcp -lXext -lXfixes -lXv -lXinerama
-+LIBS += -lX11 -lXau -lXdmcp -lXext -lXfixes -lXinerama
-+LIBS += -lintl -liconv
- LIBS += -lfontconfig -lfreetype
--LIBS += -lavcodec -lavdevice -lavfilter -lavformat -lavresample -lavutil
+ ifeq ($(WANT_CIN_3RDPARTY),no)
+-LIBS += -lavcodec -lavdevice -lavfilter -lavformat -lavutil
 -LIBS += -lswresample -lswscale
--LIBS += -lvpx -lwebp -lwebpmux
- 
- LIBS += $(if $(filter fftw,$(static_pkgs)), -lfftw3)
- LIBS += $(if $(filter flac,$(static_pkgs)), -lFLAC)
-@@ -454,7 +470,7 @@ LIBS += $(if $(filter x265,$(static_pkgs)), -lx265)
- LIBS += $(if $(filter libvpx,$(static_pkgs)), -lvpx)
+-LIBS += -lintl -liconv
+-LIBS += -lexecinfo
++LIBS += -L$(FF_PATH)/lib
++LIBS += -Wl,--out-implib,x86_64/libcin.exe.a
++LIBS += -Wl,-rpath-link=:$(FF_PATH)/lib -Wl,--as-needed -Wl,--warn-common
++LIBS += -lavdevice -lavfilter -lavformat -lavcodec
++LIBS += -lswresample -lswscale -lavutil
++LIBS += -L/usr/lib -lintl -liconv
++LIBS += -lsecur32 -lole32 -luser32 -luser32 -lbcrypt -lshell32
  
- ifneq ($(WANT_GL),no)
--LIBS += -lGL -lGLU -lGLX
-+LIBS += -lGL -lGLU
- endif
- ifneq ($(WANT_XFT),no)
- LIBS += -lXft
-@@ -548,7 +564,7 @@ CFLAGS += -DUSE_ALPHA
+ LIBS += $(shared_libs)
+ LIBS += $(system_libs)
+@@ -492,7 +495,7 @@ CFLAGS += -DUSE_ALPHA
  
  else
  
@@ -53,7 +29,7 @@ index 645b273..e482dcd 100644
  LDFLAGS2 = $(LDFLAGS)
  LINKER = $(CXX) -o $(OUTPUT)
  
-@@ -566,7 +582,7 @@ all:	$(OUTPUT) $(CUTADS) $(BDWRITE) $(LV2UI)
+@@ -510,7 +513,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))
@@ -62,25 +38,25 @@ index 645b273..e482dcd 100644
  	ln -f -s ../bin/$(WANT_CIN) ci
  
  ifneq ($(WANT_COMMERCIAL),no)
-@@ -574,7 +590,7 @@ $(CUTADS):	$(CUTOBJS) $(CUTLIBS) $(LIBRARIES)
- 	@echo g++ -o $@ $(CUTOBJS)
- 	@g++ $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS) $(LIBS)
+@@ -518,7 +521,7 @@ $(CUTADS):	$(CUTOBJS) $(CUTLIBS) $(LIBRARIES)
+ 	@echo $(CXX) -o $@ $(CUTOBJS)
+ 	@$(CXX) $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS) $(LIBS)
  	$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(CUTADS) $(CUTADS).debuginfo)
 -	$(if $(findstring -ggdb,$(CFLAGS)),,strip $(CUTADS))
 +	#$(if $(findstring -ggdb,$(CFLAGS)),,strip $(CUTADS))
  
  install-cutads:
  	cp -av $(OBJDIR)/cutads $(BINDIR)/.
-@@ -586,7 +602,7 @@ $(BDWRITE):	$(BDWOBJS) $(LIBRARIES)
- 	@echo g++ -o $@ $(BDWOBJS)
- 	@g++ $(CFLAGS) -pthread -o $@ $(BDWOBJS) $(LIBS)
+@@ -530,7 +533,7 @@ $(BDWRITE):	$(BDWOBJS) $(LIBRARIES)
+ 	@echo $(CXX) -o $@ $(BDWOBJS)
+ 	@$(CXX) $(CFLAGS) -pthread -o $@ $(BDWOBJS) $(LIBS)
  	$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(BDWRITE) $(BDWRITE).debuginfo)
 -	$(if $(findstring -ggdb,$(CFLAGS)),,strip $(BDWRITE))
 +	#$(if $(findstring -ggdb,$(CFLAGS)),,strip $(BDWRITE))
  
  install-bdwrite:
  	cp -av $(OBJDIR)/bdwrite $(BINDIR)/.
-@@ -629,7 +645,7 @@ $(OBJDIR)/lv2ui: $(LV2OBJS)
+@@ -573,7 +576,7 @@ $(OBJDIR)/lv2ui: $(LV2OBJS)
  	@echo $(CXX) \`cat $(OBJDIR)/c_flags\` $^ -o $@
  	@$(CXX) `cat $(OBJDIR)/c_flags` $^ -o $@ $(LIBS) $(GTK2_LIBS)
  	$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(LV2UI) $(LV2UI).debuginfo)
@@ -117,6 +93,40 @@ index 1d52855..fdab491 100644
  
  	if( x_scale <= 0 ) x_scale = 1;
  	if( y_scale <= 0 ) y_scale = x_scale;
+diff --git a/cinelerra-5.1/guicast/bcsignals.C b/cinelerra-5.1/guicast/bcsignals.C
+index ffc8a1c..ad11365 100644
+--- a/cinelerra-5.1/guicast/bcsignals.C
++++ b/cinelerra-5.1/guicast/bcsignals.C
+@@ -44,6 +44,7 @@
+ #include <sys/prctl.h>
+ #endif
+ #include <sys/types.h>
++#include <sys/wait.h>
+ 
+ BC_Signals* BC_Signals::global_signals = 0;
+ static int signal_done = 0;
+diff --git a/cinelerra-5.1/guicast/bctrace.C b/cinelerra-5.1/guicast/bctrace.C
+index 7e45392..2d08b46 100644
+--- a/cinelerra-5.1/guicast/bctrace.C
++++ b/cinelerra-5.1/guicast/bctrace.C
+@@ -309,7 +309,7 @@ void BC_Trace::dump_traces(FILE *fp)
+ 	}
+ }
+ 
+-void trace_info::set_owner() { owner = pthread_self(); }
++void trace_info::set_owner() { owner = (unsigned long)pthread_self(); }
+ void trace_info::unset_owner() { owner = 0; }
+ 
+ void BC_Trace::dump_locks(FILE *fp)
+@@ -322,7 +322,7 @@ void BC_Trace::dump_locks(FILE *fp)
+ 		fprintf(fp,"    %p %s, %s %p%s",
+ 			p->info, p->title, p->loc,
+ 			(void*)p->tid, p->is_owner ? " *" : "");
+-		if( p->info->owner && p->info->owner != p->tid )
++		if( p->info->owner && p->info->owner != (unsigned long)p->tid )
+ 			fprintf(fp," %p", (void*)p->info->owner);
+ 		fprintf(fp,"\n");
+ 	}
 diff --git a/cinelerra-5.1/guicast/filesystem.h b/cinelerra-5.1/guicast/filesystem.h
 index c976135..5613702 100644
 --- a/cinelerra-5.1/guicast/filesystem.h
@@ -132,7 +142,7 @@ index c976135..5613702 100644
  {
  public:
 diff --git a/cinelerra-5.1/plugin_config b/cinelerra-5.1/plugin_config
-index 56f4351..f7149bb 100644
+index 56f4351..ecd5837 100644
 --- a/cinelerra-5.1/plugin_config
 +++ b/cinelerra-5.1/plugin_config
 @@ -4,12 +4,21 @@ CFLAGS += -I../ -I$(CINELERRA) -I$(GUICAST) -I../colors -fPIC
@@ -199,14 +209,3 @@ index 22bc7dd..6404536 100644
  
  PLUGIN_DIR = $(BINDIR)/plugins
  DATA = $(PLUGIN_DIR)/fonts $(PLUGIN_DIR)/shapes
-diff --git a/cinelerra-5.1/guicast/bcsignals.C b/cinelerra-5.1/guicast/bcsignals.C
---- guicast/bcsignals.C	2020-01-27 07:27:45.332623800 -0700
-+++ guicast/bcsignals.C	2020-01-27 07:28:11.443049600 -0700
-@@ -44,6 +44,7 @@
- #include <sys/prctl.h>
- #endif
- #include <sys/types.h>
-+#include <sys/wait.h>
- 
- BC_Signals* BC_Signals::global_signals = 0;
- static int signal_done = 0;