projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sams icons, changed with-findobj to with-opencv, added plugins flowobj, gaborobj
[goodguy/history.git]
/
cinelerra-5.1
/
configure.ac
diff --git
a/cinelerra-5.1/configure.ac
b/cinelerra-5.1/configure.ac
index d66079337ed0bf8f2db72bf3e97837272f517b0e..7ba17ed63dba0304a9412abb0da8e8c21d632a95 100644
(file)
--- a/
cinelerra-5.1/configure.ac
+++ b/
cinelerra-5.1/configure.ac
@@
-125,7
+125,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.
2
],
+ [ffmpeg-3.3.
4
],
[ libavutil/libavutil.a \
libavcodec/libavcodec.a \
libpostproc/libpostproc.a \
[ libavutil/libavutil.a \
libavcodec/libavcodec.a \
libpostproc/libpostproc.a \
@@
-299,7
+299,7
@@
PKG_3RD([x264],[auto],
[ . ])
PKG_3RD([x265],[auto],
[ . ])
PKG_3RD([x265],[auto],
- [x265_2.
4
],
+ [x265_2.
5
],
[ libx265.a ],
[ . source ])
[ libx265.a ],
[ . source ])
@@
-463,7
+463,7
@@
if test "x$WANT_$1" != "xno" ; then
if test "x$RESULT" = "xno" -a "x$PKG_$1" = "x"; then
echo "=== want $1 Failed."
WANT_$1=no
if test "x$RESULT" = "xno" -a "x$PKG_$1" = "x"; then
echo "=== want $1 Failed."
WANT_$1=no
- el
se
+ el
if test "x$WANT_$1" = "xauto" ; then
WANT_$1=yes
fi
fi
WANT_$1=yes
fi
fi
@@
-520,6
+520,9
@@
CHECK_WANT([DL], [auto], [system has libdl], [
CHECK_LIB([DL], [dl], [dlopen])])
CHECK_WANT([EXR], [auto], [use exr], [])
CHECK_LIB([DL], [dl], [dlopen])])
CHECK_WANT([EXR], [auto], [use exr], [])
+CHECK_WANT([OPENCV], [no], [opencv=sys/sta/dyn,git/tar=url], [
+ WANT_OPENCV="$withval"
+])
CHECK_WANT([NUMA], [auto], [system has libnuma], [
CHECK_LIB([NUMA], [numa], [numa_alloc])])
CHECK_WANT([NUMA], [auto], [system has libnuma], [
CHECK_LIB([NUMA], [numa], [numa_alloc])])
@@
-597,7
+600,6
@@
for dep in \
libtheora/libogg libtheora/libvorbis ; do
lib=`dirname $dep`; needs=`basename $dep`
eval pkg_lib="\$PKG_$lib"; eval needs_lib="\$HAVE_$needs";
libtheora/libogg libtheora/libvorbis ; do
lib=`dirname $dep`; needs=`basename $dep`
eval pkg_lib="\$PKG_$lib"; eval needs_lib="\$HAVE_$needs";
- echo "dep lib=$lib, needs=$needs, pkg_lib=$pkg_lib, needs_lib=$needs_lib" > /dev/tty
if test "x$pkg_lib" != "xno"; then
eval "PKG_$needs=yes"
fi
if test "x$pkg_lib" != "xno"; then
eval "PKG_$needs=yes"
fi
@@
-643,9
+645,7
@@
PKG_PROVIDE([libtheora])
PKG_PROVIDE([libuuid])
PKG_PROVIDE([libvorbis])
PKG_PROVIDE([mjpegtools])
PKG_PROVIDE([libuuid])
PKG_PROVIDE([libvorbis])
PKG_PROVIDE([mjpegtools])
-echo "WANT_OPENEXR = $WANT_OPENEXR" > /dev/tty
PKG_PROVIDE([openexr], [$WANT_OPENEXR])
PKG_PROVIDE([openexr], [$WANT_OPENEXR])
-echo "PKG_openexr = $PKG_openexr" > /dev/tty
PKG_PROVIDE([openjpeg])
PKG_PROVIDE([tiff])
PKG_PROVIDE([twolame])
PKG_PROVIDE([openjpeg])
PKG_PROVIDE([tiff])
PKG_PROVIDE([twolame])
@@
-683,6
+683,7
@@
echo " using: with-config-dir = $WANT_CONFIG_DIR"
echo " using: with-browser = $WANT_CIN_BROWSER"
echo " using: with-plugin-dir = $WANT_PLUGIN_DIR"
echo " using: with-ladspa-dir = $WANT_LADSPA_DIR"
echo " using: with-browser = $WANT_CIN_BROWSER"
echo " using: with-plugin-dir = $WANT_PLUGIN_DIR"
echo " using: with-ladspa-dir = $WANT_LADSPA_DIR"
+echo " using: with-opencv = $WANT_OPENCV"
echo ""
echo " using: single-user = $WANT_CINBIN_BUILD"
echo " using: static-build = $WANT_STATIC_BUILD"
echo ""
echo " using: single-user = $WANT_CINBIN_BUILD"
echo " using: static-build = $WANT_STATIC_BUILD"