xbmc-rpi: update to xbmc-rpi-abeb41e

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/mediacenter/xbmc-rpi-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-rpi-theme-Confluence"
-PKG_VERSION="c691108"
+PKG_VERSION="abeb41e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-rpi/meta

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="xbmc-rpi"
-PKG_VERSION="c691108"
+PKG_VERSION="abeb41e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 yajl sqlite mysql bc xbmc-addon-settings"
-PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 yajl sqlite mysql"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 yajl sqlite mysql bc xbmc-addon-settings"
+PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 yajl sqlite mysql"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
 PKG_SHORTDESC="xbmc: XBMC Mediacenter"

packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-c691108-404-add_lame_check-0.6.patch

@@ -1,125 +0,0 @@
-diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
---- xbmc-pvr-3513480/configure.in	2011-04-25 05:46:35.000000000 +0200
-+++ xbmc-pvr-3513480.patch/configure.in	2011-04-25 05:50:02.982401390 +0200
-@@ -72,6 +72,8 @@
- rsxs_disabled="== RSXS disabled. =="
- pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
- pulse_disabled="== PulseAudio support manually disabled. =="
-+lame_not_found="== Could not find libmp3lame. LAME support disabled. =="
-+lame_disabled="== LAME support manually disabled. =="
- dvdcss_enabled="== DVDCSS support enabled. =="
- dvdcss_disabled="== DVDCSS support disabled. =="
- hal_not_found="== Could not find hal. HAL support disabled. =="
-@@ -244,6 +246,12 @@
-   [use_ffmpeg_libvorbis=$enableval],
-   [use_ffmpeg_libvorbis=no])
- 
-+AC_ARG_ENABLE([lame],
-+  [AS_HELP_STRING([--enable-lame],
-+  [enable lame support (default is yes)])],
-+  [use_lame=$enableval],
-+  [use_lame=yes])
-+
- AC_ARG_ENABLE([dvdcss],
-   [AS_HELP_STRING([--enable-dvdcss],
-   [enable DVDCSS support (default is yes)])],
-@@ -758,6 +766,20 @@
-   USE_PULSE=0
- fi
- 
-+# LAME
-+if test "$use_lame" = "yes"; then
-+  AC_CHECK_LIB([mp3lame], [main],
-+    AC_DEFINE([HAVE_LIBMP3LAME], [1], [Define to 1 if you have the 'libmp3lame' library (-lmp3lame).]),
-+    use_lame=no;AC_MSG_RESULT($lame_not_found))
-+else
-+  AC_MSG_RESULT($lame_disabled)
-+fi
-+if test "$use_lame" = "yes"; then
-+  AC_SUBST([HAVE_LIBMP3LAME], 1)
-+else
-+  AC_SUBST([HAVE_LIBMP3LAME], 0)
-+fi
-+
- # HAL
- if test "$host_vendor" = "apple" ; then
-   use_hal="no"
-@@ -1311,6 +1333,12 @@
-   final_message="$final_message\n  HAL Support:\tNo"
- fi
- 
-+if test "$use_lame" = "yes"; then
-+  final_message="$final_message\n  LAME:\t\tYes"
-+else
-+  final_message="$final_message\n  LAME:\t\tNo"
-+fi
-+
- # DVDCSS
- if test "$use_dvdcss" = "yes"; then
-   AC_MSG_NOTICE($dvdcss_enabled)
-diff -Naur xbmc-pvr-3513480/configure.in.orig xbmc-pvr-3513480.patch/configure.in.orig
-diff -Naur xbmc-pvr-3513480/Makefile.in.orig xbmc-pvr-3513480.patch/Makefile.in.orig
-diff -Naur xbmc-pvr-3513480/xbmc/cdrip/CDDARipper.cpp xbmc-pvr-3513480.patch/xbmc/cdrip/CDDARipper.cpp
---- xbmc-pvr-3513480/xbmc/cdrip/CDDARipper.cpp	2011-04-25 02:36:33.000000000 +0200
-+++ xbmc-pvr-3513480.patch/xbmc/cdrip/CDDARipper.cpp	2011-04-25 05:48:10.487548571 +0200
-@@ -27,7 +27,11 @@
- #include "CDDAReader.h"
- #include "utils/StringUtils.h"
- #include "Util.h"
-+
-+#ifdef HAVE_LIBMP3LAME
- #include "EncoderLame.h"
-+#endif
-+
- #include "EncoderWav.h"
- #include "EncoderVorbis.h"
- #include "EncoderFFmpeg.h"
-@@ -78,9 +82,16 @@
-   case CDDARIP_ENCODER_FLAC:
-     m_pEncoder = new CEncoderFlac();
-     break;
--  default:
-+#ifdef HAVE_LIBMP3LAME
-+  case CDDARIP_ENCODER_LAME:
-     m_pEncoder = new CEncoderLame();
-     break;
-+#else
-+  default:
-+    CLog::Log(LOGERROR,"invalid encoder selected");
-+    return false;
-+    break;
-+#endif
-   }
- 
-   // we have to set the tags before we init the Encoder
-diff -Naur xbmc-pvr-3513480/xbmc/cdrip/Makefile.in xbmc-pvr-3513480.patch/xbmc/cdrip/Makefile.in
---- xbmc-pvr-3513480/xbmc/cdrip/Makefile.in	2011-04-25 02:36:33.000000000 +0200
-+++ xbmc-pvr-3513480.patch/xbmc/cdrip/Makefile.in	2011-04-25 05:51:13.013064387 +0200
-@@ -3,10 +3,13 @@
-      Encoder.cpp \
-      EncoderFFmpeg.cpp \
-      EncoderFlac.cpp \
--     EncoderLame.cpp \
-      EncoderVorbis.cpp \
-      EncoderWav.cpp \
- 
-+ifeq (@HAVE_LIBMP3LAME@,1)
-+  SRCS+=EncoderLame.cpp
-+endif
-+
- LIB=cdrip.a
- 
- include @abs_top_srcdir@/Makefile.include
-diff -Naur xbmc-pvr-3513480/xbmc/settings/GUISettings.cpp xbmc-pvr-3513480.patch/xbmc/settings/GUISettings.cpp
---- xbmc-pvr-3513480/xbmc/settings/GUISettings.cpp	2011-04-25 05:47:12.000000000 +0200
-+++ xbmc-pvr-3513480.patch/xbmc/settings/GUISettings.cpp	2011-04-25 05:48:47.956833472 +0200
-@@ -324,7 +324,9 @@
-   AddPath(acd,"audiocds.recordingpath",20000,"select writable folder",BUTTON_CONTROL_PATH_INPUT,false,657);
-   AddString(acd, "audiocds.trackpathformat", 13307, "%A - %B/[%N. ][%A - ]%T", EDIT_CONTROL_INPUT, false, 16016);
-   map<int,int> encoders;
-+#ifdef HAVE_LIBMP3LAME
-   encoders.insert(make_pair(34000,CDDARIP_ENCODER_LAME));
-+#endif
-   encoders.insert(make_pair(34001,CDDARIP_ENCODER_VORBIS));
-   encoders.insert(make_pair(34002,CDDARIP_ENCODER_WAV));
-   encoders.insert(make_pair(34005,CDDARIP_ENCODER_FLAC));

packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-c691108-902.02-xvba_support-gcc-4.7.patch

@@ -1,11 +0,0 @@
-diff -Naur xbmc-11.0.1/xbmc/threads/platform/pthreads/ThreadImpl.h xbmc-11.0.1.patch/xbmc/threads/platform/pthreads/ThreadImpl.h
---- xbmc-11.0.1/xbmc/threads/platform/pthreads/ThreadImpl.h	2012-03-23 07:22:04.215885089 +0100
-+++ xbmc-11.0.1.patch/xbmc/threads/platform/pthreads/ThreadImpl.h	2012-03-23 07:24:07.875383186 +0100
-@@ -22,6 +22,7 @@
- #pragma once
- 
- #include <pthread.h>
-+#include <unistd.h>
- 
- struct threadOpaque
- {