dnl DEP and ASLR options
dnl
AC_ARG_ENABLE(peflags,
- [ --enable-peflags peflags use (default enabled)])
+ [ --enable-peflags peflags use (default enabled on Windows)])
if test "${enable_peflags}" != "no"
then
AC_CHECK_TOOL(PEFLAGS, peflags, :)
AC_CHECK_HEADERS([dvbpsi/dr.h],[
VLC_ADD_PLUGIN([ts])
if test "${enable_sout}" != "no"; then
- VLC_ADD_PLUGIN([mux_ts])
+ AC_CHECK_LIB(dvbpsi, dvbpsi_SDTServiceAddDescriptor,
+ [VLC_ADD_PLUGIN([mux_ts])], [], [${LDFLAGS_test} -ldvbpsi])
fi
VLC_ADD_CPPFLAGS([mux_ts ts dvb],[${CPPFLAGS_test}])
VLC_ADD_LIBS([mux_ts ts dvb],[${LDFLAGS_test} -ldvbpsi])
],[
if test -n "${enable_dvbpsi}"
then
- AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1])
+ AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.6])
fi
],
[#if defined( HAVE_STDINT_H )
AC_MSG_ERROR([cannot find ${real_mod_tree}/src/.libs/libmodplug.a, make sure you compiled mod in ${with_mod_tree}])
fi
else
- AC_CHECK_HEADERS(libmodplug/modplug.h, [
- VLC_ADD_PLUGIN([mod])
- VLC_ADD_CXXFLAGS([mod],[])
- VLC_ADD_LIBS([mod],[-lmodplug -lstdc++])])
+ PKG_CHECK_MODULES(LIBMODPLUG, libmodplug >= 0.8,
+ [ VLC_ADD_PLUGIN([mod])
+ VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])
+ VLC_ADD_LIBS([mod],[$LIBMODPLUG_LIBS])
+ ],[AC_MSG_WARN([libmodplug not found!])])
fi
fi
dnl libva needs avcodec
dnl
AC_ARG_ENABLE(libva,
- [ --enable-libva libva VAAPI support (default disabled)])
-AS_IF([test "${enable_libva}" = "yes"], [
+ [ --enable-libva libva VAAPI support (default auto)])
+
+AS_IF([test "${enable_libva}" != "no"], [
AS_IF([test "x${have_avcodec}" = "xyes"], [
PKG_CHECK_MODULES(LIBVA, [libva libva-x11],
[
- VLC_ADD_LIBS([avcodec],[$LIBVA_LIBS])
- VLC_ADD_CFLAGS([avcodec],[$LIBVA_CFLAGS])
- AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.])
+ AC_CHECK_HEADERS(libavcodec/vaapi.h, [
+ VLC_ADD_LIBS([avcodec],[$LIBVA_LIBS])
+ VLC_ADD_CFLAGS([avcodec],[$LIBVA_CFLAGS])
+ AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.])
+ echo "VAAPI acceleration activated"
+ ],[
+ AS_IF([test "${enable_libva}" == "yes"],
+ [AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])],
+ [AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])])
+ ])
],[
- AC_MSG_ERROR([Could not find libva.])
+ AS_IF([test "${enable_libva}" == "yes"],
+ [AC_MSG_ERROR([Could not find required libva.])],
+ [AC_MSG_WARN([libva not found ])])
+ ])
+ ],[
+ AS_IF([test "x${enable_libva}" != "x"], [
+ AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive.])
])
+ ])
+])
+
+dnl
+dnl dxva2 needs avcodec
+dnl
+AC_ARG_ENABLE(dxva2,
+ [ --enable-dxva2 DxVA2 support (default auto)])
+
+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"
+ ],[
+ AS_IF([test "${enable_dxva2}" == "yes"],
+ [AC_MSG_ERROR([dxva2 is present but libavcodec/dxva2.h is missing])],
+ [AC_MSG_WARN([dxva2 is present but libavcodec/dxva2.h is missing ])])
+ ])
+ ],[
+ AS_IF([test "${enable_dxva2}" == "yes"],
+ [AC_MSG_ERROR([Could not find required dxva2api.h])],
+ [AC_MSG_WARN([dxva2api.h not found])])
+ ])
],[
- AC_MSG_ERROR([libva VAAPI support depends on libavcodec.])
+ AS_IF([test "x${enable_dxva2}" != "x"], [
+ AC_MSG_ERROR([--enable-dxva2 and --disable-avcodec options are mutually exclusive.])
+ ])
])
+ fi
])
+
dnl
dnl stream_out switcher needs libavcodec
dnl
dnl
PKG_ENABLE_MODULES_VLC([SPEEX], [], [ogg speex >= 1.0.5], [Speex decoder support], [auto])
-dnl
-dnl tarkin decoder plugin
-dnl
-AC_ARG_ENABLE(tarkin,
-[ --enable-tarkin experimental tarkin codec (default disabled)])
-if test "${enable_tarkin}" = "yes"
-then
- AC_ARG_WITH(tarkin-tree,
- [ --with-tarkin-tree=PATH tarkin tree for static linking])
- if test -n "${with_tarkin_tree}"
- then
- AC_MSG_CHECKING(for tarkin.o in ${with_tarkin_tree})
- real_tarkin_tree="`cd ${with_tarkin_tree} 2>/dev/null && pwd`"
- if test -f "${real_tarkin_tree}/tarkin.o"
- then
- VLC_ADD_PLUGIN([tarkin])
- VLC_ADD_CPPFLAGS([tarkin],[-I${real_tarkin_tree}])
- VLC_ADD_LIBS([tarkin],[${real_tarkin_tree}/mem.o ${real_tarkin_tree}/pnm.o ${real_tarkin_tree}/wavelet.o ${real_tarkin_tree}/wavelet_xform.o ${real_tarkin_tree}/wavelet_coeff.o ${real_tarkin_tree}/yuv.o ${real_tarkin_tree}/tarkin.o ${real_tarkin_tree}/info.o -logg])
- AC_MSG_RESULT(yes)
- else
- dnl The given tarkin tree wasn't built
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find ${real_tarkin_tree}/tarkin.o,
- make sure you compiled tarkin in ${with_tarkin_tree}])
- fi
- fi
-fi
-
dnl
dnl theora decoder plugin
dnl
AS_IF( [test "${enable_zvbi}" != "no"],[
PKG_CHECK_MODULES(ZVBI,
- zvbi-0.2 >= 0.2.25,
+ zvbi-0.2 >= 0.2.28,
[
VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS])
if test "${SYS}" = "mingw32"; then
dnl
dnl libcaca plugin
dnl
-PKG_ENABLE_MODULES_VLC([CACA], [], [caca >= 0.99.beta1], [libcaca output],[auto])
+PKG_ENABLE_MODULES_VLC([CACA], [], [caca >= 0.99.beta14], [libcaca output],[auto])
dnl
dnl Audio plugins
AC_ARG_WITH(sqlite,
[ --with-sqlite=PATH sqlite path linking])
if test "${SYS}" != "darwin"; then
- PKG_ENABLE_MODULES_VLC([SQLITE], [], [sqlite3], [sqlite3], [auto])
+ PKG_ENABLE_MODULES_VLC([SQLITE], [], [sqlite3 >= 3.6.0], [sqlite3], [auto])
else
if test "${enable_sqlite}" != "no"
then
projects / vlc / blobdiff