X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2FMakefile;h=7268028bdbf72a26e53cb269244af0543ca9af29;hb=15ae384acd95de544db3986ace65e870b0c0b2c6;hp=4d3c1457e44db3d1af2906373afa597598275d69;hpb=4fedf98530b3a6ff1ada6d2b9fbbc470e3df300c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 4d3c1457..7268028b 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -50,8 +50,9 @@ unpack_bz2=tar -xjf $(1)
 unpack_xz=tar -xJf $(1)
 bld_depends=$(if $(ver_$(1)),$(call pkg-built,$(1)))
 bld_path=$(ver_$(1))/$(2)
-inc_path=$(inc_$(1))
-ld_path=$(if $(ver_$(1)),-L$(call bld_path,$(1),$(2)) $(lib_$(1)))
+if_pkg=$(if $(ver_$(1)),$(2))
+inc_path=$(call if_pkg,$(1),$(inc_$(1)))
+ld_path=$(call if_pkg,$(1),-L$(call bld_path,$(1),$(2)) $(lib_$(1)))
 
 #$(eval $(call std-build,pkg,deps...))
 #$(pkg.cflags) added as CFLAGS+=$(cflags) to pkg.vars
@@ -114,19 +115,17 @@ ffmpeg.cfg_params= \
 	--enable-pthreads --enable-gpl \
 	--disable-ffserver --disable-ffplay \
 	--disable-vaapi \
-	--enable-libfdk-aac \
-	--enable-libtwolame \
-	--enable-libopenjpeg \
-	--enable-libmp3lame \
-	--enable-libvorbis \
-	--enable-libtheora \
-	--enable-libvpx \
-	--enable-libx264 \
-	--enable-libx265 \
+	$(call if_pkg,fdk,--enable-libfdk-aac) \
+	$(call if_pkg,twolame,--enable-libtwolame) \
+	$(call if_pkg,openjpeg,--enable-libopenjpeg) \
+	$(call if_pkg,lame,--enable-libmp3lame) \
+	$(call if_pkg,libvorbis,--enable-libvorbis) \
+	$(call if_pkg,libtheora,--enable-libtheora) \
+	$(call if_pkg,libvpx,--enable-libvpx) \
+	$(call if_pkg,x264,--enable-libx264) \
+	$(call if_pkg,x265,--enable-libx265) \
 	--enable-nonfree \
 	--extra-cflags="\
-		$(call inc_path,faad2,include) \
-		$(call inc_path,faac,include) \
 		$(call inc_path,twolame,libtwolame) \
 		$(call inc_path,lame,include) \
 		$(call inc_path,openjpeg,src/lib/openjp2) \
@@ -178,7 +177,7 @@ 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
+mjpegtools.cfg_params?= --enable-shared=no --without-libsdl
 ladspa.cfg_vars?= CFLAGS+=' -Dinline="" '
 ladspa.mak_params?=; $(MAKE) -C ladspa* install DESTDIR=$(call bld_path,ladspa)
 libavc1394.cfg_vars?=PKG_CONFIG_PATH=$(call bld_path,libraw1394)