X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2FMakefile;h=395207cd418fa73a86da3be51680c87a2916139b;hb=4d7f82a573a67301c43189fe20d0d4aa96b2b200;hp=60c05f731b86f71f1ca70621bea05c85efced2f4;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 60c05f73..395207cd 100644
--- 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,52 +143,56 @@ 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
-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
-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)
-libavc1394.cfg_vars=PKG_CONFIG_PATH=$(bld_path libraw1394)
-libavc1394.cflags="$(inc_path libraw1394)"
-libavc1394.ldflags="$(ld_path libraw1394,src/.libs)"
-libavc1394.cfg_params= --enable-shared=no
-libdv.cfg_params= --disable-gtk --enable-shared=no
-libiec61883.cfg_vars=PKG_CONFIG_PATH=$(bld_path libraw1394)
-libiec61883.cflags="$(inc_path libraw1394)"
-libiec61883.ldflags="$(ld_path libraw1394,src/.libs)"
-libiec61883.cfg_params= --enable-shared=no
-libjpeg.cfg_params= --enable-shared=no
-libogg.cfg_params= --enable-shared=no
-libraw1394.cfg_params=  --enable-shared=no; ln -sf src libraw1394
-libtheora.cfg_vars=PKG_CONFIG_PATH=$(bld_path libogg):$(bld_path libvorbis)
-libtheora.cflags="$(inc_path libogg,include) $(inc_path libogg,src) $(inc_path libvorbis,include)"
-libtheora.ldflags="$(ld_path libvorbis,lib/.libs) $(ld_path libogg,src/.libs)"
-libtheora.cfg_params= --disable-examples --enable-shared=no
-libuuid.cfg_params=--enable-shared=no
-libvorbis.cfg_params= --disable-oggtest --enable-shared=no
-openjpeg.cfg_vars=echo "exec cmake -DBUILD_SHARED_LIBS:BOOL=OFF ." > ./configure; chmod +x ./configure;
-openjpeg.mak_params= ; cd $(call bld_path,openjpeg,src/lib/openjp2); ln -sf . openjpeg-2.1
-opencv.cfg_vars=echo "exec cmake -DBUILD_SHARED_LIBS:BOOL=OFF ." > ./configure; chmod +x ./configure;
-openexr.cfg_vars=LD_LIBRARY_PATH=$(call bld_path,ilmbase,usr/lib)
-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;
+cmake_config=echo "exec cmake \$$$$@ $(1)" > ./configure; chmod +x ./configure;
+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
+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)
+libavc1394.cfg_vars?=PKG_CONFIG_PATH=$(bld_path libraw1394)
+libavc1394.cflags?="$(inc_path libraw1394)"
+libavc1394.ldflags?="$(ld_path libraw1394,src/.libs)"
+libavc1394.cfg_params?= --enable-shared=no
+libdv.cfg_params?= --disable-gtk --enable-shared=no
+libiec61883.cfg_vars?=PKG_CONFIG_PATH=$(bld_path libraw1394)
+libiec61883.cflags?="$(inc_path libraw1394)"
+libiec61883.ldflags?="$(ld_path libraw1394,src/.libs)"
+libiec61883.cfg_params?= --enable-shared=no
+libjpeg.cfg_params?= --enable-shared=no
+libogg.cfg_params?= --enable-shared=no
+libraw1394.cfg_params?=  --enable-shared=no; ln -sf src libraw1394
+libtheora.cfg_vars?=PKG_CONFIG_PATH=$(bld_path libogg):$(bld_path libvorbis)
+libtheora.cflags?="$(inc_path libogg,include) $(inc_path libogg,src) $(inc_path libvorbis,include)"
+libtheora.ldflags?="$(ld_path libvorbis,lib/.libs) $(ld_path libogg,src/.libs)"
+libtheora.cfg_params?= --disable-examples --enable-shared=no
+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
+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,.)
+opencv.cfg_params?= -DBUILD_SHARED_LIBS:BOOL=OFF
+openexr.cfg_vars?=LD_LIBRARY_PATH=$(call bld_path,ilmbase,usr/lib)
+openexr.cfg_params?=--enable-shared=no --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?=$(call cmake_config,source)
+x265.cfg_params?= -DENABLE_SHARED=no
 
 # compile flag vars
 $(foreach tgt,$(TARGETS), \
@@ -263,7 +268,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: