X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2FMakefile;h=7f995e16dd69ec564e0e7492059320337a4f73ab;hp=846a843fca468e0eeb2a63ecf14bca02a0c68978;hb=9c5e262df5b6cbe0f4e4b2d53e68e8edc487494b;hpb=fad344fef5e7cb1259e49c61208b1159bc382aee diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 846a843f..7f995e16 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -55,12 +55,16 @@ bld_depends=$(if $(ver_$(1)),$(call pkg-built,$(1))) bld_path=$(ver_$(1))/$(2) if_pkg=$(if $(ver_$(1)),$(2),$(3)) if_npkg=$(if $(ver_$(1)),,$(2)) -if_shr=$(if $(findstring $(1),$(shared_pkgs)),$(2),$(3)) +if_shr=$(if $(filter $(1),$(shared_pkgs)),$(2),$(3)) pkg_conf=$(call if_shr,$(1),$(foreach p,$(pc_$(1)), $(shell pkg-config 2> /dev/null $(2) $(p)))) inc_path=$(call if_pkg,$(1),$(inc_$(1)), $(call pkg_conf,$(1),--cflags)) ld_path=$(call if_pkg,$(1),-L$(call bld_path,$(1),$(2)) $(lib_$(1))) -if_ena=$(if $(or $(ver_$(1)),$(findstring $(1),$(shared_pkgs))),$(2)) -if_want=$(if $(findstring x$(WANT_$(1)),xyes),$(2),$(3)) +if_ena=$(if $(or $(ver_$(1)),$(filter $(1),$(shared_pkgs))),$(2)) +if_want=$(if $(filter x$(WANT_$(1)),xyes),$(2),$(3)) +sysincs:=usr/include usr/local/include +syslibs:=usr/lib usr/lib32 usr/lib64 lib lib32 lib64 usr/local/lib usr/local/lib32 usr/local/lib64 +pkg_incl=$(lastword $(wildcard $(foreach f,$(sysincs), $(call bld_path,$(1),$(f))))) +pkg_libs=$(lastword $(wildcard $(foreach f,$(syslibs), $(call bld_path,$(1),$(f))))) #$(eval $(call std-build,pkg,deps...)) #$(pkg.cflags) added as CFLAGS+=$(cflags) to pkg.vars @@ -191,23 +195,22 @@ audiofile.mak_params?=LIBS="-lm -lstdc++" flac.cfg_params?= --enable-shared=no flac.cflags?="$(call inc_path,libogg) $(call ld_path,libogg,src/.libs)" 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 \ +libaom.cfg_vars?= mkdir aom.build && cd aom.build && $(call cmake_config,..) +libaom.cfg_params?= -DENABLE_TESTS=no -DCMAKE_BUILD_TYPE=Release -DENABLE_DOCS=no -DENABLE_SHARED=no -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_PREFIX=$(call bld_path,libaom)/usr/local -libaom.mak_params?= ; $(MAKE) -C libaom* install +libaom.mak_params?= ; $(MAKE) -C libaom*/aom.build 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)" -mjpegtools.mak_params?=; ln -s . $(call bld_path,mjpegtools,utils)/mjpegtools -mjpegtools.cfg_params?= --enable-shared=no --without-libsdl --without-v4l +mjpegtools.cflags?="$(call inc_path,libjpeg) $(call ld_path,libjpeg,build)" +mjpegtools.cfg_vars?= ./autogen.sh; +mjpegtools.cfg_params?= --enable-shared=no --without-libquicktime --without-libdv \ + --without-libpng --without-dga --without-gtk --without-libsdl --without-sdlgfx +mjpegtools.mak_params?= all 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) @@ -221,7 +224,9 @@ libiec61883.cflags?="$(call inc_path,libraw1394)" libiec61883.ldflags?="$(call ld_path,libraw1394,src/.libs)" libiec61883.cfg_params?= --enable-shared=no libiec61883.mak_params?=; cd $(call bld_path,libiec61883,src); ln -sf . libiec61883 -libjpeg.cfg_params?= --enable-shared=no +libjpeg.cfg_vars?= mkdir build && cd build && $(call cmake_config,..) +libjpeg.cfg_params?= -DENABLE_SHARED=no -DCMAKE_INSTALL_LIBDIR=lib +libjpeg.mak_params?= -C build all install DESTDIR=$(call bld_path,libjpeg) libogg.cfg_params?= --enable-shared=no libraw1394.cfg_params?= --enable-shared=no; ln -sf src libraw1394 libtheora.cfg_vars?=PKG_CONFIG_PATH=$(call bld_path,libogg):$(call bld_path,libvorbis) @@ -235,15 +240,19 @@ openjpeg.cfg_vars?=$(call cmake_config,.) openjpeg.mak_params?= ; cd $(call bld_path,openjpeg,src/lib/openjp2); ln -sf . openjpeg-2.1 opencv.cfg_vars?=$(call cmake_config,.) 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) +openexr.cfg_vars?=true; \# +openexr.mak_vars?=true; \# speech_tools.mak_params?=-j1 -tiff.cfg_params+= --enable-shared=no --disable-zstd $(call if_npkg,libwebp,--without-webp) +tiff.cfg_vars+=LIBS+=" -lpthread" +tiff.cfg_params+= --enable-shared=no --disable-zstd $(call if_pkg,libwebp,\ + --with-webp-include-dir=$(call pkg_incl,libwebp)\ + --with-webp-lib-dir=$(call pkg_libs,libwebp))\ + $(call if_npkg,libwebp,--disable-webp) twolame.cfg_params?=--enable-shared=no x264.cfg_params?= --enable-static --enable-pic x265.cfg_vars?=$(call cmake_config,source) x265.cfg_params?= -DENABLE_SHARED=no -libvpx.cfg_params?= --enable-pic +libvpx.cfg_params?= --enable-pic --disable-avx512 --disable-examples --disable-unit_tests DS:=$$$$$$$$ pkg_cfg=$(call bld_path,$(1),usr/local/lib/pkgconfig): @@ -254,15 +263,15 @@ define waf-setup $(1).cfg_vars+=./waf --version; find .waf* -type f -name "*.py" | \ while read f; do sed -e '/StopIter/d' -i "$(DS)f"; done; \ echo 'exec ./waf configure "$(DS)@"' > ./configure; chmod +x \ - ./configure; PKG_CONFIG_PATH=$(LV2_PKGCFG) LD_LIBRARY_PATH=$(LV2_LIBPATH) + ./configure; PKG_CONFIG_PATH=$(LV2_PKGCFG):$(PKG_CONFIG_PATH) LD_LIBRARY_PATH=$(LV2_LIBPATH) $(1).cfg_params+=\ 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)) " + LDFLAGS="-lm `pkg-config --libs x11` $(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)) ) endef -SYS_LIB:=$(notdir $(lastword $(wildcard /usr/lib /usrlib32 /usr/lib64))) +SYS_LIB:=$(notdir $(lastword $(wildcard /usr/lib /usr/lib32 /usr/lib64))) SYS_LV2:=$(lastword $(wildcard /usr/$(SYS_LIB)/lv2 /usr/local/$(SYS_LIB)/lv2)) $(if $(SYS_LV2),,$(eval SYS_LV2:=/usr/$(SYS_LIB)/lv2)) lv2.cfg_params?= --lv2dir=$(SYS_LV2) @@ -274,7 +283,7 @@ sratom.cfg_params?= --static --no-shared serd.cfg_params?= --static --no-shared sord.cfg_params?= --static --no-shared lilv.cfg_params?= --static --dyn-manifest -suil.cfg_params?= --static --no-qt +suil.cfg_params?= --static --no-qt --no-qt5 $(eval $(call waf-setup,lv2)) $(eval $(call waf-setup,serd)) @@ -318,7 +327,7 @@ $(call rules,$(call std-build,ffmpeg, twolame lame openjpeg opus \ $(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,ilmBase, openexr)) $(call rules,$(call std-build,ladspa)) $(call rules,$(call std-build,lame)) $(call rules,$(call std-build,libaom)) @@ -336,11 +345,12 @@ $(call rules,$(call std-build,libuuid)) $(call rules,$(call std-build,libvorbis)) $(call rules,$(call std-build,mjpegtools, libjpeg)) $(call rules,$(call std-build,opencv)) -$(call rules,$(call std-build,openexr, ilmbase)) +$(call rules,$(call std-build,openexr)) +$(call rules,$(call std-build,openExr, ilmBase)) $(call rules,$(call std-build,openjpeg)) $(call rules,$(call std-build,opus)) $(call rules,$(call std-build,speech_tools)) -$(call rules,$(call std-build,tiff)) +$(call rules,$(call std-build,tiff, libwebp)) $(call rules,$(call std-build,twolame)) $(call rules,$(call std-build,x264)) $(call rules,$(call std-build,x265))