projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes for xft when gc func not copy, fixes for zmpeg timestamp processing
[goodguy/history.git]
/
cinelerra-5.1
/
configure.ac
diff --git
a/cinelerra-5.1/configure.ac
b/cinelerra-5.1/configure.ac
index 441291d6e66ec6779df0557910eef80cc6d3c412..bdd1abb7c802ed270936d66d108e3e681d9c6412 100644
(file)
--- a/
cinelerra-5.1/configure.ac
+++ b/
cinelerra-5.1/configure.ac
@@
-135,7
+135,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.1.
2
],
+ [ffmpeg-3.1.
4
],
[ libavutil/libavutil.a \
libavcodec/libavcodec.a \
libpostproc/libpostproc.a \
[ libavutil/libavutil.a \
libavcodec/libavcodec.a \
libpostproc/libpostproc.a \
@@
-309,7
+309,7
@@
PKG_3RD([x264],[yes],
[ . ])
PKG_3RD([x265],[yes],
[ . ])
PKG_3RD([x265],[yes],
- [x265_2.
0
],
+ [x265_2.
1
],
[ libx265.a ],
[ . source ])
[ libx265.a ],
[ . source ])
@@
-352,6
+352,7
@@
if test "x$FATAL_ERROR" != "x"; then
AC_MSG_ERROR("fatal eror.")
fi
CHECK_PROG(PACTL, [pactl])
AC_MSG_ERROR("fatal eror.")
fi
CHECK_PROG(PACTL, [pactl])
+WANT_PACTL=$PROG_PACTL
AC_CHECK_DECL([X_HAVE_UTF8_STRING],,[no_utf=yes],[#include <X11/Xlib.h>])
if test "$no_utf" = "yes"; then
AC_CHECK_DECL([X_HAVE_UTF8_STRING],,[no_utf=yes],[#include <X11/Xlib.h>])
if test "$no_utf" = "yes"; then
@@
-662,7
+663,7
@@
AC_SUBST(SYSTEM_LIBS)
echo ""
for v in GL XFT XXF86VM OSS ALSA FIREWIRE DV DVB \
echo ""
for v in GL XFT XXF86VM OSS ALSA FIREWIRE DV DVB \
- VIDEO4LINUX2 ESOUND; do
+ VIDEO4LINUX2 ESOUND
PACTL
; do
eval vv="\$WANT_$v"
if test "x$vv" != "xno"; then
CFG_CFLAGS+=" -DHAVE_$v"
eval vv="\$WANT_$v"
if test "x$vv" != "xno"; then
CFG_CFLAGS+=" -DHAVE_$v"