diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 77 |
1 files changed, 55 insertions, 22 deletions
diff --git a/configure.in b/configure.in index 50a124ce8f..490b12be36 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([xbmc], [13.9.701], [http://issues.xbmc.org]) +AC_INIT([xbmc], [13.9.704], [http://issues.xbmc.org]) AC_CONFIG_HEADERS([xbmc/config.h]) AH_TOP([#pragma once]) m4_include([m4/ax_prog_cc_for_build.m4]) @@ -164,6 +164,7 @@ spectrum_disabled="== SPECTRUM disabled ==" goom_enabled="== GOOM enabled. ==" goom_disabled="== GOOM disabled. ==" alsa_disabled="== ALSA support disabled. ==" +dbus_disabled="== DBUS support disabled. ==" rsxs_enabled="== RSXS enabled. ==" rsxs_disabled="== RSXS disabled. ==" fishbmc_enabled="== FishBMC enabled. ==" @@ -377,6 +378,12 @@ AC_ARG_ENABLE([alsa], [use_alsa=$enableval], [use_alsa=yes]) +AC_ARG_ENABLE([dbus], + [AS_HELP_STRING([--disable-dbus], + [disable DBUS support])], + [use_dbus=$enableval], + [use_dbus=yes]) + AC_ARG_ENABLE([pulse], [AS_HELP_STRING([--enable-pulse], [enable PulseAudio support (default is auto)])], @@ -542,7 +549,7 @@ AC_ARG_ENABLE([gtest], AC_ARG_ENABLE([codec], [AS_HELP_STRING([--enable-codec], - [enable additional codecs from a list of comma separated names, (default is none, choices are amcodec, libstagefright)])], + [enable additional codecs from a list of comma separated names, (default is none, choices are amcodec, libstagefright and imxvpu)])], [add_codecs=$enableval], [add_codecs=no]) @@ -663,8 +670,8 @@ case $host in use_joystick=no use_neon=yes use_gles=yes + use_gl=no use_sdl=no - use_x11=no use_wayland=no USE_STATIC_FFMPEG=1 ;; @@ -711,7 +718,6 @@ case $use_platform in use_arch="arm" use_cpu=arm1176jzf-s use_hardcoded_tables="yes" - use_alsa="no" ARCH="arm" AC_DEFINE(HAS_EGLGLES, [1], [Define if supporting EGL based GLES Framebuffer]) USE_OMXLIB=1; AC_DEFINE([HAVE_OMXLIB],[1],["Define to 1 if OMX libs is enabled"]) @@ -827,6 +833,19 @@ elif test "$use_arch" = "arm"; then fi fi +use_sse4=no +if test "$ARCH" = "x86_64-linux" || test "$ARCH" = "i486-linux"; then + SAVE_CFLAGS="$CFLAGS" + CFLAGS="-msse4.1" + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([int foo;])], + [ use_sse4=yes + USE_SSE4=1], + [ use_sse=no + USE_SSE4=0]) + CFLAGS="$SAVE_CFLAGS" +fi + # Checks for library functions. AC_FUNC_ALLOCA AC_FUNC_CHOWN @@ -1189,10 +1208,14 @@ if test "x$use_alsa" != "xno"; then [INCLUDES="$INCLUDES $ALSA_CFLAGS"; LIBS="$LIBS $ALSA_LIBS"; use_alsa=yes], AC_MSG_NOTICE($alsa_not_found); use_alsa=no) fi +if test "x$use_dbus" != "xno"; then PKG_CHECK_MODULES([DBUS], [dbus-1], [INCLUDES="$INCLUDES $DBUS_CFLAGS"; LIBS="$LIBS $DBUS_LIBS"; use_dbus=yes]; \ AC_DEFINE([HAVE_DBUS],[1],["Define to 1 if dbus is installed"]), AC_MSG_NOTICE($missing_library); use_dbus=no) +else + AC_MSG_NOTICE($dbus_disabled) +fi if test "x$use_sdl" != "xno"; then PKG_CHECK_MODULES([SDL], [sdl], [INCLUDES="$INCLUDES $SDL_CFLAGS"; LIBS="$LIBS $SDL_LIBS"], @@ -1636,13 +1659,13 @@ else fi # FFmpeg -FFMPEG_LIBNAMES="libavcodec >= 55.69.100 - libavfilter >= 4.11.100 - libavformat >= 55.48.100 - libavutil >= 52.92.100 - libpostproc >= 52.3.100 - libswscale >= 2.6.100 - libswresample >= 0.19.100" +FFMPEG_LIBNAMES="libavcodec >= 56.1.100 + libavfilter >= 5.1.100 + libavformat >= 56.4.101 + libavutil >= 54.7.100 + libpostproc >= 53.0.100 + libswscale >= 3.0.100 + libswresample >= 1.1.100" ffmpeg_build="${abs_top_srcdir}/tools/depends/target/ffmpeg" FFMPEG_VER_SHA=$(grep "VERSION=" ${ffmpeg_build}/FFMPEG-VERSION | sed 's/VERSION=//g') @@ -1813,21 +1836,15 @@ if test "x$use_vaapi" != "xno"; then USE_VAAPI=0 else initial_val=$use_vaapi - AC_CHECK_LIB([va], main, :, use_vaapi=no) if test "x$use_vaapi" != "xno"; then - AC_CHECK_LIB([va-glx], main, LIBS="-lva -lva-glx $LIBS", use_vaapi=no, -lva) - fi - - if test "x$use_vaapi" = "xno"; then + PKG_CHECK_MODULES([LIBVA], [libva libva-x11], + [INCLUDES="$INCLUDES $LIBVA_CFLAGS"; LIBS="$LIBS $LIBVA_LIBS"; USE_VAAPI=1; + AC_DEFINE([HAVE_LIBVA], [1], [Define to 1 if you have the 'vaapi' libraries])], + [use_vaapi="no"; USE_VAAPI=0; AC_MSG_RESULT($vaapi_not_found)]) + else if test "x$initial_val" = "xyes"; then AC_MSG_ERROR($vaapi_not_found) - else - AC_MSG_RESULT($vaapi_not_found) fi - USE_VAAPI=0 - else - AC_DEFINE([HAVE_LIBVA], [1], [Define to 1 if you have the 'vaapi' libraries (-lva AND -lva-glx)]) - USE_VAAPI=1 fi fi else @@ -1901,6 +1918,17 @@ for codecs in `echo $add_codecs | sed 's/,/ /g'`; do *libstagefright*) XB_ADD_CODEC([LIBSTAGEFRIGHT], [libstagefright], [$codecs]) ;; + *imxvpu*) + AC_CHECK_HEADER([imx-mm/vpu/vpu_wrapper.h],, AC_MSG_ERROR($missing_headers)) + AC_CHECK_LIB([vpu], main, LIBS="$LIBS -lfslvpuwrap -lvpu", AC_MSG_ERROR($missing_library)) + XB_ADD_CODEC([IMXVPU], [imxvpu], [$codecs]) + CXXFLAGS="$CXXFLAGS -Wno-psabi -DLINUX " + CFLAGS="$CFLAGS -DLINUX" + if test "$use_x11" = "no"; then + CXXFLAGS="$CXXFLAGS -DEGL_API_FB" + CFLAGS="$CFLAGS -DEGL_API_FB" + fi + ;; *) esac done @@ -2474,6 +2502,10 @@ if test "$use_codec_libstagefright" = "yes"; then OUTPUT_FILES="$OUTPUT_FILES xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile" fi +if test "$use_sse4" = "yes"; then +OUTPUT_FILES="$OUTPUT_FILES xbmc/linux/sse4/Makefile" +fi + OUTPUT_FILES="$OUTPUT_FILES \ xbmc/interfaces/python/Makefile \ xbmc/interfaces/python/test/Makefile" @@ -2550,6 +2582,7 @@ AC_SUBST(GTEST_CONFIGURED) AC_SUBST(USE_DOXYGEN) AC_SUBST(USE_PVR_ADDONS) AC_SUBST(UPNP_DEFINES) +AC_SUBST(USE_SSE4) # pushd and popd are not available in other shells besides bash, so implement # our own pushd/popd functions |