Merge branch 'tizen_gst_1.16.2' into tizen

[platform/upstream/gst-libav.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 92b2927..31799eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.69)
 dnl initialize autoconf
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT(GStreamer libav, 1.15.0.1,
+AC_INIT(GStreamer libav, 1.16.2,
     http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
     gst-libav)
 
@@ -42,11 +42,11 @@ AC_SUBST(GST_API_VERSION)
 dnl *** Check for external $AS vs detected by AS_LIBTOOL
 orig_AS="$AS"
 AG_GST_LIBTOOL_PREPARE
-AS_LIBTOOL(GST, 1500, 0, 1500)
+AS_LIBTOOL(GST, 1602, 0, 1602)
 
 dnl *** required versions of GStreamer stuff ***
-GST_REQ=1.15.0.1
-GST_PBREQ=1.15.0.1
+GST_REQ=1.16.2
+GST_PBREQ=1.16.2
 
 ORC_REQ=0.4.16
 ORC_CHECK([$ORC_REQ])
@@ -255,8 +255,7 @@ AC_ARG_WITH(system-libav,
 HAVE_LZMA="no"
 HAVE_BZ2="no"
 if test "x$with_system_libav" = "xyes"; then
-  PKG_CHECK_MODULES(LIBAV, libavfilter libavformat libavcodec >= 57 libavutil)
-  PKG_CHECK_MODULES(SWSCALE, libswscale libavutil)
+  PKG_CHECK_MODULES(LIBAV, libavfilter libavformat libavcodec >= 58 libavutil)
   saved_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $LIBAV_CFLAGS"
   AC_CHECK_HEADERS([avi.h])
@@ -327,23 +326,6 @@ else
               $ac_pwd/gst-libs/ext/libswresample.la \
               $ac_pwd/gst-libs/ext/libavutil.la"
 
-  dnl
-  SWSCALE_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav \
-                  -I \$(top_builddir)/gst-libs/ext/libav \
-                  -Wno-deprecated-declarations"
-
-  SWSCALE_DEPS="\$(top_builddir)/gst-libs/ext/libav/libswscale/libswscale.a \
-                \$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a"
-  if test "x$enable_static_plugins" = xyes; then
-      dnl with static linking we can't use the .a archive directly as they would
-      dnl be included in the final libgstswscale.a as a file and won't be usable.
-      dnl libav*.a must be copied to the final destination too
-      SWSCALE_LIBS="-lswscale -lavutil"
-  else
-      dnl libgstswscale.la: libs to statically link to
-      SWSCALE_LIBS="$SWSCALE_DEPS"
-  fi
-
   LIBAV_SUBDIRS=gst-libs
   AC_DEFINE(HAVE_AVI_H)
   AC_DEFINE([LIBAV_SOURCE], ["local snapshot"], [Describes where the Libav libraries come from.])
@@ -359,11 +341,11 @@ else
   # Enable pic and static so that we get .a files, but with PIC code.
   emblibav_configure_args="$emblibav_configure_args \
         --enable-static --enable-pic \
-        --disable-avdevice --disable-postproc \
+        --disable-avdevice --disable-postproc --disable-swscale \
         --disable-programs --disable-ffplay --disable-ffprobe --disable-ffmpeg \
         --disable-encoder=flac --disable-protocols --disable-devices \
         --disable-network --disable-hwaccels --disable-dxva2 --disable-vdpau \
-        --disable-filters --enable-filter=yadif --disable-doc --disable-d3d11va --disable-dxva2 \
+        --disable-filters --enable-filter=yadif --disable-doc --disable-d3d11va \
         --disable-audiotoolbox --disable-videotoolbox --disable-vaapi --disable-crystalhd \
         --disable-mediacodec --disable-nvenc --disable-mmal --disable-omx \
         --disable-omx-rpi --disable-cuda --disable-cuvid --disable-libmfx \
@@ -393,7 +375,7 @@ else
 
   case $host_os in
     mingw32*)
-      WIN32_LIBS="-lws2_32"
+      WIN32_LIBS="-lws2_32 -lbcrypt"
       ;;
     *)
       WIN32_LIBS=
@@ -431,11 +413,6 @@ else
   if test "$can_disable" != ""; then
     emblibav_configure_args="$emblibav_configure_args --disable-ffmpeg"
   fi
-  dnl check if libswscale needs enabling explicitly
-  can_enable=`echo "$LIBAV_OPTS" | grep 'enable-swscale'`
-  if test "$can_enable" != ""; then
-    emblibav_configure_args="$emblibav_configure_args --enable-swscale"
-  fi
 
   # append extra configure options to emblibav_configure_args if needed
   if test "x$with_libav_extra_configure" != "xno"; then
@@ -479,9 +456,6 @@ AC_SUBST(LIBAV_CFLAGS)
 AC_SUBST(LIBAV_DEPS)
 AC_SUBST(LIBAV_LIBS)
 AC_SUBST(LIBAV_SUBDIRS)
-AC_SUBST(SWSCALE_CFLAGS)
-AC_SUBST(SWSCALE_DEPS)
-AC_SUBST(SWSCALE_LIBS)
 AC_SUBST(WIN32_LIBS)
 AC_SUBST(BZ2_LIBS)
 AC_SUBST(LZMA_LIBS)
@@ -497,7 +471,6 @@ common/Makefile
 common/m4/Makefile
 ext/Makefile
 ext/libav/Makefile
-ext/libswscale/Makefile
 gst-libs/Makefile
 gst-libs/ext/Makefile
 docs/Makefile