X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=9192c109209417efcbbcf5657e5114df17f6314e;hb=7d575ec68e3c562306b40e8bdfa9823fdea73123;hp=b5762f9254cb2628b7fcccc0a00f5e644489c4f5;hpb=5bf0606149f2273b0dd0d9b58c9ce20d96fb0b74;p=vlc diff --git a/configure.ac b/configure.ac index b5762f9254..9192c10920 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Autoconf settings for vlc -AC_COPYRIGHT([Copyright 2002-2012 VLC authors and VideoLAN]) +AC_COPYRIGHT([Copyright 2002-2013 VLC authors and VideoLAN]) AC_INIT(vlc, 2.1.0-git) VERSION_MAJOR=2 @@ -14,7 +14,7 @@ AC_SUBST(PKGDIR) CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" CODENAME="Rincewind" -COPYRIGHT_YEARS="1996-2012" +COPYRIGHT_YEARS="1996-2013" AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) @@ -25,7 +25,7 @@ AC_CANONICAL_HOST AC_PRESERVE_HELP_ORDER AM_INIT_AUTOMAKE(tar-ustar color-tests foreign) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) # Disable with "./configure --disable-silent-rules" or "make V=1" AM_SILENT_RULES([yes]) @@ -155,10 +155,10 @@ case "${host_os}" in CPPFLAGS="${CPPFLAGS} ${ARCH_flag}" OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}" LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}" - VLC_ADD_LIBS([motion], [-Wl,-framework,IOKit,-framework,CoreFoundation]) + VLC_ADD_LIBS([motion rotate], [-Wl,-framework,IOKit,-framework,CoreFoundation]) VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit]) VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress]) - VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings]) + VLC_ADD_CFLAGS([motion rotate],[-fconstant-cfstrings]) VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation]) dnl Allow binaries created on Lion to run on earlier releases @@ -205,8 +205,12 @@ case "${host_os}" in *mingw32* | *cygwin* | *wince* | *mingwce*) AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(OBJCOPY, objcopy, :) - AC_DEFINE([_WIN32_WINNT], 0x0502, [Define to '0x0502' for Windows XP SP2 APIs.]) + AH_TOP([#if defined(WIN32) && !defined(_WIN32_WINNT)]) + AH_TOP([# define _WIN32_WINNT 0x0502 /* Windows XP SP2 */]) + AH_TOP([#endif]) AC_DEFINE([_WIN32_IE], 0x0600, [Define to '0x0600' for IE 6.0 (and shell) APIs.]) + AC_DEFINE([_UNICODE], [1], [Define to 1 for Unicode (Wide Chars) APIs.]) + AC_DEFINE([UNICODE], [1], [Define to 1 for Unicode (Wide Chars) APIs.]) case "${host_os}" in *mingw32*) @@ -459,6 +463,16 @@ dnl Check for fnative-struct or mms-bitfields support for mingw32 fi ]) +AC_ARG_ENABLE(winstore_app, + AS_HELP_STRING([--enable-winstore-app], + [Build targetted for Windows Store apps (default disabled)])) + +AS_IF([test "${SYS}" = "mingw32"], [ + AS_IF([test "${enable_winstore_app}" == "yes"], [ + AC_DEFINE(WINAPI_FAMILY_APP, 1, [Define if you want to build for Windows Store apps])]) + ]) + + dnl dnl Buggy glibc prevention. Purposedly not cached. dnl See sourceware.org bugs 5058 and 5443. @@ -492,7 +506,7 @@ need_libc=false dnl Check for usual libc functions AC_CHECK_DECLS([nanosleep],,,[#include ]) AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale]) -AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp]) +AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp]) AC_CHECK_FUNCS(fdatasync,, [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) ]) @@ -515,11 +529,8 @@ AC_LINK_IFELSE([ dnl C11 static_assert() AC_MSG_CHECKING([for static_assert in assert.h]) -AC_PREPROC_IFELSE([AC_LANG_SOURCE([ -#include -#ifndef static_assert -# error BOOM! -#endif +AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [ +static_assert(1, "The impossible happened."); ])], [ AC_MSG_RESULT([yes]) AC_DEFINE([HAVE_STATIC_ASSERT], [1], [Define to 1 if defines static_assert.]) @@ -531,7 +542,14 @@ AC_PREPROC_IFELSE([AC_LANG_SOURCE([ AC_FUNC_STRCOLL dnl Check for non-standard system calls -AC_CHECK_FUNCS([accept4 pipe2 eventfd vmsplice sched_getaffinity]) +case "$SYS" in + "linux") + AC_CHECK_FUNCS([accept4 pipe2 eventfd vmsplice sched_getaffinity]) + ;; + "mingw32") + AC_CHECK_FUNCS([_lock_file]) + ;; +esac AH_BOTTOM([#include ]) @@ -1568,10 +1586,15 @@ dnl AC_ARG_ENABLE(live555, [AS_HELP_STRING([--enable-live555], [enable RTSP input through live555 (default enabled)])]) + AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [ AC_LANG_PUSH(C++) VLC_SAVE_FLAGS - AS_IF([test -z "${CONTRIB_DIR}"], [ + + dnl detect include paths + AS_IF([test -f "${CONTRIB_DIR}/include/UsageEnvironment.hh"], [ + CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment" + ], [ AS_IF([test ${SYS} != "os2"], [ LIVE555_PREFIX=${LIVE555_PREFIX-"/usr"} CPPFLAGS_live555="-I${LIVE555_PREFIX}/include/liveMedia -I${LIVE555_PREFIX}/include/groupsock -I${LIVE555_PREFIX}/include/BasicUsageEnvironment -I${LIVE555_PREFIX}/include/UsageEnvironment" @@ -1580,15 +1603,16 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [ CPPFLAGS_live555="-I${LIVE555_PREFIX}/liveMedia/include -I${LIVE555_PREFIX}/groupsock/include -I${LIVE555_PREFIX}/BasicUsageEnvironment/include -I${LIVE555_PREFIX}/UsageEnvironment/include" LDFLAGS_live555="-L${LIVE555_PREFIX}/liveMedia -L${LIVE555_PREFIX}/groupsock -L${LIVE555_PREFIX}/BasicUsageEnvironment -L${LIVE555_PREFIX}/UsageEnvironment" ]) - ], [ - CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment" ]) + + dnl CPP Flags AS_IF([test "${SYS}" = "solaris"], [ CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS" ]) CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}" LDFLAGS="${LDFLAGS} ${LDFLAGS_live555}" + dnl version check AC_CACHE_CHECK([for live555 version 1324598400 or later], [ac_cv_live555], [ AC_PREPROC_IFELSE([AC_LANG_PROGRAM([ [#include @@ -1601,6 +1625,7 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [ ac_cv_live555="no" ]) ]) + AS_IF([test "$ac_cv_live555" = "no"], [ AC_MSG_WARN([liveMedia is missing or its installed version is too old: Version 2011.12.23 or later is required to proceed. @@ -1634,13 +1659,14 @@ You can get an updated one from http://www.live555.com/liveMedia .]) ]) dnl -dnl - special access module for dc1394 input -dnl - dv module: digital video module check for libraw1394 -dnl - linsys modules: access module check for libzvbi +dnl IIDC and DV FireWire input modules dnl PKG_ENABLE_MODULES_VLC([DC1394], [], [libdc1394-2 >= 2.1.0], [IIDC FireWire input module], [auto]) PKG_ENABLE_MODULES_VLC([DV1394], [], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV FireWire input module], [auto]) +dnl +dnl - linsys modules: access module check for libzvbi +dnl AC_ARG_ENABLE(linsys, [AS_HELP_STRING([--enable-linsys], [Linux Linear Systems Ltd. SDI and HD-SDI input cards (default enabled)])]) @@ -1709,15 +1735,7 @@ fi dnl dnl sftp access support dnl -AC_ARG_ENABLE(sftp, - [AS_HELP_STRING([--enable-sftp], - [support SFTP file transfer via libssh2 (default disabled)])]) -if test "${enable_sftp}" = "yes"; then - AC_CHECK_HEADERS(libssh2.h, [ - VLC_ADD_PLUGIN([access_sftp]) - VLC_ADD_LIBS([access_sftp], [-lssh2]) - ]) -fi +PKG_ENABLE_MODULES_VLC([SFTP], [access_sftp], [libssh2], (support SFTP file transfer via libssh2), [auto]) dnl dnl Video4Linux 2 @@ -1741,21 +1759,25 @@ AC_ARG_ENABLE(decklink, AC_ARG_WITH(decklink_sdk, [AS_HELP_STRING[--with-decklink-sdk=DIR], [ location of Blackmagic DeckLink SDI SDK])]) +have_decklink=no if test "${enable_decklink}" != "no" then if test "${with_decklink_sdk}" != "no" -a -n "${with_decklink_sdk}" then - VLC_ADD_CPPFLAGS([decklink],[-I${with_decklink_sdk}/include]) + VLC_ADD_CXXFLAGS([decklink],[-I${with_decklink_sdk}/include]) fi VLC_SAVE_FLAGS - CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_decklink}" + CXXFLAGS="${CXXFLAGS} ${CXXFLAGS_decklink}" AC_LANG_PUSH(C++) AC_CHECK_HEADERS(DeckLinkAPIDispatch.cpp, [ - VLC_ADD_PLUGIN([decklink]) - ],[AC_MSG_WARN(Blackmagic DeckLink SDI include files not found, decklink disabled)]) + have_decklink=yes + ], [ + AC_MSG_WARN(Blackmagic DeckLink SDI include files not found, decklink disabled) + ]) AC_LANG_POP(C++) VLC_RESTORE_FLAGS fi +AM_CONDITIONAL(HAVE_DECKLINK, [ test "${have_decklink}" != "no" ]) dnl @@ -1766,21 +1788,7 @@ PKG_ENABLE_MODULES_VLC([GNOMEVFS], [access_gnomevfs], [gnome-vfs-2.0], [GnomeVFS dnl dnl VCDX modules dnl -AC_ARG_ENABLE(vcdx, - [AS_HELP_STRING([--enable-vcdx], - [navigate VCD with libvcdinfo (default disabled)])]) -if test "${enable_vcdx}" = "yes" -then - PKG_CHECK_MODULES(LIBCDIO, [libcdio >= 0.78.2 libiso9660 >= 0.72], - [VLC_ADD_LIBS([vcdx],[$LIBCDIO_LIBS]) - VLC_ADD_CFLAGS([vcdx],[$LIBCDIO_CFLAGS])], - [AC_MSG_ERROR([${LIBCDIO_PKG_ERRORS} (required for vcdx plugin).])]) - PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22, - [VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS]) - VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])], - [AC_MSG_ERROR([${LIBVCDINFO_PKG_ERRORS} (required for vcdx plugin).])]) - VLC_ADD_PLUGIN([vcdx]) -fi +PKG_ENABLE_MODULES_VLC([VCDX], [vcdx], [libcdio >= 0.78.2 libiso9660 >= 0.72 libvcdinfo >= 0.7.22], [navigate VCD with libvcdinfo], [no]) dnl dnl Built-in CD-DA and VCD module @@ -2107,16 +2115,6 @@ then VLC_ADD_PLUGIN([omxil]) fi -dnl -dnl iomx codec plugin -dnl -AC_ARG_ENABLE(iomx, - [ --enable-iomx iomx codec module (default disabled)]) -if test "${enable_iomx}" = "yes" -then - VLC_ADD_PLUGIN([iomx]) -fi - dnl dnl CrystalHD codec plugin dnl @@ -2225,7 +2223,7 @@ dnl AC_ARG_ENABLE(avcodec, [ --enable-avcodec libavcodec codec (default enabled)]) AS_IF([test "${enable_avcodec}" != "no"], [ - PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.25.0 libavutil >= 49.5.0], + PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [ VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" @@ -2256,16 +2254,15 @@ 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"], [ PKG_CHECK_MODULES(LIBVA, [libva libva-x11], [ VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}" AC_CHECK_HEADERS(libavcodec/vaapi.h, [ - VLC_ADD_LIBS([avcodec],[$LIBVA_LIBS ${X_LIBS} ${X_PRE_LIBS} -lX11]) - VLC_ADD_CFLAGS([avcodec],[$LIBVA_CFLAGS ${X_CFLAGS}]) - AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.]) 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]) @@ -2282,6 +2279,7 @@ AS_IF([test "${enable_libva}" != "no"], [ ]) ]) ]) +AM_CONDITIONAL([HAVE_AVCODEC_VAAPI], [test "${have_avcodec_vaapi}" = "yes"]) dnl dnl dxva2 needs avcodec @@ -2289,15 +2287,15 @@ dnl AC_ARG_ENABLE(dxva2, [ --enable-dxva2 DxVA2 GPU decoding support (default auto)]) +have_avcodec_dxva2="no" AS_IF([test "${enable_dxva2}" != "no"], [ if test "${SYS}" = "mingw32"; then AS_IF([test "x${have_avcodec}" = "xyes"], [ AC_CHECK_HEADERS(dxva2api.h, [ AC_CHECK_HEADERS(libavcodec/dxva2.h, [ - VLC_ADD_LIBS([avcodec],[-lole32 -lshlwapi -luuid]) - AC_DEFINE(HAVE_AVCODEC_DXVA2, 1, [Define if avcodec has to be built with DxVA2 support.]) - echo "DxVA2 acceleration activated" + AC_MSG_NOTICE([DxVA2 acceleration activated]) + have_avcodec_dxva2="yes" ],[ AS_IF([test "${enable_dxva2}" = "yes"], [AC_MSG_ERROR([dxva2 is present but libavcodec/dxva2.h is missing])], @@ -2317,6 +2315,7 @@ AS_IF([test "${enable_dxva2}" != "no"], [ ]) fi ]) +AM_CONDITIONAL([HAVE_AVCODEC_DXVA2], [test "${have_avcodec_dxva2}" = "yes"]) dnl dnl vda needs avcodec @@ -2324,22 +2323,21 @@ dnl AC_ARG_ENABLE(vda, [ --enable-vda VDA support (default auto)]) +have_avcodec_vda="no" AS_IF([test "${enable_vda}" != "no"], [ if test "${SYS}" = "darwin"; then AS_IF([test "x${have_avcodec}" = "xyes"], [ AC_CHECK_HEADERS(VideoDecodeAcceleration/VDADecoder.h, [ AC_CHECK_HEADERS(libavcodec/vda.h, [ - VLC_ADD_LIBS([avcodec],[-Wl,-framework,CoreFoundation,-framework,VideoDecodeAcceleration,-framework,QuartzCore]) - VLC_ADD_LDFLAGS([vda],[-Wl,-framework,CoreFoundation,-framework,VideoDecodeAcceleration,-framework,QuartzCore]) - AC_DEFINE(HAVE_AVCODEC_VDA, 1, [Define if avcodec has to be built with VDA support.]) + have_avcodec_vda="yes" ],[ - AS_IF([test "${enable_vda}" == "yes"], + AS_IF([test "${enable_vda}" = "yes"], [AC_MSG_ERROR([vda is present but libavcodec/vda.h is missing])], [AC_MSG_WARN([vda is present but libavcodec/vda.h is missing ])]) ]) ],[ - AS_IF([test "${enable_vda}" == "yes"], + AS_IF([test "${enable_vda}" = "yes"], [AC_MSG_ERROR([Could not find required VideoDecodeAcceleration/VDADecoder.h])], [AC_MSG_WARN([VideoDecodeAcceleration/VDADecoder.h not found])]) ]) @@ -2350,6 +2348,7 @@ AS_IF([test "${enable_vda}" != "no"], [ ]) fi ]) +AM_CONDITIONAL([HAVE_AVCODEC_VDA], [test "${have_avcodec_vda}" = "yes"]) dnl dnl stream_out switcher needs libavcodec @@ -2376,7 +2375,7 @@ AC_ARG_ENABLE(avformat, ]) if test "${enable_avformat}" != "no" then - PKG_CHECK_MODULES(AVFORMAT,[libavformat > 52.30.0 libavcodec libavutil], + PKG_CHECK_MODULES(AVFORMAT,[libavformat >= 53.21.0 libavcodec libavutil], [ VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}" @@ -2432,7 +2431,7 @@ dnl postproc plugin dnl AC_ARG_ENABLE(postproc, -[ --enable-postproc libpostproc image post-processing (default enabled)]) +[ --enable-postproc libpostproc image post-processing (default auto)]) if test "${enable_postproc}" != "no" then PKG_CHECK_MODULES(POSTPROC,[libpostproc libavutil], @@ -2446,7 +2445,7 @@ then VLC_ADD_CFLAGS([postproc],[$POSTPROC_CFLAGS $AVUTIL_CFLAGS]) VLC_RESTORE_FLAGS ],[ - AC_MSG_ERROR([${POSTPROC_PKG_ERRORS}. Pass --disable-postproc to ignore this error.]) + AC_MSG_WARN([${POSTPROC_PKG_ERRORS}.]) ]) fi @@ -2502,6 +2501,11 @@ dnl twolame encoder plugin dnl PKG_ENABLE_MODULES_VLC([TWOLAME], [], [twolame], [MPEG Audio Layer 2 encoder], [auto], [], [], [ -DLIBTWOLAME_STATIC]) +dnl +dnl fdk-aac encoder plugin +dnl +PKG_ENABLE_MODULES_VLC([FDKAAC], [], [fdk-aac], [FDK-AAC encoder], [disabled]) + dnl dnl QuickTime plugin dnl @@ -2590,11 +2594,6 @@ then fi fi -AC_ARG_WITH(a52-fixed, - [ --with-a52-fixed specify if liba52 has been compiled with fixed point support], - [ - VLC_ADD_CPPFLAGS([a52tofloat32],[-DLIBA52_FIXED]) ]) - dnl dnl DTS Coherent Acoustics decoder plugin dnl @@ -2667,18 +2666,17 @@ dnl PNG decoder module dnl AC_ARG_ENABLE(png, [ --enable-png PNG support (default enabled)]) -if test "${enable_png}" != "no"; then +AS_IF([test "${enable_png}" != "no"], [ AC_CHECK_HEADERS(png.h, [ VLC_SAVE_FLAGS LDFLAGS="${LDFLAGS} -lz $LIBM" AC_CHECK_LIB(png, png_set_rows, [ VLC_ADD_LIBS([png],[-lpng -lz $LIBM]) - VLC_ADD_PLUGIN([png osdmenu osd_parser])], - [],[-lz $LIBM] ) + VLC_ADD_PLUGIN([png]) + ], [], [-lz $LIBM]) VLC_RESTORE_FLAGS ]) -fi -AM_CONDITIONAL(BUILD_OSDMENU, [test "${enable_png}" != "no"]) +]) dnl dnl H264 encoder plugin (10-bit lib264) @@ -2961,13 +2959,18 @@ AS_IF([test "${enable_xcb}" != "no"], [ AC_MSG_WARN([${XCB_RANDR_PKG_ERRORS}. Panoramix filter will not be supported.]) ]) - dnl xcb-utils - PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [ - PKG_CHECK_MODULES(XPROTO, [xproto]) - VLC_ADD_PLUGIN([globalhotkeys]) - VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS]) + PKG_CHECK_MODULES(XPROTO, [xproto], [ + VLC_ADD_PLUGIN([xwd]) + + dnl xcb-utils + PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [ + VLC_ADD_PLUGIN([globalhotkeys]) + VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS]) + ], [ + AC_MSG_WARN([${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work.]) + ]) ], [ - AC_MSG_WARN([${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work.]) + AC_MSG_WARN([${XPROTO_PKG_ERRORS}. Hotkeys and XWD will not work.]) ]) AS_IF([test "${enable_glx}" != "no"], [ @@ -2975,10 +2978,50 @@ AS_IF([test "${enable_xcb}" != "no"], [ AC_MSG_ERROR([${GL_PKG_ERRORS}. Pass --disable-glx if you do not need OpenGL X11 support.]) ]) VLC_ADD_PLUGIN([xcb_glx]) + VLC_ADD_PLUGIN([glx]) + VLC_ADD_PLUGIN([gl]) ]) ]) AM_CONDITIONAL([HAVE_XCB], [test "${have_xcb}" = "yes"]) + +dnl +dnl VDPAU needs X11 and avcodec +dnl +AC_ARG_ENABLE(vdpau, + [AS_HELP_STRING([--enable-vdpau], + [VDPAU hardware decoder support (default auto)])]) +have_vdpau="no" +AS_IF([test "${enable_vdpau}" != "no"], [ + PKG_CHECK_MODULES([VDPAU], [vdpau], [ + have_vdpau="yes" + AS_IF([test "${no_x}" = "yes"], [ + AC_MSG_ERROR([VDPAU requires Xlib (X11).]) + ]) + AC_MSG_NOTICE([VDPAU acceleration activated]) + ], [ + AS_IF([test -n "${enable_vdpau}"], [ + AC_MSG_ERROR([${VDPAU_PKG_ERRORS}.]) + ]) + ]) +]) +dnl AM_CONDITIONAL([HAVE_VDPAU], [test "${have_vdpau}" = "yes"]) + +have_avcodec_vdpau="no" +AS_IF([test "${have_vdpau}" = "yes"], [ + PKG_CHECK_EXISTS([libavutil >= 0.52.4 libavcodec >= 54.36.0], [ + have_avcodec_vdpau="yes" + ], [ + 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_WARN([libavutil >= 0.52.4 and libavcodec >= 54.36.0 are required for VDPAU decoding.]) + ]) + ]) +]) +AM_CONDITIONAL([HAVE_AVCODEC_VDPAU], [test "${have_avcodec_vdpau}" = "yes"]) + + dnl dnl SDL module dnl @@ -3334,11 +3377,11 @@ AC_ARG_ENABLE(alsa, ]) have_alsa="no" AS_IF([test "${enable_alsa}" != "no"], [ - PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.16], [ + PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.24], [ have_alsa="yes" ], [ AS_IF([test "x${enable_alsa}" != "x"], [ - AC_MSG_ERROR([$ALSA_PKG_ERRORS. alsa-lib 1.0.16 or later required.]) + AC_MSG_ERROR([$ALSA_PKG_ERRORS. alsa-lib 1.0.24 or later required.]) ]) ]) ]) @@ -3549,9 +3592,9 @@ AS_IF([test "${enable_qt}" != "no"], [ ]) QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)" - AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, [${QT_PATH}/bin]) - AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin]) - AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, [${QT_PATH}/bin]) + AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) + AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) + AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) ]) AM_CONDITIONAL(ENABLE_QT4, [test "$enable_qt" != "no"]) @@ -3630,9 +3673,9 @@ AC_ARG_ENABLE(macosx, [ --enable-macosx Mac OS X gui support (default enabled on Mac OS X)]) if test "x${enable_macosx}" != "xno" -a "${SYS}" = "darwin" then - VLC_ADD_LIBS([macosx minimal_macosx], [-Wl,-framework,Cocoa -Wl,-framework,OpenGL -Wl,-framework,Carbon -Wl,-framework,CoreServices -Wl,-framework,AGL]) - VLC_ADD_OBJCFLAGS([macosx minimal_macosx], [-fobjc-exceptions] ) - VLC_ADD_PLUGIN([macosx minimal_macosx]) + VLC_ADD_LIBS([macosx], [-Wl,-framework,Cocoa -Wl,-framework,OpenGL -Wl,-framework,Carbon -Wl,-framework,CoreServices -Wl,-framework,AGL]) + VLC_ADD_OBJCFLAGS([macosx], [-fobjc-exceptions] ) + VLC_ADD_PLUGIN([macosx]) VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio -Wl,-framework,SystemConfiguration]) @@ -3649,11 +3692,24 @@ then fi VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,BGHUDAppKit]) VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}]) +fi +AM_CONDITIONAL(ENABLE_MACOSX_UI, [test "$enable_macosx" != "no"]) +dnl +dnl Minimal Mac OS X module +dnl +AC_ARG_ENABLE(minimal-macosx, + [ --enable-minimal-macosx Minimal Mac OS X support (default disabled)]) +if test "${enable_minimal_macosx}" = "yes" -a "${SYS}" = "darwin" +then + VLC_ADD_LIBS([minimal_macosx], [-Wl,-framework,Cocoa]) + VLC_ADD_OBJCFLAGS([minimal_macosx], [-fobjc-exceptions] ) + VLC_ADD_PLUGIN([minimal_macosx]) fi +AM_CONDITIONAL(ENABLE_MINIMAL_MACOSX, [test "$enable_minimal_macosx" != "no"]) dnl -dnl MacOS X dialor provider +dnl MacOS X dialog provider dnl AC_ARG_ENABLE(macosx-dialog-provider, [ --enable-macosx-dialog-provider Mac OS X dialog module (default enabled on Mac OS X)]) @@ -3663,6 +3719,7 @@ then VLC_ADD_LIBS([macosx_dialog_provider],[-Wl,-framework,Cocoa]) VLC_ADD_PLUGIN([macosx_dialog_provider]) fi +AM_CONDITIONAL(ENABLE_MACOSX_DIALOG_PROVIDER, [test "$enable_macosx_dialog_provider" != "no"]) dnl dnl ncurses module @@ -3755,6 +3812,13 @@ AS_IF([test "${enable_atmo}" != no], [ ]) ]) +AC_ARG_ENABLE(osdmenu, + AS_HELP_STRING([--enable-osdmenu],[OSD menu (default disabled)]),, [ + enable_osdmenu="no" +]) +AM_CONDITIONAL(BUILD_OSDMENU, [test "${enable_osdmenu}" != "no"]) + + EXTEND_HELP_STRING([Service Discovery plugins:]) dnl dnl Bonjour services discovery @@ -3813,13 +3877,6 @@ dnl TLS/SSL dnl AC_ARG_ENABLE(gnutls, [ --enable-gnutls GNU TLS TLS/SSL support (default enabled)]) - -AS_IF([test "${have_libgcrypt}" != "yes"], [ - AS_IF([test "${enable_gnutls}" = "yes"], [ - AC_MSG_ERROR([--enable-gnutls and --disable-libgcrypt are mutually exclusive.]) - ]) - enable_gnutls="no" -]) AS_IF([test "${enable_gnutls}" != "no"], [ PKG_CHECK_MODULES(GNUTLS, [gnutls >= 2.6.6], [ VLC_ADD_PLUGIN([gnutls]) @@ -3978,7 +4035,7 @@ AS_IF([test "${enable_loader}" = "yes"], VLC_ADD_LIBS([dmo quicktime], [-lpthread]) ]) -AS_IF([test "${SYS}" == "mingw32"], [VLC_ADD_PLUGIN([dmo]) VLC_ADD_LIBS([dmo],[-lole32 -luuid]) ]) +AS_IF([test "${SYS}" = "mingw32"], [VLC_ADD_PLUGIN([dmo]) VLC_ADD_LIBS([dmo],[-lole32 -luuid]) ]) EXTEND_HELP_STRING([Components:])