X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2FMakefile;h=39d93f6ad52065cdc4cafc3f717da626890bde81;hp=2da7d7ee068dfa1cec59fd88483a4a40d3b56d72;hb=59e74f262d7b6be235f2bbfaac35ef4274f52dc9;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1 diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 2da7d7ee..39d93f6a 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -109,11 +109,15 @@ 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) \ + $(call if_pkg,libaom,--enable-libaom) \ + $(call if_pkg,libwebp,--enable-libwebp) \ + $(call if_pkg,opus,--enable-libopus) \ $(call if_pkg,libvorbis,--enable-libvorbis) \ $(call if_pkg,libtheora,--enable-libtheora) \ $(call if_pkg,libvpx,--enable-libvpx) \ @@ -122,6 +126,8 @@ ffmpeg.cfg_params= \ --extra-cflags="\ $(call inc_path,twolame,libtwolame) \ $(call inc_path,lame,include) \ + $(call inc_path,libaom,usr/local/include) \ + $(call inc_path,libwebp,usr/local/include) \ $(call inc_path,openjpeg,src/lib/openjp2) \ $(call inc_path,libogg,include) \ $(call inc_path,opus,include) \ @@ -136,6 +142,8 @@ ffmpeg.cfg_params= \ --extra-libs="-Wl,--start-group \ $(call ld_path,twolame,libtwolame/.libs) \ $(call ld_path,lame,libmp3lame/.libs) \ + $(call ld_path,libaom,usr/local/lib) \ + $(call ld_path,libwebp,usr/local/lib) \ $(call ld_path,openjpeg,bin) \ $(call ld_path,opus,.libs) \ $(call ld_path,libogg,lib/.libs) \ @@ -147,7 +155,8 @@ ffmpeg.cfg_params= \ -Wl,--end-group -lm -lstdc++ -pthread \ $(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 "exec 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 @@ -159,16 +168,22 @@ audiofile.cfg_params?=--enable-shared=no audiofile.mak_params?=LIBS="-lm -lstdc++" flac.cfg_params?= --enable-shared=no flac.cflags?="$(call inc_path,libogg,include) $(call ld_path,libogg,src/.libs)" -giflib.cfg_params?=--enable-shared=no +giflib.cfg_params=echo "exec true" > ./configure; chmod +x ./configure; ilmbase.cfg_vars= CFLAGS+=" -Wno-narrowing" CXXFLAGS+=" -Wno-narrowing" ilmbase.cfg_params?=--prefix=$(call bld_path,ilmbase,usr) ilmbase.mak_params?=; $(MAKE) -C ilmbase* install; cd $(call bld_path,ilmbase); ln -sf lib64 usr/lib lame.cfg_vars?= CFLAGS+=" -O" lame.cfg_params?=--enable-shared=no lame.mak_params?= ; cd $(call bld_path,lame,include); ln -sf . lame +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 +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)" mjpegtools.mak_params?=; ln -s . $(call bld_path,mjpegtools,utils)/mjpegtools -mjpegtools.cfg_params?= --enable-shared=no --without-libsdl +mjpegtools.cfg_params?= --enable-shared=no --without-libsdl --without-v4l 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) @@ -199,6 +214,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 twolame.cfg_params?=--enable-shared=no x264.cfg_params?= --enable-static --enable-pic x265.cfg_vars?=$(call cmake_config,source) @@ -216,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)) ) @@ -272,13 +288,15 @@ $(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)) +$(call rules,$(call std-build,ffmpeg, twolame lame openjpeg opus libtheora x264 x265 libvpx libaom libwebp)) $(call rules,$(call std-build,fftw)) $(call rules,$(call std-build,flac,libogg)) $(call rules,$(call std-build,giflib)) $(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,libwebp)) $(call rules,$(call std-build,libavc1394,libraw1394)) $(call rules,$(call std-build,libdv)) $(call rules,$(call std-build,libiec61883,libraw1394))