update to gotham rc1, fix Darwin cross problems

48 files changed, 227 insertions, 739 deletions

diff --git a/package/xbmc/patches/patch-Makefile_in b/package/xbmc/patches/patch-Makefile_in
new file mode 100644
index 000000000..8742f0f50
--- /dev/null
+++ b/package/xbmc/patches/patch-Makefile_in
@@ -0,0 +1,55 @@
+--- xbmc-13.0rc1.orig/Makefile.in	2014-04-30 15:45:06.000000000 +0200
++++ xbmc-13.0rc1/Makefile.in	2014-05-03 15:31:00.000000000 +0200
+@@ -586,25 +586,6 @@ install-arch:
+ ifeq (@USE_PVR_ADDONS@,1)
+ 	$(MAKE) -C pvr-addons install
+ endif
+-ifeq ($(findstring freebsd,@ARCH@), freebsd)
+-	@find -E system addons -type f -not -iregex ".*svn.*" \
+-		-iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \
+-		-exec sh -c "install -d \"$(DESTDIR)$(libdir)/xbmc/\`dirname '{}'\`\"" \; \
+-		-and \
+-		-exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \
+-		-exec printf " -- %-75.75s\r" "{}" \;
+-else
+-ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
+-	@find -E system addons -type f -not -iregex ".*svn.*" \
+-		-iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \
+-		-exec sh -c "install -d \"$(DESTDIR)$(libdir)/xbmc/\`dirname '{}'\`\"" \; \
+-		-and \
+-		-exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \
+-		-exec printf " -- %-75.75s\r" "{}" \;
+-else
+-	@find system addons -regextype posix-extended -type f -not -iregex ".*svn.*" -iregex ".*\.so|.*\.vis|.*\.xbs|.*\.pvr" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
+-endif
+-endif
+ 
+ install-scripts:
+ 	@install -d $(DESTDIR)$(bindir)
+@@ -624,26 +605,7 @@ install-datas: install-scripts
+ 	@echo "Done!"
+ 	@echo "Copying system files to $(DESTDIR)$(datarootdir)/xbmc"
+ 	@install -d $(DESTDIR)$(datarootdir)/xbmc
+-	@# Arch independent files
+-ifeq ($(findstring bsd,@ARCH@), bsd)
+-	@find -E addons language media sounds userdata system -type f \
+-		-not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \
+-		-exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
+-		-and \
+-		-exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
+-		-exec printf " -- %-75.75s\r" "{}" \;
+-else
+-ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
+-	@find -E addons language media sounds userdata system -type f \
+-		-not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \
+-		-exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
+-		-and \
+-		-exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
+-		-exec printf " -- %-75.75s\r" "{}" \;
+-else
+ 	@find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pvr|$(subst ${space},|,$(INSTALL_FILTER))" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
+-endif
+-endif
+ 	@# Icons and links
+ 	@install -d $(DESTDIR)$(datarootdir)/applications
+ 	@install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
diff --git a/package/xbmc/patches/patch-Makefile_include_in b/package/xbmc/patches/patch-Makefile_include_in
index 2706f6698..6e3e10640 100644
--- a/package/xbmc/patches/patch-Makefile_include_in
+++ b/package/xbmc/patches/patch-Makefile_include_in
@@ -1,10 +1,10 @@
---- xbmc-12.2.orig/Makefile.include.in	2013-05-03 07:57:40.000000000 +0200
-+++ xbmc-12.2/Makefile.include.in	2013-07-31 11:46:19.000000000 +0200
-@@ -32,6 +32,7 @@ CC=@CC@
- CXXFLAGS+=@CXXFLAGS@
- CFLAGS+=@CFLAGS@
+--- xbmc-24032014.orig/Makefile.include.in	2014-03-24 15:52:26.000000000 +0100
++++ xbmc-24032014/Makefile.include.in	2014-03-25 10:05:01.625705714 +0100
+@@ -37,6 +37,7 @@ CFLAGS+=@CFLAGS@
+ CFLAGS_FOR_BUILD+=@CFLAGS_FOR_BUILD@
  LDFLAGS+=@LDFLAGS@
+ LDFLAGS_FOR_BUILD+=@LDFLAGS_FOR_BUILD@
 +INCLUDES+=@CPPFLAGS@
  INCLUDES+=-I@abs_top_srcdir@/lib
  INCLUDES+=-I@abs_top_srcdir@/xbmc
- INCLUDES+=$(sort @INCLUDES@)
+ INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.gui
diff --git a/package/xbmc/patches/patch-configure_in b/package/xbmc/patches/patch-configure_in
index 502ee03c0..0f6c1689c 100644
--- a/package/xbmc/patches/patch-configure_in
+++ b/package/xbmc/patches/patch-configure_in
@@ -1,6 +1,64 @@
---- xbmc-12.2.orig/configure.in	2013-05-03 07:57:40.000000000 +0200
-+++ xbmc-12.2/configure.in	2013-12-04 11:36:43.000000000 +0100
-@@ -876,7 +876,7 @@ if test "$use_gles" = "yes"; then
+--- xbmc-13.0rc1.orig/configure.in	2014-04-30 15:45:07.000000000 +0200
++++ xbmc-13.0rc1/configure.in	2014-05-03 11:22:45.000000000 +0200
+@@ -600,7 +600,12 @@ PKG_PROG_PKG_CONFIG
+ MAKE="${MAKE:-make}"
+ OBJDUMP="${OBJDUMP:-objdump}"
+ 
+-use_external_ffmpeg=no
++if test "x$use_external_libraries" != no;then
++  use_external_ffmpeg=yes
++else
++  use_external_ffmpeg=no
++fi
++
+ use_static_ffmpeg=no
+ 
+ # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
+@@ -626,21 +631,21 @@ case $host in
+      use_x11=no
+      build_shared_lib=yes    
+      ;;
+-  i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
++  i*86*-linux-*)
+      ARCH="i486-linux"
+      if test "$use_cpu" = "no" -a "$cross_compiling" = "yes";  then
+         use_arch="x86"
+         use_cpu="i686"
+      fi
+-     use_static_ffmpeg=yes
++     use_static_ffmpeg=no
+      ;;
+-  x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
++  x86_64-*-linux-*)
+      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
++     use_static_ffmpeg=no
+      ;;
+   i386-*-freebsd*)
+      ARCH="x86-freebsd"
+@@ -686,7 +691,7 @@ case $host in
+   powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
+      ARCH="powerpc64-linux"
+      ;;
+-  arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
++  arm*-*-linux-*)
+      ARCH="arm"
+      use_arch="arm"
+      ffmpeg_target_os=linux
+@@ -696,7 +701,7 @@ case $host in
+      use_sdl=no
+      use_x11=no
+      use_wayland=no
+-     use_static_ffmpeg=yes
++     use_static_ffmpeg=no
+      ;;
+   arm*-*linux-android*)
+      target_platform=target_android
+@@ -1047,7 +1052,7 @@ if test "$use_gles" = "yes"; then
        AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."])
        AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."])
        AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.)
diff --git a/package/xbmc/patches/patch-lib_DllAvCodec_h b/package/xbmc/patches/patch-lib_DllAvCodec_h
deleted file mode 100644
index 89b259d9c..000000000
--- a/package/xbmc/patches/patch-lib_DllAvCodec_h
+++ /dev/null
@@ -1,35 +0,0 @@
---- xbmc-12.2.orig/lib/DllAvCodec.h	2013-05-03 07:57:40.000000000 +0200
-+++ xbmc-12.2/lib/DllAvCodec.h	2013-07-31 12:23:26.000000000 +0200
-@@ -72,8 +72,8 @@ public:
-   virtual void avcodec_register_all(void)=0;
-   virtual void avcodec_flush_buffers(AVCodecContext *avctx)=0;
-   virtual int avcodec_open2_dont_call(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options)=0;
--  virtual AVCodec *avcodec_find_decoder(enum CodecID id)=0;
--  virtual AVCodec *avcodec_find_encoder(enum CodecID id)=0;
-+  virtual AVCodec *avcodec_find_decoder(enum AVCodecID id)=0;
-+  virtual AVCodec *avcodec_find_encoder(enum AVCodecID id)=0;
-   virtual int avcodec_close_dont_call(AVCodecContext *avctx)=0;
-   virtual AVFrame *avcodec_alloc_frame(void)=0;
-   virtual int avpicture_fill(AVPicture *picture, uint8_t *ptr, PixelFormat pix_fmt, int width, int height)=0;
-@@ -129,8 +129,8 @@ public:
-   }
-   virtual int avcodec_open2_dont_call(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) { *(volatile int *)0x0 = 0; return 0; }
-   virtual int avcodec_close_dont_call(AVCodecContext *avctx) { *(volatile int *)0x0 = 0; return 0; }
--  virtual AVCodec *avcodec_find_decoder(enum CodecID id) { return ::avcodec_find_decoder(id); }
--  virtual AVCodec *avcodec_find_encoder(enum CodecID id) { return ::avcodec_find_encoder(id); }
-+  virtual AVCodec *avcodec_find_decoder(enum AVCodecID id) { return ::avcodec_find_decoder(id); }
-+  virtual AVCodec *avcodec_find_encoder(enum AVCodecID id) { return ::avcodec_find_encoder(id); }
-   virtual int avcodec_close(AVCodecContext *avctx)
-   {
-     CSingleLock lock(DllAvCodec::m_critSection);
-@@ -203,8 +203,8 @@ class DllAvCodec : public DllDynamic, Dl
-   LOAD_SYMBOLS();
- 
-   DEFINE_METHOD0(void, avcodec_register_all_dont_call)
--  DEFINE_METHOD1(AVCodec*, avcodec_find_decoder, (enum CodecID p1))
--  DEFINE_METHOD1(AVCodec*, avcodec_find_encoder, (enum CodecID p1))
-+  DEFINE_METHOD1(AVCodec*, avcodec_find_decoder, (enum AVCodecID p1))
-+  DEFINE_METHOD1(AVCodec*, avcodec_find_encoder, (enum AVCodecID p1))
-   DEFINE_METHOD1(int, avcodec_close_dont_call, (AVCodecContext *p1))
-   DEFINE_METHOD0(AVFrame*, avcodec_alloc_frame)
-   DEFINE_METHOD5(int, avpicture_fill, (AVPicture *p1, uint8_t *p2, PixelFormat p3, int p4, int p5))
diff --git a/package/xbmc/patches/patch-lib_DllAvFilter_h b/package/xbmc/patches/patch-lib_DllAvFilter_h
deleted file mode 100644
index 9f1188165..000000000
--- a/package/xbmc/patches/patch-lib_DllAvFilter_h
+++ /dev/null
@@ -1,46 +0,0 @@
---- xbmc-12.2.orig/lib/DllAvFilter.h	2013-05-03 07:57:40.000000000 +0200
-+++ xbmc-12.2/lib/DllAvFilter.h	2013-08-01 10:49:46.000000000 +0200
-@@ -45,6 +45,7 @@ extern "C" {
-   #if (defined HAVE_LIBAVFILTER_AVFILTER_H)
-     #include <libavfilter/avfiltergraph.h>
-     #include <libavfilter/buffersink.h>
-+    #include <libavfilter/buffersrc.h>
-     #include <libavfilter/avcodec.h>
-   #elif (defined HAVE_FFMPEG_AVFILTER_H)
-     #include <ffmpeg/avfiltergraph.h>
-@@ -77,7 +78,7 @@ public:
- #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)
-   virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
- #else
--  virtual int av_buffersrc_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
-+  virtual int av_buffersrc_add_frame_flags(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
- #endif
-   virtual void avfilter_unref_buffer(AVFilterBufferRef *ref)=0;
-   virtual int avfilter_link(AVFilterContext *src, unsigned srcpad, AVFilterContext *dst, unsigned dstpad)=0;
-@@ -137,7 +138,7 @@ public:
- #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)
-   virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, flags); }
- #else
--  virtual int av_buffersrc_add_frame(AVFilterContext *buffer_filter, AVFrame* frame, int flags) { return ::av_buffersrc_add_frame(buffer_filter, frame, flags); }
-+  virtual int av_buffersrc_add_frame_flags(AVFilterContext *buffer_filter, AVFrame* frame, int flags) { return ::av_buffersrc_add_frame_flags(buffer_filter, frame, flags); }
- #endif
-   virtual void avfilter_unref_buffer(AVFilterBufferRef *ref) { ::avfilter_unref_buffer(ref); }
-   virtual int avfilter_link(AVFilterContext *src, unsigned srcpad, AVFilterContext *dst, unsigned dstpad) { return ::avfilter_link(src, srcpad, dst, dstpad); }
-@@ -175,7 +176,7 @@ class DllAvFilter : public DllDynamic, D
- #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)
-   DEFINE_METHOD3(int, av_vsrc_buffer_add_frame, (AVFilterContext *p1, AVFrame *p2, int p3))
- #else
--  DEFINE_METHOD3(int, av_buffersrc_add_frame, (AVFilterContext *p1, AVFrame *p2, int p3))
-+  DEFINE_METHOD3(int, av_buffersrc_add_frame_flag, (AVFilterContext *p1, AVFrame *p2, int p3))
- #endif
-   DEFINE_METHOD1(void, avfilter_unref_buffer, (AVFilterBufferRef *p1))
-   DEFINE_METHOD4(int, avfilter_link, (AVFilterContext *p1, unsigned p2, AVFilterContext *p3, unsigned p4))
-@@ -198,7 +199,7 @@ class DllAvFilter : public DllDynamic, D
- #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)
-     RESOLVE_METHOD(av_vsrc_buffer_add_frame)
- #else
--    RESOLVE_METHOD(av_buffersrc_add_frame)
-+    RESOLVE_METHOD(av_buffersrc_add_frame_flag)
- #endif
-     RESOLVE_METHOD(avfilter_unref_buffer)
-     RESOLVE_METHOD(avfilter_link)
diff --git a/package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile b/package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile
deleted file mode 100644
index 799e54eeb..000000000
--- a/package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- xbmc-12.2.orig/lib/libdvd/libdvdread/Makefile	2013-05-03 07:57:40.000000000 +0200
-+++ xbmc-12.2/lib/libdvd/libdvdread/Makefile	2013-12-15 12:24:12.000000000 +0100
-@@ -131,8 +131,8 @@ distclean: clean
- dvdread-config: $(.OBJDIR)/dvdread-config
- $(.OBJDIR)/dvdread-config: $(BUILDDEPS)
- 	@echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config
--	@echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config
--	@echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config
-+	@echo 'prefix='$(DESTDIR)$(PREFIX) >> $(.OBJDIR)/dvdread-config
-+	@echo 'libdir='$(DESTDIR)$(shlibdir) >> $(.OBJDIR)/dvdread-config
- 	@echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config
- 	@echo >> $(.OBJDIR)/dvdread-config
- 	cat $(SRC_PATH_BARE)/misc/dvdread-config.sh >> $(.OBJDIR)/dvdread-config
diff --git a/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c b/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c
deleted file mode 100644
index 1a93e1411..000000000
--- a/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-12.3-Frodo.orig/lib/xbmc-dll-symbols/DllAvFormat.c	2013-12-12 22:47:49.000000000 +0100
-+++ xbmc-12.3-Frodo/lib/xbmc-dll-symbols/DllAvFormat.c	2014-04-14 17:07:49.000000000 +0200
-@@ -110,7 +110,7 @@ void av_read_frame_flush(AVFormatContext
- #define RELATIVE_TS_BASE (INT64_MAX - (1LL<<48))
-         if(st->first_dts == AV_NOPTS_VALUE) st->cur_dts = RELATIVE_TS_BASE;
-         else                                st->cur_dts = AV_NOPTS_VALUE; /* we set the current DTS to an unspecified origin */
--        st->reference_dts = AV_NOPTS_VALUE;
-+        //st->reference_dts = AV_NOPTS_VALUE;
- 
-         st->probe_packets = MAX_PROBE_PACKETS;
- #endif
diff --git a/package/xbmc/patches/patch-m4_ax_python_devel_m4 b/package/xbmc/patches/patch-m4_ax_python_devel_m4
index cdc234436..ded81dbd5 100644
--- a/package/xbmc/patches/patch-m4_ax_python_devel_m4
+++ b/package/xbmc/patches/patch-m4_ax_python_devel_m4
@@ -1,33 +1,11 @@
---- xbmc-12.3-Frodo.orig/m4/ax_python_devel.m4	2013-12-12 22:47:49.000000000 +0100
-+++ xbmc-12.3-Frodo/m4/ax_python_devel.m4	2014-01-27 18:51:28.000000000 +0100
-@@ -151,10 +151,9 @@ $ac_distutils_result])
- 	#
- 	AC_MSG_CHECKING([for Python include path])
- 	if test -z "$PYTHON_CPPFLAGS"; then
--		python_path=`$PYTHON -c "import distutils.sysconfig; \
--			print (distutils.sysconfig.get_python_inc ());"`
-+		python_path=`python2-config --includes`
- 		if test -n "${python_path}"; then
--			python_path="-I$python_path"
-+			python_path="$python_path"
- 		fi
- 		PYTHON_CPPFLAGS=$python_path
- 	fi
-@@ -267,17 +266,6 @@ EOD`
- 	AC_MSG_RESULT([$PYTHON_SITE_PKG])
- 	AC_SUBST([PYTHON_SITE_PKG])
- 
--	#
--	# libraries which must be linked in when embedding
--	#
--	AC_MSG_CHECKING(python extra libraries)
--	if test -z "$PYTHON_EXTRA_LIBS"; then
--	   PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
--                conf = distutils.sysconfig.get_config_var; \
--                print (conf('LOCALMODLIBS') + ' ' + conf('LIBS'))"`
--	fi
--	AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
--	AC_SUBST(PYTHON_EXTRA_LIBS)
- 
- 	#
- 	# linking flags needed when embedding
+--- xbmc-13.0rc1.orig/m4/ax_python_devel.m4	2014-04-30 15:43:58.000000000 +0200
++++ xbmc-13.0rc1/m4/ax_python_devel.m4	2014-05-02 08:03:10.000000000 +0200
+@@ -298,7 +298,7 @@ EOD`
+ 	# save current global flags
+ 	ac_save_LIBS="$LIBS"
+ 	ac_save_CPPFLAGS="$CPPFLAGS"
+-	LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
++	LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
+ 	CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+ 	AC_LANG_PUSH([C])
+ 	AC_LINK_IFELSE([
diff --git a/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in b/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
index 9b670449b..f430c5af9 100644
--- a/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
+++ b/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
@@ -1,15 +1,61 @@
---- xbmc-12.3-Frodo.orig/tools/Linux/xbmc.sh.in	2013-12-12 22:47:49.000000000 +0100
-+++ xbmc-12.3-Frodo/tools/Linux/xbmc.sh.in	2014-01-14 09:55:27.409527526 +0100
-@@ -52,7 +52,7 @@ single_stacktrace()
+--- xbmc-24032014.orig/tools/Linux/xbmc.sh.in	2014-03-24 15:52:52.000000000 +0100
++++ xbmc-24032014/tools/Linux/xbmc.sh.in	2014-03-27 11:42:33.985822969 +0100
+@@ -23,7 +23,7 @@ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ datarootdir="@datarootdir@"
+ LIBDIR="@libdir@"
+-CRASHLOG_DIR=${CRASHLOG_DIR:-$HOME}
++CRASHLOG_DIR=/tmp/xbmc
  
- print_crash_report()
+ # Check for some options used by this script
+ while [ "$#" -gt "0" ]
+@@ -42,7 +42,7 @@ done
+ single_stacktrace()
  {
--  FILE="$HOME/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log"
-+  FILE="/tmp/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log"
-   echo "############## XBMC CRASH LOG ###############" >> $FILE
+   # core filename is either "core.$PID" or "core"
+-  find "$1" -maxdepth $2 -name 'core*' | while read core; do
++  find "$1" -name 'core*' | while read core; do
+       LC_ALL=C gdb --core="$core" --batch 2> /dev/null | grep -q "^Core was generated by \`$LIBDIR/xbmc/xbmc.bin" || continue
+       echo "=====>  Core file: "$core" ($(stat -c%y "$core"))" >> $FILE
+       echo "        =========================================" >> $FILE
+@@ -64,33 +64,14 @@ print_crash_report()
+   uname -m >> $FILE
+   echo -n " Kernel: " >> $FILE
+   uname -rvs >> $FILE
+-  echo -n " Release: " >> $FILE
+-  if [ -f /etc/os-release ]; then
+-	  . /etc/os-release
+-	  echo $NAME $VERSION >> $FILE
+-  elif which lsb_release > /dev/null; then
+-    echo >> $FILE
+-    lsb_release -a 2> /dev/null | sed -e 's/^/    /' >> $FILE
+-  else
+-    echo "lsb_release not available" >> $FILE
+-  fi
+   echo "############## END SYSTEM INFO ##############" >> $FILE
    echo >> $FILE
-   echo "################ SYSTEM INFO ################" >> $FILE
-@@ -91,9 +91,9 @@ print_crash_report()
+   echo "############### STACK TRACE #################" >> $FILE
+   if which gdb >/dev/null 2>&1; then
+-    if which systemd-coredumpctl &> /dev/null; then
+-      systemd-coredumpctl dump -o core xbmc.bin &> /dev/null
+-    fi
+-    single_stacktrace "$PWD" 1
++    single_stacktrace "$PWD"
+     # Find in plugins directories
+-    if [ $XBMC_HOME ]; then
+-      BASEDIR=$XBMC_HOME
+-    else
+-      BASEDIR="$LIBDIR/xbmc/"
+-    fi
+-    single_stacktrace "$BASEDIR" 5
+-    # find in user xbmc dir
+-    single_stacktrace $HOME/.xbmc/ 5
++    BASEDIR="$LIBDIR/xbmc/"
++    single_stacktrace "$BASEDIR"
+   else
+     echo "gdb not installed, can't get stack trace." >> $FILE
+   fi
+@@ -98,9 +79,9 @@ print_crash_report()
    echo >> $FILE
    echo "################# LOG FILE ##################" >> $FILE
    echo >> $FILE
@@ -21,7 +67,7 @@
      echo >> $FILE
    else
      echo "Logfile not found in the usual place." >> $FILE
-@@ -107,12 +107,6 @@ print_crash_report()
+@@ -114,12 +95,6 @@ print_crash_report()
    echo "Crash report available at $FILE"
  }
  
diff --git a/package/xbmc/patches/patch-tools_TexturePacker_XBMCTex_cpp b/package/xbmc/patches/patch-tools_TexturePacker_XBMCTex_cpp
deleted file mode 100644
index 81b0b931d..000000000
--- a/package/xbmc/patches/patch-tools_TexturePacker_XBMCTex_cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- xbmc-12.2.orig/tools/TexturePacker/XBMCTex.cpp	2013-05-03 07:57:41.000000000 +0200
-+++ xbmc-12.2/tools/TexturePacker/XBMCTex.cpp	2013-08-01 16:12:13.000000000 +0200
-@@ -35,12 +35,12 @@
- #include <SDL/SDL_image.h>
- #undef main
- 
--#include "guilib/XBTF.h"
-+#include "../../xbmc/guilib/XBTF.h"
- #include "XBTFWriter.h"
- #include "md5.h"
- #include "SDL_anigif.h"
- #include "cmdlineargs.h"
--#include "libsquish/squish.h"
-+#include "../../lib/libsquish/squish.h"
- 
- #ifdef _WIN32
- #define strncasecmp strnicmp
diff --git a/package/xbmc/patches/patch-tools_TexturePacker_XBTFWriter_cpp b/package/xbmc/patches/patch-tools_TexturePacker_XBTFWriter_cpp
deleted file mode 100644
index 91be356a7..000000000
--- a/package/xbmc/patches/patch-tools_TexturePacker_XBTFWriter_cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- xbmc-12.2.orig/tools/TexturePacker/XBTFWriter.cpp	2013-05-03 07:57:41.000000000 +0200
-+++ xbmc-12.2/tools/TexturePacker/XBTFWriter.cpp	2013-08-01 13:50:44.000000000 +0200
-@@ -22,8 +22,8 @@
- #include "XBTFWriter.h"
- #define __STDC_FORMAT_MACROS
- #include <inttypes.h>
--#include "guilib/XBTF.h"
--#include "utils/EndianSwap.h"
-+#include "../../xbmc/guilib/XBTF.h"
-+#include "../../xbmc/utils/EndianSwap.h"
- #if defined(__FreeBSD__)
- #include <stdlib.h>
- #elif !defined(__APPLE__)
diff --git a/package/xbmc/patches/patch-tools_TexturePacker_cmdlineargs_h b/package/xbmc/patches/patch-tools_TexturePacker_cmdlineargs_h
deleted file mode 100644
index efded26b5..000000000
--- a/package/xbmc/patches/patch-tools_TexturePacker_cmdlineargs_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-12.2.orig/tools/TexturePacker/cmdlineargs.h	2013-05-03 07:57:41.000000000 +0200
-+++ xbmc-12.2/tools/TexturePacker/cmdlineargs.h	2013-08-01 14:37:40.000000000 +0200
-@@ -23,7 +23,7 @@
-  */
- 
- #ifdef _LINUX
--#include "PlatformDefs.h"
-+#include "../../xbmc/linux/PlatformDefs.h"
- #include "xwinapi.h"
- typedef LPSTR PSZ;
- #define _snprintf snprintf
diff --git a/package/xbmc/patches/patch-tools_TexturePacker_xwinapi_h b/package/xbmc/patches/patch-tools_TexturePacker_xwinapi_h
deleted file mode 100644
index 1cc7efdc1..000000000
--- a/package/xbmc/patches/patch-tools_TexturePacker_xwinapi_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-12.2.orig/tools/TexturePacker/xwinapi.h	2013-05-03 07:57:41.000000000 +0200
-+++ xbmc-12.2/tools/TexturePacker/xwinapi.h	2013-08-01 15:51:48.000000000 +0200
-@@ -22,7 +22,7 @@
-  *
-  */
- 
--#include "PlatformDefs.h"
-+#include "../../xbmc/linux/PlatformDefs.h"
- 
- LPTSTR GetCommandLine();
- DWORD GetCurrentDirectory(DWORD nBufferLength, LPTSTR lpBuffer);
diff --git a/package/xbmc/patches/patch-tools_buildsteps_rbpi_configure-depends b/package/xbmc/patches/patch-tools_buildsteps_rbpi_configure-depends
new file mode 100644
index 000000000..db1aa7aab
--- /dev/null
+++ b/package/xbmc/patches/patch-tools_buildsteps_rbpi_configure-depends
@@ -0,0 +1,31 @@
+--- xbmc-24032014.orig/tools/buildsteps/rbpi/configure-depends	2014-03-24 15:52:53.000000000 +0100
++++ x