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)
*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.])
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]))
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"], [
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
[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])
[#include <sys/types.h>
#if HAVE_POLL
# include <poll.h>
-#elif defined (WIN32)
+#elif defined (_WIN32)
# include <winsock2.h>
#endif
])
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
ac_cv_type_socklen_t,
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
[#include <sys/types.h>
-#ifdef WIN32
+#ifdef _WIN32
# include <winsock2.h>
# include <ws2tcpip.h>
#else
AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_struct_sockaddr_storage,
[AC_TRY_COMPILE(
[#include <sys/types.h>
- #if defined( WIN32 )
+ #if defined( _WIN32 )
# include <winsock2.h>
#else
# include <sys/socket.h>
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=""
[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}"], [
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"
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
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
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
LIBS="${SAVED_LIBS}"
if test "${have_avfoundation}" != "no"
then
- VLC_ADD_LIBS([macosx],[-Wl,-framework,AVFoundation])
VLC_ADD_PLUGIN([avcapture])
fi
fi
[ --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}"
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
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}])
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
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"
])
])
have_xcb="no"
+have_xcb_randr="no"
AS_IF([test "${enable_xcb}" != "no"], [
dnl libxcb
PKG_CHECK_MODULES(XCB, [xcb >= 1.6])
])
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], [
])
])
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.])
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
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
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)])],, [
])
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++])
#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])
])
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])
])
])
+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
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], [
projects / vlc / blobdiff