X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fthirdparty%2FMakefile;h=42211838aae214e58238dc22604c8f8cfe250a8b;hb=fb661e853152fd63537629a20f493a4cdcd4f019;hp=74ce4eaf3ac1d681aec1f3c6aaf6af341d672b70;hpb=c905fabd0678fcc8ab9e32e4443ad8709adafefd;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 74ce4eaf..42211838 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -53,6 +53,7 @@ unpack_xz=tar -xJf $(1) bld_depends=$(if $(ver_$(1)),$(call pkg-built,$(1))) bld_path=$(ver_$(1))/$(2) if_pkg=$(if $(ver_$(1)),$(2)) +if_npkg=$(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))) @@ -111,6 +112,8 @@ fftw.cfg_params= --disable-fortran --enable-shared=no ffmpeg.cfg_params= \ --enable-pthreads --enable-gpl --disable-ffplay \ $(if $(WANT_VAAPI),--enable-vaapi,--disable-vaapi) \ + $(if $(WANT_VDPAU),--enable-vdpau,--disable-vdpau) \ + $(if $(WANT_NV), --enable-nvenc --enable-nvdec) \ $(call if_pkg,twolame,--enable-libtwolame) \ $(call if_pkg,openjpeg,--enable-libopenjpeg) \ $(call if_pkg,lame,--enable-libmp3lame) \ @@ -122,7 +125,8 @@ 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) \ @@ -213,7 +217,7 @@ opencv.cfg_params?= -DBUILD_SHARED_LIBS:BOOL=OFF openexr.cfg_vars?=LD_LIBRARY_PATH=$(call bld_path,ilmbase,usr/lib) openexr.cfg_params?=--enable-shared=no --with-ilmbase-prefix=$(call bld_path,ilmbase,usr) speech_tools.mak_params?=-j1 -tiff.cfg_params+= --enable-shared=no --disable-zstd +tiff.cfg_params+= --enable-shared=no --disable-zstd $(call if_npkg,libwebp,--without-webp) twolame.cfg_params?=--enable-shared=no x264.cfg_params?= --enable-static --enable-pic x265.cfg_vars?=$(call cmake_config,source) @@ -287,7 +291,9 @@ $(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,ffmpeg, twolame lame openjpeg opus libtheora x264 x265 libvpx libaom libwebp)) +$(call rules,$(call std-build,ffmpeg, twolame lame openjpeg opus \ + libtheora x264 x265 libvpx libaom libwebp \ + $(if $(WANT_NV), ffnvcodec))) $(call rules,$(call std-build,fftw)) $(call rules,$(call std-build,flac,libogg)) $(call rules,$(call std-build,giflib)) @@ -323,6 +329,7 @@ $(call rules,$(call std-build,sord, serd)) $(call rules,$(call std-build,sratom, serd sord lv2)) $(call rules,$(call std-build,lilv, lv2 sratom serd sord)) $(call rules,$(call std-build,suil, lv2)) +$(call rules,$(call std-build,ffnvcodec)) # specialize festival, multiple tarballs festival: