X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=33491eef2544389fd85e910d4091f378a737fb2f;hp=ee75006c35636d9c94d798ea82af8239a628a27e;hb=9c5e262df5b6cbe0f4e4b2d53e68e8edc487494b;hpb=86c9537e0540010ff43b16feb4cd7de98409eba1 diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index ee75006c..33491eef 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -53,7 +53,7 @@ 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([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]) @@ -189,7 +189,7 @@ PKG_3RD([esound],[no], [ . ]) PKG_3RD([ffmpeg],[yes], - [ffmpeg-4.2], + [ffmpeg-4.3], [ libavutil/libavutil.a \ libavcodec/libavcodec.a \ libpostproc/libpostproc.a \ @@ -239,15 +239,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 +270,7 @@ PKG_3RD([libdv],[auto], [ . ]) PKG_3RD([libjpeg],[auto], - [libjpeg-turbo-2.0.4], + [libjpeg-turbo-2.1.0], [ build/libjpeg.a \ build/libturbojpeg.a ], [ opt/libjpeg-turbo/include ]) @@ -290,7 +281,7 @@ PKG_3RD([opus],[auto], [ include ]) PKG_3RD([openjpeg],[auto], - [openjpeg-2.3.1], + [openjpeg-2.4.0], [ bin/libopenjp2.a ], [ src/lib/openjp2 ]) @@ -312,7 +303,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,7 +311,7 @@ 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 ], @@ -338,10 +329,18 @@ PKG_3RD([mjpegtools],[yes], [ . lavtools utils ]) 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], @@ -365,22 +364,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.8.2], [ 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 +389,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 +399,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,7 +409,7 @@ PKG_3RD([suil],[auto], [ usr/local/include ]) PKG_3RD([libaom],[auto], - [libaom-v1.0.0], + [libaom-v3.1.1], [ usr/local/lib*/libaom*.a ], [ usr/local/include ]) @@ -674,9 +673,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 +700,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 +749,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,8 +813,8 @@ 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 @@ -895,7 +894,7 @@ PKG_PROVIDE([ffmpeg]) PKG_PROVIDE([fftw]) PKG_PROVIDE([flac]) PKG_PROVIDE([giflib]) -PKG_PROVIDE([ilmbase], [$WANT_OPENEXR]) +PKG_PROVIDE([ilmBase], [$WANT_OPENEXR]) PKG_PROVIDE([ladspa],[$WANT_LADSPA_BUILD]) PKG_PROVIDE([lame]) PKG_PROVIDE([libavc1394],[$WANT_FIREWIRE]) @@ -912,6 +911,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])