X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fthirdparty%2FMakefile;h=60c05f731b86f71f1ca70621bea05c85efced2f4;hb=74084f4d67651fac69f5e5484d57921cb6aa6e1d;hp=67451b9c127c1c2e2054964db0483911edc124a7;hpb=2d99bb8ce591f05a31464b517d85dc2bc35b2abe;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/thirdparty/Makefile b/cinelerra-5.0/thirdparty/Makefile
index 67451b9c..60c05f73 100644
--- a/cinelerra-5.0/thirdparty/Makefile
+++ b/cinelerra-5.0/thirdparty/Makefile
@@ -69,11 +69,11 @@ $(call pkg-source,$(1)):
 $(call pkg-config,$(1)): $(call pkg-source,$(1)) $(foreach dep,$(2),$(call bld_depends,$(dep)))
 	@echo "CONFIGURING $(1)"
 	cd $(1)* && \
-		$($(1).cfg_vars) ./configure $($(1).cfg_params)
+		$($(1).cfg_vars) $(CFG_VARS) ./configure $($(1).cfg_params) $(CFG_PARAMS)
 	touch $$@
 
 $(call pkg-built,$(1)): $(call pkg-config,$(1))
-	+$($(1).mak_vars) make -C $(1)* $($(1).mak_params)
+	+$($(1).mak_vars) $(MAK_VARS) make -C $(1)* $($(1).mak_params) $(MAK_PARAMS)
 	touch $$@
 
 endef
@@ -94,7 +94,7 @@ esound.cfg_vars+= AUDIOFILE_LIBS="$(call ld_path,audiofile,libaudiofile/.libs)"
 esound.cfg_params= --enable-shared=no --with-pic
 esound.ldflags="-lm -lstdc++"
 faac.cfg_params= --enable-shared=no
-faad2.cfg_params= --with-drm --enable-shared=no
+faad2.cfg_params= --enable-shared=no
 fdk.cfg_vars= ./autogen.sh ;
 fdk.cfg_params= --enable-shared=no
 fdk.mak_params= ; for f in $(call bld_path,fdk,/lib*/include); do ln -s include `dirname $$$$f`/fdk-aac ; done
@@ -118,7 +118,7 @@ ffmpeg.cfg_params= \
 		$(call inc_path,faac,include) \
 		$(call inc_path,twolame,libtwolame) \
 		$(call inc_path,lame,include) \
-		$(call inc_path,openjpeg,src/lib/openmj2) \
+		$(call inc_path,openjpeg,src/lib/openjp2) \
 		$(call inc_path,libvorbis,include) \
 		$(call inc_path,libtheora,include) \
 		$(call inc_path,libvpx) \
@@ -145,6 +145,7 @@ ffmpeg.cfg_params= \
 		-ldl $(EXTRA_LIBS)" \
 	--extra-ldflags="-ldl"
 
+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
@@ -152,7 +153,7 @@ 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_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)"
@@ -177,8 +178,8 @@ 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 -DBUILD_MJ2:BOOL=ON ." > ./configure; chmod +x ./configure;
-openjpeg.mak_params= openmj2
+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
@@ -208,6 +209,7 @@ else
 rules=$(eval $(1))
 endif
 
+$(call rules,$(call std-build,a52dec))
 $(call rules,$(call std-build,audiofile))
 $(call rules,$(call std-build,encore))
 $(call rules,$(call std-build,esound,audiofile))