X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2FMakefile;h=39d93f6ad52065cdc4cafc3f717da626890bde81;hb=7ead9f7382846e81c2f8efb25780014e5f8834c3;hp=4fae862b801e8f9565f03d3e19de657d92b9eb94;hpb=cb1a1530246ad67fb9be9aa2dbba5b88eb63e933;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 4fae862b..39d93f6a 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -109,8 +109,9 @@ esound.mak_vars+= CFLAGS=""
 esound.ldflags=" -lm -lstdc++"
 fftw.cfg_params= --disable-fortran --enable-shared=no
 ffmpeg.cfg_params= \
-	--enable-pthreads --enable-gpl \
-	--disable-ffplay --disable-vaapi \
+	--enable-pthreads --enable-gpl --disable-ffplay \
+	$(if $(WANT_VAAPI),--enable-vaapi,--disable-vaapi) \
+	$(if $(WANT_VDPAU),--enable-vdpau,--disable-vdpau) \
 	$(call if_pkg,twolame,--enable-libtwolame) \
 	$(call if_pkg,openjpeg,--enable-libopenjpeg) \
 	$(call if_pkg,lame,--enable-libmp3lame) \
@@ -231,7 +232,7 @@ $(1).cfg_vars+=./waf --version; find .waf* -type f -name "*.py" | \
  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 "\
+ CFLAGS="-I$(call bld_path,lv2) $(foreach f,$(2), $(call inc_path,$(f))) -fPIC -std=c99"\
  LDFLAGS="-lm $(foreach f,$(2), $(call ld_path,$(f),usr/local/lib)) "
 $(1).mak_vars=(echo "all:"; echo "	./waf -v build") > $(call bld_path,$(1),Makefile); 
 $(1).mak_params+=; ( cd $(1)*; ./waf install --destdir=$(call bld_path,$(1)) )