1 diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
2 index 645b273..e482dcd 100644
3 --- a/cinelerra-5.1/cinelerra/Makefile
4 +++ b/cinelerra-5.1/cinelerra/Makefile
5 @@ -428,13 +428,28 @@ LIBS := $(LIBRARIES)
6 ifneq ($(WANT_CIN_3RDPARTY),no)
9 +LIBS += -Wl,--export-all-symbols -g
10 +LIBS += -Wl,--out-implib,$(OBJDIR)/lib$(WANT_CIN).exe.a
11 +LIBS += -L$(FF_DIR)/lib
12 +LIBS += -Wl,-rpath-link=:$(FF_DIR)/lib
13 +LIBS += -Wl,--as-needed -Wl,--warn-common
22 +LIBS += -lvpx -lwebp -lwebpmux
23 +LIBS += -ljpeg -lFLAC -lgif -lsndfile -ltiff
25 +LIBS += -lsecur32 -lole32 -luser32 -luser32 -lbcrypt -lshell32
27 LIBS += -lpthread -lm -lbz2 -llzma -lz -lpng -luuid
28 -LIBS += -lX11 -lXau -lXdmcp -lXext -lXfixes -lXv -lXinerama
29 +LIBS += -lX11 -lXau -lXdmcp -lXext -lXfixes -lXinerama
30 +LIBS += -lintl -liconv
31 LIBS += -lfontconfig -lfreetype
32 -LIBS += -lavcodec -lavdevice -lavfilter -lavformat -lavresample -lavutil
33 -LIBS += -lswresample -lswscale
34 -LIBS += -lvpx -lwebp -lwebpmux
36 LIBS += $(if $(filter fftw,$(static_pkgs)), -lfftw3)
37 LIBS += $(if $(filter flac,$(static_pkgs)), -lFLAC)
38 @@ -454,7 +470,7 @@ LIBS += $(if $(filter x265,$(static_pkgs)), -lx265)
39 LIBS += $(if $(filter libvpx,$(static_pkgs)), -lvpx)
42 -LIBS += -lGL -lGLU -lGLX
45 ifneq ($(WANT_XFT),no)
47 @@ -548,7 +564,7 @@ CFLAGS += -DUSE_ALPHA
51 -LDFLAGS1 = -Wl,-export-dynamic -g
52 +LDFLAGS1 = -Wl,-export-all-symbols -g
54 LINKER = $(CXX) -o $(OUTPUT)
56 @@ -566,7 +582,7 @@ all: $(OUTPUT) $(CUTADS) $(BDWRITE) $(LV2UI)
57 $(OUTPUT): $(OBJS) $(THEME_DATA) $(DCRAW) $(LIBRARIES)
58 $(LINKER) `cat $(OBJDIR)/objs`
59 $(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(OUTPUT) $(OUTPUT_G))
60 - $(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
61 + #$(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
62 ln -f -s ../bin/$(WANT_CIN) ci
64 ifneq ($(WANT_COMMERCIAL),no)
65 @@ -574,7 +590,7 @@ $(CUTADS): $(CUTOBJS) $(CUTLIBS) $(LIBRARIES)
66 @echo g++ -o $@ $(CUTOBJS)
67 @g++ $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS) $(LIBS)
68 $(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(CUTADS) $(CUTADS).debuginfo)
69 - $(if $(findstring -ggdb,$(CFLAGS)),,strip $(CUTADS))
70 + #$(if $(findstring -ggdb,$(CFLAGS)),,strip $(CUTADS))
73 cp -av $(OBJDIR)/cutads $(BINDIR)/.
74 @@ -586,7 +602,7 @@ $(BDWRITE): $(BDWOBJS) $(LIBRARIES)
75 @echo g++ -o $@ $(BDWOBJS)
76 @g++ $(CFLAGS) -pthread -o $@ $(BDWOBJS) $(LIBS)
77 $(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(BDWRITE) $(BDWRITE).debuginfo)
78 - $(if $(findstring -ggdb,$(CFLAGS)),,strip $(BDWRITE))
79 + #$(if $(findstring -ggdb,$(CFLAGS)),,strip $(BDWRITE))
82 cp -av $(OBJDIR)/bdwrite $(BINDIR)/.
83 @@ -629,7 +645,7 @@ $(OBJDIR)/lv2ui: $(LV2OBJS)
84 @echo $(CXX) \`cat $(OBJDIR)/c_flags\` $^ -o $@
85 @$(CXX) `cat $(OBJDIR)/c_flags` $^ -o $@ $(LIBS) $(GTK2_LIBS)
86 $(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(LV2UI) $(LV2UI).debuginfo)
87 - $(if $(findstring -ggdb,$(CFLAGS)),,strip $(LV2UI))
88 + #$(if $(findstring -ggdb,$(CFLAGS)),,strip $(LV2UI))
92 diff --git a/cinelerra-5.1/db/tdb.h b/cinelerra-5.1/db/tdb.h
93 index 8ee8800..9a17091 100644
94 --- a/cinelerra-5.1/db/tdb.h
95 +++ b/cinelerra-5.1/db/tdb.h
96 @@ -32,7 +32,7 @@ inline void operator delete[](void *t,size_t n) { free(t); }
105 diff --git a/cinelerra-5.1/guicast/bcresources.C b/cinelerra-5.1/guicast/bcresources.C
106 index 1d52855..fdab491 100644
107 --- a/cinelerra-5.1/guicast/bcresources.C
108 +++ b/cinelerra-5.1/guicast/bcresources.C
109 @@ -367,8 +367,8 @@ BC_Resources::BC_Resources(float x_scale, float y_scale)
110 BC_WindowBase::resources = this;
118 if( x_scale <= 0 ) x_scale = 1;
119 if( y_scale <= 0 ) y_scale = x_scale;
120 diff --git a/cinelerra-5.1/guicast/filesystem.h b/cinelerra-5.1/guicast/filesystem.h
121 index c976135..5613702 100644
122 --- a/cinelerra-5.1/guicast/filesystem.h
123 +++ b/cinelerra-5.1/guicast/filesystem.h
125 #include "bcwindowbase.inc"
128 +#define dirent64 dirent
129 +#define readdir64 readdir
134 diff --git a/cinelerra-5.1/plugin_config b/cinelerra-5.1/plugin_config
135 index 56f4351..f7149bb 100644
136 --- a/cinelerra-5.1/plugin_config
137 +++ b/cinelerra-5.1/plugin_config
138 @@ -4,12 +4,21 @@ CFLAGS += -I../ -I$(CINELERRA) -I$(GUICAST) -I../colors -fPIC
139 CFLAGS += $(static_incs)
140 LFLAGS += $(static_libs)
143 +LFLAGS += -Wl,$(CINELERRA)/$(OBJDIR)/libcin.exe.a
144 +LFLAGS += -lintl -liconv
145 +ifneq ($(WANT_GL),no)
146 +LFLAGS += -lGL -lGLU
149 LDLINKER ?= $(CXX) -shared
150 $(shell mkdir -p $(OBJDIR))
154 PLUGIN_DIR := $(BINDIR)/plugins
155 OUTPUT_DIR = $(PLUGIN_DIR)/$($(PLUGIN))
156 -OUTPUT = $(OUTPUT_DIR)/$(PLUGIN).plugin
157 +OUTPUT = $(OUTPUT_DIR)/$(PLUGIN).$(SFX)
158 OUTPUT_G = $(OBJDIR)/$(PLUGIN).debuginfo
160 $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
161 @@ -20,16 +29,16 @@ ifeq ($(OUTPUT_THEME),)
162 $(OUTPUT): $(OBJS) $(OUTPUT_DIR) $(OUTPUT_BINS)
163 $(LDLINKER) -o $(OUTPUT) $(OBJS) $(OUTPUT_BINS) `cat $(OBJDIR)/l_flags`
164 $(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(OUTPUT) $(OUTPUT_G))
165 - $(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
166 + #$(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
170 THEME_DATA = $(OBJDIR)/$(PLUGIN)_data.o
172 $(OUTPUT_THEME): $(OBJS) $(OUTPUT_DIR) $(THEME_DATA)
173 - $(LDLINKER) -o $(OUTPUT_THEME) $(OBJS) $(THEME_DATA) $(LDFLAGS)
174 + $(LDLINKER) -o $(OUTPUT_THEME) $(OBJS) $(THEME_DATA) `cat $(OBJDIR)/l_flags`
175 $(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(OUTPUT_THEME) $(OUTPUT_G))
176 - $(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT_THEME))
177 + #$(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT_THEME))
181 diff --git a/cinelerra-5.1/plugins/Makefile b/cinelerra-5.1/plugins/Makefile
182 index 22bc7dd..6404536 100644
183 --- a/cinelerra-5.1/plugins/Makefile
184 +++ b/cinelerra-5.1/plugins/Makefile
185 @@ -36,7 +36,6 @@ DIRS = $(OPENCV_OBJS) \
193 @@ -176,6 +175,8 @@ DIRS = $(OPENCV_OBJS) \
200 PLUGIN_DIR = $(BINDIR)/plugins
201 DATA = $(PLUGIN_DIR)/fonts $(PLUGIN_DIR)/shapes
202 diff --git a/cinelerra-5.1/guicast/bcsignals.C b/cinelerra-5.1/guicast/bcsignals.C
203 --- guicast/bcsignals.C 2020-01-27 07:27:45.332623800 -0700
204 +++ guicast/bcsignals.C 2020-01-27 07:28:11.443049600 -0700
206 #include <sys/prctl.h>
208 #include <sys/types.h>
209 +#include <sys/wait.h>
211 BC_Signals* BC_Signals::global_signals = 0;
212 static int signal_done = 0;