X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=fca0148e3cceed9ce1a766b1e058852971baad52;hb=abf5bf99808f0d7308ff6ef2543dce7a83810af3;hp=726b5148564c6dafefa7fd263ed121d9985d4114;hpb=bf7670fd44fad65b25f091afa2ddfcef969fbdcb;p=vlc diff --git a/configure.ac b/configure.ac index 726b514856..fca0148e3c 100644 --- a/configure.ac +++ b/configure.ac @@ -2,18 +2,18 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 2002-2013 VLC authors and VideoLAN]) -AC_INIT(vlc, 2.1.0-pre1) +AC_INIT(vlc, 2.2.0-git) VERSION_MAJOR=2 -VERSION_MINOR=1 +VERSION_MINOR=2 VERSION_REVISION=0 VERSION_EXTRA=0 -VERSION_DEV=pre1 +VERSION_DEV=git 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])) @@ -401,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"], [ @@ -413,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 @@ -475,7 +472,10 @@ AC_ARG_ENABLE(winstore_app, [Build targetted for Windows Store apps (default disabled)])) vlc_winstore_app=0 -AS_IF([test "${SYS}" = "mingw32" -a "${enable_winstore_app}" = "yes"], [vlc_winstore_app=1]) +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]) @@ -564,7 +564,7 @@ AC_CHECK_TYPES([struct pollfd],,, [#include #if HAVE_POLL # include -#elif defined (WIN32) +#elif defined (_WIN32) # include #endif ]) @@ -590,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 @@ -616,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 @@ -633,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 @@ -655,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="" @@ -812,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}"], [ @@ -1374,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" @@ -1551,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 @@ -1743,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 @@ -1915,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 @@ -1955,7 +1956,6 @@ then LIBS="${SAVED_LIBS}" if test "${have_avfoundation}" != "no" then - VLC_ADD_LIBS([macosx],[-Wl,-framework,AVFoundation]) VLC_ADD_PLUGIN([avcapture]) fi fi @@ -2285,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}" @@ -2763,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 @@ -2821,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}]) @@ -2839,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 @@ -2936,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" ]) @@ -2986,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]) @@ -3000,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], [ @@ -3031,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.]) @@ -3117,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 @@ -3217,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 @@ -3249,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)])],, [ @@ -3691,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++]) @@ -3707,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]) ]) @@ -3716,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]) @@ -3947,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 @@ -4215,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], [