From 3fdc604189337e3e9ee34f09b74100957a036f90 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu Date: Sun, 23 May 2021 12:18:21 +0300 Subject: [PATCH 24/29] add libbthread to thirdparty/Makefile, do not install mpeg2enc/mplex from mjpegtools --- cinelerra-5.1/thirdparty/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 2dd2867e..5f0924f4 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -183,6 +183,7 @@ ffmpeg.cfg_params= \ #cmake_config=echo "exec cmake \$$$$@ $(1)" > ./configure; chmod +x ./configure; cmake_config=echo 'cmake "$$$$@" "$(1)"' > ./configure; chmod +x ./configure; +libbthread.cfg_vars?= echo "exec true" > ./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 @@ -317,6 +318,7 @@ else rules=$(eval $(1)) endif +$(call rules,$(call std-build,libbthread)) $(call rules,$(call std-build,a52dec,djbfft)) $(call rules,$(call std-build,djbfft)) $(call rules,$(call std-build,audiofile)) @@ -391,8 +393,8 @@ clean: rm -rf $(BLD) install: - cp -a $(ver_mjpegtools)/mpeg2enc/mpeg2enc $(BINDIR)/. - cp -a $(ver_mjpegtools)/mplex/mplex $(BINDIR)/. +# cp -a $(ver_mjpegtools)/mpeg2enc/mpeg2enc $(BINDIR)/. +# cp -a $(ver_mjpegtools)/mplex/mplex $(BINDIR)/. else # not WANT_CIN_3RDPARTY all: -- 2.31.1