AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team])
-AC_INIT(vlc, 1.1.0-pre1)
+AC_INIT(vlc, 1.2.0-git)
VERSION_MAJOR="1"
-VERSION_MINOR="1"
+VERSION_MINOR="2"
VERSION_REVISION="0"
-VERSION_EXTRA="-pre1"
+VERSION_EXTRA="-git"
PKGDIR="vlc"
AC_SUBST(PKGDIR)
CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
-CODENAME="The Luggage"
+CODENAME="Twoflower"
COPYRIGHT_YEARS="1996-2010"
AC_PREREQ(2.59c)
;;
*mingw32*)
SYS=mingw32
- AC_DEFINE([_WIN32_WINNT], 0x0500, [Define to '0x0500' for Windows 2000 APIs.])
+ AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0500' for Windows XP APIs.])
;;
*cygwin*)
dnl Check if we are using the mno-cygwin mode in which case we are
dnl actually dealing with a mingw32 compiler.
- AC_DEFINE([_WIN32_WINNT], 0x0500, [Define to '0x0500' for Windows 2000 APIs.])
+ AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0501' for Windows XP APIs.])
AC_EGREP_CPP(yes,
[#ifdef WIN32
yes
VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([activex mozilla win32text],[-lgdi32])
VLC_ADD_LIBS([cdda vcdx sdl_image aout_sdl vout_sdl],[-lwinmm])
- VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp oldhttp stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldtelnet oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-lws2_32])
+ VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap oldhttp stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldtelnet oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-lws2_32])
VLC_ADD_LIBS([filesystem], [-lshlwapi])
dnl
dnl DEP and ASLR options
# add ws2 for closesocket, select, recv
VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts oldtelnet audiobargraph_a netsync],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
+ AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
fi
;;
*nto*)
VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger],[-lm])
])
AC_CHECK_LIB(m,pow,[
- VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realvideo opengl],[-lm])
+ VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realvideo],[-lm])
])
AC_CHECK_LIB(m,sqrt,[
VLC_ADD_LIBS([headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball],[-lm])
AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
fi
AC_ARG_VAR([LUAC], [LUA byte compiler])
- AC_PATH_PROG(LUAC, luac, [
+ AC_PATH_PROG(LUAC, luac, [false])
+ AS_IF([test "${ac_cv_path_LUAC}" = "false"], [
AC_MSG_ERROR([Could not find the LUA byte compiler.])
])
fi
dnl
dnl OpenCV wrapper and example filters
dnl
-PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv], (OpenCV (computer vision) filter), [off])
+PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example], [opencv], (OpenCV (computer vision) filter), [off])
dnl
[ --enable-avcodec libavcodec codec (default enabled)])
if test "${enable_avcodec}" != "no"
then
- PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 51.48.0 libavutil],
+ PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.2.0 libavutil],
[
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
dnl
AC_PATH_XTRA()
-AC_CHECK_HEADERS(X11/Xlib.h, [
- VLC_ADD_LIBS([omapfb],[${X_LIBS} ${X_PRE_LIBS} -lX11])
-])
+AC_CHECK_HEADERS(X11/Xlib.h)
dnl
dnl X C Bindings modules
AC_SUBST([GL_CFLAGS])
AC_SUBST([GL_LIBS])
-
-dnl
-dnl OpenGL module
-dnl (enabled by default except on beos)
-dnl
-AC_ARG_ENABLE(opengl,
- [ --enable-opengl OpenGL support (default enabled)])
-if test "${enable_opengl}" != "no" &&
- test "${SYS}" = "darwin"; then
- dnl OS X special case (no GL/gl.h but OpenGL/gl.h)
- VLC_ADD_PLUGIN([opengl])
- VLC_ADD_LIBS([opengl],[-Wl,-framework,OpenGL])
-fi
-
dnl
dnl SDL module
dnl
VLC_ADD_PLUGIN([snapshot])
fi
-dnl
-dnl Roku HD1000 Video output module
-dnl
-AC_ARG_ENABLE(hd1000v,
- [ --enable-hd1000v HD1000 Video Output module (default enabled on HD1000)])
-if test "${enable_hd1000v}" != "no" -a "${CXX}" != "" &&
- (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
- test "${enable_hd1000v}" = "yes"); then
- AC_LANG_PUSH([C++])
- AC_CHECK_HEADERS([cascade/graphics/CascadeScreen.h cascade/graphics/CascadeBitmap.h],
- [
- can_build_roku="yes"
- ],
- [
- can_build_roku="no"
- AC_MSG_WARN([Not building Roku HD1000 compatible video output])
- ])
- if test "$can_build_roku" = "yes"
- then
- VLC_ADD_PLUGIN([hd1000v])
- VLC_ADD_LIBS([hd1000v],[-lCascade -ldvbpsi -lmad])
- fi
- AC_LANG_POP([C++])
-fi
-
dnl
dnl Windows DirectX module
dnl
])
fi
-dnl
-dnl OMAP Framebuffer module
-dnl
-AC_ARG_ENABLE(omapfb,
- [ --enable-omapfb OMAP framebuffer support (default disabled)])
- if test "${enable_omapfb}" = "yes"
- then
- AC_CHECK_HEADERS(asm/arch-omap/omapfb.h, [
- VLC_ADD_PLUGIN([omapfb])
- ])
- VLC_ADD_PLUGIN([swscale_omap])
- fi
-
-dnl
-dnl SVGAlib module
-dnl
-AC_ARG_ENABLE(svgalib,
- [ --enable-svgalib SVGAlib support (default disabled)])
-if test "${enable_svgalib}" = "yes"
-then
- VLC_ADD_PLUGIN([svgalib])
- VLC_ADD_LIBS([svgalib],[-lvgagl -lvga])
-fi
-
dnl
dnl DirectFB module
dnl try to find using: 1 - given location; 2 - directfb-config; 3 - pkg-config
fi
fi
-
-
-dnl
-dnl GGI module
-dnl
-AC_ARG_ENABLE(ggi,
- [ --enable-ggi GGI support (default disabled)])
-if test "${enable_ggi}" = "yes"
-then
- AC_CHECK_HEADER([ggi/ggi.h],[
- VLC_ADD_PLUGIN([ggi])
- VLC_ADD_LIBS([ggi],[-lggi])
- AC_ARG_WITH(ggi,
- [ --with-ggi=PATH path to libggi],
- [ if test "${with_ggi}" != "no" -a -n "${with_ggi}"
- then
- VLC_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include])
- VLC_ADD_LIBS([ggi],[-L${with_ggi}/lib])
- fi ])
- ],[
- AC_MSG_ERROR([LibGGI development files can't be found])
- ])
-fi
-
dnl
dnl AA plugin
dnl
soliddatadir=""
AS_IF([test "${with_kde_solid}" != "no"], [
AS_IF([test "${with_kde_solid}" = "yes"], [
- soliddatadir="`${KDE4_CONFIG} --install data`solid/actions"
- AS_IF([test "x${soliddatadir}" = "x"], [
- soliddatadir='$(datadir)/kde4/apps/solid/actions'
- ])
+ kde4datadir="`${KDE4_CONFIG} --install data`"
+ AS_IF([test "x$kde4datadir" = "x"], [kde4datadir='${datadir}/kde4/apps'])
+ soliddatadir="${kde4datadir}/solid/actions"
], [
soliddatadir="${with_kde_solid}"
])
fi
real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`"
- CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include"
+ CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk}/include"
MOZILLA_REQUIRED_HEADERS=1
- AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
[#if HAVE_NPAPI_H
MOZILLA_REQUIRED_HEADERS=
mozilla=:
PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
- VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include])
- if ${need_xpcom_libs}; then
- VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue])
- if test "${SYS}" = "mingw32"; then
- dnl latest gecko sdk does not have embedstring
- if test -d "${real_mozilla_sdk}/embedstring/bin"
- then
- VLC_ADD_LIBS([mozilla],[-lembedstring])
- fi
- fi
- fi
+ VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk}/include])
MOZILLA_SDK_PATH="${real_mozilla_sdk}"
if test -n "${CYGPATH}"; then
projects/mozilla/vlc.r
projects/mozilla/install.js
projects/mozilla/install.rdf
+ projects/mozilla/manifest.json
share/Makefile
compat/Makefile
src/Makefile