X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=1c9f289d0dc5063cc91e0233729ce3e833ee5293;hp=bdc0351e43c29397b2975949a54b250b068be428;hb=2ff681c423ff0f83efbaed49aa37195a3b37f6db;hpb=8b7ea38c6c4ddf7eab2f606682798aebd5fbb99a

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index bdc0351e..1c9f289d 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -29,6 +29,7 @@ CFG_CFLAGS+=" -D__STDC_LIMIT_MACROS"
 CFG_CFLAGS+=" -DPNG_SKIP_SETJMP_CHECK=1"
 CFG_CFLAGS+=" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 CFG_CFLAGS+=" -I/usr/include -I/usr/local/include"
+CFG_CFLAGS+=" -I/data/data/com.termux/files/usr/include/a52dec -I/usr/include/a52dec"
 CFG_CFLAGS+=" -I/usr/include/freetype2 -I/usr/local/include/freetype2"
 CFG_CFLAGS+=" -I/data/data/com.termux/files/usr/include/freetype2"
 CFG_CFLAGS+=" -I/usr/include/uuid -I/usr/local/include/uuid"
@@ -70,6 +71,7 @@ CHECK_WITH([vdpau],[video decode+presentation api for unix],[VDPAU],[yes])
 CHECK_WITH([nv],[nvenc/nvdec ffnvcodec api],[NV],[yes])
 CHECK_WITH([cuda],[nv cuda plugins],[CUDA],[auto])
 CHECK_WITH([clang],[use clang instead of gcc/g++],[CLANG],[no])
+CHECK_WITH([filegif],[enable filegif i/o], [GIFLIB],[yes])
 
 if test "x$WANT_LV2" != "xno"; then
   GTK2_LIBS=`pkg-config --libs gtk+-2.0`
@@ -84,6 +86,12 @@ fi
 if test "x$WANT_COMMERCIAL" = "xyes" -a "x$WANT_LIBZMPEG" != "xyes" ; then
   AC_MSG_ERROR([commercial requires libzmpeg support.])
 fi
+if test "x$WANT_VIDEO4LINUX2" = "xyes" -a "x$WANT_LIBZMPEG" != "xyes" ; then
+  AC_MSG_ERROR([video4linux2 currently requires libzmpeg support.])
+fi
+if test "x$WANT_DVB" = "xyes" -a "x$WANT_LIBZMPEG" != "xyes" ; then
+  AC_MSG_ERROR([dvb currently requires libzmpeg support.])
+fi
 
 if test "x$WANT_CINBIN_BUILD" = "xyes"; then
   WANT_LOCALE_DIR='$$CIN_LIB/locale'
@@ -288,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 ])
 
@@ -574,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])
@@ -581,7 +591,16 @@ CHECK_LIB([XEXT], [Xext], [XShmQueryExtension])
 CHECK_HEADERS([XEXT], [Xlib XShm extention], [X11/Xlib.h X11/extensions/XShm.h X11/extensions/shape.h])
 CHECK_LIB([XINERAMA], [Xinerama], [XineramaQueryExtension])
 CHECK_HEADERS([XINERAMA], [Xinerama headers], [X11/extensions/Xinerama.h])
+
+if test "x$HAVE_XINERAMA" != "xyes"; then
+  AC_MSG_ERROR([requires Xinerama support.])
+fi
+
 CHECK_LIB([XFIXES], [Xfixes], [XFixesQueryVersion])
+if test "x$HAVE_XFIXES" != "xyes"; then
+  AC_MSG_ERROR([requires XFixes support.])
+fi
+
 CHECK_LIB([BZ2], [bz2], [BZ2_bzDecompress])
 CHECK_LIB([FONTCONFIG], [fontconfig], [FcInit])
 CHECK_LIB([FREETYPE], [freetype], [FT_Init_FreeType])
@@ -607,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])
@@ -628,7 +648,7 @@ CHECK_HEADERS([dav1d], [libdav1d headers], [dav1d/dav1d.h])
 CHECK_LIB([libwebp], [webp], [WebPGetEncoderVersion])
 CHECK_HEADERS([libwebp], [libwebp headers], [webp/encode.h])
 CHECK_LIB([a52dec], [a52], [a52_init])
-CHECK_HEADERS([a52dec], [a52 headers], [stdint.h a52.h])
+CHECK_HEADERS([a52dec], [a52 headers], [stdint.h a52dec/a52.h])
 CHECK_LIB([encore], [encore], [encore])
 CHECK_HEADERS([encore], [encore headers], [encore.h])
 CHECK_LIB([giflib], [gif], [DGifOpen])
@@ -776,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" && \
@@ -820,8 +850,13 @@ 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++)
  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include "ImfChannelList.h"
@@ -847,13 +882,22 @@ EXROStream() : Imf::OStream("mypath") {} };
     SHARED_openexr="$LIBS"
     SHARED_LIBS+=" $LIBS"
     CFG_CFLAGS+=" -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR"
+    CFG_CFLAGS+=" $(pkg-config --cflags OpenEXR)"
   fi
+  CFG_CFLAGS+=" $(pkg-config --cflags OpenEXR)"
  fi
  LIBS="$saved_LIBS"
  CXXFLAGS="$saved_CXXFLAGS"
  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" && \
@@ -863,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)
@@ -940,7 +990,7 @@ PKG_PROVIDE([esound],[$WANT_ESOUND])
 PKG_PROVIDE([ffmpeg])
 PKG_PROVIDE([fftw])
 PKG_PROVIDE([flac])
-PKG_PROVIDE([giflib])
+PKG_PROVIDE([giflib], [$WANT_GIFLIB])
 PKG_PROVIDE([ilmBase], [$WANT_OPENEXR])
 PKG_PROVIDE([ladspa],[$WANT_LADSPA_BUILD])
 PKG_PROVIDE([lame])
@@ -999,7 +1049,7 @@ if test "x$WANT_CIN_3RDPARTY" != "xno"; then
 fi
 for v in GL XFT XXF86VM OSS ALSA FIREWIRE OGG DV DVB LADSPA \
 	 VIDEO4LINUX2 ESOUND PULSE PACTL OPENEXR LV2 \
-	 COMMERCIAL LIBZMPEG SHUTTLE SHUTTLE_USB XV \
+	 COMMERCIAL GIFLIB LIBZMPEG LIBDPX SHUTTLE SHUTTLE_USB XV \
 	 VAAPI VDPAU CUDA NV WINTV X10TV; do
   eval vv="\$WANT_$v"
   if test "x$vv" != "xno"; then
@@ -1027,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'