Merge pull request #4314 from MartijnKaijser/beta1 Gotham-beta1
authorTrent Nelson <trent.a.b.nelson@gmail.com>
Mon, 3 Mar 2014 20:11:24 +0000 (15:11 -0500)
committerTrent Nelson <trent.a.b.nelson@gmail.com>
Mon, 3 Mar 2014 20:11:24 +0000 (15:11 -0500)
[release] version bump to 13.0 beta1

1  2 
configure.in
tools/android/packaging/xbmc/AndroidManifest.xml
tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh

diff --combined configure.in
@@@ -2,7 -2,7 +2,7 @@@
  # Process this file with autoconf to produce a configure script.
  
  AC_PREREQ(2.59)
- AC_INIT([xbmc], [12.9.12], [http://issues.xbmc.org])
+ AC_INIT([xbmc], [12.9.81], [http://issues.xbmc.org])
  AC_CONFIG_HEADERS([xbmc/config.h])
  AH_TOP([#pragma once])
  m4_include([m4/ax_prog_cc_for_build.m4])
@@@ -18,9 -18,6 +18,9 @@@ tolower()
    echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
  }
  
 +# workaround for autotools that don't set this
 +abs_top_srcdir=${abs_top_srcdir=$(cd $srcdir; pwd)}
 +
  # check for enabling additional players
  AC_DEFUN([XB_ADD_PLAYER],
  [
@@@ -40,7 -37,7 +40,7 @@@
  AC_DEFUN([XB_ADD_CODEC],
  [
    AC_MSG_CHECKING([for $2])
 -  case $add_codecs in
 +  case $3 in
      *$2*)
        use_codec_$2="yes"
        AC_SUBST([USE_$1], 1)
@@@ -140,7 -137,7 +140,7 @@@ wayland_disabled="== Wayland disabled. 
  x11_enabled="== X11 enabled. =="
  x11_disabled="== X11 disabled. =="
  pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
 -pulse_disabled="== PulseAudio support manually disabled. =="
 +pulse_disabled="== PulseAudio support disabled. =="
  dvdcss_enabled="== DVDCSS support enabled. =="
  dvdcss_disabled="== DVDCSS support disabled. =="
  hal_not_found="== Could not find hal. HAL support disabled. =="
@@@ -191,6 -188,9 +191,6 @@@ libcec_disabled="== libcec disabled. CE
  # External library message strings
  external_libraries_enabled="== Use of all supported external libraries enabled. =="
  external_libraries_disabled="== Use of all supported external libraries disabled. =="
 -external_ffmpeg_enabled="== Use of external ffmpeg enabled. =="
 -external_ffmpeg_disabled="== Use of external ffmpeg disabled. =="
 -ffmpeg_vdpau_not_supported="== External ffmpeg doesn't support VDPAU. VDPAU support disabled. =="
  dashes="------------------------"
  final_message="\n  XBMC Configuration:"
  final_message="\n$dashes$final_message\n$dashes"
@@@ -371,9 -371,9 +371,9 @@@ AC_ARG_ENABLE([alsa]
  
  AC_ARG_ENABLE([pulse],
    [AS_HELP_STRING([--enable-pulse],
 -  [enable PulseAudio support (default is no)])],
 +  [enable PulseAudio support (default is auto)])],
    [use_pulse=$enableval],
 -  [use_pulse=no])
 +  [use_pulse=auto])
  
  AC_ARG_ENABLE([ssh],
    [AS_HELP_STRING([--disable-ssh],
@@@ -569,6 -569,12 +569,6 @@@ AC_ARG_ENABLE([external-libraries]
    [use_external_libraries=$enableval],
    [use_external_libraries=no])
  
 -AC_ARG_ENABLE([external-ffmpeg],
 -  [AS_HELP_STRING([--enable-external-ffmpeg],
 -  [enable use of external ffmpeg libraries (default is no) 'Linux only'])],
 -  [use_external_ffmpeg=$enableval],
 -  [use_external_ffmpeg=$use_external_libraries])
 -
  AC_ARG_ENABLE([libav-compat],
    [AS_HELP_STRING([--enable-libav-compat],
    [build a wrapper around libav to provide the functions needed by XBMC. This is
@@@ -600,9 -606,6 +600,9 @@@ PKG_PROG_PKG_CONFI
  MAKE="${MAKE:-make}"
  OBJDUMP="${OBJDUMP:-objdump}"
  
 +use_external_ffmpeg=no
 +use_static_ffmpeg=no
 +
  # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
  # there is no autoconf variable which will give
  # the correct output format when doing cross compilation
@@@ -625,22 -628,20 +625,22 @@@ case $host i
       use_sdl=no
       use_x11=no
       build_shared_lib=yes    
 -    ;;
 -  i*86*-linux-gnu*)
 +     ;;
 +  i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
       ARCH="i486-linux"
       if test "$use_cpu" = "no" -a "$cross_compiling" = "yes";  then
          use_arch="x86"
          use_cpu="i686"
       fi
 +     use_static_ffmpeg=yes
       ;;
 -  x86_64-*-linux-gnu*)
 +  x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
       ARCH="x86_64-linux"
       if test "$use_cpu" = "no" -a "$cross_compiling" = "yes";  then
          use_arch="x86_64"
          use_cpu="x86_64"
       fi
 +     use_static_ffmpeg=yes
       ;;
    i386-*-freebsd*)
       ARCH="x86-freebsd"
       ARCH="powerpc-osx"
       use_arch="ppc"
       ;;
 -  powerpc-*-linux-gnu*)
 +  powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*)
       ARCH="powerpc-linux"
       ;;
 -  powerpc64-*-linux-gnu*)
 +  powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
       ARCH="powerpc64-linux"
       ;;
    arm*-*-linux-gnu*)
       use_sdl=no
       use_x11=no
       use_wayland=no
 +     use_static_ffmpeg=yes
       ;;
    arm*-*linux-android*)
       target_platform=target_android
@@@ -759,7 -759,7 +759,7 @@@ AC_CHECK_PROG(HAVE_GIT,git,"yes","no",
  if test "$GIT_REV" = ""; then
    if test -f VERSION ; then
      GIT_REV=$(awk 'END{print substr($1,1,16)}' VERSION)
 -  elif test "$HAVE_GIT" = "yes"; then
 +  elif test "$HAVE_GIT" = "yes" -a -d ${abs_top_srcdir}/.git; then
      GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}')
    else
      GIT_REV="Unknown"
@@@ -874,14 -874,6 +874,14 @@@ elif test "$use_arch" = "arm"; the
      fi
    fi
  fi
 +if test "$use_static_ffmpeg" = "yes"; then
 +  USE_STATIC_FFMPEG=1
 +  AC_DEFINE([USE_STATIC_FFMPEG], [1], [link ffmpeg statically])
 +  # ffmpeg may depend on gnutls and vorbisenc, we add those libs at the end of linker
 +  # command in order to resolve any missing symbols
 +  GNUTLS_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors gnutls`
 +  VORBISENC_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors vorbisenc`
 +fi 
  
  # Checks for library functions.
  AC_FUNC_ALLOCA
@@@ -1104,11 -1096,6 +1104,11 @@@ AC_CHECK_HEADER([FLAC/stream_decoder.h]
  # we need to check for the header because if it exists we set the openssl
  # and gcrypt MT callback hooks. This is mostly so that libcurl operates 
  # in MT manner correctly.
 +AC_MSG_CHECKING([for CRYPTO_set_locking_callback(0)])
 +AC_TRY_LINK([],[CRYPTO_set_locking_callback(0);],
 +                [have_curl_static=yes],
 +                [have_curl_static=no])
 +AC_MSG_RESULT($have_curl_static)
  AC_CHECK_HEADER([openssl/crypto.h], AC_DEFINE([HAVE_OPENSSL],[1],[Define if we have openssl]),)
  AC_CHECK_HEADER([gcrypt.h], gcrypt_headers_available=yes,gcrypt_headers_available=no)
  if test "$gcrypt_headers_available" = "yes"; then
@@@ -1328,17 -1315,17 +1328,17 @@@ if test "x$use_pulse" != "xno"; the
      fi
      USE_PULSE=0
    else
 -    AC_CHECK_LIB([pulse],[main],,pulse_found="no")
 -    AC_CHECK_LIB([pulse-simple],[main],,pulse_found="no")
 -
 -    if test "x$pulse_found" != "xno"; then
 -      USE_PULSE=1
 -    elif test "x$use_pulse" = "xyes"; then
 -      AC_MSG_ERROR($pulse_not_found)
 -    else
 -      use_pulse=no
 -      USE_PULSE=0
 -      AC_MSG_RESULT($pulse_not_found)
 +    PKG_CHECK_MODULES([PULSE], [libpulse >= 1.0],
 +      [INCLUDES="$INCLUDES $PULSE_CFLAGS"; LIBS="$LIBS $PULSE_LIBS"; USE_PULSE=1;
 +        HAVE_LIBPULSE=1; AC_DEFINE([HAVE_LIBPULSE],[1],[Pulse audio enabled])],
 +      [pulse_found="no"; USE_PULSE=0; HAVE_LIBPULSE=0])
 +
 +    if test "$pulse_found" = "no"; then
 +      if test "x$use_pulse" = "xyes"; then
 +        AC_MSG_ERROR($pulse_not_found)
 +      else
 +        AC_MSG_RESULT($pulse_disabled)
 +      fi
      fi
    fi
  else
    AC_DEFINE([HAVE_LIBSSH], [1], [Whether to use libSSH library.])
  fi
  
 +# libcurl
 +if test "x$have_curl_static" = "xyes"; then
 +  AC_DEFINE([HAS_CURL_STATIC], [1], [Whether OpenSSL inside libcurl is static.])
 +fi
 +
  # libRTMP
  if test "$use_librtmp" != "no"; then
    AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
  # libshairplay for AirTunes (prefered lib)
  USE_AIRTUNES=0
  if test "x$use_airtunes" != "xno"; then
 -  AC_CHECK_HEADERS([shairplay/raop.h],,
 -   [if test "x$use_airtunes" = "xyes"; then
 -      AC_MSG_ERROR($libshairplay_not_found)
 -    elif test "x$use_airtunes" != "xno"; then
 -      AC_MSG_NOTICE($libshairplay_not_found)
 -      use_airtunes="no"
 -    fi
 +  AC_CHECK_HEADERS([shairplay/raop.h],USE_AIRTUNES=1,
 +   [AC_MSG_NOTICE($libshairplay_not_found)
     ])
  
 -  if test "x$use_airtunes" != "xno"; then
 -    XB_FIND_SONAME([SHAIRPLAY], [shairplay], [use_airtunes])
 -    USE_AIRTUNES=1
 -    USE_LIBSHAIRPORT=1
 +  if test "x$USE_AIRTUNES" != "x0"; then
 +    XB_FIND_SONAME([SHAIRPLAY], [shairplay], [USE_AIRTUNES])
 +    USE_LIBSHAIRPLAY=1
      AC_CHECK_MEMBERS([struct raop_callbacks_s.cls],,,
                       [[#include <shairplay/raop.h>]])
      AC_DEFINE([HAVE_LIBSHAIRPLAY],[1],["Define to 1 if you have libshairplay."])
  
    #libshairport - as a fallback for AirTunes
    if test "x$USE_AIRTUNES" == "x0"; then
 -    AC_CHECK_HEADERS([shairport/shairport.h],,
 -     [if test "x$use_airtunes" = "xyes"; then
 -        AC_MSG_ERROR($libshairport_not_found)
 -      elif test "x$use_airtunes" != "xno"; then
 -        AC_MSG_NOTICE($libshairport_not_found)
 -        use_airtunes="no"
 -      fi
 +    AC_CHECK_HEADERS([shairport/shairport.h],USE_AIRTUNES=1,
 +     [AC_MSG_NOTICE($libshairport_not_found)
       ])
  
 -    if test "x$use_airtunes" != "xno"; then
 -      XB_FIND_SONAME([SHAIRPORT], [shairport], [use_airtunes])
 -      USE_AIRTUNES=1
 +    if test "x$USE_AIRTUNES" != "x0"; then
 +      XB_FIND_SONAME([SHAIRPORT], [shairport], [USE_AIRTUNES])
        AC_CHECK_MEMBERS([struct AudioOutput.ao_set_metadata],,,
                         [[#include <shairport/shairport.h>]])
        AC_DEFINE([HAVE_LIBSHAIRPORT],[1],["Define to 1 if you have libshairport."])
      fi
    fi
 +
 +  if test "x$USE_AIRTUNES" == "x0"; then
 +    if test "x$use_airtunes" == "xyes"; then
 +      AC_MSG_ERROR("No airtunes library could be found. (libshairport/libshairplay)")
 +    fi
 +    use_airtunes="no"
 +  fi
  fi
  
  # libudev
@@@ -1981,19 -1968,16 +1981,19 @@@ case $add_players i
  esac
  
  # additional internal codecs
 -case $add_codecs in
 -  *amcodec*)
 -      AC_CHECK_HEADER([amcodec/codec_error.h],, AC_MSG_ERROR($missing_headers))
 -      XB_ADD_CODEC([LIBAMCODEC], [amcodec])
 -      ;;
 -  *libstagefright*)
 -      XB_ADD_CODEC([LIBSTAGEFRIGHT], [libstagefright])
 -      ;;
 -  *)
 -esac
 +# remember to convert commas to spaces
 +for codecs in `echo $add_codecs | sed 's/,/ /g'`; do
 +  case $codecs in
 +    *amcodec*)
 +        AC_CHECK_HEADER([amcodec/codec_error.h],, AC_MSG_ERROR($missing_headers))
 +        XB_ADD_CODEC([LIBAMCODEC], [amcodec], [$codecs])
 +        ;;
 +    *libstagefright*)
 +        XB_ADD_CODEC([LIBSTAGEFRIGHT], [libstagefright], [$codecs])
 +        ;;
 +    *)
 +  esac
 +done
  
  # platform specific bin utilities
  if test "$build_vendor" != "apple" ; then
@@@ -2400,7 -2384,7 +2400,7 @@@ els
  fi
  
  if test "x$use_airtunes" != "xno"; then
 -  if test "x$USE_LIBSHAIRPORT" == "x1"; then
 +  if test "x$USE_LIBSHAIRPLAY" == "x1"; then
      final_message="$final_message\n  AirTunes support (libshairplay):\tYes"  
    else
      final_message="$final_message\n  AirTunes support (libshairport):\tYes"
@@@ -2621,7 -2605,6 +2621,7 @@@ AC_SUBST(DISABLE_FISHBMC
  AC_SUBST(DISABLE_PROJECTM)
  AC_SUBST(USE_SKIN_TOUCHED)
  AC_SUBST(USE_EXTERNAL_FFMPEG)
 +AC_SUBST(USE_STATIC_FFMPEG)
  AC_SUBST(USE_LIBAV_HACKS)
  AC_SUBST(PYTHON_VERSION)
  AC_SUBST(OUTPUT_FILES)
@@@ -2649,7 -2632,6 +2649,7 @@@ AC_SUBST(USE_LIBAFPCLIENT
  AC_SUBST(USE_AIRPLAY)
  AC_SUBST(USE_OPENMAX)
  AC_SUBST(USE_PULSE)
 +AC_SUBST(HAVE_LIBPULSE)
  AC_SUBST(USE_XRANDR)
  AC_SUBST(USE_ALSA)
  AC_SUBST(USE_TEXTUREPACKER)
@@@ -2667,8 -2649,6 +2667,8 @@@ AC_SUBST(USE_ANDROID
  AC_SUBST(GTEST_CONFIGURED)
  AC_SUBST(USE_DOXYGEN)
  AC_SUBST(USE_PVR_ADDONS)
 +AC_SUBST(GNUTLS_ALL_LIBS)
 +AC_SUBST(VORBISENC_ALL_LIBS)
  
  # pushd and popd are not available in other shells besides bash, so implement
  # our own pushd/popd functions
@@@ -2802,6 -2782,7 +2802,6 @@@ XB_CONFIG_MODULE([lib/ffmpeg], 
      LDFLAGS="$(echo "$LDFLAGS" | sed "s/-Wl,-Bsymbolic-functions//g")" \
      ./configure \
        --extra-cflags="$PASSED_CFLAGS $FFMPEG_EXTRACFLAGS" \
 -      --disable-static \
        `if test "$use_debug" = "no"; then echo --disable-debug; fi` \
        `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
        `if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
        --disable-ffserver \
        --disable-ffmpeg \
        --disable-crystalhd \
 -      --enable-shared \
 +      `if test "$use_static_ffmpeg" = "yes"; then echo --enable-static --disable-shared; else echo --disable-static --enable-shared; fi` \
        --disable-doc \
        --enable-postproc \
        --enable-gpl \
@@@ -2873,6 -2854,7 +2873,6 @@@ XB_CONFIG_MODULE([lib/libdvd/libdvdread
      --disable-strip \
      --disable-opts \
      --cc="$CC" &&
 -  $MAKE dvdread-config &&
    mkdir -p `pwd`/../includes/dvdread
    cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
    cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread
@@@ -2882,7 -2864,7 +2882,7 @@@ XB_CONFIG_MODULE([lib/libdvd/libdvdnav]
    ./configure2 \
      --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \
      --extra-ldflags="-L`pwd`/../libdvdread/obj" \
 -    --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
 +    --with-dvdread-config="`pwd`/../dvdread-config" \
      --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
      --host=$host_alias \
      --build=$build_alias \
@@@ -2,8 -2,8 +2,8 @@@
  <!-- BEGIN_INCLUDE(manifest) -->
  <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="org.xbmc.xbmc"
-     android:versionCode="18"
-     android:versionName="13.0-ALPHA12" >
+     android:versionCode="20"
+     android:versionName="13.0-BETA1" >
  
      <!-- This is the platform API where NativeActivity was introduced. -->
      <uses-sdk android:minSdkVersion="14" />
@@@ -16,7 -16,7 +16,7 @@@
      <application android:icon="@drawable/ic_launcher" android:debuggable="true" android:label="@string/app_name" android:hasCode="true">
          <activity
              android:name=".Splash"
 -            android:configChanges="orientation|keyboard|keyboardHidden|navigation"
 +            android:configChanges="orientation|keyboard|keyboardHidden|navigation|touchscreen"
              android:finishOnTaskLaunch="true"
              android:launchMode="singleInstance"
              android:screenOrientation="sensorLandscape"
@@@ -46,7 -46,7 +46,7 @@@ f
  PACKAGE=org.xbmc.xbmc-ios
  
  VERSION=13.0
- REVISION=0~alpha12
+ REVISION=0~beta1
  ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
  
  echo Creating $PACKAGE package version $VERSION revision $REVISION
@@@ -58,7 -58,7 +58,7 @@@ mkdir -p $DIRNAME/$PACKAGE/DEBIA
  echo "Package: $PACKAGE"                          >  $DIRNAME/$PACKAGE/DEBIAN/control
  echo "Priority: Extra"                            >> $DIRNAME/$PACKAGE/DEBIAN/control
  echo "Name: XBMC-iOS"                             >> $DIRNAME/$PACKAGE/DEBIAN/control
 -echo "Depends: firmware (>= 4.1), curl, org.xbmc.xbmc-iconpack" >> $DIRNAME/$PACKAGE/DEBIAN/control
 +echo "Depends: firmware (>= 4.1), curl"           >> $DIRNAME/$PACKAGE/DEBIAN/control
  echo "Version: $VERSION-$REVISION"                >> $DIRNAME/$PACKAGE/DEBIAN/control
  echo "Architecture: iphoneos-arm"                 >> $DIRNAME/$PACKAGE/DEBIAN/control
  echo "Description: XBMC Multimedia Center for 4.x iOS" >> $DIRNAME/$PACKAGE/DEBIAN/control