From: Good Guy <good1.2guy@gmail.com>
Date: Thu, 17 Mar 2022 22:44:33 +0000 (-0600)
Subject: minor changes from Andrew to accomodate Termux, etc
X-Git-Tag: 2022-03~5
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=c99e0f2d150ed4c92b3c31fbcacab3604b4bd43b;p=goodguy%2Fcinelerra.git

minor changes from Andrew to accomodate Termux, etc
---

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 163851d4..b36cb264 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -196,7 +196,6 @@ PKG_3RD([ffmpeg],[yes],
   [ libavutil/libavutil.a \
     libavcodec/libavcodec.a \
     libpostproc/libpostproc.a \
-    libavdevice/libavdevice.a \
     libavformat/libavformat.a \
     libswscale/libswscale.a \
     libavfilter/libavfilter.a \
@@ -1055,7 +1054,7 @@ fi
 
 if test [ "$(uname -o)"] = "Android" ; then
 # termux
-EXTRA_LIBS+=' -liconv'
+EXTRA_LIBS+=' -liconv -landroid-shmem'
 fi
 
 # intel lock elision bugs
diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 1e6af0b9..b2e222d4 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -130,7 +130,7 @@ 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 \
+	--enable-pthreads --disable-avdevice --enable-gpl --disable-ffplay \
 	$(call if_want,VAAPI,--enable-vaapi,--disable-vaapi) \
 	$(call if_want,VDPAU,--enable-vdpau,--disable-vdpau) \
 	$(call if_want,NV, --enable-nvenc --enable-nvdec --enable-ffnvcodec) \