X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=e83d466603546e1ef77da0920edd392720e8a564;hb=180a8d6775163af5c008fcd933a81b78f5c768dc;hp=f10af67ef952e0a04e9841421957b4262e125f43;hpb=21af3206552d78919dad02f83c08439bedb05c89;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index f10af67e..e83d4666 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]) ]) @@ -53,7 +59,8 @@ CHECK_WITH([git-ffmpeg],[git ffmpeg using url],[GIT_FFMPEG],[no]) CHECK_WITH([noelision],[use noelision/libpthread],[NOELISION],[auto]) CHECK_WITH([booby],[window lock trace booby trap],[BOOBY],[no]) CHECK_WITH([libzmpeg],[build libzmpeg],[LIBZMPEG],[yes]) -CHECK_WITH([commercial],[enable commercial capture],[COMMERCIAL],[yes]) +CHECK_WITH([libdpx],[build libdpx],[LIBDPX],[auto]) +CHECK_WITH([commercial],[enable commercial capture],[COMMERCIAL],[no]) CHECK_WITH([thirdparty],[use thirdparty build],[CIN_3RDPARTY],[yes]) CHECK_WITH([shuttle],[shuttle device],[SHUTTLE],[yes]) CHECK_WITH([wintv],[usb 2040:826d wintv device],[WINTV],[yes]) @@ -63,6 +70,7 @@ CHECK_WITH([vdpau],[video decode+presentation api for unix],[VDPAU],[yes]) CHECK_WITH([nv],[nvenc/nvdec ffnvcodec api],[NV],[yes]) CHECK_WITH([cuda],[nv cuda plugins],[CUDA],[auto]) CHECK_WITH([clang],[use clang instead of gcc/g++],[CLANG],[no]) +CHECK_WITH([filegif],[enable filegif i/o], [GIFLIB],[yes]) if test "x$WANT_LV2" != "xno"; then GTK2_LIBS=`pkg-config --libs gtk+-2.0` @@ -140,7 +148,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 +162,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 +198,10 @@ PKG_3RD([esound],[no], [ . ]) PKG_3RD([ffmpeg],[yes], - [ffmpeg-4.2], + [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 +213,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 \ @@ -239,15 +247,6 @@ PKG_3RD([giflib],[yes], libutil.a ], [ . ]) -PKG_3RD([ilmbase],[auto], - [ilmbase-2.2.1], - [ Iex/.libs/libIex.a \ - IexMath/.libs/libIexMath.a \ - Half/.libs/libHalf.a \ - Imath/.libs/libImath.a \ - IlmThread/.libs/libIlmThread.a ], - [ Iex Half Imath config IlmThread ]) - PKG_DEF([ladspa], [ladspa-0.4.17], [], []) PKG_3RD([lame],[auto], @@ -279,7 +278,7 @@ PKG_3RD([libdv],[auto], [ . ]) PKG_3RD([libjpeg],[auto], - [libjpeg-turbo-2.0.4], + [libjpeg-turbo-2.1.2], [ build/libjpeg.a \ build/libturbojpeg.a ], [ opt/libjpeg-turbo/include ]) @@ -290,12 +289,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 ]) @@ -312,7 +311,7 @@ PKG_3RD([libtheora],[auto], [ lib/.libs/libtheora.a \ lib/.libs/libtheoradec.a \ lib/.libs/libtheoraenc.a ], - [ . ]) + [ include ]) PKG_3RD([libuuid],[yes], [libuuid-1.0.3], @@ -320,12 +319,19 @@ PKG_3RD([libuuid],[yes], [ . ]) PKG_3RD([libvorbis],[auto], - [libvorbis-1.3.6], + [libvorbis-1.3.7], [ lib/.libs/libvorbis.a \ lib/.libs/libvorbisenc.a \ 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 \ @@ -337,11 +343,33 @@ 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.2.1], - [ IlmImf/.libs/libIlmImf.a \ - IlmImfUtil/.libs/libIlmImfUtil.a ], - [ IlmImf config ]) + [openexr-2.4.1], + [ usr/local/lib/libHalf.a \ + usr/local/lib/libIex.a \ + usr/local/lib/libIexMath.a \ + usr/local/lib/libIlmThread.a \ + usr/local/lib/libImath.a \ + usr/local/lib/libIlmImf.a \ + usr/local/lib/libIlmImfUtil.a ], + [ usr/local/include/OpenEXR ]) + +PKG_3RD([openExr],[auto], [openExr], [] []) +PKG_3RD([ilmBase],[auto], [ilmBase], [] []) #PKG_3RD([festival],[no], # [festival], @@ -353,7 +381,7 @@ PKG_3RD([openexr],[auto], # []) # PKG_3RD([tiff],[auto], - [tiff-4.1.0], + [tiff-4.3.0], [ libtiff/.libs/libtiff.a \ libtiff/.libs/libtiffxx.a \ port/.libs/libport.a ],[ @@ -365,22 +393,22 @@ 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.2.1], + [x265_3.5], [ libx265.a ], [ . source ]) PKG_3RD([libvpx],[auto], - [libvpx-1.8.1], + [libvpx-1.11.0], [ libvpx.a ], [ . ]) PKG_3RD([lv2],[auto], - [lv2-1.16.0], + [lv2-1.18.0], [ ], [ usr/local/include usr/local/lib64/lv2 usr/local/lib/lv2 ]) @@ -390,7 +418,7 @@ PKG_3RD([sratom],[auto], [ usr/local/include ]) PKG_3RD([serd],[auto], - [serd-0.30.2], + [serd-0.30.4], [ usr/local/lib/libserd-0.a ], [ usr/local/include ]) @@ -400,7 +428,7 @@ PKG_3RD([sord],[auto], [ usr/local/include ]) PKG_3RD([lilv],[auto], - [lilv-0.24.6], + [lilv-0.24.8], [ usr/local/lib/liblilv-0.a ], [ usr/local/include ]) @@ -410,12 +438,12 @@ PKG_3RD([suil],[auto], [ usr/local/include ]) PKG_3RD([libaom],[auto], - [libaom-v1.0.0], + [libaom-v3.2.0], [ usr/local/lib*/libaom*.a ], [ usr/local/include ]) PKG_3RD([dav1d],[auto], - [dav1d-0.6.0], + [dav1d-0.5.1], [ usr/local/lib*/libdav1d*.a ], [ usr/local/include ]) @@ -429,11 +457,25 @@ PKG_3RD([ffnvcodec],[auto], [ ], [ . ]) +PKG_3RD([libdpx],[auto], + [libdpx], + [ libdpx/libdpx.a ], + [ libdpx ]) + +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]]) ]) @@ -477,6 +519,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]) @@ -616,7 +662,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 @@ -674,9 +720,9 @@ test "x$HAVE_libavc1394" = "xyes" && \ test "x$HAVE_libiec61883" = "xyes" && \ test "x$HAVE_libraw1394" = "xyes" && \ HAVE_FIREWIRE=yes || \ -HAVE_libavc1394=no && \ -HAVE_libiec61883=no && \ -HAVE_libraw1394=no && \ +HAVE_libavc1394=no \ +HAVE_libiec61883=no \ +HAVE_libraw1394=no \ HAVE_FIREWIRE=no CHECK_WANT([DV], [auto], [use dv], [ @@ -701,8 +747,8 @@ CHECK_WANT([ESOUND], [no], [use esd], [ test "x$HAVE_esound" = "xyes" && \ test "x$HAVE_audiofile" = "xyes" && \ HAVE_ESOUND=yes || \ -HAVE_esound=no && \ -HAVE_audiofile=no && \ +HAVE_esound=no \ +HAVE_audiofile=no \ HAVE_ESOUND=no CHECK_WANT([PULSE], [auto], [use pulseaudio], [ @@ -750,12 +796,12 @@ test "x$HAVE_serd" = "xyes" && \ test "x$HAVE_sratom" = "xyes" && \ test "x$HAVE_suil" = "xyes" && \ HAVE_LV2=yes || \ -HAVE_lv2=no && \ -HAVE_lilv=no && \ -HAVE_sord=no && \ -HAVE_serd=no && \ -HAVE_sratom=no && \ -HAVE_suil=no && \ +HAVE_lv2=no \ +HAVE_lilv=no \ +HAVE_sord=no \ +HAVE_serd=no \ +HAVE_sratom=no \ +HAVE_suil=no \ HAVE_LV2=no CHECK_WANT([CUDA], [auto], [build cuda plugins], [ @@ -814,22 +860,22 @@ AC_SUBST([HAVE_OPENEXR]) test "x$HAVE_openexr" = "xyes" && \ test "x$HAVE_ilmbase" = "xyes" && \ HAVE_OPENEXR=yes || \ -HAVE_openexr=no && \ -HAVE_ilmbase=no && +HAVE_openexr=no \ +HAVE_ilmbase=no \ HAVE_OPENEXR=no # build global_config 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" @@ -844,7 +890,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 ]) @@ -886,6 +932,7 @@ if test "x$BUILD_$1" = "x" ; then fi ]) +PKG_PROVIDE([libbthread]) PKG_PROVIDE([a52dec]) PKG_PROVIDE([djbfft]) PKG_PROVIDE([encore]) @@ -894,8 +941,8 @@ PKG_PROVIDE([esound],[$WANT_ESOUND]) PKG_PROVIDE([ffmpeg]) PKG_PROVIDE([fftw]) PKG_PROVIDE([flac]) -PKG_PROVIDE([giflib]) -PKG_PROVIDE([ilmbase], [$WANT_OPENEXR]) +PKG_PROVIDE([giflib], [$WANT_GIFLIB]) +PKG_PROVIDE([ilmBase], [$WANT_OPENEXR]) PKG_PROVIDE([ladspa],[$WANT_LADSPA_BUILD]) PKG_PROVIDE([lame]) PKG_PROVIDE([libavc1394],[$WANT_FIREWIRE]) @@ -912,6 +959,7 @@ PKG_PROVIDE([mjpegtools]) PKG_PROVIDE([libaom]) PKG_PROVIDE([dav1d]) PKG_PROVIDE([libwebp]) +PKG_PROVIDE([openExr], [$WANT_OPENEXR]) PKG_PROVIDE([openexr], [$WANT_OPENEXR]) PKG_PROVIDE([openjpeg]) PKG_PROVIDE([tiff]) @@ -927,6 +975,7 @@ PKG_PROVIDE([serd], [$WANT_LV2]) PKG_PROVIDE([sord], [$WANT_LV2]) PKG_PROVIDE([suil], [$WANT_LV2]) PKG_PROVIDE([ffnvcodec], [$WANT_NV]) +PKG_PROVIDE([libdpx]) if test "x$WANT_LV2" = "xyes"; then if test "x$HAVE_lv2" = "xyes" -a "x$BUILD_lilv" = "x0"; then @@ -937,11 +986,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) @@ -951,7 +1000,7 @@ if test "x$WANT_CIN_3RDPARTY" != "xno"; then fi for v in GL XFT XXF86VM OSS ALSA FIREWIRE OGG DV DVB LADSPA \ VIDEO4LINUX2 ESOUND PULSE PACTL OPENEXR LV2 \ - COMMERCIAL LIBZMPEG SHUTTLE SHUTTLE_USB XV \ + COMMERCIAL GIFLIB LIBZMPEG LIBDPX SHUTTLE SHUTTLE_USB XV \ VAAPI VDPAU CUDA NV WINTV X10TV; do eval vv="\$WANT_$v" if test "x$vv" != "xno"; then @@ -1015,6 +1064,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 \