X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2FMakefile;h=aa6535660972ba7eae504e37a4b5d59b6af1fa38;hb=a4de4732339bf38b5b225c533be1bdf60748f04a;hp=aae252b0616990f739c013ebee3281803e7bf98b;hpb=14c59195960203265f308a703e834e7c5f59f6d2;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index aae252b0..aa653566 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -42,7 +42,7 @@ pkg-config=$(BLD)/$(1).configure pkg-built=$(BLD)/$(1).built ext=$(lastword $(subst ., ,$(1))) -tarball=$(lastword $(wildcard src/$(1)*.tar.*)) +tarball=$(lastword $(sort $(wildcard src/$(1)*.tar.*))) unpack=$(call unpack_$(call ext,$(1)),$(1)) unpack_gz=tar -xzf $(1) unpack_bz2=tar -xjf $(1) @@ -71,7 +71,7 @@ $(1)-clean: $(call pkg-source,$(1)): $(call unpack,$(call tarball,$(1))) \ - $(foreach pch,$(wildcard src/$(1).patch*), + $(foreach pch,$(sort $(wildcard src/$(1).patch*)), patch -d $(1)* -p1 < $(pch)) touch $$@ @@ -195,7 +195,7 @@ libraw1394.cfg_params?= --enable-shared=no; ln -sf src libraw1394 libtheora.cfg_vars?=PKG_CONFIG_PATH=$(call bld_path,libogg):$(call bld_path,libvorbis) libtheora.cflags?="$(call inc_path,libogg,include) $(call inc_path,libogg,src) $(call inc_path,libvorbis,include)" libtheora.ldflags?="$(call ld_path,libvorbis,lib/.libs) $(call ld_path,libogg,src/.libs)" -libtheora.cfg_params?= --disable-examples --enable-shared=no +libtheora.cfg_params?= --disable-examples --disable-spec --enable-shared=no libuuid.cfg_params?=--enable-shared=no libvorbis.cfg_params?= --disable-oggtest --enable-shared=no openjpeg.cfg_params?= -DBUILD_SHARED_LIBS:BOOL=OFF