X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2FMakefile;h=7aa050c947e06e1aa9a95ed22b447001265373ac;hb=6f0ddd863f975ca407ddf08c59a9eb1db8d2fd72;hp=0dc54fe4149b0b31a802098af59c014e20af77bd;hpb=8b7ea38c6c4ddf7eab2f606682798aebd5fbb99a;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 0dc54fe4..7aa050c9 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -47,7 +47,7 @@ pkg-built=$(BLD)/$(1).built
 ext=$(lastword $(subst ., ,$(1)))
 tarball=$(if $($(1).git),$(1).git,$(lastword $(sort $(wildcard src/$(1)*.tar.*))))
 unpack=$(call unpack_$(call ext,$(1)),$(1))
-unpack_git=git clone $($(1)) $(1)
+unpack_git=git clone --depth 1 $($(1)) $(1)
 unpack_gz=tar -xzf $(1)
 unpack_bz2=tar -xjf $(1)
 unpack_xz=tar -xJf $(1)
@@ -190,12 +190,13 @@ a52dec.ldflags?= "$(call ld_path,djbfft)"
 a52dec.cfg_vars?= CFLAGS+=" -U__FreeBSD__ $(call inc_path,djbfft)" LIBS+=" $(call ld_path,djbfft)"; autoreconf -ifv && automake -caf;
 a52dec.cfg_params?=--enable-djbfft --disable-oss
 djbfft.cfg_vars?=echo "$(call bld_path,djbfft)" > conf-home; \
- (CFLAGS="$(CFLAGS)"; $(CFG_VARS)$(if $(CFG_VARS),; )echo "$(CC) $$$$CFLAGS") > conf-cc; \
+ (CFLAGS="$(CFLAGS) -std=gnu89"; $(CFG_VARS)$(if $(CFG_VARS),; )echo "$(CC) $$$$CFLAGS") > conf-cc; \
  echo "exec true" > ./configure; chmod +x ./configure;
 djbfft.mak_params?=; cd $(call bld_path,djbfft); ln -sf djbfft.a libdjbfft.a
-audiofile.cfg_params?=--enable-shared=no
+audiofile.cfg_params?=--enable-shared=no --disable-doxygen-docs --enable-debug=no --enable-examples=no
 audiofile.mak_params?=LIBS="-lm -lstdc++"
-flac.cfg_params?= --enable-shared=no
+flac.cfg_vars?= CFLAGS+=" -O3 -funroll-loops " CPPFLAGS+=" -DNDEBUG " CXXFLAGS+=" -O2 "
+flac.cfg_params?= --enable-shared=no --disable-doxygen-docs
 flac.cflags?="$(call inc_path,libogg) $(call ld_path,libogg,src/.libs)"
 ffnvcodec.cfg_vars=echo "exec true" > ./configure; chmod +x ./configure;
 giflib.cfg_vars=echo "exec true" > ./configure; chmod +x ./configure;
@@ -211,7 +212,7 @@ dav1d.mak_params?=; $(MAKE) -C dav1d* install DESTDIR="$(call bld_path,dav1d)"
 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_vars?= ./autogen.sh; export CXXFLAGS+="-std=c++11";
 mjpegtools.cfg_params?= --enable-shared=no --without-libquicktime --without-libdv \
  --without-libpng --without-dga --without-gtk --without-libsdl --without-sdlgfx
 mjpegtools.mak_params?= all
@@ -243,7 +244,7 @@ libtheora.cfg_params?= --disable-examples --disable-spec --enable-shared=no
 libuuid.cfg_vars?= autoreconf -ifv -I m4 && automake -caf;
 libuuid.cfg_params?=--enable-shared=no
 libvorbis.cfg_params?= --disable-oggtest --enable-shared=no
-openjpeg.cfg_params?= -DBUILD_SHARED_LIBS:BOOL=OFF
+openjpeg.cfg_params?= -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_CODEC:BOOL=OFF
 openjpeg.cfg_vars?=$(call cmake_config,.)
 openjpeg.mak_params?= ; cd $(call bld_path,openjpeg,src/lib/openjp2); ln -sf . openjpeg-2.1
 opencv.cfg_vars?=$(call cmake_config,.)
@@ -252,8 +253,10 @@ openexr.cfg_vars?=true; \#
 openexr.mak_vars?=true; \#
 opus.cfg_params?= --disable-extra-programs
 speech_tools.mak_params?=-j1
+tiff.ldflags?="$(call ld_path,libjpeg,build)"
+tiff.cflags?="$(call lnc_path,libjpeg)"
 tiff.cfg_vars+=LIBS+=" -lpthread"; autoreconf -ifv -I m4 && automake -caf;
-tiff.cfg_params+= --disable-libdeflate --enable-shared=no --disable-zstd $(call if_pkg,libwebp,\
+tiff.cfg_params+= --disable-libdeflate --disable-lerc --enable-shared=no --disable-zstd $(call if_pkg,libwebp,\
  --with-webp-include-dir=$(call pkg_incl,libwebp)\
  --with-webp-lib-dir=$(call pkg_libs,libwebp))\
  $(call if_npkg,libwebp,--disable-webp)
@@ -364,7 +367,7 @@ $(call rules,$(call std-build,openExr, ilmBase))
 $(call rules,$(call std-build,openjpeg))
 $(call rules,$(call std-build,opus))
 $(call rules,$(call std-build,speech_tools))
-$(call rules,$(call std-build,tiff, libwebp))
+$(call rules,$(call std-build,tiff, libwebp libjpeg))
 $(call rules,$(call std-build,twolame))
 $(call rules,$(call std-build,x264))
 $(call rules,$(call std-build,x265))
@@ -407,6 +410,9 @@ clean:
 install:
 	cp -a $(ver_mjpegtools)/mpeg2enc/mpeg2enc $(BINDIR)/.
 	cp -a $(ver_mjpegtools)/mplex/mplex $(BINDIR)/.
+
+objrem:
+	find . -type f -name '*.o' -delete
 else
 # not WANT_CIN_3RDPARTY
 all: