Only configure.ac patch this time ..
diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index f10af67..7375fa9 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -8,7 +8,7 @@ AC_LANG_CPLUSPLUS
AC_LANG_C
AC_PROG_CXX
-CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
+CFG_CFLAGS+=" -std=c++11 -fno-omit-frame-pointer -fno-math-errno
-fno-signed-zeros"
CFG_CFLAGS+=" -pthread -Wall"
# misguided pedantic warnings
# this is extra work, not a gain...
@@ -239,14 +239,14 @@ 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_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], [], [])
@@ -337,11 +337,16 @@ PKG_3RD([mjpegtools],[yes],
mpeg2enc/.libs/libmpeg2encpp.a ],
[ . lavtools utils ])
-PKG_3RD([openexr],[auto],
- [openexr-2.2.1],
- [ IlmImf/.libs/libIlmImf.a \
- IlmImfUtil/.libs/libIlmImfUtil.a ],
- [ IlmImf config ])
+PKG_3RD([openexr],[yes],
+ [openexr-2.4.1],
+ [ IlmBase/Iex/.libs/libIex.a \
+ IlmBase/IexMath/.libs/libIexMath.a \
+ IlmBase/Half/.libs/libHalf.a \
+ IlmBase/Imath/.libs/libImath.a \
+ IlmBase/IlmThread/.libs/libIlmThread.a
+ OpenEXR/IlmImf/.libs/libIlmImf.a \
+ OpenEXR/IlmImfUtil/.libs/libIlmImfUtil.a ],
+ [ Iex Half Imath IlmThread IlmImf config usr/include/OpenEXR ])
---
I force-disabled openEXR probe so it will NOT pick up system headers/libs,
discovered new includes demand -std=c++11 in CFLAGS :}
seems to work ....
diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index f10af67..7375fa9 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -8,7 +8,7 @@ AC_LANG_CPLUSPLUS
AC_LANG_C
AC_PROG_CXX
-CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
+CFG_CFLAGS+=" -std=c++11 -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
CFG_CFLAGS+=" -pthread -Wall"
# misguided pedantic warnings
# this is extra work, not a gain...
@@ -239,14 +239,14 @@ 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_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], [], [])
@@ -337,11 +337,16 @@ PKG_3RD([mjpegtools],[yes],
mpeg2enc/.libs/libmpeg2encpp.a ],
[ . lavtools utils ])
-PKG_3RD([openexr],[auto],
- [openexr-2.2.1],
- [ IlmImf/.libs/libIlmImf.a \
- IlmImfUtil/.libs/libIlmImfUtil.a ],
- [ IlmImf config ])
+PKG_3RD([openexr],[yes],
+ [openexr-2.4.1],
+ [ IlmBase/Iex/.libs/libIex.a \
+ IlmBase/IexMath/.libs/libIexMath.a \
+ IlmBase/Half/.libs/libHalf.a \
+ IlmBase/Imath/.libs/libImath.a \
+ IlmBase/IlmThread/.libs/libIlmThread.a
+ OpenEXR/IlmImf/.libs/libIlmImf.a \
+ OpenEXR/IlmImfUtil/.libs/libIlmImfUtil.a ],
+ [ Iex Half Imath IlmThread IlmImf config usr/include/OpenEXR ])
#PKG_3RD([festival],[no],
# [festival],
@@ -374,7 +379,7 @@ PKG_3RD([x265],[auto],
[ libx265.a ],
[ . source ])
-PKG_3RD([libvpx],[auto],
+PKG_3RD([libvpx],[yes],
[libvpx-1.8.1],
[ libvpx.a ],
[ . ])
@@ -775,8 +780,8 @@ CHECK_WANT([OPENEXR], [auto], [use openexr], [
saved_LIBS="$LIBS"
saved_CXXFLAGS="$CXXFLAGS"
# ilmbase libs
- LIBS=" -lIlmImf -lIlmThread -lIex -lpthread"
- CXXFLAGS="-I/usr/include/OpenEXR -I/usr/local/include/OpenEXR"
+# LIBS=" -lIlmImf -lIlmThread -lIex -lpthread"
+ CXXFLAGS="-I./thirdparty/openexr-2.4.1/usr/include/OpenEXR -I/usr/local/include/OpenEXR"
AC_LANG_PUSH(C++)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include "ImfChannelList.h"
@@ -980,7 +985,7 @@ fi
FFMPEG_EXTRA_LDFLAGS=""
if test "x$WANT_VAAPI" != "xno" -a "x$HAVE_VAAPI" = "xyes"; then
FFMPEG_EXTRA_LDFLAGS+=' -lva'
- EXTRA_LIBS+=' -lva'
+ EXTRA_LIBS+=' -lva -L/usr/X11R7/lib'
WANT_VAAPI="yes"
if test "x$HAVE_vaapi_x11" = "xyes"; then
FFMPEG_EXTRA_LDFLAGS+=' -lva-x11'
@@ -994,6 +999,8 @@ fi
CFG_WANTS+=" VAAPI"
if test "x$WANT_VDPAU" != "xno" -a "x$HAVE_VDPAU" = "xyes"; then
+ FFMPEG_EXTRA_LDFLAGS+=' -lvdpau'
+ EXTRA_LIBS+=' -lvdpau -L/usr/X11R7/lib'
WANT_VDPAU="yes"
fi
CFG_WANTS+=" VDPAU"
--
Cin mailing list
[email protected]
https://lists.cinelerra-gg.org/mailman/listinfo/cin
