X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2FMakefile;h=2562727f8df90394bebcb8901fcd374af67082ed;hb=a2ebbc5e88800bd740652a32285f8145a1acfdc6;hp=acaf4efacd63f73daa047da170aac9d0d8cbf3b6;hpb=b1649fe7b38cfb4bbec58b19fb8dda2daa0ce520;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index acaf4efa..2562727f 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -118,6 +118,7 @@ ffmpeg.cfg_params= \
 	$(call if_pkg,openjpeg,--enable-libopenjpeg) \
 	$(call if_pkg,lame,--enable-libmp3lame) \
 	$(call if_pkg,libaom,--enable-libaom) \
+	$(call if_pkg,dav1d,--enable-libdav1d) \
 	$(call if_pkg,libwebp,--enable-libwebp) \
 	$(call if_pkg,opus,--enable-libopus) \
 	$(call if_pkg,libvorbis,--enable-libvorbis) \
@@ -125,11 +126,12 @@ ffmpeg.cfg_params= \
 	$(call if_pkg,libvpx,--enable-libvpx) \
 	$(call if_pkg,x264,--enable-libx264) \
 	$(call if_pkg,x265,--enable-libx265) \
-	--extra-cflags="\
+	--extra-cflags="-Wno-attributes \
 		$(if $(WANT_NV), $(inc_ffnvcodec)) \
 		$(call inc_path,twolame,libtwolame) \
 		$(call inc_path,lame,include) \
 		$(call inc_path,libaom,usr/local/include) \
+		$(call inc_path,dav1d,usr/local/include) \
 		$(call inc_path,libwebp,usr/local/include) \
 		$(call inc_path,openjpeg,src/lib/openjp2) \
 		$(call inc_path,libogg,include) \
@@ -146,6 +148,7 @@ ffmpeg.cfg_params= \
 		$(call ld_path,twolame,libtwolame/.libs) \
 		$(call ld_path,lame,libmp3lame/.libs) \
 		$(call ld_path,libaom,usr/local/lib) \
+		$(call ld_path,dav1d,usr/local/lib) \
 		$(call ld_path,libwebp,usr/local/lib) \
 		$(call ld_path,openjpeg,bin) \
 		$(call ld_path,opus,.libs) \
@@ -159,7 +162,7 @@ ffmpeg.cfg_params= \
 		$(EXTRA_LIBS)" $(FFMPEG_EXTRA_CFG) \
 
 #cmake_config=echo "exec cmake \$$$$@ $(1)" > ./configure; chmod +x ./configure;
-cmake_config=echo "exec cmake $(1) \$$$$@" > ./configure; chmod +x ./configure;
+cmake_config=echo 'cmake "$$$$@" "$(1)"' > ./configure; chmod +x ./configure;
 a52dec.mak_params?= ; cd $(call bld_path,a52dec,include); ln -sf . a52dec
 a52dec.cfg_vars?= CFLAGS+=" -U__FreeBSD__ $(call inc_path,djbfft)" LIBS+=" $(call ld_path,djbfft)"
 a52dec.cfg_params?=--enable-djbfft
@@ -182,6 +185,8 @@ libaom.cfg_vars?=$(call cmake_config,aom-master)
 libaom.cfg_params?= -DENABLE_SHARED=no -DCMAKE_INSTALL_LIBDIR=lib \
  -DCMAKE_INSTALL_PREFIX=$(call bld_path,libaom)/usr/local
 libaom.mak_params?= ; $(MAKE) -C libaom* install
+dav1d.cfg_vars?=echo "echo dav1d custom make" >> configure; chmod +x ./configure;
+dav1d.mak_params?=; $(MAKE) -C dav1d* install DESTDIR="$(call bld_path,dav1d)"
 libwebp.cfg_vars?= mkdir build && cd build && $(call cmake_config,..)
 libwebp.mak_params?= -C build all install DESTDIR=$(call bld_path,libwebp)
 mjpegtools.cflags?="$(call inc_path,libjpeg) $(call ld_path,libjpeg,.libs)"
@@ -292,7 +297,7 @@ $(call rules,$(call std-build,audiofile))
 $(call rules,$(call std-build,encore))
 $(call rules,$(call std-build,esound,audiofile))
 $(call rules,$(call std-build,ffmpeg, twolame lame openjpeg opus \
-	libtheora x264 x265 libvpx libaom libwebp \
+	libtheora x264 x265 libvpx libaom dav1d libwebp \
 	$(if $(WANT_NV), ffnvcodec)))
 $(call rules,$(call std-build,fftw))
 $(call rules,$(call std-build,flac,libogg))
@@ -301,6 +306,7 @@ $(call rules,$(call std-build,ilmbase))
 $(call rules,$(call std-build,ladspa))
 $(call rules,$(call std-build,lame))
 $(call rules,$(call std-build,libaom))
+$(call rules,$(call std-build,dav1d))
 $(call rules,$(call std-build,libwebp))
 $(call rules,$(call std-build,libavc1394,libraw1394))
 $(call rules,$(call std-build,libdv))