X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=c7394b7b217ad80b331d4bc176ef8b3610639f1b;hb=e15276685c9e3eafaa329ae41092074a0e8452b1;hp=d529a8015e29bd7fbca52942b0c5efab6aa7e2a8;hpb=abdff69b9309c7d5cd2ed6ce17dd2e0d85aef9a1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index d529a801..c7394b7b 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -1,18 +1,22 @@
 
 AC_PREREQ([2.69])
-AC_INIT([cinelerra], [5.1], [mail@lists.cinelerra-gg.org])
+AC_INIT([cinelerra],[5.1],[mail@lists.cinelerra-gg.org])
+
+# Put autogenerated stuff in subdir m4, which must be created
+# externally. This macro must be set before calling AC_INIT_AUTOMAKE
+AC_CONFIG_AUX_DIR(m4)
 AM_INIT_AUTOMAKE([foreign])
 
 AM_PROG_AS
-AC_LANG_CPLUSPLUS
-AC_LANG_C
+AC_LANG([C++])
+AC_LANG([C])
 AC_PROG_CXX
 
 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,12 +30,14 @@ 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], [
 AC_ARG_WITH([$1],
-  AC_HELP_STRING([--with-[$1]], [$2 ($4)]),
+  AS_HELP_STRING([--with-[$1]],[$2 ($4)]),
   [WANT_$3=$withval], [WANT_$3='$4'])
 AC_SUBST([WANT_$3])
 ])
@@ -140,7 +146,8 @@ AC_SUBST(MAK_INSTALLS)
 AC_SUBST(MAK_UNINSTALLS)
 
 if test "x$WANT_JOBS" = "xauto"; then
-  CPUS=`grep -c "^proc" /proc/cpuinfo`
+#  CPUS=`grep -c "^proc" /proc/cpuinfo`
+  CPUS=`nproc`
   WANT_JOBS=`expr $CPUS + $CPUS / 2 + 2`
 fi
 
@@ -153,7 +160,7 @@ inc_$1="$4"
 
 AC_DEFUN([PKG_3RD],[
 AC_ARG_ENABLE([$1],
-  AC_HELP_STRING([--enable-$1],[build $1 ($2)]),
+  AS_HELP_STRING([--enable-$1],[build $1 ($2)]),
   [PKG_$1=$enableval], [PKG_$1=$2])
 PKG_DEF([$1],[$3],[$4],[$5])
 ])
@@ -189,11 +196,10 @@ PKG_3RD([esound],[no],
   [ . ])
 
 PKG_3RD([ffmpeg],[yes],
-  [ffmpeg-4.3],
+  [ffmpeg-4.4],
   [ libavutil/libavutil.a \
     libavcodec/libavcodec.a \
     libpostproc/libpostproc.a \
-    libavdevice/libavdevice.a \
     libavformat/libavformat.a \
     libswscale/libswscale.a \
     libavfilter/libavfilter.a \
@@ -205,7 +211,7 @@ if test "x$WANT_GIT_FFMPEG" != "xno" ; then
 fi
 
 PKG_3RD([fftw],[auto],
-  [fftw-3.3.8],
+  [fftw-3.3.10],
   [ .libs/libfftw3.a \
     libbench2/libbench2.a \
     rdft/scalar/r2cb/.libs/librdft_scalar_r2cb.a \
@@ -270,7 +276,7 @@ PKG_3RD([libdv],[auto],
   [ . ])
 
 PKG_3RD([libjpeg],[auto],
-  [libjpeg-turbo-2.0.5],
+  [libjpeg-turbo-2.1.2],
   [ build/libjpeg.a \
     build/libturbojpeg.a ],
   [ opt/libjpeg-turbo/include ])
@@ -281,12 +287,12 @@ PKG_3RD([opus],[auto],
   [ include ])
 
 PKG_3RD([openjpeg],[auto],
-  [openjpeg-2.3.1],
+  [openjpeg-2.4.0],
   [ bin/libopenjp2.a ],
   [ src/lib/openjp2 ])
 
 PKG_3RD([libogg],[auto],
-  [libogg-1.3.4],
+  [libogg-1.3.5],
   [ src/.libs/libogg.a ],
   [ include ])
 
@@ -317,6 +323,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 +341,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 \
@@ -352,7 +379,7 @@ PKG_3RD([ilmBase],[auto], [ilmBase], [] [])
 #  [])
 #
 PKG_3RD([tiff],[auto],
-  [tiff-4.1.0],
+  [tiff-4.3.0],
   [ libtiff/.libs/libtiff.a \
     libtiff/.libs/libtiffxx.a \
     port/.libs/libport.a ],[
@@ -364,17 +391,17 @@ PKG_3RD([twolame],[auto],
   [  libtwolame ])
 
 PKG_3RD([x264],[auto],
-  [x264-snapshot-20191217-2245-stable],
+  [x264-snapshot-20210615-master],
   [ libx264.a ],
   [ . ])
 
 PKG_3RD([x265],[auto],
-  [x265_3.4],
+  [x265_3.5],
   [ libx265.a ],
   [ . source ])
 
 PKG_3RD([libvpx],[auto],
-  [libvpx-1.8.2],
+  [libvpx-1.11.0],
   [ libvpx.a ],
   [ . ])
 
@@ -409,7 +436,7 @@ PKG_3RD([suil],[auto],
   [ usr/local/include ])
 
 PKG_3RD([libaom],[auto],
-  [libaom-v3.0.0],
+  [libaom-v3.2.0],
   [ usr/local/lib*/libaom*.a ],
   [ usr/local/include ])
 
@@ -428,11 +455,20 @@ 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], [
 AC_ARG_ENABLE([$1],
-  AC_HELP_STRING([--enable-[$1]], [$3 ([$4])]),
+  AS_HELP_STRING([--enable-[$1]],[$3 ([$4])]),
   [WANT_$2=$enableval], [WANT_$2=[$4]])
 ])
 
@@ -476,6 +512,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])
@@ -615,7 +655,7 @@ AC_DEFUN([CHECK_WANT], [
 RESULT=yes
 # WANT_$1
 AC_ARG_WITH(m4_tolower([$1]),
- AC_HELP_STRING([m4_join([-],[--with],m4_tolower([$1]))], [$3] (auto)),
+ AS_HELP_STRING([m4_join([-],[--with],m4_tolower([$1]))],[$3 (auto)]),
   [WANT_$1=$withval],[WANT_$1=$2])
  m4_quote($4)
  if test "x$WANT_$1" = "xauto" ; then
@@ -821,14 +861,14 @@ HAVE_ilmbase=no \
 OBJDIR=`uname -m`
 AC_SUBST(OBJDIR)
 
-echo "AC_HELP_STRING([Reason],[Package])"
-echo "AC_HELP_STRING([------],[-------])"
+echo "AS_HELP_STRING([Reason],[Package])"
+echo "AS_HELP_STRING([------],[-------])"
 
 AC_DEFUN([PKG_DISABLED],[
  PKG_$1="no"
  BUILD_$1=0
  AC_SUBST(BUILD_$1)
- echo "AC_HELP_STRING([disabled],[$1])"
+ echo "AS_HELP_STRING([disabled],[$1])"
 ])
 AC_DEFUN([PKG_SHARED],[
  PKG_$1="shared"
@@ -843,7 +883,7 @@ AC_DEFUN([PKG_STATIC],[
   BUILD_$1=1
   AC_SUBST(BUILD_$1)
   STATIC_BLDS+=" [$1]"
-  echo "AC_HELP_STRING([$2],[$1])"
+  echo "AS_HELP_STRING([$2],[$1])"
  fi
 ])
 
@@ -885,6 +925,7 @@ if test "x$BUILD_$1" = "x" ; then
 fi
 ])
 
+PKG_PROVIDE([libbthread])
 PKG_PROVIDE([a52dec])
 PKG_PROVIDE([djbfft])
 PKG_PROVIDE([encore])
@@ -937,11 +978,11 @@ fi
 
 AC_SUBST(STATIC_BLDS)
 for f in $SHARED_LIBS; do
-  echo "AC_HELP_STRING([shared],[$f])"
+  echo "AS_HELP_STRING([shared],[$f])"
 done
 AC_SUBST(SHARED_LIBS)
 for f in $SYSTEM_LIBS; do
-  echo "AC_HELP_STRING([system],[$f])"
+  echo "AS_HELP_STRING([system],[$f])"
 done
 AC_SUBST(SYSTEM_LIBS)
 
@@ -1015,6 +1056,11 @@ if test "x$WANT_BOOBY" != "xno"; then
   CFG_CFLAGS+=" -DBOOBY"
 fi
 
+if test [ "$(uname -o)"] = "Android" ; then
+# termux
+EXTRA_LIBS+=' -liconv -landroid-shmem'
+fi
+
 # intel lock elision bugs
 if test "x$WANT_NOELISION" != "xno"; then
   CFG_RPATH=`ls -1fd 2> /dev/null \