[ios] enabled ios/atv2 support in trunk

1 files changed, 100 insertions, 48 deletions

diff --git a/configure.in b/configure.in
index fa84c5b7e8..987eb6a5cc 100644
--- a/configure.in
+++ b/configure.in
@@ -82,6 +82,8 @@ crystalhd_not_found="== Could not find libcrystalhd. CrystalHD support disabled.
 crystalhd_disabled="== CrystalHD support manually disabled. =="
 vdadecoder_enabled="== VDADecoder support enabled. =="
 vdadecoder_disabled="== VDADecoder support manually disabled. =="
+vtbdecoder_enabled="== VTBDecoder support enabled. =="
+vtbdecoder_disabled="== VTBDecoder support manually disabled. =="
 openmax_disabled="== OpenMax support manually disabled. =="
 openmax_not_found="== Could not find libnvomx. OpenMax support disabled. =="
 libass_using_internal="== External Libass not found, using internal. =="
@@ -162,6 +164,12 @@ AC_ARG_ENABLE([vdadecoder],
   [use_vdadecoder=$enableval],
   [use_vdadecoder=auto])
 
+AC_ARG_ENABLE([vtbdecoder],
+  [AS_HELP_STRING([--enable-vtbdecoder],
+  [enable VTBDecoder decoding (default is auto)])],
+  [use_vtbdecoder=$enableval],
+  [use_vtbdecoder=auto])
+
 AC_ARG_ENABLE([openmax],
   [AS_HELP_STRING([--enable-openmax],
   [enable OpenMax decoding (default is yes)])],
@@ -331,7 +339,19 @@ case $host in
   x86_64-*-linux-gnu*)
      ARCH="x86_64-linux"
      ;;
+  arm-apple-darwin*)
+     use_joystick=no
+     use_vdadecoder=no
+     use_vtbdecoder=yes
+     ARCH="arm-osx"
+     SYSROOT="-miphoneos-version-min=4.1 -isysroot $SDKROOT"
+     ARCHTYPE=$HOSTTYPE
+     AC_SUBST([ARCHTYPE])
+     AC_SUBST(ARCH_DEFINES, "-D_ARMEL")
+     ;;
   i386-apple-darwin*)
+     use_joystick=no
+     use_vtbdecoder=no
      ARCH="x86-osx"
      export MACOSX_DEPLOYMENT_TARGET=10.4
      SYSROOT="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
@@ -387,6 +407,7 @@ fi
 CFLAGS="$CFLAGS $DEBUG_FLAGS"
 CXXFLAGS="$CXXFLAGS $DEBUG_FLAGS"
 
+
 if test "$use_optimizations" = "yes"; then
   final_message="$final_message\n  Optimization:\tYes"
   CXXFLAGS="$CXXFLAGS -O2"
@@ -400,22 +421,26 @@ fi
 if test "$host_vendor" = "apple" ; then
   # standard xbmc paths
   INCLUDES="$INCLUDES -I\$(abs_top_srcdir)/xbmc/osx"
-  LIBS="$LIBS -framework IOKit"
-  LIBS="$LIBS -framework Cocoa"
-  LIBS="$LIBS -framework OpenGL"
-  LIBS="$LIBS -framework AppKit"
-  LIBS="$LIBS -framework Carbon"
-  LIBS="$LIBS -framework CoreAudio"
-  LIBS="$LIBS -framework QuickTime"
-  LIBS="$LIBS -framework AudioUnit"
-  LIBS="$LIBS -framework Foundation"
-  LIBS="$LIBS -framework CoreServices"
-  LIBS="$LIBS -framework CoreVideo"
-  LIBS="$LIBS -framework CoreAudio"
-  LIBS="$LIBS -framework AudioToolbox"
-  LIBS="$LIBS -framework CoreFoundation"
-  LIBS="$LIBS -framework DiskArbitration"
-  LIBS="$LIBS -framework ApplicationServices"
+  if expr "X$host_cpu" : 'Xarm.*' > /dev/null; then
+    use_arch=arm
+  else
+    LIBS="$LIBS -framework IOKit"
+    LIBS="$LIBS -framework Cocoa"
+    LIBS="$LIBS -framework OpenGL"
+    LIBS="$LIBS -framework AppKit"
+    LIBS="$LIBS -framework Carbon"
+    LIBS="$LIBS -framework CoreAudio"
+    LIBS="$LIBS -framework QuickTime"
+    LIBS="$LIBS -framework AudioUnit"
+    LIBS="$LIBS -framework Foundation"
+    LIBS="$LIBS -framework CoreServices"
+    LIBS="$LIBS -framework CoreVideo"
+    LIBS="$LIBS -framework CoreAudio"
+    LIBS="$LIBS -framework AudioToolbox"
+    LIBS="$LIBS -framework CoreFoundation"
+    LIBS="$LIBS -framework DiskArbitration"
+    LIBS="$LIBS -framework ApplicationServices"
+  fi
 elif expr "X$host_cpu" : 'Xarm.*' > /dev/null; then
   use_arch=arm
   CFLAGS="$CFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
@@ -483,8 +508,9 @@ AC_LANG_POP([C++])
 # Checks for platforms libraries.
 if test "$use_gles" = "yes"; then
   # GLES overwrites GL if both set to yes.
-  AC_CHECK_LIB([EGL],     [main],, AC_MSG_ERROR($missing_library))
-  AC_CHECK_LIB([GLESv2],  [main],, AC_MSG_ERROR($missing_library))
+  #AC_CHECK_LIB([EGL],     [main],, AC_MSG_ERROR($missing_library))
+  #AC_CHECK_LIB([GLESv2],  [main],, AC_MSG_ERROR($missing_library))
+  AC_MSG_RESULT(== WARNING: OpenGL EL  support is assumed.)
 else
   if test "$use_gl" = "yes"; then
     if test "$host_vendor" = "apple" ; then
@@ -502,6 +528,14 @@ else
 fi
 
 # platform common libraries
+AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no")
+if test $MYSQL_CONFIG = "yes"; then
+  INCLUDES="$INCLUDES `mysql_config --include`"
+  LIBS="$LIBS `mysql_config --libs`"
+else
+  AC_MSG_ERROR($missing_program)
+fi
+AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_HEADER([mad.h],,            AC_MSG_ERROR($missing_library))
 AC_CHECK_HEADER([jpeglib.h],,        AC_MSG_ERROR($missing_library))
 AC_CHECK_HEADER([samplerate.h],,     AC_MSG_ERROR($missing_library))
@@ -519,6 +553,7 @@ AC_CHECK_LIB([crypto],      [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_LIB([wavpack],     [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_LIB([mpeg2],       [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_LIB([mpeg2convert],[main],, AC_MSG_ERROR($missing_library))
+AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_LIB([ssh],         [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh]))
 PKG_CHECK_MODULES([MAD],        [mad],
   [INCLUDES="$INCLUDES $MAD_CFLAGS"; LIBS="$LIBS $MAD_LIBS"],
@@ -558,9 +593,12 @@ PKG_CHECK_MODULES([OGG],        [ogg],
 PKG_CHECK_MODULES([VORBIS],     [vorbis],
   [INCLUDES="$INCLUDES $VORBIS_CFLAGS"; LIBS="$LIBS $VORBIS_LIBS"],
   AC_MSG_ERROR($missing_library))
-PKG_CHECK_MODULES([VORBISENC],     [vorbisenc],
+PKG_CHECK_MODULES([VORBISENC],  [vorbisenc],
   [INCLUDES="$INCLUDES $VORBISENC_CFLAGS"; LIBS="$LIBS $VORBISENC_LIBS"],
   AC_MSG_ERROR($missing_library))
+PKG_CHECK_MODULES([CURL],       [libcurl],
+  [INCLUDES="$INCLUDES $CURL_CFLAGS"],
+  AC_MSG_ERROR($missing_library))
 
 # check for libbluray
 AS_CASE([x$use_libbluray],
@@ -587,33 +625,14 @@ AS_CASE([x$use_libbluray],
 
 # platform dependent libraries
 if test "$host_vendor" = "apple" ; then
-  AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no")
-  if test $MYSQL_CONFIG = "yes"; then
-    INCLUDES="$INCLUDES `mysql_config --include`"
-    LIBS="$LIBS `mysql_config --libs`"
-  else
-    AC_MSG_ERROR($missing_program)
-  fi
   AC_CHECK_LIB([iconv],     [main],, AC_MSG_ERROR($missing_library))
-  AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
-  AC_CHECK_LIB([faad],       [main],, AC_MSG_ERROR($missing_library))
   AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))
   AC_CHECK_LIB([tiff],       [main],, AC_MSG_ERROR($missing_library))
   PKG_CHECK_MODULES([VORBISFILE],     [vorbisfile],
     [INCLUDES="$INCLUDES $VORBISFILE_CFLAGS"; LIBS="$LIBS $VORBISFILE_LIBS"],
     AC_MSG_ERROR($missing_library))
 else
-  AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no")
-  if test $MYSQL_CONFIG = "yes"; then
-    INCLUDES="$INCLUDES `mysql_config --include`"
-    LIBS="$LIBS `mysql_config --libs`"
-  else
-    AC_MSG_ERROR($missing_program)
-  fi
-  # don't combine with mysqlclient check in apple section above, Linux needs
-  # paths from mysql_config
   AC_CHECK_LIB([modplug],    [main],, AC_MSG_ERROR($missing_library))
-  AC_CHECK_LIB([mysqlclient],[main],, AC_MSG_ERROR($missing_library))
   AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library))
   AC_CHECK_LIB([smbclient],  [main],, AC_MSG_ERROR($missing_library))
   AC_CHECK_LIB([SDL_mixer],  [main],, AC_MSG_ERROR($missing_library))
@@ -642,9 +661,6 @@ else
   PKG_CHECK_MODULES([XMU],   [xmu],
     [INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"],
     AC_MSG_ERROR($missing_library))
-  PKG_CHECK_MODULES([CURL],  [libcurl],
-    [INCLUDES="$INCLUDES $CURL_CFLAGS"],
-    AC_MSG_ERROR($missing_library))
   PKG_CHECK_MODULES([DBUS],  [dbus-1],
     [INCLUDES="$INCLUDES $DBUS_CFLAGS"; LIBS="$LIBS $DBUS_LIBS"],
     AC_MSG_ERROR($missing_library))
@@ -663,9 +679,9 @@ if test "$host_vendor" != "apple"; then
   XB_FIND_SONAME([FLAC],        [FLAC])
   XB_FIND_SONAME([MODPLUG],     [modplug])
 fi
-XB_FIND_SONAME([CURL],        [curl])
 XB_FIND_SONAME([MAD],         [mad])
 XB_FIND_SONAME([OGG],         [ogg])
+XB_FIND_SONAME([CURL],        [curl])
 XB_FIND_SONAME([VORBIS],      [vorbis])
 XB_FIND_SONAME([VORBISENC],   [vorbisenc])
 XB_FIND_SONAME([VORBISFILE],  [vorbisfile])
@@ -1006,7 +1022,24 @@ if test "x$use_vdadecoder" != "xno"; then
   fi
 else
   AC_MSG_NOTICE($vdadecoder_disabled)
-  USE_VDA=0
+fi
+
+# VTBDecoder
+if test "x$use_vtbdecoder" != "xno"; then
+  if test "$host_vendor" = "apple" ; then
+    HAVE_VIDEOTOOLBOXDECODER=1
+    AC_DEFINE([HAVE_VIDEOTOOLBOXDECODER], [1], [Define to 1 if you have the 'VTBDecoder' library.])
+    AC_MSG_NOTICE($vtbdecoder_enabled)
+  else
+    if test "x$use_vtbdecoder" = "xyes"; then
+      AC_MSG_ERROR([VTB Decoder not supported on this platform])
+    else
+      use_vtbdecoder="no"
+      AC_MSG_NOTICE($vtbdecoder_disabled)
+    fi
+  fi
+else
+  AC_MSG_NOTICE($vtbdecoder_disabled)
 fi
 
 # OpenMax
@@ -1037,9 +1070,11 @@ if test "$host_vendor" != "apple" ; then
   fi
 fi
 
-AC_CHECK_PROG(HAVE_CMAKE,cmake,"yes","no",)
-if test "$HAVE_CMAKE" = "no" ; then
-  AC_MSG_ERROR($missing_program)
+if test "$use_arch" != "arm" ; then
+  AC_CHECK_PROG(HAVE_CMAKE,cmake,"yes","no",)
+  if test "$HAVE_CMAKE" = "no" ; then
+    AC_MSG_ERROR($missing_program)
+  fi
 fi
 
 AC_CHECK_PROG(HAVE_GPERF,gperf,"yes","no",)
@@ -1150,6 +1185,12 @@ else
   final_message="$final_message\n  VDADecoder:\tNo"
 fi
 
+if test "x$use_vtbdecoder" != "xno"; then
+  final_message="$final_message\n  VTBDecoder:\tYes"
+else
+  final_message="$final_message\n  VTBDecoder:\tNo"
+fi
+
 if test "$use_openmax" != "no"; then
   final_message="$final_message\n  OpenMax:\tYes"
 else
@@ -1551,6 +1592,9 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
       `if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\
       --target-os=$(tolower $(uname -s)) \
       --disable-amd3dnow \
+      --disable-armv5te \
+      --disable-armv6t2 \
+      `if test "$use_arch" != "yes"; then echo --enable-neon; fi`\
       --disable-static \
       `if test "$use_debug" = "no"; then echo --disable-debug; fi` \
       --disable-muxers \
@@ -1756,8 +1800,10 @@ XB_CONFIG_MODULE([lib/libid3tag/libid3tag],[
 
 XB_CONFIG_MODULE([xbmc/visualizations/XBMCProjectM/libprojectM],[
   if test "$host_vendor" = "apple" ; then
+  if test "$use_arch" != "arm" ; then
     rm -f CMakeCache.txt && CC="$CC" CXX="$CXX" cmake -DCMAKE_BUILD_TYPE=None -DUSE_FTGL:BOOL=OFF \
       -DCMAKE_C_FLAGS:STRING="${CPPFLAGS} ${CFLAGS} -fno-common" -DCMAKE_CXX_FLAGS:STRING="${CPPFLAGS} ${CXXFLAGS} -fno-common"
+  fi
   else
 set -x
     rm -f CMakeCache.txt && CC="$CC" CXX="$CXX" cmake -DCMAKE_BUILD_TYPE=None -DUSE_FTGL:BOOL=OFF \
@@ -1833,7 +1879,10 @@ fi
 XB_CONFIG_MODULE([lib/libapetag], [
   if test "$host_vendor" = "apple" ; then
     CFLAGS="$CFLAGS -fno-common" \
-    ./configure --disable-shared
+    ./configure --disable-shared \
+      --host=$host_alias \
+      --build=$build_alias \
+      --target=$target_alias CFLAGS="$CFLAGS" CC="$CC" CXX="$CXX"
   else
     ./configure \
       --host=$host_alias \
@@ -1868,7 +1917,10 @@ XB_CONFIG_MODULE([lib/libmicrohttpd], [
 
 XB_CONFIG_MODULE([lib/cpluff], [
   if test "$host_vendor" = "apple" ; then
-    ./configure --disable-nls CFLAGS="$CFLAGS" CC="$CC" CXX="$CXX" LDFLAGS="$LDFLAGS"
+    ./configure --disable-nls \
+      --host=$host_alias \
+      --build=$build_alias \
+      --target=$target_alias CFLAGS="$CFLAGS" CC="$CC" CXX="$CXX" LDFLAGS="$LDFLAGS -Wl,-read_only_relocs,suppress"    
   else
     ./configure --disable-nls \
       --host=$host_alias \