dnl Autoconf settings for vlc
-AC_COPYRIGHT([Copyright 2002-2013 VLC authors and VideoLAN])
+AC_COPYRIGHT([Copyright 2002-2014 VLC authors and VideoLAN])
AC_INIT(vlc, 2.2.0-git)
VERSION_MAJOR=2
CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
CODENAME="Weatherwax"
-COPYRIGHT_YEARS="1996-2013"
+COPYRIGHT_YEARS="1996-2014"
AC_CONFIG_SRCDIR(src/libvlc.c)
AC_CONFIG_AUX_DIR(autotools)
dnl Check the operating system
dnl
HAVE_WIN64="0"
+HAVE_IOS="0"
+HAVE_OSX="0"
YASMFLAGS=""
case "${host}" in
VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x262 x264 x26410b],[-Wl,-read_only_relocs,suppress])
VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,CoreServices])
+ AC_EGREP_CPP(yes,
+ [#import <TargetConditionals.h>
+ #if TARGET_OS_IPHONE
+ yes
+ #endif],
+ [HAVE_IOS="1"],
+ [HAVE_OSX="1"])
+
dnl Allow binaries created on Lion to run on earlier releases
AC_EGREP_CPP(yes,
[#import <Cocoa/Cocoa.h>
;;
*os2*)
SYS=os2
- LDFLAGS="${LDFLAGS} -Zomf -Zbin-files -Zargs-wild"
+ LDFLAGS="${LDFLAGS} -Zomf -Zbin-files -Zargs-wild -Zhigh-mem"
;;
*)
SYS="${host_os}"
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1")
AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")
+AM_CONDITIONAL(HAVE_IOS, test "${HAVE_IOS}" = "1")
+AM_CONDITIONAL(HAVE_OSX, test "${HAVE_OSX}" = "1")
AC_SUBST(YASMFLAGS)
CFLAGS="${CFLAGS} -I${CONTRIB_DIR}/include"
CXXFLAGS="${CXXFLAGS} -I${CONTRIB_DIR}/include"
OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include"
- AS_IF([test "$build" = "$host" -o "$PKG_CONFIG_LIBDIR"], [
- export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH"
- ], [
- export PKG_CONFIG_LIBDIR="${CONTRIB_DIR}/lib/pkgconfig"
- ])
+ export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH"
LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib"
AS_IF([test "${SYS}" = "darwin"], [
VLC_ADD_LIBS([libvlccore], [-lole32 -lruntimeobject])
])
AC_DEFINE_UNQUOTED(VLC_WINSTORE_APP, ${vlc_winstore_app}, [Define to 1 if you want to build for Windows Store apps])
+AM_CONDITIONAL([HAVE_WINSTORE], [test "$vlc_winstore_app" = "1"])
dnl
])
])
-AC_SEARCH_LIBS([getaddrinfo], [nsl], [
+AC_SEARCH_LIBS([inet_pton], [nsl], [
AS_IF([test "$ac_cv_search_getaddrinfo" != "none required"], [
SOCKET_LIBS="$ac_cv_search_getaddrinfo $SOCKET_LIBS"
])
AS_IF([test "${LUAC}" = "false"], [
AC_MSG_ERROR([Could not find the LUA byte compiler.])
])
- AS_IF([test -d "${CONTRIB_DIR}" -a -f "${CONTRIB_DIR}"/lib/liblua.a -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|cut -d' ' -f2` != 0404], [
+ AS_IF([test -d "${CONTRIB_DIR}" -a -f "${CONTRIB_DIR}"/lib/liblua.a -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|tr -s ' '|cut -d' ' -f2` != 0404], [
AC_MSG_ERROR([You need 32-bits luac when using using lua from contrib.])
])
fi
AM_CONDITIONAL([ENABLE_VLM], [test "${enable_vlm}" != "no"])
+dnl
+dnl Addons manager storage and repositories modules
+dnl
+AC_ARG_ENABLE(addonmanagermodules,
+ [AS_HELP_STRING([--disable-addonmanagermodules],
+ [disable the addons manager modules (default enabled)])])
+if test "${enable_addonmanagermodules}" != "no"
+then
+ AC_DEFINE(ENABLE_ADDONMANAGERMODULES, 1, [Define if you want the addons manager modules])
+fi
+AM_CONDITIONAL([ENABLE_ADDONMANAGERMODULES], [test "${enable_addonmanagermodules}" != "no"])
+
+
dnl
dnl Input plugins
dnl
dnl
dnl libdvdnav plugin
dnl
-AC_ARG_ENABLE(dvdnav,
- [AS_HELP_STRING([--disable-dvdnav],
- [disable DVD navigation with libdvdnav (default auto)])])
-AS_IF([test "${enable_dvdnav}" != "no"], [
- PKG_CHECK_MODULES(DVDNAV, dvdnav, [
- VLC_ADD_PLUGIN([dvdnav])
- AC_CHECK_LIB(dvdnav, dvdnav_get_video_resolution,
- AC_DEFINE(HAVE_DVDNAV_GET_VIDEO_RESOLUTION, 1, [Define if you have dvdnav_get_video_resolution.]),
- [], [${LIBS_dvdnav}])
- AC_CHECK_LIB(dvdnav, dvdnav_describe_title_chapters,
- AC_DEFINE(HAVE_DVDNAV_DESCRIBE_TITLE_CHAPTERS, 1, [Define if you have dvdnav_describe_title_chapters.]),
- [], [${LIBS_dvdnav}])],
- [AC_MSG_WARN([${DVDNAV_PKG_ERRORS}.])])
-])
+PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav >= 4.2.1], [DVD with navigation input module (dvdnav)], [auto])
dnl
dnl Blu-ray Disc Support with libbluray
dnl
-PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2.1], (libbluray for Blu-ray disc support ) )
+PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.3.0], (libbluray for Blu-ray disc support ) )
dnl
dnl OpenCV wrapper and example filters
dnl
dnl DCP plugin (using asdcplib)
dnl
-AC_ARG_ENABLE(dcp,
- AS_HELP_STRING([--enable-dcp],[Digital Cinema Package support using asdcplib (default auto)]))
-have_asdcp="no"
-AS_IF([test "x${enable_dcp}" != "no"], [
- AC_LANG_PUSH(C++)
- AC_CHECK_HEADERS( [[AS@&t@_DCP.h]],
- [have_asdcp="yes"],
- [AS_IF( [test "x${enable_dcp}" = "yes"],
- [AC_MSG_ERROR( [ ASDCP library cannot be found (needed for dcp module). Either use --enable-dcp=no or install asdcp library: http://www.cinecert.com/asdcplib/download/] )])
- ])
- AC_LANG_POP(C++)
-])
-AM_CONDITIONAL(HAVE_ASDCP, [test "${have_asdcp}" != "no"])
+PKG_WITH_MODULES([ASDCP], [asdcplib], [have_asdcp="yes"])
+AM_CONDITIONAL(HAVE_ASDCP, [test "${have_asdcp}" = "yes"])
dnl
dnl Demux plugins
dnl ogg demux plugin
dnl
PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto])
+PKG_CHECK_MODULES(LIBVORBIS, [vorbis >= 1.1], [
+ AC_DEFINE(HAVE_LIBVORBIS, 1, [Define to 1 if you have the libvorbis])
+],[])
+PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto], [${LIBVORBIS_CFLAGS}], [${LIBVORBIS_LIBS}])
if test "${enable_sout}" != "no"; then
PKG_ENABLE_MODULES_VLC([MUX_OGG], [], [ogg >= 1.0], [Ogg mux support], [auto])
dnl Check for libshout
])
AM_CONDITIONAL([MERGE_FFMPEG], [test "$enable_merge_ffmpeg" != "no"])
+AC_MSG_CHECKING([for libavutil variant])
+PKG_CHECK_EXISTS([libavutil], [
+ libavutil_version="$(${PKG_CONFIG} --modversion libavutil)"
+ libavutil_micro="${libavutil_version##*.}"
+ AS_IF([test ${libavutil_micro} -le 99], [
+ avfork="libav"
+ ], [
+ avfork="ffmpeg"
+ ])
+], [
+ avfork="none"
+])
+AC_MSG_RESULT([${avfork}])
+
dnl
dnl avcodec decoder/encoder plugin
dnl
VLC_ADD_PLUGIN([vpx])
VLC_ADD_CPPFLAGS([vpx], [${VPX_CFLAGS}])
VLC_ADD_LIBS([vpx], [${VPX_LIBS}])
+ AC_CHECK_LIB([vpx],[vpx_codec_vp8_dx], [
+ VLC_ADD_CPPFLAGS([vpx], [-DENABLE_VP8_DECODER])
+ ], [], [${VPX_LIBS}])
AC_CHECK_LIB([vpx],[vpx_codec_vp9_dx], [
VLC_ADD_CPPFLAGS([vpx], [-DENABLE_VP9_DECODER])
], [], [${VPX_LIBS}])
dnl
PKG_ENABLE_MODULES_VLC([THEORA], [], [ogg theoradec >= 1.0 theoraenc], [experimental theora codec], [auto])
-dnl
-dnl dirac encoder plugin
-dnl
-PKG_ENABLE_MODULES_VLC([DIRAC], [], [dirac >= 0.10.0], [dirac encoder], [auto])
-
dnl
dnl schroedinger decoder plugin (for dirac format video)
dnl
fi
dnl x265 encoder
-AC_ARG_ENABLE(x265,
- AS_HELP_STRING([--enable-x265],[H265 / HEVC encoding support with libx265 (default enabled)]))
-AS_IF( [test "${enable_x265}" != "no"],[
- AC_PREPROC_IFELSE([AC_LANG_SOURCE([
-#include <x265.h>
-#if X265_BUILD != 4
-# error Fail
-#endif
- ])], [
- AC_CHECK_LIB([x265],[x265_encoder_open_4], [
- VLC_ADD_PLUGIN([x265])
- VLC_ADD_LIBS([x265], [-lx265 -lstdc++ -lm -lpthread])
- ], [
- AC_MSG_ERROR([x265 library not found])
- ], [-lstdc++ -lm -lpthread])
- ], [
- AS_IF([test "${enable_x265}" = "yes"], [
- AC_MSG_ERROR([x265.h not found])
- ])
- ])
-])
-
+PKG_ENABLE_MODULES_VLC([X265],, [x265], [HEVC/H.265 encoder], [auto])
dnl
dnl H264 encoder plugin (10-bit lib264)
[#include <GL/gl.h>]], [
[int t0 = GL_TEXTURE0;]])
], [
- have_gl="yes"
GL_CFLAGS=""
- AS_IF([test "${SYS}" = "mingw32"], [
+ AS_IF([test "${SYS}" != "mingw32"], [
+ have_gl="yes"
+ GL_LIBS="-lGL"
+ ], [
AC_CHECK_HEADER([GL/glew.h], [
+ have_gl="yes"
], [
have_gl="no"
])
GL_LIBS="-lopengl32"
- ], [
- GL_LIBS="-lGL"
])
], [
have_gl="no"
have_avcodec_vdpau="no"
AS_IF([test "${have_vdpau}" = "yes" -a "${have_avcodec}" = "yes"], [
- PKG_CHECK_EXISTS([libavutil >= 0.52.4 libavcodec >= 54.36.0], [
+ case "${avfork}" in
+ libav) av_vdpau_ver="55.26.0" ;;
+ ffmpeg) av_vdpau_ver="55.42.100" ;;
+ esac
+ PKG_CHECK_EXISTS([libavutil >= 0.52.4 libavcodec >= ${av_vdpau_ver}], [
have_avcodec_vdpau="yes"
AC_MSG_NOTICE([VDPAU decoding acceleration activated])
], [
AS_IF([test -n "${enable_vdpau}"], [
- AC_MSG_ERROR([libavutil >= 0.52.4 and libavcodec >= 54.36.0 are required for VDPAU decoding.])
+ AC_MSG_ERROR([libavutil >= 0.52.4 and libavcodec >= 55.26.0 are required for VDPAU decoding.])
], [
- AC_MSG_WARN([libavutil >= 0.52.4 and libavcodec >= 54.36.0 are required for VDPAU decoding.])
+ AC_MSG_WARN([libavutil >= 0.52.4 and libavcodec >= 55.26.0 are required for VDPAU decoding.])
])
])
])
])
fi
-
-dnl
-dnl Mac Vout
-AC_ARG_ENABLE(macosx-vout,
- [ --enable-macosx-vout Mac OS X video output module (default enabled on Mac OS X)])
-if test "x${enable_macosx_vout}" != "xno" &&
- (test "${SYS}" = "darwin" || test "${enable_macosx_vout}" = "yes")
-then
- VLC_ADD_LIBS([vout_macosx],[-Wl,-framework,Cocoa])
- VLC_ADD_LIBS([vout_macosx],[-Wl,-framework,OpenGL])
- VLC_ADD_PLUGIN([vout_macosx])
-fi
-
-dnl
-dnl Mac CoreGraphics Layer Vout
-AC_ARG_ENABLE(coregraphicslayer-vout,
- [ --enable-coregraphicslayer-vout CoreGraphics layered video output module (default disabled)])
-if test "${enable_coregraphicslayer_vout}" = "yes"; then
- VLC_ADD_LIBS([vout_coregraphicslayer],[-Wl,-framework,Cocoa])
- VLC_ADD_LIBS([vout_coregraphicslayer],[-Wl,-framework,QuartzCore])
- VLC_ADD_PLUGIN([vout_coregraphicslayer])
-fi
-
dnl
dnl freetype module
dnl
if test "${HAVE_ANDROID}" = "1"; then
VLC_ADD_PLUGIN([android_surface])
VLC_ADD_LIBS([android_surface], [-ldl])
+ VLC_ADD_PLUGIN([android_opaque])
+ VLC_ADD_LIBS([android_opaque], [-ldl])
fi
fi
-
-dnl
-dnl iOS ES2 vout module
-dnl
-AC_ARG_ENABLE(ios-vout2,
- [ --enable-ios-vout2 iOS video output module (default disabled)])
-if test "${enable_ios_vout2}" = "yes"
-then
- VLC_ADD_PLUGIN([vout_ios2])
- VLC_ADD_LIBS([vout_ios2], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit])
-fi
-
-
dnl
dnl Windows DirectX module
dnl
])
AM_CONDITIONAL([HAVE_WASAPI], [test "${have_wasapi}" = "yes"])
-dnl
-dnl CoreAudio plugin
-dnl
-AC_ARG_ENABLE(macosx-audio,
- [ --enable-macosx-audio Mac OS X audio module (default enabled on MacOS X)])
-if test "x${enable_macosx_audio}" != "xno" &&
- (test "${SYS}" = "darwin" || test "${enable_macosx_audio}" = "yes")
-then
- AC_CHECK_HEADER([CoreAudio/CoreAudio.h],
- [ VLC_ADD_PLUGIN([auhal])
- ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
-fi
-
-dnl
-dnl iOS CoreAudio plugin
-dnl
-AC_ARG_ENABLE(ios-audio,
- [ --enable-ios-audio Audio module for iOS (default disabled)])
-if test "${enable_ios_audio}" = "yes"
-then
- AC_CHECK_HEADER([AudioUnit/AudioUnit.h],
- [ VLC_ADD_PLUGIN([audiounit_ios])
- ], [ AC_MSG_ERROR([cannot find AudioUnit headers]) ])
-fi
-
dnl
dnl AudioQueue plugin
dnl
modules/audio_filter/Makefile
modules/control/Makefile
modules/gui/Makefile
+ modules/gui/ios_dialog_provider/Makefile
modules/gui/macosx/Makefile
modules/gui/minimal_macosx/Makefile
modules/gui/macosx_dialog_provider/Makefile