X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=2f283859d639213a047514452140c4045d88c2e0;hb=8c9e80fb1f9c848e61105a304a74c26664383311;hp=fc3429c729f09c5c8011a8bc4e6d08ee76b5d669;hpb=d75a07a202fabab74cee6574092ad0c94380e32e;p=vlc diff --git a/configure.ac b/configure.ac index fc3429c729..2f283859d6 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,8 @@ dnl dnl Check the operating system dnl HAVE_WIN64="0" +HAVE_IOS="0" +HAVE_OSX="0" YASMFLAGS="" case "${host}" in @@ -172,6 +174,14 @@ case "${host_os}" 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 + #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 @@ -279,7 +289,7 @@ case "${host_os}" in ;; *os2*) SYS=os2 - LDFLAGS="${LDFLAGS} -Zomf -Zbin-files -Zargs-wild" + LDFLAGS="${LDFLAGS} -Zomf -Zbin-files -Zargs-wild -Zhigh-mem" ;; *) SYS="${host_os}" @@ -291,6 +301,8 @@ AM_CONDITIONAL(HAVE_OS2, test "${SYS}" = "os2") 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) @@ -375,11 +387,7 @@ AS_IF([test -n "${CONTRIB_DIR}"], [ 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"], [ @@ -487,6 +495,7 @@ AS_IF([test "${SYS}" = "mingw32" -a "${enable_winstore_app}" = "yes"], [ 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 @@ -1519,7 +1528,7 @@ then 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 @@ -1555,6 +1564,19 @@ AS_IF([test "${enable_vlm}" != "no"], [ 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 @@ -1672,25 +1694,12 @@ AS_IF([test "$SYS" = "linux" -a "${enable_linsys}" != "no"], [ dnl dnl dvdread module: check for libdvdread dnl -PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread], [dvdread input module], [auto]) +PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread > 4.9.0], [dvdread input module], [auto]) 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 @@ -1920,19 +1929,8 @@ AM_CONDITIONAL(HAVE_AVFOUNDATION, [test "${have_avfoundation}" != "no"]) 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 @@ -2001,6 +1999,10 @@ dnl 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 @@ -2239,6 +2241,20 @@ AC_ARG_ENABLE(merge-ffmpeg, ]) 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 @@ -2273,30 +2289,50 @@ AC_ARG_ENABLE(libva, AS_IF([test "${enable_libva}" = "yes" -a "${have_avcodec}" != "yes" ], [ AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive. Use --enable-avcodec.]) ]) -have_avcodec_vaapi="no" -AS_IF([test "${enable_libva}" != "no" -a "${have_avcodec}" = "yes"], [ - PKG_CHECK_MODULES(LIBVA, [libva libva-x11], [ - VLC_SAVE_FLAGS - CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" - CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}" - AC_CHECK_HEADERS(libavcodec/vaapi.h, [ - AC_MSG_NOTICE([VAAPI acceleration activated]) - have_avcodec_vaapi="yes" - ],[ - AS_IF([test -n "${enable_libva}"], [ - AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing]) - ], [ - AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ]) - ]) - ]) - VLC_RESTORE_FLAGS - ],[ + +have_vaapi="no" +have_vaapi_drm="no" +have_vaapi_x11="no" +AS_IF([test "${enable_libva}" != "no"], [ + PKG_CHECK_EXISTS([libva], [ + have_vaapi="yes" + ], [ AS_IF([test -n "${enable_libva}"], [ AC_MSG_ERROR([${LIBVA_PKG_ERRORS}.]) ], [ AC_MSG_WARN([${LIBVA_PKG_ERRORS}.]) ]) ]) + PKG_CHECK_MODULES([LIBVA_DRM], [libva-drm], [ + have_vaapi_drm="yes" + ], [ + AC_MSG_WARN([${LIBVA_DRM_PKG_ERRORS}.]) + ]) + PKG_CHECK_MODULES(LIBVA_X11, [libva-x11], [ + have_vaapi_x11="yes" + ], [ + AC_MSG_WARN([${LIBVA_X11_PKG_ERRORS}.]) + ]) +]) +AM_CONDITIONAL([HAVE_VAAPI_DRM], [test "${have_vaapi_drm}" = "yes"]) +AM_CONDITIONAL([HAVE_VAAPI_X11], [test "${have_vaapi_x11}" = "yes"]) + +have_avcodec_vaapi="no" +AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [ + VLC_SAVE_FLAGS + CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" + CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}" + AC_CHECK_HEADERS([libavcodec/vaapi.h], [ + AC_MSG_NOTICE([VAAPI acceleration activated]) + have_avcodec_vaapi="yes" + ],[ + AS_IF([test -n "${enable_libva}"], [ + AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing]) + ], [ + AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ]) + ]) + ]) + VLC_RESTORE_FLAGS ]) AM_CONDITIONAL([HAVE_AVCODEC_VAAPI], [test "${have_avcodec_vaapi}" = "yes"]) @@ -2957,27 +2993,25 @@ PKG_CHECK_MODULES([EGL], [egl], [ ]) AM_CONDITIONAL([HAVE_EGL], [test "${have_egl}" = "yes"]) +have_gl="no" PKG_CHECK_MODULES([GL], [gl], [ have_gl="yes" ], [ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ - [#include ]], [ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#ifdef _WIN32 +# include +#endif +#include +]], [ [int t0 = GL_TEXTURE0;]]) ], [ GL_CFLAGS="" + have_gl="yes" 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" ]) - ], [ - have_gl="no" ]) ]) AM_CONDITIONAL([HAVE_GL], [test "${have_gl}" = "yes"]) @@ -3065,14 +3099,18 @@ AM_CONDITIONAL([HAVE_VDPAU], [test "${have_vdpau}" = "yes"]) 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.]) ]) ]) ]) @@ -3111,29 +3149,6 @@ then ]) 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 @@ -3239,19 +3254,6 @@ if test "${enable_android_surface}" = "yes"; then 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 @@ -3530,31 +3532,6 @@ AS_IF([test "$enable_wasapi" != "no"], [ ]) 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 @@ -3973,10 +3950,10 @@ AS_IF([test "${enable_libgcrypt}" != "no"], [ GCRYPT_CFLAGS="`libgcrypt-config --cflags`" GCRYPT_LIBS="`libgcrypt-config --libs`" ], [ - AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.]) + AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or pass --disable-libgcrypt.]) ], [`libgcrypt-config --libs`]) ], [ - AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.]) + AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or pass --disable-libgcrypt.]) ], [#include ] ) ]) @@ -4008,7 +3985,7 @@ AC_ARG_ENABLE(taglib, [AS_HELP_STRING([--disable-taglib], [do not use TagLib (default enabled)])]) AS_IF([test "${enable_taglib}" != "no"], [ - PKG_CHECK_MODULES(TAGLIB, taglib >= 1.6.1, [ + PKG_CHECK_MODULES(TAGLIB, taglib >= 1.9, [ VLC_ADD_PLUGIN([taglib]) ], [ AC_MSG_WARN([${TAGLIB_PKG_ERRORS}.])]) @@ -4169,6 +4146,7 @@ AC_CONFIG_FILES([ 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