dnl Autoconf settings for vlc
-AC_COPYRIGHT([Copyright 2002-2014 VLC authors and VideoLAN])
+AC_COPYRIGHT([Copyright 1999-2015 VLC authors and VideoLAN])
AC_INIT(vlc, 3.0.0-git)
VERSION_MAJOR=3
CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
CODENAME="Vetinari"
-COPYRIGHT_YEARS="1996-2014"
+COPYRIGHT_YEARS="1996-2015"
AC_CONFIG_SRCDIR(src/libvlc.c)
AC_CONFIG_AUX_DIR(autotools)
AC_ARG_VAR([DESKTOP_FILE_VALIDATE], [Validator for desktop entry files])
AC_CHECK_PROGS(DESKTOP_FILE_VALIDATE, [${DESKTOP_FILE_VALIDATE} desktop-file-validate], :)
-AC_CHECK_PROGS(YASM, yasm)
+AC_PATH_PROG(YASM, yasm)
dnl Check for compiler properties
AC_C_CONST
# 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])
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
ac_default_prefix="`pwd`/_win32"
DESTDIR="`pwd`/_win32/"
*os2*)
SYS=os2
LDFLAGS="${LDFLAGS} -Zomf -Zbin-files -Zargs-wild -Zhigh-mem"
+ AC_LIBOBJ([freeaddrinfo])
;;
*)
SYS="${host_os}"
AC_SUBST(CONTRIB_DIR)
dnl Add extras/tools to the PATH
-TOOLS_DIR="${srcdir}/extras/tools/build"
+TOOLS_DIR="${srcdir}/extras/tools/build/bin"
AS_IF([test -d "${TOOLS_DIR}"], [
TOOLS_DIR=`cd "${TOOLS_DIR}" && pwd`
export PATH="${TOOLS_DIR}":$PATH
dnl
dnl checks for mingw
AS_IF([test "${SYS}" = "mingw32"], [
+
dnl Check for broken versions of mingw-runtime compatability library
AC_MSG_CHECKING(for broken mingw-runtime)
AC_PREPROC_IFELSE([AC_LANG_SOURCE([
AC_MSG_RESULT([present])
AC_MSG_ERROR([LibVLC requires mingw-runtime version 3.15 or higher, or mingw-w64 version 3.0 or higher!])
])
+
dnl force use of mingw provided c99 *printf over msvcrt
CPPFLAGS="${CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=1"
-dnl Check for the need to include the mingwex lib for mingw32
+ dnl Add WinMainCRTStartup entry point to show it's a WinMain application
+ VLC_ADD_LDFLAGS([vlc],[-mwindows])
+
+ dnl Check for the need to include the mingwex lib for mingw32
VLC_SAVE_FLAGS
AC_CHECK_LIB(mingwex,opendir,
AC_CHECK_LIB(mingw32,opendir,,
)
VLC_RESTORE_FLAGS
-dnl Check for fnative-struct or mms-bitfields support for mingw32
+ dnl Check for fnative-struct or mms-bitfields support for mingw32
VLC_SAVE_FLAGS
CFLAGS="${CFLAGS} -mms-bitfields"
CXXFLAGS="${CXXFLAGS} -mms-bitfields"
[Build targetted for Windows Store apps (default disabled)]))
vlc_winstore_app=0
-AS_IF([test "${SYS}" = "mingw32" -a "${enable_winstore_app}" = "yes"], [
+AS_IF([test "${SYS}" = "mingw32"],[
+ AS_IF([test "${enable_winstore_app}" = "yes"], [
vlc_winstore_app=1
- VLC_ADD_LIBS([libvlccore], [-lole32 -lruntimeobject])
+ VLC_ADD_LIBS([libvlccore], [-lole32 -lruntimeobject])
+ ],[
+ VLC_ADD_LIBS([win32text],[-lgdi32])
+ VLC_ADD_LIBS([libvlccore],[-lwinmm])
])
+ ])
AC_DEFINE_UNQUOTED(VLC_WINSTORE_APP, ${vlc_winstore_app}, [Define to 1 if you want to build for Windows Store apps])
AM_CONDITIONAL([HAVE_WINSTORE], [test "$vlc_winstore_app" = "1"])
dnl Check for usual libc functions
AC_CHECK_DECLS([nanosleep],,,[#include <time.h>])
-AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale pthread_cond_timedwait_monotonic_np pthread_condattr_setclock])
+AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap open_memstream openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale pthread_cond_timedwait_monotonic_np pthread_condattr_setclock])
AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp])
AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
])
AC_SEARCH_LIBS([inet_pton], [nsl], [
- AS_IF([test "$ac_cv_search_getaddrinfo" != "none required"], [
- SOCKET_LIBS="$ac_cv_search_getaddrinfo $SOCKET_LIBS"
+ AS_IF([test "$ac_cv_search_inet_pton" != "none required"], [
+ SOCKET_LIBS="$ac_cv_search_inet_pton $SOCKET_LIBS"
])
],, [${SOCKET_LIBS}])
AC_SUBST(GNUGETOPT_LIBS)
AC_CHECK_LIB(m,cos,[
- VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom noise grain scene chorus_flanger freetype swscale postproc equalizer spatializer param_eq samplerate freetype mpc qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v mono colorthres extract ball hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum],[-lm])
+ VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom noise grain scene chorus_flanger freetype swscale postproc equalizer spatializer param_eq samplerate freetype mpc qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v mono colorthres extract ball hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum smooth],[-lm])
LIBM="-lm"
], [
LIBM=""
dnl Check for various optimization flags
AS_IF([test "${enable_optimizations}" != "no"], [
- dnl -O4 and -O3 only in production builds
+ dnl -O3 only in production builds
AS_IF([test "${enable_debug}" = "no"], [
VLC_SAVE_FLAGS
- CFLAGS="${CFLAGS} -O4"
- CXXFLAGS="${CXXFLAGS} -O4"
- OBJCFLAGS="${OBJCFLAGS} -O4"
- AC_CACHE_CHECK([if $CC accepts -O4], [ac_cv_c_o4], [
+ CFLAGS="${CFLAGS} -O3"
+ CXXFLAGS="${CXXFLAGS} -O3"
+ OBJCFLAGS="${OBJCFLAGS} -O3"
+ AC_CACHE_CHECK([if $CC accepts -O3], [ac_cv_c_o3], [
AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
- ac_cv_c_o4=yes
+ ac_cv_c_o3=yes
], [
- ac_cv_c_o4=no
+ ac_cv_c_o3=no
])
])
- AS_IF([test "${ac_cv_c_o4}" = "no"], [
- VLC_RESTORE_FLAGS
- CFLAGS="${CFLAGS} -O3"
- CXXFLAGS="${CXXFLAGS} -O3"
- OBJCFLAGS="${OBJCFLAGS} -O3"
- AC_CACHE_CHECK([if $CC accepts -O3], [ac_cv_c_o3], [
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
- ac_cv_c_o3=yes
- ], [
- ac_cv_c_o3=no
- ])
- ])
- AS_IF([test "${ac_cv_c_o3}" = "no"], [VLC_RESTORE_FLAGS])
- ])
+ AS_IF([test "${ac_cv_c_o3}" = "no"], [VLC_RESTORE_FLAGS])
])
dnl Check for -ffast-math
AS_IF([test "${ac_cv_c_fast_math}" = "no"], [VLC_RESTORE_FLAGS])
AH_BOTTOM([
#ifndef __FAST_MATH__
-# pragma STDC FENV_ACCESS OFF
-# pragma STDC FP_CONTRACT ON
+# ifndef _MSC_VER
+# pragma STDC FENV_ACCESS OFF
+# pragma STDC FP_CONTRACT ON
+# else
+# pragma fenv_access(off)
+# pragma fp_contract(on)
+# endif
#endif
])
dnl
dnl libarchive access module
dnl
-PKG_ENABLE_MODULES_VLC([ARCHIVE], [access_archive], [libarchive >= 2.8.5], (libarchive support), [auto])
+PKG_ENABLE_MODULES_VLC([ARCHIVE], [access_archive], [libarchive >= 3.1.0], (libarchive support), [auto])
dnl
dnl live555 input
dnl
dnl Blu-ray Disc Support with libbluray
dnl
-PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.3.0], (libbluray for Blu-ray disc support ) )
+PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.5.0], (libbluray for Blu-ray disc support ) )
dnl
dnl OpenCV wrapper and example filters
dnl
dnl liBDSM access module
dnl
-PKG_ENABLE_MODULES_VLC([DSM], [dsm], [libdsm], [libdsm SMB/CIFS access/sd module], [auto])
+PKG_ENABLE_MODULES_VLC([DSM], [dsm], [libdsm >= 0.0.4], [libdsm SMB/CIFS access/sd module], [auto])
dnl
dnl sftp access support
dnl
dnl mad plugin
dnl
+have_mad="no"
+MAD_CFLAGS=""
+MAD_LIBS=""
+
+AC_ARG_WITH(mad, [ --with-mad=PATH path to libmad], [
+ enable_mad="yes"
+], [
+ with_mad="no"
+])
+AS_IF([test "${with_mad}" != "no"], [
+ MAD_CFLAGS="-I${with_mad}/include"
+ MAD_LIBS="-L${with_mad}/lib"
+])
+
AC_ARG_ENABLE(mad,
[ --enable-mad libmad module (default enabled)])
-if test "${enable_mad}" != "no"
-then
- AC_ARG_WITH(mad,
- [ --with-mad=PATH path to libmad],[],[])
- if test "${with_mad}" != "no" -a -n "${with_mad}"
- then
- VLC_ADD_CPPFLAGS([mpgatofixed32],[-I${with_mad}/include])
- VLC_ADD_LIBS([mpgatofixed32],[-L${with_mad}/lib])
- fi
-
- AC_ARG_WITH(mad-tree,
- [ --with-mad-tree=PATH mad tree for static linking],[],[])
- if test "${with_mad_tree}" != "no" -a -n "${with_mad_tree}"
- then
- real_mad_tree="`cd ${with_mad_tree} 2>/dev/null && pwd`"
- if test -z "${real_mad_tree}"
- then
- dnl The given directory can't be found
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([${with_mad_tree} directory does not exist])
- fi
- dnl Use a custom libmad
- AC_MSG_CHECKING(for mad.h in ${real_mad_tree})
- if test -f ${real_mad_tree}/mad.h
- then
- AC_MSG_RESULT(yes)
- VLC_ADD_CPPFLAGS([mpgatofixed32],[-I${real_mad_tree}])
- VLC_ADD_LIBS([mpgatofixed32],[-L${real_mad_tree}/.libs])
- VLC_SAVE_FLAGS
- LDFLAGS="${LDFLAGS} ${LIBS_mpgatofixed32}"
- AC_CHECK_LIB(mad, mad_bit_init, [
- VLC_ADD_PLUGIN([mpgatofixed32])
- VLC_ADD_LIBS([mpgatofixed32],[-lmad])
- ],[ AC_MSG_ERROR([the specified tree has not been compiled ])
- ],[])
- VLC_RESTORE_FLAGS
- else
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([the specified tree does not have mad.h])
- fi
- else
- VLC_SAVE_FLAGS
- CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_mpgatofixed32}"
- LDFLAGS="${LDFLAGS} ${LIBS_mpgatofixed32}"
- AC_CHECK_HEADERS(mad.h, ,
- [ AC_MSG_ERROR([Could not find libmad on your system: you may get it from http://www.underbit.com/products/mad/. Alternatively you can use --disable-mad to disable the mad plugin.]) ])
+AS_IF([test "${enable_mad}" != "no"], [
+ VLC_SAVE_FLAGS
+ CPPFLAGS="${CPPFLAGS} ${MAD_CFLAGS}"
+ LDFLAGS="${LDFLAGS} ${MAD_LIBS}"
+ AC_CHECK_HEADERS(mad.h, [
AC_CHECK_LIB(mad, mad_bit_init, [
- VLC_ADD_PLUGIN([mpgatofixed32])
- VLC_ADD_LIBS([mpgatofixed32],[-lmad])],
- [ AC_MSG_ERROR([Cannot find libmad library...]) ])
- VLC_RESTORE_FLAGS
- fi
-fi
+ have_mad="yes"
+ MAD_LIBS="${MAD_LIBS} -lmad"
+ ])
+ ])
+ VLC_RESTORE_FLAGS
+ AS_IF([test -n "$enable_mad" -a "${have_mad}" = "no"], [
+ AC_MSG_ERROR([Could not find libmad. Install it or pass --disable-mad to disable it.])
+ ])
+])
+AC_SUBST(MAD_CFLAGS)
+AC_SUBST(MAD_LIBS)
+AM_CONDITIONAL([HAVE_MAD], [test "${have_mad}" = "yes"])
+
+dnl mpg123 plugin
+dnl
+dnl
+PKG_ENABLE_MODULES_VLC([MPG123], [mpg123], [libmpg123], [libmpg123 decoder support], [auto])
AC_ARG_ENABLE(merge-ffmpeg,
CPPFLAGS="${CPPFLAGS} ${SWSCALE_CFLAGS}"
CFLAGS="${CFLAGS} ${SWSCALE_CFLAGS}"
AC_CHECK_HEADERS(libswscale/swscale.h)
+ AC_CHECK_HEADERS(libavutil/avutil.h)
VLC_ADD_PLUGIN([swscale])
VLC_ADD_LIBS([swscale],[$SWSCALE_LIBS])
VLC_ADD_CFLAGS([swscale],[$SWSCALE_CFLAGS])
dnl
AC_ARG_ENABLE(faad,
[ --enable-faad faad codec (default auto)])
-if test "${enable_faad}" != "no"; then
- AC_ARG_WITH(faad-tree, [ --with-faad-tree=PATH faad tree for static linking])
- if test -n "${with_faad_tree}"; then
- AC_MSG_CHECKING(for libfaad.a in ${with_faad_tree})
- real_faad_tree="`cd ${with_faad_tree} 2>/dev/null && pwd`"
- if test -z "${real_faad_tree}"; then
- dnl The given directory can't be found
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot cd to ${with_faad_tree}])
- fi
- if test -f "${real_faad_tree}/libfaad/.libs/libfaad.a"; then
- dnl Use the custom faad
- AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a)
+have_faad="no"
+AS_IF([test "${enable_faad}" != "no"], [
+ AC_CHECK_HEADERS([faad.h], [
+ AC_CHECK_LIB(faad, faacDecOpen, [have_faad="yes"],, [$LIBM])
+ AC_CHECK_LIB(faad, NeAACDecOpen, [have_faad="yes"],, [$LIBM])
+
+ AS_IF([test "${have_faad}" = "yes"], [
VLC_ADD_PLUGIN([faad])
- VLC_ADD_LIBS([faad],[${real_faad_tree}/libfaad/.libs/libfaad.a])
- VLC_ADD_CPPFLAGS([faad],[-I${real_faad_tree}/include])
- else
- dnl The given libfaad wasn't built
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find ${real_faad_tree}/libfaad/.libs/libfaad.a, make sure you compiled libfaad in ${with_faad_tree}])
- fi
- else
- VLC_SAVE_FLAGS
- CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_faad}"
- LDFLAGS="${LDFLAGS} ${LIBS_faad}"
- AC_CHECK_HEADERS(faad.h,
- [ AC_CHECK_LIB(faad, faacDecOpen, [
- VLC_ADD_PLUGIN([faad])
- VLC_ADD_LIBS([faad],[-lfaad]) ], [
- AC_CHECK_LIB(faad, NeAACDecOpen, [
- VLC_ADD_PLUGIN([faad])
- VLC_ADD_LIBS([faad],[-lfaad]) ], [
- AS_IF([test "${enable_faad}" = "yes"],
- [ AC_MSG_ERROR([Cannot find libfaad library...]) ],
- [ AC_MSG_WARN([Cannot find libfaad library...]) ]) ]) ])
- ] , [ AS_IF([test "${enable_faad}" = "yes"],
- [ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ],
- [ AC_MSG_WARN([Cannot find development headers for libfaad...]) ]) ])
- VLC_RESTORE_FLAGS
- fi
-fi
+ VLC_ADD_LIBS([faad],[-lfaad])
+ ], [
+ AS_IF([test "${enable_faad}" = "yes"], [
+ AC_MSG_ERROR([cannot find FAAD library])
+ ], [
+ AC_MSG_WARN([cannot find FAAD library])
+ ])
+ ])
+ ])
+])
dnl
dnl libvpx decoder plugin
then
AC_ARG_WITH(a52,
[ --with-a52=PATH a52 headers and libraries])
- AC_ARG_WITH(a52-tree,
- [ --with-a52-tree=PATH a52dec tree for static linking ],[],[])
- if test "${with_a52_tree}" != "no" -a -n "${with_a52_tree}"
- then
- real_a52_tree="`cd ${with_a52_tree} 2>/dev/null && pwd`"
- if test -z "${real_a52_tree}"
- then
- dnl The given directory can't be found
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([${with_a52_tree} directory does not exist])
- fi
- dnl Use a custom a52dec
- AC_MSG_CHECKING(for a52.h in ${real_a52_tree}/include)
- if test -f ${real_a52_tree}/include/a52.h
- then
- AC_MSG_RESULT(yes)
- VLC_ADD_CPPFLAGS([a52tofloat32],[-I${real_a52_tree}])
- VLC_ADD_LIBS([a52tofloat32],[-L${real_a52_tree}/liba52/.libs])
- VLC_SAVE_FLAGS
- LDFLAGS="${LDFLAGS} ${LIBS_a52tofloat32}"
- AC_CHECK_LIB(a52, a52_free, [
- VLC_ADD_PLUGIN([a52tofloat32])
- VLC_ADD_CPPFLAGS([a52tofloat32],[-DUSE_A52DEC_TREE])
- VLC_ADD_LIBS([a52tofloat32],[-la52])
- ],[
- if test -f ${real_a52_tree}/liba52/.libs/liba52.a
- then
- AC_MSG_ERROR([make sure you have at least a52dec-0.7.3 ($real_a52_tree)])
- else
- AC_MSG_ERROR([the specified tree has not been compiled])
- fi
- ])
- else
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([the specified tree does not have a52.h])
- fi
- else
if test -z "${with_a52}"
then
LDFLAGS_test=""
AC_MSG_ERROR([Could not find liba52 on your system: you may get it from http://liba52.sf.net/. Alternatively you can use --disable-a52 to disable the a52 plugin.])
])
VLC_RESTORE_FLAGS
- fi
fi
dnl
])
])
+dnl
+dnl BPG decoder module
+dnl
+AC_ARG_ENABLE(bpg,
+ [ --enable-bpg BPG support (default disabled)])
+AS_IF([test "${enable_bpg}" != "no"], [
+AC_CHECK_HEADERS(libbpg.h, [
+ VLC_ADD_PLUGIN([bpg])
+ ])
+])
+
dnl
dnl H262 encoder plugin (lib262)
dnl
AC_ARG_ENABLE(x262,
[ --enable-x262 H262 encoding support with static libx262 (default disabled)])
if test "${enable_x262}" != "no"; then
-AC_ARG_WITH(x262-tree,
- [ --with-x262-tree=PATH H262 encoding module with libx262 (static linking)],[],[])
- if test "${with_x262_tree}" != "no" -a -n "${with_x262_tree}"
- then
- real_x262_tree="̧`cd ${with_x262_tree} 2>/dev/null && pwd`"
- if test -z "${real_x262_tree}"
- then
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([${with_x262_tree} directory does not exist])
- fi
- AC_MSG_CHECKING(for x262.h in ${real_x262_tree})
- if test -f ${with_x262_tree}/x262_config.h
- then
- VLC_ADD_PLUGIN([x262])
- VLC_ADD_CFLAGS([x262],[-I${with_x262_tree}])
- VLC_ADD_LIBS([x262],[-L${with_x262_tree} -lm -lpthread -lx262])
- else
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([${with_x262_tree} doesnt have x262_config.h])
- fi
- else
PKG_CHECK_MODULES(X262, x262, [
VLC_ADD_PLUGIN([x262])
VLC_ADD_LDFLAGS([x262],[${X262_LIBS}])
AC_MSG_ERROR([x262 module doesn't work without staticly compiled libx262.a])
fi
])
- fi
fi
dnl x265 encoder
AC_ARG_ENABLE(x26410b,
[ --enable-x26410b H264 10-bit encoding support with static libx264 (default disabled)])
if test "${enable_x26410b}" != "no"; then
-AC_ARG_WITH(x26410b-tree,
- [ --with-x26410b-tree=PATH H264 10-bit encoding module with libx264 (static linking)],[],[])
- if test "${with_x26410b_tree}" != "no" -a -n "${with_x26410b_tree}"
- then
- real_x26410b_tree="̧`cd ${with_x26410b_tree} 2>/dev/null && pwd`"
- if test -z "${real_x26410b_tree}"
- then
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([${with_x26410b_tree} directory does not exist])
- fi
- AC_MSG_CHECKING(for x264.h in ${real_x26410b_tree})
- if test -f ${with_x26410b_tree}/x264_config.h
- then
- AC_MSG_RESULT(yes)
- AC_MSG_CHECKING(for 10-bit build of x264)
- if grep -q "BIT_DEPTH.*10" ${with_x26410b_tree}/x264_config.h ;then
- AC_MSG_RESULT(yes)
- VLC_ADD_PLUGIN([x26410b])
- VLC_ADD_CFLAGS([x26410b],[-I${with_x26410b_tree}])
- VLC_ADD_LIBS([x26410b],[-L${with_x26410b_tree} -lm -lpthread -lx264])
- else
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([${with_x26410b_tree} isnt build 10-bit])
- fi
- else
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([${with_x26410b_tree} doesnt have x264_config.h])
- fi
- else
PKG_CHECK_MODULES(X26410B, x26410b, [
VLC_ADD_PLUGIN([x26410b])
VLC_ADD_LIBS([x26410b],[${X26410B_LIBS}])
AC_MSG_ERROR([x26410b module doesn't work without staticly compiled libx264.a])
fi
])
- fi
fi
AC_ARG_ENABLE(x264,
[ --enable-x264 H264 encoding support with libx264 (default enabled)])
if test "${enable_x264}" != "no"; then
- AC_ARG_WITH(x264-tree,
- [ --with-x264-tree=PATH x264 tree for static linking ],[],[])
- if test "${with_x264_tree}" != "no" -a -n "${with_x264_tree}"
- then
- real_x264_tree="`cd ${with_x264_tree} 2>/dev/null && pwd`"
- if test -z "${real_x264_tree}"
- then
- dnl The given directory can't be found
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([${with_x264_tree} directory does not exist])
- fi
- dnl Use a custom libx264
- AC_MSG_CHECKING(for x264.h in ${real_x264_tree})
- if test -f ${real_x264_tree}/x264.h
- then
- AC_MSG_RESULT(yes)
- VLC_ADD_CPPFLAGS([x264],[-I${real_x264_tree}])
- VLC_ADD_LIBS([x264],[-L${real_x264_tree}])
- PKG_CHECK_MODULES(X264,x264, [
- VLC_ADD_PLUGIN([x264])
- VLC_ADD_LIBS([x264],[${X264_LIBS}])
- VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}])
- if echo ${X264_LIBS} |grep -q 'pthreadGC2'; then
- VLC_ADD_CFLAGS([x264], [-DPTW32_STATIC_LIB])
- fi
- ],[
- AC_MSG_ERROR([the specified tree has not been compiled])
- ])
- else
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([the specified tree does not have x264.h])
- fi
- else
PKG_CHECK_MODULES(X264,x264 >= 0.86, [
VLC_ADD_PLUGIN([x264])
VLC_ADD_LIBS([x264],[${X264_LIBS}])
AC_MSG_ERROR([${X264_PKG_ERRORS}: you may get it from http://www.videolan.org/x264.html])
fi
])
- fi
fi
dnl
AC_MSG_WARN(Library [aribb24] needed for [aribsub] was not found)
have_aribb24="no"
])
- AM_CONDITIONAL([HAVE_ARIBB24], [test "${have_aribb24}" = "yes"])
])
+AM_CONDITIONAL([HAVE_ARIBB24], [test x"${have_aribb24}" = x"yes"])
+
+dnl
+dnl ARIB B25
+dnl
+PKG_ENABLE_MODULES_VLC([ARIBB25], [aribcam], [aribb25 >= 0.2.6], [ARIB STD-B25], [auto])
dnl
dnl kate decoder plugin
],[AC_MSG_WARN([library fontconfig not found. Styles will be disabled in freetype])])
fi
else
- VLC_ADD_LIBS([freetype],[-lgdi32])
+ AS_IF([test "$vlc_winstore_app" != "1"],[
+ VLC_ADD_LIBS([freetype],[-lgdi32])
+ ])
fi
dnl fribidi support
[ --enable-android-surface Android Surface video output module (default disabled)])
if test "${enable_android_surface}" = "yes"; then
VLC_ADD_PLUGIN([android_surface])
- VLC_ADD_PLUGIN([android_opaque])
+ VLC_ADD_PLUGIN([android_window])
fi
dnl
dnl Direct3D
AC_CHECK_HEADERS(d3d9.h, [
- VLC_ADD_PLUGIN([direct3d])
+ VLC_ADD_PLUGIN([direct3d9])
])
dnl Direct2D
[Multi-Media Abstraction Layer (MMAL) hardware plugin (default enable)]))
if test "${enable_mmal}" != "no"; then
VLC_SAVE_FLAGS
- LDFLAGS="${LDFLAGS} -L/opt/vc/lib"
+ LDFLAGS="${LDFLAGS} -L/opt/vc/lib -lvchostif"
CPPFLAGS="${CPPFLAGS} -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
AC_CHECK_HEADERS(interface/mmal/mmal.h,
[ AC_CHECK_LIB(bcm_host, vc_tv_unregister_callback_full, [
VLC_ADD_PLUGIN([mmal])
VLC_ADD_LDFLAGS([mmal],[ -L/opt/vc/lib ])
VLC_ADD_CFLAGS([mmal],[ -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux ])
- VLC_ADD_LIBS([mmal],[ -lbcm_host -lmmal ]) ], [
+ VLC_ADD_LIBS([mmal],[ -lbcm_host -lmmal -lvchostif ]) ], [
AS_IF([test "${enable_mmal}" = "yes"],
[ AC_MSG_ERROR([Cannot find bcm library...]) ],
[ AC_MSG_WARN([Cannot find bcm library...]) ])
dnl Chromecast streaming support
dnl
m4_pushdef([protobuf_lite_version], 2.5.0)
+AC_ARG_VAR(PROTOC, [protobuf compiler])
+AC_PATH_PROGS(PROTOC, protoc, no)
PKG_WITH_MODULES([CHROMECAST],[protobuf-lite >= protobuf_lite_version], [
- AC_CHECK_PROGS(PROTOC, protoc)
- AS_IF([test "${PROTOC}" = "protoc"], [
+ AS_IF([test "x${PROTOC}" != "xno"], [
VLC_ADD_PLUGIN([stream_out_chromecast])
VLC_ADD_CXXFLAGS([stream_out_chromecast],[${CHROMECAST_CFLAGS}] [-I./chromecast])
VLC_ADD_LIBS([stream_out_chromecast],[${CHROMECAST_LIBS}])
])
QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
- AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, [${QT_HOST_PATH} ${QT_PATH}/bin ${CONTRIB_DIR}/bin])
- AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, [${QT_HOST_PATH} ${QT_PATH}/bin ${CONTRIB_DIR}/bin])
- AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, [${QT_HOST_PATH} ${QT_PATH}/bin ${CONTRIB_DIR}/bin])
+ AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
+ AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
+ AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
], [
PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
AS_IF([test -n "${enable_qt}"],[
enable_qt="no"
])
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_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
- AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
+ AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
])
])
AS_IF([test "${enable_qt}" != "no"], [
PKG_CHECK_MODULES([NCURSES], [ncursesw], [
VLC_ADD_PLUGIN([ncurses])
VLC_ADD_CFLAGS([ncurses],[${NCURSES_CFLAGS}])
- VLC_ADD_LIBS([ncurses],[${NCURSES_LIBS}])
+ VLC_ADD_LIBS([ncurses],[${NCURSES_LIBS} ${LIBPTHREAD}])
ALIASES="${ALIASES} nvlc"
], [
AS_IF([test -n "${enable_ncurses}"], [
projects / vlc / blobdiff