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

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 2da7d7ee..4fae862b 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -114,6 +114,9 @@ ffmpeg.cfg_params= \
 	$(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 +125,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 +141,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 +154,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 +167,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 +213,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)
@@ -272,13 +287,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))