X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=fca0148e3cceed9ce1a766b1e058852971baad52;hb=abf5bf99808f0d7308ff6ef2543dce7a83810af3;hp=632fb8809c24635d01a9dcff9b53485aac303b0e;hpb=7f73d8cc15cda0e0d67159b5ffad5b247ac2be38;p=vlc diff --git a/configure.ac b/configure.ac index 632fb8809c..fca0148e3c 100644 --- a/configure.ac +++ b/configure.ac @@ -2,9 +2,9 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 2002-2013 VLC authors and VideoLAN]) -AC_INIT(vlc, 2.1.0-git) +AC_INIT(vlc, 2.2.0-git) VERSION_MAJOR=2 -VERSION_MINOR=1 +VERSION_MINOR=2 VERSION_REVISION=0 VERSION_EXTRA=0 VERSION_DEV=git @@ -13,7 +13,7 @@ PKGDIR="vlc" AC_SUBST(PKGDIR) CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" -CODENAME="Rincewind" +CODENAME="Weatherwax" COPYRIGHT_YEARS="1996-2013" AC_CONFIG_SRCDIR(src/libvlc.c) @@ -204,7 +204,7 @@ case "${host_os}" in *mingw32* | *cygwin* | *wince* | *mingwce*) AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(OBJCOPY, objcopy, :) - AH_TOP([#if defined(WIN32) && !defined(_WIN32_WINNT)]) + 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.]) @@ -219,7 +219,7 @@ case "${host_os}" in dnl Check if we are using the mno-cygwin mode in which case we are dnl actually dealing with a mingw32 compiler. AC_EGREP_CPP(yes, - [#ifdef WIN32 + [#ifdef _WIN32 yes #endif], SYS=mingw32, AC_MSG_ERROR([VLC requires -mno-cygwin])) @@ -227,6 +227,9 @@ case "${host_os}" in esac if test "${SYS}" = "mingw32"; then + # DEP, ASLR, NO SEH + LDFLAGS="${LDFLAGS} -Wl,--nxcompat -Wl,--no-seh -Wl,--dynamicbase" + VLC_ADD_LIBS([libvlccore],[-lwinmm]) VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LIBS([win32text],[-lgdi32]) @@ -398,9 +401,6 @@ LT_LANG([Windows Resource]) DOLT -m4_undefine([AC_DEPLIBS_CHECK_METHOD]) -m4_defun([AC_DEPLIBS_CHECK_METHOD],[]) - lt_cv_deplibs_check_method=pass_all AS_IF([test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"], [ @@ -410,7 +410,7 @@ AS_IF([test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"], [ dnl dnl Gettext stuff dnl -AM_GNU_GETTEXT_VERSION([0.18.1]) +AM_GNU_GETTEXT_VERSION([0.18.3]) AM_GNU_GETTEXT([external], [need-ngettext]) dnl @@ -471,10 +471,12 @@ 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])]) +vlc_winstore_app=0 +AS_IF([test "${SYS}" = "mingw32" -a "${enable_winstore_app}" = "yes"], [ + vlc_winstore_app=1 + 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]) dnl @@ -562,7 +564,7 @@ AC_CHECK_TYPES([struct pollfd],,, [#include #if HAVE_POLL # include -#elif defined (WIN32) +#elif defined (_WIN32) # include #endif ]) @@ -588,7 +590,7 @@ AC_SEARCH_LIBS([getaddrinfo], [nsl], [ LIBS="${LIBS} ${SOCKET_LIBS}" AC_LINK_IFELSE([ - AC_LANG_PROGRAM([#ifdef WIN32 + AC_LANG_PROGRAM([#ifdef _WIN32 # if _WIN32_WINNT < 0x600 # error Needs vista+ # endif @@ -614,7 +616,7 @@ AC_CACHE_CHECK([for socklen_t in sys/socket.h], dnl ` (fix VIM syntax highlight ac_cv_type_socklen_t, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ [#include -#ifdef WIN32 +#ifdef _WIN32 # include # include #else @@ -631,7 +633,7 @@ AH_TEMPLATE(ss_family, [Define to `sa_family' if does not define. AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_struct_sockaddr_storage, [AC_TRY_COMPILE( [#include - #if defined( WIN32 ) + #if defined( _WIN32 ) # include #else # include @@ -653,7 +655,7 @@ AC_CHECK_FUNC(getopt_long,, [ AC_SUBST(GNUGETOPT_LIBS) AC_CHECK_LIB(m,cos,[ - VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom panoramix rotate noise grain scene kate lua chorus_flanger freetype avcodec access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x26410b hqdn3d anaglyph oldrc ncurses],[-lm]) + VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom rotate noise grain scene kate lua chorus_flanger freetype avcodec access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum],[-lm]) LIBM="-lm" ], [ LIBM="" @@ -810,7 +812,7 @@ AC_ARG_ENABLE(dbus, [compile D-Bus message bus support (default enabled)])]) have_dbus="no" AS_IF([test "${enable_dbus}" != "no"], [ - PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0.0], [ + PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.6.0], [ have_dbus="yes" ], [ AS_IF([test -n "${enable_dbus}"], [ @@ -1372,7 +1374,7 @@ AM_CONDITIONAL(HAVE_NEON, [test "${ac_cv_arm_neon}" = "yes"]) AC_ARG_ENABLE(altivec, [AS_HELP_STRING([--disable-altivec], [disable AltiVec optimizations (default auto)])],, [ - AS_IF([test "${host_cpu}" = "powerpc"], + AS_CASE("${host_cpu}", [powerpc*], [enable_altivec=yes], [enable_altivec=no]) ]) have_altivec="no" @@ -1507,28 +1509,35 @@ AC_ARG_ENABLE(lua, [disable LUA scripting support (default enabled)])]) if test "${enable_lua}" != "no" then - PKG_CHECK_MODULES(LUA, lua5.1, + PKG_CHECK_MODULES(LUA, lua5.2, [ have_lua=yes ], [ - AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua >= 5.1 instead]) - PKG_CHECK_MODULES(LUA, lua >= 5.1, + AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua 5.1 instead]) + + PKG_CHECK_MODULES(LUA, lua5.1, [ have_lua=yes ], [ - AC_MSG_WARN([${LUA_PKG_ERRORS}, trying manual detection instead]) - have_lua=yes - AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], - [], - [ have_lua=no ] ) - AC_CHECK_LIB( lua5.1 , luaL_newstate, - [LUA_LIBS="-llua5.1"], - AC_CHECK_LIB( lua51 , luaL_newstate, - [LUA_LIBS="-llua51"], - AC_CHECK_LIB( lua , luaL_newstate, - [LUA_LIBS="-llua"], - [ have_lua=no - ], [-lm]) - ) - ) + AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua >= 5.1 instead]) + PKG_CHECK_MODULES(LUA, lua >= 5.1, + [ have_lua=yes ], + [ + AC_MSG_WARN([${LUA_PKG_ERRORS}, trying manual detection instead]) + have_lua=yes + AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], + [], + [ have_lua=no ] ) + AC_CHECK_LIB( lua5.2 , luaL_newstate, + [LUA_LIBS="-llua5.2"], + AC_CHECK_LIB( lua5.1 , luaL_newstate, + [LUA_LIBS="-llua5.1"], + AC_CHECK_LIB( lua51 , luaL_newstate, + [LUA_LIBS="-llua51"], + AC_CHECK_LIB( lua , luaL_newstate, + [LUA_LIBS="-llua"], + [ have_lua=no + ], [-lm]) + ))) + ]) ]) ]) if test "x${have_lua}" = "xyes" ; then @@ -1542,7 +1551,7 @@ then AS_IF([test "${LUAC}" = "false"], [ AC_MSG_ERROR([Could not find the LUA byte compiler.]) ]) - AS_IF([test -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|cut -d' ' -f2` != 0404], [ AC_MSG_ERROR([You need 32-bits luac when using using lua from contrib.]) ]) fi @@ -1592,74 +1601,83 @@ AC_ARG_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 - - 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" + PKG_CHECK_MODULES(LIVE555, live555, [ + VLC_ADD_PLUGIN([live555]) + VLC_ADD_CXXFLAGS([live555], [$LIVE555_CFLAGS]) + VLC_ADD_LIBS([live555],[$LIVE555_LIBS]) ], [ - 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" + AC_MSG_WARN([${LIVE555_PKG_ERRORS}.]) + + AC_LANG_PUSH(C++) + VLC_SAVE_FLAGS + + 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" ], [ - LIVE555_PREFIX=${LIVE555_PREFIX-"/usr/lib/live"} - 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" + 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" + ], [ + LIVE555_PREFIX=${LIVE555_PREFIX-"/usr/lib/live"} + 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" + ]) ]) - ]) - dnl CPP Flags - AS_IF([test "${SYS}" = "solaris"], [ - CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS" - ]) - CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}" - LDFLAGS="${LDFLAGS} ${LDFLAGS_live555}" + 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([ + dnl version check + AC_CACHE_CHECK([for live555 version 1324598400 or later], [ac_cv_live555], [ + AC_PREPROC_IFELSE([AC_LANG_PROGRAM([ [#include #if !defined (LIVEMEDIA_LIBRARY_VERSION_INT) || (LIVEMEDIA_LIBRARY_VERSION_INT < 1324598400) # error BOOM #endif]]) - ], [ - ac_cv_live555="yes" - ], [ - ac_cv_live555="no" + ], [ + ac_cv_live555="yes" + ], [ + ac_cv_live555="no" + ]) ]) - ]) - AS_IF([test "$ac_cv_live555" = "no"], [ - AC_MSG_WARN([liveMedia is missing or its installed version is too old: + AS_IF([test "$ac_cv_live555" = "no"], [ + AC_MSG_WARN([live555 is missing or its installed version is too old: Version 2011.12.23 or later is required to proceed. You can get an updated one from http://www.live555.com/liveMedia .]) - AS_IF([test -n "${enable_live555}"], [ - AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.]) - ]) - ], [ - other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment" - other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic" - AS_IF([test "${SYS}" = "mingw32"], [ - # add ws2_32 for closesocket, select, recv - other_libs="$other_libs -lws2_32" - ]) + AS_IF([test -n "${enable_live555}"], [ + AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.]) + ]) + ], [ + other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment" + other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic" + AS_IF([test "${SYS}" = "mingw32"], [ + # add ws2_32 for closesocket, select, recv + other_libs="$other_libs -lws2_32" + ]) - dnl We need to check for pic because live555 don't provide shared libs - dnl and we want to build a plugins so we need -fPIC on some arch. - VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}]) - VLC_ADD_LDFLAGS([live555], [${LDFLAGS_live555}]) - AC_CHECK_LIB(liveMedia_pic, main, [ - VLC_ADD_PLUGIN([live555]) - VLC_ADD_LIBS([live555], [-lliveMedia_pic ${other_libs_pic}]) - ],[ - AC_CHECK_LIB(liveMedia, main, [ + dnl We need to check for pic because live555 don't provide shared libs + dnl and we want to build a plugins so we need -fPIC on some arch. + VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}]) + VLC_ADD_LDFLAGS([live555], [${LDFLAGS_live555}]) + AC_CHECK_LIB(liveMedia_pic, main, [ VLC_ADD_PLUGIN([live555]) - VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}]) - ],[],[${other_libs}])],[${other_libs_pic}]) + VLC_ADD_LIBS([live555], [-lliveMedia_pic ${other_libs_pic}]) + ],[ + AC_CHECK_LIB(liveMedia, main, [ + VLC_ADD_PLUGIN([live555]) + VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}]) + ],[],[${other_libs}]) + ],[${other_libs_pic}]) + ]) + VLC_RESTORE_FLAGS + AC_LANG_POP(C++) ]) - VLC_RESTORE_FLAGS - AC_LANG_POP(C++) ]) dnl @@ -1725,6 +1743,7 @@ dnl dnl libsmbclient plugin dnl PKG_ENABLE_MODULES_VLC([SMBCLIENT], [access_smb], [smbclient], (SMB/CIFS support), [auto]) +AS_IF([test "${SYS}" = "mingw32"], [ VLC_ADD_PLUGIN([access_smb]) ]) dnl @@ -1897,7 +1916,7 @@ dnl AC_ARG_ENABLE(realrtsp, [ --enable-realrtsp Real RTSP module (default disabled)]) if test "${enable_realrtsp}" = "yes"; then - VLC_ADD_PLUGIN([realrtsp]) + VLC_ADD_PLUGIN([access_realrtsp]) fi dnl @@ -1925,14 +1944,22 @@ AM_CONDITIONAL(HAVE_QTKIT, [test "${SYS}" = "darwin" -a "x${enable_macosx_qtkit} dnl dnl AVFoundation +AC_SUBST(have_avfoundation, ["no"]) AC_ARG_ENABLE(macosx-avfoundation, [ --enable-macosx-avfoundation Mac OS X avcapture (video) module (default enabled on Mac OS X)]) if test "x${enable_macosx_avfoundation}" != "xno" && (test "${SYS}" = "darwin" || test "${enable_macosx_avfoundation}" = "yes") then - VLC_ADD_PLUGIN([avcapture]) + SAVED_LIBS="${LIBS}" + LIBS="-framework AVFoundation" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])],[have_avfoundation=yes],[have_avfoundation=no]) + LIBS="${SAVED_LIBS}" + if test "${have_avfoundation}" != "no" + then + VLC_ADD_PLUGIN([avcapture]) + fi fi -AM_CONDITIONAL(HAVE_AVFOUNDATION, [test "${SYS}" = "darwin" -a "x${enable_macosx_avfoundation}" != "xno"]) +AM_CONDITIONAL(HAVE_AVFOUNDATION, [test "${have_avfoundation}" != "no"]) dnl dnl Demux plugins @@ -2258,9 +2285,9 @@ AC_ARG_ENABLE(avcodec, [ --enable-avcodec libavcodec codec (default enabled)]) AS_IF([test "${enable_avcodec}" != "no"], [ PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [ - PKG_CHECK_EXISTS([libavcodec < 56],, [ - AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.]) - ]) + dnl PKG_CHECK_EXISTS([libavcodec < 56],, [ + dnl AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.]) + dnl ]) VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}" @@ -2291,7 +2318,7 @@ 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"], [ +AS_IF([test "${enable_libva}" != "no" -a "${have_avcodec}" = "yes"], [ PKG_CHECK_MODULES(LIBVA, [libva libva-x11], [ VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" @@ -2736,9 +2763,9 @@ AC_ARG_WITH(x26410b-tree, else PKG_CHECK_MODULES(X26410B, x26410b, [ VLC_ADD_PLUGIN([x26410b]) - VLC_ADD_LDFLAGS([x26410b],[${X26410B_LIBS}]) + VLC_ADD_LIBS([x26410b],[${X26410B_LIBS}]) AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ - VLC_ADD_LIBS([x26410b],[-Wl,-Bsymbolic]) + VLC_ADD_LDFLAGS([x26410b],[-Wl,-Bsymbolic]) ]) VLC_ADD_CFLAGS([x26410b],[${X26410B_CFLAGS}]) if echo ${X26410B_LIBS} |grep -q 'pthreadGC2'; then @@ -2794,10 +2821,10 @@ if test "${enable_x264}" != "no"; then else PKG_CHECK_MODULES(X264,x264 >= 0.86, [ VLC_ADD_PLUGIN([x264]) - VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) + VLC_ADD_LIBS([x264],[${X264_LIBS}]) AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ - VLC_ADD_LIBS([x264],[-Wl,-Bsymbolic]) + VLC_ADD_LDFLAGS([x264],[-Wl,-Bsymbolic]) ]) VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) @@ -2812,6 +2839,11 @@ if test "${enable_x264}" != "no"; then fi fi +dnl +dnl Intel QuickSync (aka MediaSDK) H264/H262 encoder +dnl +PKG_ENABLE_MODULES_VLC([QUICKSYNC], [qsv], [libmfx], [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto]) + dnl dnl libfluidsynth (MIDI synthetizer) plugin dnl @@ -2909,7 +2941,11 @@ PKG_CHECK_MODULES([GL], [gl], [ AC_CHECK_HEADER([GL/gl.h], [ have_gl="yes" GL_CFLAGS="" - GL_LIBS="-lGL" + AS_IF([test "${SYS}" = "mingw32"], [ + GL_LIBS="-lopengl32" + ], [ + GL_LIBS="-lGL" + ]) ], [ have_gl="no" ]) @@ -2959,6 +2995,7 @@ AC_ARG_ENABLE(glx, ]) have_xcb="no" +have_xcb_randr="no" AS_IF([test "${enable_xcb}" != "no"], [ dnl libxcb PKG_CHECK_MODULES(XCB, [xcb >= 1.6]) @@ -2973,11 +3010,7 @@ AS_IF([test "${enable_xcb}" != "no"], [ ]) PKG_CHECK_MODULES(XCB_RANDR, [xcb-randr >= 1.3], [ - VLC_ADD_PLUGIN([panoramix]) - VLC_ADD_LIBS([panoramix],[${XCB_RANDR_LIBS} ${XCB_LIBS}]) - VLC_ADD_CFLAGS([panoramix],[${XCB_RANDR_CFLAGS} ${XCB_CFLAGS}]) - ], [ - AC_MSG_WARN([${XCB_RANDR_PKG_ERRORS}. Panoramix filter will not be supported.]) + have_xcb_randr="yes" ]) PKG_CHECK_MODULES(XPROTO, [xproto], [ @@ -3004,34 +3037,34 @@ AS_IF([test "${enable_xcb}" != "no"], [ ]) ]) AM_CONDITIONAL([HAVE_XCB], [test "${have_xcb}" = "yes"]) +AM_CONDITIONAL([HAVE_XCB_RANDR], [test "${have_xcb_randr}" = "yes"]) dnl -dnl VDPAU needs X11 and avcodec +dnl VDPAU needs X11 dnl AC_ARG_ENABLE(vdpau, - [AS_HELP_STRING([--enable-vdpau], - [VDPAU hardware decoder support (default auto)])]) + [AS_HELP_STRING([--enable-vdpau], [VDPAU hardware support (default auto)])]) have_vdpau="no" -AS_IF([test "${enable_vdpau}" != "no" -a "${have_avcodec}" == "yes"], [ - PKG_CHECK_MODULES([VDPAU], [vdpau], [ +AS_IF([test "${enable_vdpau}" != "no"], [ + PKG_CHECK_MODULES([VDPAU], [vdpau >= 0.6], [ 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"]) +AM_CONDITIONAL([HAVE_VDPAU], [test "${have_vdpau}" = "yes"]) have_avcodec_vdpau="no" -AS_IF([test "${have_vdpau}" = "yes"], [ +AS_IF([test "${have_vdpau}" = "yes" -a "${have_avcodec}" = "yes"], [ PKG_CHECK_EXISTS([libavutil >= 0.52.4 libavcodec >= 54.36.0], [ 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.]) @@ -3090,6 +3123,15 @@ then 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 @@ -3190,7 +3232,7 @@ AC_ARG_ENABLE(android-surface, if test "${enable_android_surface}" = "yes"; then if test "${HAVE_ANDROID}" = "1"; then VLC_ADD_PLUGIN([android_surface]) - VLC_ADD_LDFLAGS([android_surface], [-ldl]) + VLC_ADD_LIBS([android_surface], [-ldl]) fi fi @@ -3222,11 +3264,6 @@ dnl dnl Windows DirectX module dnl -if test "${SYS}" = "mingw32" -then - VLC_ADD_PLUGIN([panoramix]) -fi - AC_ARG_ENABLE(directx, [AS_HELP_STRING([--enable-directx], [Microsoft DirectX support (default enabled on Windows)])],, [ @@ -3554,7 +3591,29 @@ fi dnl dnl JACK modules dnl -PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modules],[auto]) +AC_ARG_ENABLE(jack, + [AS_HELP_STRING([--disable-jack], + [do not use jack (default auto)])]) +if test "${enable_jack}" != "no" ; then + PKG_CHECK_MODULES(JACK, jack >= 1.9.7, + [ have_jack=yes ], + [ + AC_MSG_WARN([${JACK_PKG_ERRORS}, trying jack1 instead]) + + PKG_CHECK_MODULES(JACK, jack >= 0.120.1 jack < 1.0, + [ have_jack=yes ], + [ + AS_IF([test -n "${enable_jack}"], + [AC_MSG_ERROR([${JACK_PKG_ERRORS}.])], + [AC_MSG_WARN([${JACK_PKG_ERRORS}.])]) + ]) + ]) + if test "x${have_jack}" = "xyes" ; then + VLC_ADD_PLUGIN([jack access_jack]) + VLC_ADD_LIBS([jack access_jack],[$JACK_LIBS]) + VLC_ADD_CFLAGS([jack access_jack],[$JACK_CFLAGS]) + fi +fi dnl dnl OpenSLES Android @@ -3642,8 +3701,6 @@ AS_IF([test "${enable_qt}" != "no"], [ ]) AS_IF([test "${enable_qt}" != "no"], [ VLC_ADD_PLUGIN([qt4]) - VLC_ADD_LIBS([qt4],[${QT_LIBS}]) - VLC_ADD_CXXFLAGS([qt4],[${QT_CFLAGS}]) ALIASES="${ALIASES} qvlc" AC_LANG_PUSH([C++]) @@ -3658,8 +3715,6 @@ AS_IF([test "${enable_qt}" != "no"], [ #endif ])], [ AC_MSG_RESULT([yes]) - VLC_ADD_LIBS([qt4],[${X_LIBS} ${X_PRE_LIBS} -lX11]) - VLC_ADD_CXXFLAGS([qt4],[${X_CFLAGS}]) ], [ AC_MSG_RESULT([no]) ]) @@ -3667,13 +3722,6 @@ AS_IF([test "${enable_qt}" != "no"], [ VLC_RESTORE_FLAGS AC_LANG_POP([C++]) - AS_IF([test "${SYS}" = "mingw32"], [ - VLC_ADD_LIBS([qt4],[-lole32]) - ]) - AS_IF([test "${SYS}" = "darwin" ],[ - VLC_ADD_LIBS([qt4], [-Wl,-framework,Cocoa]) - ]) - QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)" 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]) @@ -3709,6 +3757,9 @@ AS_IF([test "${enable_skins2}" != "no"], [ ], [test "${SYS}" = "darwin"], [ VLC_ADD_CPPFLAGS([skins2],[ -DMACOSX_SKINS]) VLC_ADD_LIBS([skins2],[-Wl,-framework,Carbon]) + dnl OS/2 + ], [test "${SYS}" = "os2"], [ + VLC_ADD_CPPFLAGS([skins2],[ -DOS2_SKINS]) dnl Linux/Unix ], [ PKG_CHECK_MODULES([XPM], [xpm],, [have_skins_deps="no"]) @@ -3762,9 +3813,6 @@ then VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio -Wl,-framework,SystemConfiguration -Wl,-framework,ScriptingBridge]) - AC_CHECK_HEADERS(AVFoundation/AVFoundation.h, - [VLC_ADD_LIBS([macosx],[-Wl,-framework,AVFoundation])]) - if test ! -d ${CONTRIB_DIR}/Sparkle.framework then AC_MSG_ERROR([Sparkle framework is required and was not found in ${CONTRIB_DIR}]) @@ -3898,6 +3946,16 @@ AS_IF([test "${enable_atmo}" != no], [ ]) ]) +dnl +dnl glSpectrum +dnl +AC_ARG_ENABLE(glspectrum, + [ --enable-glspectrum 3D OpenGL spectrum visualization (default auto)]) +if test "${enable_glspectrum}" != "no" && test "${have_gl}" = "yes" +then + VLC_ADD_PLUGIN([glspectrum]) + VLC_ADD_LIBS([glspectrum],[$GL_LIBS]) +fi EXTEND_HELP_STRING([Service Discovery plugins:]) dnl @@ -4166,11 +4224,13 @@ AC_CONFIG_FILES([ modules/video_chroma/Makefile modules/video_filter/Makefile modules/video_output/Makefile + modules/video_splitter/Makefile modules/visualization/Makefile modules/mmx/Makefile modules/sse2/Makefile modules/altivec/Makefile modules/arm_neon/Makefile + modules/hw/vdpau/Makefile ]) AM_COND_IF([HAVE_WIN32], [