From: Good Guy Date: Mon, 23 Mar 2020 18:31:05 +0000 (-0600) Subject: bld tweaks for xplatform builds, fix bad clamps, andrews lv2/opencv tweaks, trim... X-Git-Tag: 2020-03~9 X-Git-Url: http://git.cinelerra-gg.org/git/?a=commitdiff_plain;ds=sidebyside;h=e554bcee65ac3dff3ec3f6b88215b73b08e5c306;p=goodguy%2Fcinelerra.git bld tweaks for xplatform builds, fix bad clamps, andrews lv2/opencv tweaks, trim tarballs size shapes/zmpegutils --- diff --git a/cinelerra-5.1/Makefile.am b/cinelerra-5.1/Makefile.am index bd5c0f84..9e28baa2 100644 --- a/cinelerra-5.1/Makefile.am +++ b/cinelerra-5.1/Makefile.am @@ -79,12 +79,12 @@ dvl_uninstall: # with-libzmpeg3 zmp_install: cd bin; $(inst_sh) "$(DESTDIR)$(bindir)" \ - zmpeg3{cat,cc2txt,ifochk,show,toc} + zmpeg3{cc2txt,ifochk} cd bin; $(inst_sh) "$(DESTDIR)$(WANT_CINLIB_DIR)" \ hveg2enc mpeg2enc mplex mplexlo zmp_uninstall: - rm -f "$(DESTDIR)$(bindir)"/zmpeg3{cat,cc2txt,ifochk,show,toc} + rm -f "$(DESTDIR)$(bindir)"/zmpeg3{cc2txt,ifochk} # with-commercial com_install: diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile index f4e536b5..59a0e82c 100644 --- a/cinelerra-5.1/cinelerra/Makefile +++ b/cinelerra-5.1/cinelerra/Makefile @@ -554,7 +554,7 @@ clean: tags: ctags -R -h default --langmap=c:+.inc . ../guicast/ ../libzmpeg3 ../plugins ../thirdparty/ffmpeg-* -$(OBJDIR)/fileexr.o: BFLAGS:= -Wno-deprecated +$(OBJDIR)/fileexr.o: BFLAGS:= -Wno-deprecated -std=c++11 $(OBJDIR)/sha1.o: BFLAGS:= -O3 $(OVERLAYS): BFLAGS:= -Ofast -g0 diff --git a/cinelerra-5.1/cinelerra/scopewindow.C b/cinelerra-5.1/cinelerra/scopewindow.C index 4bbd34fa..4de87436 100644 --- a/cinelerra-5.1/cinelerra/scopewindow.C +++ b/cinelerra-5.1/cinelerra/scopewindow.C @@ -843,8 +843,8 @@ void ScopeGUI::draw_overlays(int overlays, int borders, int flush) int text_x = wave_x - get_text_width(SMALLFONT, string) - theme->widget_border; draw_text(text_x, text_y, string); - int y1 = CLAMP(y, 0, waveform->get_h() - 1); - waveform->draw_line(0, y1, wave_w, y1); + CLAMP(y, 0, waveform->get_h() - 1); + waveform->draw_line(0, y, wave_w, y); //waveform->draw_rectangle(0, 0, wave_w, wave_h); } set_line_dashes(0); diff --git a/cinelerra-5.1/opencv_build b/cinelerra-5.1/opencv_build index 68771bc6..fd029027 100644 --- a/cinelerra-5.1/opencv_build +++ b/cinelerra-5.1/opencv_build @@ -76,6 +76,7 @@ $(opencv)/build: $(opencv).src -DCMAKE_BUILD_TYPE=RELEASE \ -DWITH_IPP=OFF \ -DWITH_LAPACK=OFF \ + -DWITH_GPHOTO2=OFF \ -DBUILD_SHARED_LIBS=OFF \ -DINSTALL_C_EXAMPLES=OFF \ -DINSTALL_PYTHON_EXAMPLES=OFF \ @@ -97,6 +98,7 @@ $(opencv)/build: $(opencv).src -DCMAKE_BUILD_TYPE=RELEASE \ -DWITH_IPP=OFF \ -DWITH_LAPACK=OFF \ + -DWITH_GPHOTO2=OFF \ -DBUILD_SHARED_LIBS=ON \ -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ diff --git a/cinelerra-5.1/plugins/color3way/color3way.C b/cinelerra-5.1/plugins/color3way/color3way.C index 7727594d..7685257b 100644 --- a/cinelerra-5.1/plugins/color3way/color3way.C +++ b/cinelerra-5.1/plugins/color3way/color3way.C @@ -179,13 +179,13 @@ Color3WayUnit::Color3WayUnit(Color3WayMain *plugin, r = r + TOTAL_TRANSFER(r, r_factor); \ g = g + TOTAL_TRANSFER(g, g_factor); \ b = b + TOTAL_TRANSFER(b, b_factor); \ - r = CLAMP(r,0,1); g = CLAMP(g,0,1); b = CLAMP(b,0,1); \ + CLAMP(r,0,1); CLAMP(g,0,1); CLAMP(b,0,1); \ /* Apply saturation/value */ \ float h, s, v; \ HSV::rgb_to_hsv(r, g, b, h, s, v); \ v += TOTAL_TRANSFER(v, v_factor); \ s += TOTAL_TRANSFER(s, s_factor); \ - s = CLAMP(s,0,1); v = CLAMP(v,0,1); \ + CLAMP(s,0,1); CLAMP(v,0,1); \ HSV::hsv_to_rgb(r, g, b, h, s, v); diff --git a/cinelerra-5.1/plugins/shapes/16-9_boart.png b/cinelerra-5.1/plugins/shapes/16-9_boart.png deleted file mode 100644 index b63a925b..00000000 Binary files a/cinelerra-5.1/plugins/shapes/16-9_boart.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/16-9_boxes.png b/cinelerra-5.1/plugins/shapes/16-9_boxes.png deleted file mode 100644 index 19f9d2f9..00000000 Binary files a/cinelerra-5.1/plugins/shapes/16-9_boxes.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/16-9_cat_eyes.png b/cinelerra-5.1/plugins/shapes/16-9_cat_eyes.png deleted file mode 100644 index dc89dbd6..00000000 Binary files a/cinelerra-5.1/plugins/shapes/16-9_cat_eyes.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/16-9_film_bands.png b/cinelerra-5.1/plugins/shapes/16-9_film_bands.png deleted file mode 100644 index e98ec5c9..00000000 Binary files a/cinelerra-5.1/plugins/shapes/16-9_film_bands.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/16-9_multi_circle.png b/cinelerra-5.1/plugins/shapes/16-9_multi_circle.png deleted file mode 100644 index 30c246ab..00000000 Binary files a/cinelerra-5.1/plugins/shapes/16-9_multi_circle.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/16-9_multi_spiral.png b/cinelerra-5.1/plugins/shapes/16-9_multi_spiral.png deleted file mode 100644 index 257cf48e..00000000 Binary files a/cinelerra-5.1/plugins/shapes/16-9_multi_spiral.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/16-9_multi_square.png b/cinelerra-5.1/plugins/shapes/16-9_multi_square.png deleted file mode 100644 index 2952101c..00000000 Binary files a/cinelerra-5.1/plugins/shapes/16-9_multi_square.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/16-9_rare_spiral.png b/cinelerra-5.1/plugins/shapes/16-9_rare_spiral.png deleted file mode 100644 index bcddf6ff..00000000 Binary files a/cinelerra-5.1/plugins/shapes/16-9_rare_spiral.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/16-9_rectangles.png b/cinelerra-5.1/plugins/shapes/16-9_rectangles.png deleted file mode 100644 index 3f397426..00000000 Binary files a/cinelerra-5.1/plugins/shapes/16-9_rectangles.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/16-9_star.png b/cinelerra-5.1/plugins/shapes/16-9_star.png deleted file mode 100644 index f7ba3d50..00000000 Binary files a/cinelerra-5.1/plugins/shapes/16-9_star.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/16-9_stars.png b/cinelerra-5.1/plugins/shapes/16-9_stars.png deleted file mode 100644 index 54edfb21..00000000 Binary files a/cinelerra-5.1/plugins/shapes/16-9_stars.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/16-9_wood.png b/cinelerra-5.1/plugins/shapes/16-9_wood.png deleted file mode 100644 index 140e71c3..00000000 Binary files a/cinelerra-5.1/plugins/shapes/16-9_wood.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/Cinelerra16-9-Heavy.png b/cinelerra-5.1/plugins/shapes/Cinelerra16-9-Heavy.png deleted file mode 100644 index c82c92bf..00000000 Binary files a/cinelerra-5.1/plugins/shapes/Cinelerra16-9-Heavy.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/Cinelerra16-9-Light.png b/cinelerra-5.1/plugins/shapes/Cinelerra16-9-Light.png deleted file mode 100644 index 77df7ce3..00000000 Binary files a/cinelerra-5.1/plugins/shapes/Cinelerra16-9-Light.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/CinelerraGG.png b/cinelerra-5.1/plugins/shapes/CinelerraGG.png deleted file mode 100644 index 3cd49add..00000000 Binary files a/cinelerra-5.1/plugins/shapes/CinelerraGG.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/asimetric_clocks_2.png b/cinelerra-5.1/plugins/shapes/asimetric_clocks_2.png deleted file mode 100644 index e0c6e35c..00000000 Binary files a/cinelerra-5.1/plugins/shapes/asimetric_clocks_2.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/asimetric_clocks.png b/cinelerra-5.1/plugins/shapes/asymmetric_clocks.png similarity index 100% rename from cinelerra-5.1/plugins/shapes/asimetric_clocks.png rename to cinelerra-5.1/plugins/shapes/asymmetric_clocks.png diff --git a/cinelerra-5.1/plugins/shapes/film2.png b/cinelerra-5.1/plugins/shapes/film2.png deleted file mode 100644 index 2b19f1f6..00000000 Binary files a/cinelerra-5.1/plugins/shapes/film2.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/shapes/water.png b/cinelerra-5.1/plugins/shapes/water.png deleted file mode 100644 index 21790f01..00000000 Binary files a/cinelerra-5.1/plugins/shapes/water.png and /dev/null differ diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 0c595eee..e343f39a 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -208,7 +208,8 @@ libwebp.cfg_vars?= mkdir build && cd build && $(call cmake_config,..) libwebp.mak_params?= -C build all install DESTDIR=$(call bld_path,libwebp) mjpegtools.cflags?="$(call inc_path,libjpeg) $(call ld_path,libjpeg,build)" mjpegtools.cfg_vars?= ./autogen.sh; -mjpegtools.cfg_params?= --enable-shared=no --without-libsdl --without-sdlgfx --without-v4l +mjpegtools.cfg_params?= --enable-shared=no --without-libquicktime --without-libdv \ + --without-libpng --without-dga --without-gtk --without-libsdl --without-sdlgfx mjpegtools.mak_params?= all ladspa.cfg_vars?= CFLAGS+=' -Dinline="" ' ladspa.mak_params?=; $(MAKE) -C ladspa* install DESTDIR=$(call bld_path,ladspa) @@ -261,15 +262,15 @@ define waf-setup $(1).cfg_vars+=./waf --version; find .waf* -type f -name "*.py" | \ while read f; do sed -e '/StopIter/d' -i "$(DS)f"; done; \ echo 'exec ./waf configure "$(DS)@"' > ./configure; chmod +x \ - ./configure; PKG_CONFIG_PATH=$(LV2_PKGCFG) LD_LIBRARY_PATH=$(LV2_LIBPATH) + ./configure; PKG_CONFIG_PATH=$(LV2_PKGCFG):$(PKG_CONFIG_PATH) LD_LIBRARY_PATH=$(LV2_LIBPATH) $(1).cfg_params+=\ CFLAGS="-I$(call bld_path,lv2) $(foreach f,$(2), $(call inc_path,$(f))) -fPIC -std=c99"\ - LDFLAGS="-lm $(foreach f,$(2), $(call ld_path,$(f),usr/local/lib)) " + LDFLAGS="-lm `pkg-config --libs x11` $(foreach f,$(2), $(call ld_path,$(f),usr/local/lib)) " $(1).mak_vars=(echo "all:"; echo " ./waf -v build") > $(call bld_path,$(1),Makefile); $(1).mak_params+=; ( cd $(1)*; ./waf install --destdir=$(call bld_path,$(1)) ) endef -SYS_LIB:=$(notdir $(lastword $(wildcard /usr/lib /usrlib32 /usr/lib64))) +SYS_LIB:=$(notdir $(lastword $(wildcard /usr/lib /usr/lib32 /usr/lib64))) SYS_LV2:=$(lastword $(wildcard /usr/$(SYS_LIB)/lv2 /usr/local/$(SYS_LIB)/lv2)) $(if $(SYS_LV2),,$(eval SYS_LV2:=/usr/$(SYS_LIB)/lv2)) lv2.cfg_params?= --lv2dir=$(SYS_LV2) @@ -281,7 +282,7 @@ sratom.cfg_params?= --static --no-shared serd.cfg_params?= --static --no-shared sord.cfg_params?= --static --no-shared lilv.cfg_params?= --static --dyn-manifest -suil.cfg_params?= --static --no-qt +suil.cfg_params?= --static --no-qt --no-qt5 $(eval $(call waf-setup,lv2)) $(eval $(call waf-setup,serd)) diff --git a/cinelerra-5.1/thirdparty/src/ilmBase.tar.xz b/cinelerra-5.1/thirdparty/src/ilmBase.tar.xz index 08edd2d3..19ddfd73 100644 Binary files a/cinelerra-5.1/thirdparty/src/ilmBase.tar.xz and b/cinelerra-5.1/thirdparty/src/ilmBase.tar.xz differ diff --git a/cinelerra-5.1/thirdparty/src/openExr.tar.xz b/cinelerra-5.1/thirdparty/src/openExr.tar.xz index 2ce807be..dc4f7814 100644 Binary files a/cinelerra-5.1/thirdparty/src/openExr.tar.xz and b/cinelerra-5.1/thirdparty/src/openExr.tar.xz differ