AC_PROG_CXX
CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
-CFG_CFLAGS+=" -pthread -Wall -Wno-unused-result -Wno-format-truncation"
+CFG_CFLAGS+=" -pthread -Wall"
+# misguided pedantic warnings
+CFG_CFLAGS+=" -Wno-unused-result"
+CFG_CFLAGS+=" -Wno-stringop-truncation"
+CFG_CFLAGS+=" -Wno-stringop-overflow"
+CFG_CFLAGS+=" -Wno-format-truncation"
+CFG_CFLAGS+=" -Wno-format-overflow"
CFG_CFLAGS+=" -D__STDC_CONSTANT_MACROS"
CFG_CFLAGS+=" -D__STDC_LIMIT_MACROS"
CFG_CFLAGS+=" -DPNG_SKIP_SETJMP_CHECK=1"
fi
PKG_3RD([fftw],[auto],
- [fftw-3.3.6-pl2],
+ [fftw-3.3.7],
[ .libs/libfftw3.a \
libbench2/libbench2.a \
rdft/scalar/r2cb/.libs/librdft_scalar_r2cb.a \
dft/scalar/.libs/libdft_scalar.a \
dft/.libs/libdft.a \
kernel/.libs/libkernel.a \
- simd-support/.libs/libsimd_support.a \
- simd-support/.libs/libsimd_sse2_nonportable.a ],
+ simd-support/.libs/libsimd_support.a ],
[ api ])
PKG_3RD([flac],[auto],
[ lib ])
PKG_3RD([ilmbase],[auto],
- [ilmbase-2.2.0],
+ [ilmbase-2.2.1],
[ Iex/.libs/libIex.a \
IexMath/.libs/libIexMath.a \
Half/.libs/libHalf.a \
PKG_DEF([ladspa], [ladspa-0.4.17], [], [])
PKG_3RD([lame],[auto],
- [lame-3.99.5],
+ [lame-3.100],
[ libmp3lame/.libs/libmp3lame.a \
mpglib/.libs/libmpgdecoder.a ],
[ include ])
[ . lavtools utils ])
PKG_3RD([openexr],[auto],
- [openexr-2.2.0],
+ [openexr-2.2.1],
[ IlmImf/.libs/libIlmImf.a \
IlmImfUtil/.libs/libIlmImfUtil.a ],
[ IlmImf config ])
# [])
#
PKG_3RD([tiff],[auto],
- [tiff-4.0.6],
+ [tiff-4.0.9],
[ libtiff/.libs/libtiff.a \
libtiff/.libs/libtiffxx.a \
port/.libs/libport.a ],[
[ libtwolame ])
PKG_3RD([x264],[auto],
- [x264-snapshot-20170426-2245],
+ [x264-snapshot-20180118-2245],
[ libx264.a ],
[ . ])
PKG_3RD([x265],[auto],
- [x265_2.5],
+ [x265_v2.6],
[ libx265.a ],
[ . source ])
CHECK_ENABLE([static-build], [STATIC_BUILD], [build static], [auto])
CHECK_ENABLE([x264_hidepth], [X264_HIDEPTH], [build x264 10bit], [no])
-CHECK_ENABLE([x265_hidepth], [X265_HIDEPTH], [build x265 10/12bit], [no])
test "x$WANT_STATIC_BUILD" = "xauto" && WANT_STATIC_BUILD=$WANT_CINBIN_BUILD
CHECK_PROG(PACTL, [pactl])
WANT_PACTL=$PROG_PACTL
+# libx264 nasm fix
+AC_MSG_CHECKING([nasm x264 compatible])
+echo "vmovdqa32 [[eax]]{k1}{z}, zmm0" > conftest.asm
+nasm conftest.asm -o conftest.o > /dev/null 2>&1
+if test $? != 0 ; then
+ AC_MSG_RESULT([no])
+ AC_MSG_WARN([libx264 built without assembly code])
+ X264_CFG_PARAMS="$X264_CFG_PARAMS --disable-asm"
+else
+ AC_MSG_RESULT([yes])
+fi
+rm -f conftest.asm conftest.o
+
AC_CHECK_DECL([X_HAVE_UTF8_STRING],,[no_utf=yes],[#include <X11/Xlib.h>])
if test "$no_utf" = "yes"; then
AC_MSG_ERROR([Cinelerra requires utf8 support in X Windows.])
AC_SUBST(EXTRA_LIBS)
AC_SUBST(FFMPEG_EXTRA_CFG)
AC_SUBST(WANT_X264_HIDEPTH)
-AC_SUBST(WANT_X265_HIDEPTH)
AC_SUBST(CFG_CFLAGS)
AC_SUBST(CFG_CXXFLAGS)
echo ""
if test $WANT_X264_HIDEPTH = "yes" ; then
- echo "x264.cfg_params := --enable-static --bit-depth=10"
-fi
-if test $WANT_X265_HIDEPTH = "yes" ; then
- echo "x265.cfg_params := -DENABLE_SHARED=no -DHIGH_BIT_DEPTH:BOOL=ON" # -DMAIN12:BOOL=ON"
+ X264_CFG_PARAMS="$X264_CFG_PARAMS --bit-depth=10"
fi
for pkg in $STATIC_PKGS; do
if test "x$HAVE_opus" = "xyes"; then
echo 'ffmpeg.cflags+=" -I/usr/include/opus"'
fi
+if test "x$X264_CFG_PARAMS" != "x" ; then
+ echo "x264.cfg_params :=$X264_CFG_PARAMS --enable-static --enable-pic"
+fi