X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2FMakefile;h=2da7d7ee068dfa1cec59fd88483a4a40d3b56d72;hb=2e48b660e37eb5c661264d601211e16cb6cd6e89;hp=5865b7523aa752145d5146d739a7101f51136c69;hpb=4a028c75bea81ad0f03a8004eb076dfff718a469;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 5865b752..2da7d7ee 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -107,14 +107,10 @@ esound.cfg_vars+= AUDIOFILE_LIBS="$(call ld_path,audiofile,libaudiofile/.libs)"
 esound.cfg_params= --enable-shared=no --with-pic
 esound.mak_vars+= CFLAGS="" 
 esound.ldflags=" -lm -lstdc++"
-#fdk.cfg_vars= ./autogen.sh ; CFLAGS+=" -Wno-narrowing" CXXFLAGS+=" -Wno-narrowing"
-fdk.cfg_params= --enable-shared=no
-fdk.mak_params= ; for f in $(call bld_path,fdk,/lib*/include); do ln -s . $$$$f/fdk-aac; done
 fftw.cfg_params= --disable-fortran --enable-shared=no
 ffmpeg.cfg_params= \
 	--enable-pthreads --enable-gpl \
 	--disable-ffplay --disable-vaapi \
-	$(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) \
@@ -123,7 +119,6 @@ ffmpeg.cfg_params= \
 	$(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,twolame,libtwolame) \
 		$(call inc_path,lame,include) \
@@ -135,11 +130,7 @@ ffmpeg.cfg_params= \
 		$(call inc_path,libvpx) \
 		$(call inc_path,x264) \
 		$(call inc_path,x265) \
-		$(call inc_path,x265,source) \
-		$(call inc_path,fdk,libAACdec) \
-		$(call inc_path,fdk,libAACenc) \
-		$(call inc_path,fdk,libSYS) \
-		$(call inc_path,fdk,libSYS/include)" \
+		$(call inc_path,x265,source)" \
 	--extra-cxxflags="-D__STDC_CONSTANT_MACROS" \
 	--pkg-config=true \
 	--extra-libs="-Wl,--start-group \
@@ -153,7 +144,6 @@ ffmpeg.cfg_params= \
 		$(call ld_path,libvpx) \
 		$(call ld_path,x264) \
 		$(call ld_path,x265) \
-		$(call ld_path,fdk,.libs) \
 		-Wl,--end-group -lm -lstdc++ -pthread \
 		$(EXTRA_LIBS)" $(FFMPEG_EXTRA_CFG) \
 
@@ -221,7 +211,9 @@ LV2_PKGCFG:=$(subst : ,:,$(foreach p,lv2 serd sord sratom lilv suil,$(call pkg_c
 
 # lv2
 define waf-setup
-$(1).cfg_vars+=echo 'exec ./waf configure "$(DS)@"' > ./configure; chmod +x \
+$(1).cfg_vars+=./waf --version; find .waf* -type f -name "*.py" | \
+ while read f; do sed -e '/StopIter/d' -i "$(DS)f"; done; \
+ echo 'exec ./waf configure "$(DS)@"' > ./configure; chmod +x \
  ./configure;  PKG_CONFIG_PATH=$(LV2_PKGCFG) LD_LIBRARY_PATH=$(LV2_LIBPATH) 
 $(1).cfg_params+=\
  CFLAGS="-I$(call bld_path,lv2) $(foreach f,$(2), $(call inc_path,$(f))) -fPIC "\
@@ -280,8 +272,7 @@ $(call rules,$(call std-build,djbfft))
 $(call rules,$(call std-build,audiofile))
 $(call rules,$(call std-build,encore))
 $(call rules,$(call std-build,esound,audiofile))
-$(call rules,$(call std-build,fdk))
-$(call rules,$(call std-build,ffmpeg, fdk twolame lame openjpeg opus libtheora x264 x265 libvpx))
+$(call rules,$(call std-build,ffmpeg, twolame lame openjpeg opus libtheora x264 x265 libvpx))
 $(call rules,$(call std-build,fftw))
 $(call rules,$(call std-build,flac,libogg))
 $(call rules,$(call std-build,giflib))