update openjpeg and fix timecode shortcut

[goodguy/cinelerra.git] / cinelerra-5.1 / configure.ac

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index f1414a795e66db0f5ccfc6f50de41cb41bf063b3..1c9f289d0dc5063cc91e0233729ce3e833ee5293 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -296,7 +296,7 @@ PKG_3RD([opus],[auto],
   [ include ])
 
 PKG_3RD([openjpeg],[auto],
-  [openjpeg-2.4.0],
+  [openjpeg-2.5.0],
   [ bin/libopenjp2.a ],
   [ src/lib/openjp2 ])
 
@@ -582,6 +582,8 @@ if test "x$HAVE_$1" != "xno"; then
 fi
 ])
 
+IMMATH_HEADERS=$(pkg-config --cflags Imath)
+
 CHECK_LIB([X11], [X11], [XOpenDisplay])
 CHECK_HEADERS([X11], [X11 headers], [X11/X.h X11/Xlib.h X11/Xutil.h X11/cursorfont.h])
 CHECK_HEADERS([X11], [X11 headers], [X11/keysym.h X11/Sunkeysym.h X11/Xatom.h X11/XF86keysym.h])
@@ -624,6 +626,7 @@ CHECK_LIB([libsndfile], [sndfile], [sf_open])
 CHECK_HEADERS([libsndfile], [sndfile headers], [sndfile.h])
 CHECK_LIB([ilmbase], [IlmImf], [ImfOpenInputFile])
 CHECK_HEADERS([ilmbase], [IlmImf headers], [OpenEXR/ImfCRgbaFile.h])
+CHECK_LIB([Imath], [Imath], [ImfOpenInputFile])
 CHECK_LIB([libvpx], [vpx], [vpx_codec_decode])
 CHECK_HEADERS([libvpx], [vpx headers], [vpx/vpx_decoder.h])
 CHECK_LIB([mjpegtools], [mjpegutils], [mjpeg_info])
@@ -793,19 +796,29 @@ CHECK_WANT([SHUTTLE_USB], [yes], [use libusb-1.0], [
  CHECK_HEADERS([libusbx], [libusb headers], [libusb-1.0/libusb.h])])
 
 CHECK_WANT([LV2], [auto], [use lv2], [
+ AC_MSG_CHECKING([for lv2 availability])
+ saved_LIBS="$LIBS"
  saved_CFLAGS="$CFLAGS"
+ LIBS=" $(pkg-config --libs lilv-0)"
  CHECK_LIB([lilv], [lilv-0], [lilv_world_new])
  CHECK_LIB([sord], [sord-0], [sord_world_new])
  CHECK_LIB([serd], [serd-0], [serd_reader_new])
  CHECK_LIB([sratom], [sratom-0], [sratom_new])
- CFLAGS="-I/usr/include/lilv-0 -I/usr/local/include/lilv-0"
- CHECK_HEADERS([lv2], [lilv headers], [lilv/lilv.h])
+ CFLAGS="-I/usr/include/lilv-0 -I/usr/local/include/lilv-0 `pkg-config --cflags lilv-0`"
+ CHECK_HEADERS([lilv], [lilv headers], [lilv/lilv.h])
+ CFLAGS="-I/usr/include/serd-0 -I/usr/local/include/serd-0 `pkg-config --cflags serd-0`"
+ CHECK_HEADERS([serd], [serd headers], [serd/serd.h])
+ CFLAGS="-I/usr/include/sord-0 -I/usr/local/include/sord-0 `pkg-config --cflags sord-0`"
+ CHECK_HEADERS([sord], [sord headers], [sord/sord.h])
+ CFLAGS="-I/usr/include/sratom-0 -I/usr/local/include/sratom-0 `pkg-config --cflags sratom-0`"
+ CHECK_HEADERS([sratom], [sratom headers], [sratom/sratom.h])
  CHECK_LIB([suil], [suil-0], [suil_instance_new])
- CFLAGS="-I/usr/include/suil-0 -I/usr/local/include/suil-0"
- CHECK_HEADERS([lv2], [suil headers], [suil/suil.h])
+ CFLAGS="-I/usr/include/suil-0 -I/usr/local/include/suil-0 `pkg-config --cflags  suil-0`"
+ CHECK_HEADERS([suil], [suil headers], [suil/suil.h])
+ CFG_CFLAGS+=" $(pkg-config --cflags lilv-0) $(pkg-config --cflags suil-0)"
+ LIBS="$saved_LIBS"
  CFLAGS="$saved_CFLAGS"])
 # have all or none
-test "x$HAVE_lv2" = "xyes" && \
 test "x$HAVE_lilv" = "xyes" && \
 test "x$HAVE_sord" = "xyes" && \
 test "x$HAVE_serd" = "xyes" && \
@@ -837,7 +850,11 @@ CHECK_WANT([OPENEXR], [auto], [use openexr], [
  saved_LIBS="$LIBS"
  saved_CXXFLAGS="$CXXFLAGS"
  # ilmbase libs
+ if test "xHAVE_Imath"="xyes"; then
+ LIBS=" -lImath -lIlmThread -lIex -lpthread"
+ else
  LIBS=" -lIlmImf -lIlmThread -lIex -lpthread"
+ fi
  CXXFLAGS="-I/usr/include/OpenEXR -I/usr/local/include/OpenEXR"
  CXXFLAGS+=" $(pkg-config --cflags OpenEXR)"
  AC_LANG_PUSH(C++)
@@ -874,6 +891,13 @@ EXROStream() : Imf::OStream("mypath") {} };
  AC_LANG_POP(C++)
  AC_MSG_RESULT([$HAVE_OPENEXR])
 ])
+
+if test "x$WANT_CIN_3RDPARTY" = "xno"; then
+ if test "x$HAVE_OPENEXR" != "xyes" -a "x$WANT_OPENEXR" = "xyes"; then
+  AC_MSG_ERROR([requires OpenEXR but OpenEXR not found.])
+ fi
+fi
+
 AC_SUBST([HAVE_OPENEXR])
 # have all or none
 test "x$HAVE_openexr" = "xyes" && \
@@ -883,6 +907,12 @@ HAVE_openexr=no \
 HAVE_ilmbase=no \
   HAVE_OPENEXR=no
 
+if test "x$WANT_CIN_3RDPARTY" = "xno"; then
+ if test "x$HAVE_LV2" != "xyes" -a "x$WANT_LV2" = "xyes"; then
+  AC_MSG_ERROR([lv2 requested but no lv2 headers found])
+ fi
+fi
+
 # build global_config
 OBJDIR=`uname -m`
 AC_SUBST(OBJDIR)
@@ -1047,12 +1077,12 @@ fi
 
 FFMPEG_EXTRA_LDFLAGS=""
 if test "x$WANT_VAAPI" != "xno" -a "x$HAVE_VAAPI" = "xyes"; then
-  FFMPEG_EXTRA_LDFLAGS+=' -lva'
-  EXTRA_LIBS+=' -lva'
+  FFMPEG_EXTRA_LDFLAGS+=' -lva `pkg-config --libs libva`'
+  EXTRA_LIBS+=' -lva '
   WANT_VAAPI="yes"
   if test "x$HAVE_vaapi_x11" = "xyes"; then
     FFMPEG_EXTRA_LDFLAGS+=' -lva-x11'
-    EXTRA_LIBS+=' -lva-x11'
+    EXTRA_LIBS+=' -lva-x11 `pkg-config --libs x11`'
   fi
   if test "x$HAVE_vaapi_drm" = "xyes"; then
     FFMPEG_EXTRA_LDFLAGS+=' -lva-drm'