modify configure.ac for termux as submitted by Andrew

diff --git a/cinelerra-5.1/autogen.sh b/cinelerra-5.1/autogen.sh
index f9eb0ddf24e4cd5d9121ce0c999d8fba10eb16b1..50f3a13d32af4769541cd7e24131d21473857f00 100755 (executable)
--- a/cinelerra-5.1/autogen.sh
+++ b/cinelerra-5.1/autogen.sh
@@ -7,6 +7,10 @@ rm -rf autom4te.cache m4
 
 if [ "$1" = "clean" ]; then exit 0; fi
 
+#autoupdate
 mkdir m4
 autoreconf --install
 
+if [ "$(uname -o)" = "Android" ] || [ -e "/system/bin/app_process" ]; then
+sed -i 's/usr\/bin\/sh/usr\/bin\/bash/' configure
+fi
\ No newline at end of file

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 9ecd9c87a6b15404d9a62bdf79d7706e5fc66a3f..941a00d6ad9aa8e575d5fea63907d42dc2d3b385 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -12,7 +12,7 @@ CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
 CFG_CFLAGS+=" -pthread -Wall"
 # misguided pedantic warnings
 #  this is extra work, not a gain...
-CFG_CFLAGS+=" -Wno-unknown-warning-option"
+#CFG_CFLAGS+=" -Wno-unknown-warning-option"
 CFG_CFLAGS+=" -Wno-attributes"
 CFG_CFLAGS+=" -Wno-unused-result"
 CFG_CFLAGS+=" -Wno-stringop-overflow"
@@ -26,7 +26,9 @@ CFG_CFLAGS+=" -DPNG_SKIP_SETJMP_CHECK=1"
 CFG_CFLAGS+=" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 CFG_CFLAGS+=" -I/usr/include -I/usr/local/include"
 CFG_CFLAGS+=" -I/usr/include/freetype2 -I/usr/local/include/freetype2"
+CFG_CFLAGS+=" -I/data/data/com.termux/files/usr/include/freetype2"
 CFG_CFLAGS+=" -I/usr/include/uuid -I/usr/local/include/uuid"
+CFG_CFLAGS+=" -I/data/data/com.termux/files/usr/include/uuid -I/usr/local/include/uuid"
 CFG_CFLAGS+=" -I/usr/include/mjpegtools -I/usr/local/include/mjpegtools"
 
 AC_DEFUN([CHECK_WITH], [
@@ -317,6 +319,13 @@ PKG_3RD([libvorbis],[auto],
     lib/.libs/libvorbisfile.a ],
   [ include . ])
 
+## arch dep tests
+ARCH=[`uname -m`]
+I86=[`expr "x$ARCH" : 'xi[346]86.*'`]
+X86=[`expr "x$ARCH" : 'x..._64*'`]
+
+if test "x$I86$X86" != "x00" ; then
+
 PKG_3RD([mjpegtools],[yes],
   [mjpegtools-2.1.0],
   [ utils/mmxsse/.libs/libmmxsse.a \
@@ -328,6 +337,20 @@ PKG_3RD([mjpegtools],[yes],
     mpeg2enc/.libs/libmpeg2encpp.a ],
   [ .  lavtools utils ])
 
+else
+
+PKG_3RD([mjpegtools],[yes],
+  [mjpegtools-2.1.0],
+  [ utils/.libs/libmjpegutils.a \
+    lavtools/.libs/liblavfile.a \
+    lavtools/.libs/liblavjpeg.a \
+    mplex/.libs/libmplex2.a \
+    yuvfilters/.libs/libyuvfilters.a \
+    mpeg2enc/.libs/libmpeg2encpp.a ],
+  [ .  lavtools utils ])
+
+fi
+
 PKG_3RD([openexr],[auto],
   [openexr-2.4.1],
   [ usr/local/lib/libHalf.a \
@@ -428,6 +451,15 @@ PKG_3RD([ffnvcodec],[auto],
   [ ],
   [ . ])
 
+if test [ "$(uname -o)"] = "Android"  ; then
+
+PKG_3RD([libbthread],[auto],
+  [libbthread-master],
+  [ *.a ],
+  [ . ])
+fi
+
+
 AC_SUBST(STATIC_PKGS)
 
 AC_DEFUN([CHECK_ENABLE], [
@@ -476,6 +508,10 @@ if test "x$I86$X86" != "x00" ; then
   REQUIRE_PROG(YASM, [yasm])
 fi
 
+if test "x$I86$X86" == "x00"; then
+   CFG_CFLAGS+=" -DNO_CTX -DNO_GDB -DNO_BTRACE"
+fi
+
 ## end arch dep tests
 
 REQUIRE_PROG(OBJCOPY, [objcopy])
@@ -885,6 +921,7 @@ if test "x$BUILD_$1" = "x" ; then
 fi
 ])
 
+PKG_PROVIDE([libbthread])
 PKG_PROVIDE([a52dec])
 PKG_PROVIDE([djbfft])
 PKG_PROVIDE([encore])
@@ -1015,6 +1052,11 @@ if test "x$WANT_BOOBY" != "xno"; then
   CFG_CFLAGS+=" -DBOOBY"
 fi
 
+if test [ "$(uname -o)"] = "Android" ; then
+# termux
+EXTRA_LIBS+=' -liconv'
+fi
+
 # intel lock elision bugs
 if test "x$WANT_NOELISION" != "xno"; then
   CFG_RPATH=`ls -1fd 2> /dev/null \