fix messed up cut/paste in thirdparty/Makefile / last checkin

[goodguy/history.git] / cinelerra-5.1 / thirdparty / Makefile

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 60c05f731b86f71f1ca70621bea05c85efced2f4..ff055dc45bdad596abc5816258d85ecc0f36f07d 100644 (file)
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -25,7 +25,7 @@
 #
 
 include ../global_config
-include config.mak
+-include config.mak
 BLD := $(THIRDPARTY)/build
 
 pkg-source=$(BLD)/$(1).source
@@ -73,7 +73,7 @@ $(call pkg-config,$(1)): $(call pkg-source,$(1)) $(foreach dep,$(2),$(call bld_d
        touch $$@
 
 $(call pkg-built,$(1)): $(call pkg-config,$(1))
-       +$($(1).mak_vars) $(MAK_VARS) make -C $(1)* $($(1).mak_params) $(MAK_PARAMS)
+       +$($(1).mak_vars) $(MAK_VARS) $(MAKE) -C $(1)* $($(1).mak_params) $(MAK_PARAMS)
        touch $$@
 
 endef
@@ -102,6 +102,7 @@ fftw.cfg_params= --disable-fortran --enable-shared=no
 ffmpeg.cfg_params= \
        --enable-pthreads --enable-gpl \
        --disable-ffserver --disable-ffplay \
+       --disable-vaapi \
        --enable-libfaac \
        --enable-libfdk-aac \
        --enable-libtwolame \
@@ -142,24 +143,24 @@ ffmpeg.cfg_params= \
                $(call ld_path,x264) \
                $(call ld_path,x265) \
                $(call ld_path,fdk,.libs) \
-               -ldl $(EXTRA_LIBS)" \
-       --extra-ldflags="-ldl"
+               $(EXTRA_LIBS)" $(EXTRA_FFMPEG_CFG) \
 
 a52dec.mak_params= ; cd $(call bld_path,a52dec,include); ln -sf . a52dec
+a52dec.cfg_vars= CFLAGS+=" -U__FreeBSD__"
 audiofile.cfg_params=--enable-shared=no
 audiofile.mak_params=LIBS="-lm -lstdc++"
 flac.cfg_params= --enable-shared=no
 flac.cflags="$(call inc_path,libogg,include) $(call ld_path,libogg,src/.libs)"
 giflib.cfg_params=--enable-shared=no
 ilmbase.cfg_params=--prefix=$(call bld_path,ilmbase,usr)
-ilmbase.mak_params=; make -C ilmbase* install; cd $(call bld_path,ilmbase); ln -sf lib64 usr/lib
+ilmbase.mak_params=; $(MAKE) -C ilmbase* install; cd $(call bld_path,ilmbase); ln -sf lib64 usr/lib
 lame.cfg_vars= CFLAGS+=" -O"
 lame.cfg_params=--enable-shared=no
 lame.mak_params= ; cd $(call bld_path,lame,include); ln -sf . lame
 mjpegtools.cflags="$(call inc_path,libjpeg) $(call ld_path,libjpeg,.libs)"
 mjpegtools.mak_params=; ln -s . $(call bld_path,mjpegtools,utils)/mjpegtools 
 mjpegtools.cfg_params= --enable-shared=no
-ladspa.mak_params=; make -C ladspa* install DESTDIR=$(call bld_path,ladspa)
+ladspa.mak_params=; $(MAKE) -C ladspa* install DESTDIR=$(call bld_path,ladspa)
 libavc1394.cfg_vars=PKG_CONFIG_PATH=$(bld_path libraw1394)
 libavc1394.cflags="$(inc_path libraw1394)"
 libavc1394.ldflags="$(ld_path libraw1394,src/.libs)"
@@ -186,8 +187,11 @@ openexr.cfg_params=--enable-shared=no
 openexr.cfg_params+=--with-ilmbase-prefix=$(call bld_path,ilmbase,usr)
 speech_tools.mak_params=-j1
 twolame.cfg_params=--enable-shared=no
-x264.cfg_params= --enable-static
-x265.cfg_vars=echo "exec cmake source -DENABLE_SHARED=no" > ./configure; chmod +x ./configure;
+#$(error HAVE_HIGH_DEPTH $(HAVE_HIGH_DEPTH))
+x264.cfg_params= --enable-static $(if $(filter y,$(HAVE_HIGH_DEPTH)),--bit-depth=10)
+x265.cfg_vars=echo "exec cmake source -DENABLE_SHARED=no \
+ $(if $(filter y,$(HAVE_HIGH_DEPTH)),-DHIGH_BIT_DEPTH:BOOL=ON) \
+" > ./configure; chmod +x ./configure;
 
 # compile flag vars
 $(foreach tgt,$(TARGETS), \
@@ -263,7 +267,7 @@ $(call pkg-config,festival): $(call pkg-source,festival) $(call pkg-built,speech
        touch $@
 
 $(call pkg-built,festival): $(call pkg-config,festival)
-       make -C festival* -j1
+       $(MAKE) -C festival* -j1
        touch $@
 
 clean: