projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix ffmpeg w/h setup
[goodguy/history.git]
/
cinelerra-5.1
/
configure.ac
diff --git
a/cinelerra-5.1/configure.ac
b/cinelerra-5.1/configure.ac
index 9d54bc7dab7e7b9b26d68a6884312ba3839dd51c..dcfd41d4e82f5b2247cd016dec432b4dc353dec3 100644
(file)
--- a/
cinelerra-5.1/configure.ac
+++ b/
cinelerra-5.1/configure.ac
@@
-126,7
+126,7
@@
PKG_3RD([fdk],[auto],
[ libAACdec/include libAACenc/include libSYS/include ])
PKG_3RD([ffmpeg],[yes],
[ libAACdec/include libAACenc/include libSYS/include ])
PKG_3RD([ffmpeg],[yes],
- [ffmpeg-3.
3.4
],
+ [ffmpeg-3.
4.1
],
[ libavutil/libavutil.a \
libavcodec/libavcodec.a \
libpostproc/libpostproc.a \
[ libavutil/libavutil.a \
libavcodec/libavcodec.a \
libpostproc/libpostproc.a \
@@
-223,6
+223,11
@@
PKG_3RD([libjpeg],[auto],
simd/.libs/libsimd.a ],
[ . ])
simd/.libs/libsimd.a ],
[ . ])
+PKG_3RD([opus],[auto],
+ [opus-1.2.1],
+ [ .libs/libopus.a ],
+ [ include ])
+
PKG_3RD([openjpeg],[auto],
[openjpeg-2.1.0-20160221],
[ bin/libopenjp2.a ],
PKG_3RD([openjpeg],[auto],
[openjpeg-2.1.0-20160221],
[ bin/libopenjp2.a ],
@@
-397,6
+402,7
@@
CHECK_LIB([XINERAMA], [Xinerama], [XineramaQueryExtension])
CHECK_HEADERS([XINERAMA], [Xinerama headers], [X11/extensions/Xinerama.h])
CHECK_LIB([XV], [Xv], [XvQueryExtension])
CHECK_HEADERS([XV], [Xlib Xv extention], [X11/Xlib.h X11/extensions/Xvlib.h])
CHECK_HEADERS([XINERAMA], [Xinerama headers], [X11/extensions/Xinerama.h])
CHECK_LIB([XV], [Xv], [XvQueryExtension])
CHECK_HEADERS([XV], [Xlib Xv extention], [X11/Xlib.h X11/extensions/Xvlib.h])
+CHECK_LIB([XFIXES], [Xfixes], [XFixesQueryVersion])
CHECK_LIB([BZ2], [bz2], [BZ2_bzDecompress])
CHECK_LIB([FONTCONFIG], [fontconfig], [FcInit])
CHECK_LIB([FREETYPE], [freetype], [FT_Init_FreeType])
CHECK_LIB([BZ2], [bz2], [BZ2_bzDecompress])
CHECK_LIB([FONTCONFIG], [fontconfig], [FcInit])
CHECK_LIB([FREETYPE], [freetype], [FT_Init_FreeType])
@@
-521,6
+527,10
@@
CHECK_WANT([ESOUND], [no], [use esd], [
CHECK_LIB([audiofile], [audiofile], [afOpenFile])
CHECK_HEADERS([audiofile], [audiofile headers], [audiofile.h])])
CHECK_LIB([audiofile], [audiofile], [afOpenFile])
CHECK_HEADERS([audiofile], [audiofile headers], [audiofile.h])])
+CHECK_WANT([LIBOPUS], [auto], [use libopus], [
+ CHECK_LIB([opus], [opus], [opus_multistream_decoder_create])
+ CHECK_HEADERS([opus], [libopus headers], [opus/opus_multistream.h])])
+
CHECK_WANT([DL], [auto], [system has libdl], [
CHECK_LIB([DL], [dl], [dlopen])])
CHECK_WANT([DL], [auto], [system has libdl], [
CHECK_LIB([DL], [dl], [dlopen])])
@@
-537,7
+547,7
@@
CHECK_WANT([OPENEXR], [auto], [use openexr], [
saved_LIBS="$LIBS"
saved_CXXFLAGS="$CXXFLAGS"
# ilmbase libs
saved_LIBS="$LIBS"
saved_CXXFLAGS="$CXXFLAGS"
# ilmbase libs
- LIBS=" -lIlmImf -lIlmThread -lIex"
+ LIBS=" -lIlmImf -lIlmThread -lIex
-lpthread
"
CXXFLAGS="-I/usr/include/OpenEXR"
AC_LANG_PUSH(C++)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
CXXFLAGS="-I/usr/include/OpenEXR"
AC_LANG_PUSH(C++)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@@
-657,6
+667,7
@@
PKG_PROVIDE([twolame])
PKG_PROVIDE([x264])
PKG_PROVIDE([x265])
PKG_PROVIDE([libvpx])
PKG_PROVIDE([x264])
PKG_PROVIDE([x265])
PKG_PROVIDE([libvpx])
+PKG_PROVIDE([opus], [$WANT_OPUS])
AC_SUBST(STATIC_BLDS)
AC_SUBST(SHARED_LIBS)
AC_SUBST(STATIC_BLDS)
AC_SUBST(SHARED_LIBS)
@@
-709,6
+720,12
@@
if test "x$HAVE_DL" = "xyes"; then
EXTRA_LIBS+=' -ldl'
FFMPEG_EXTRA_CFG+=' --extra-ldflags="-ldl"'
fi
EXTRA_LIBS+=' -ldl'
FFMPEG_EXTRA_CFG+=' --extra-ldflags="-ldl"'
fi
+if test "x$HAVE_opus" = "xyes"; then
+ EXTRA_LIBS+=' -lopus'
+ CFG_CFLAGS+=' -I/usr/include/opus'
+ FFMPEG_EXTRA_CFG+=' --enable-libopus'
+fi
+
AC_SUBST(EXTRA_LIBS)
AC_SUBST(FFMPEG_EXTRA_CFG)
AC_SUBST(WANT_X264_HIDEPTH)
AC_SUBST(EXTRA_LIBS)
AC_SUBST(FFMPEG_EXTRA_CFG)
AC_SUBST(WANT_X264_HIDEPTH)
@@
-835,3
+852,6
@@
fi
if test "x$WANT_GIT_FFMPEG" != "xno"; then
echo "ffmpeg.git := $WANT_GIT_FFMPEG"
fi
if test "x$WANT_GIT_FFMPEG" != "xno"; then
echo "ffmpeg.git := $WANT_GIT_FFMPEG"
fi
+if test "x$HAVE_opus" = "xyes"; then
+echo 'ffmpeg.cflags+=" -I/usr/include/opus"'
+fi