xbmc: update to xbmc-dc3bee7

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

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="83e27a2"
+PKG_VERSION="dc3bee7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/build

@@ -29,9 +29,9 @@ else
 fi
 
 if [ "$XBMC_VIS_PROJECTM" = yes ]; then
-  XBMC_PROJECTM="--enable-xbmcprojectm"
+  XBMC_PROJECTM="--enable-projectm"
 else
-  XBMC_PROJECTM="--disable-xbmcprojectm"
+  XBMC_PROJECTM="--disable-projectm"
 fi
 
 if [ "$PULSEAUDIO_SUPPORT" = yes ]; then

packages/mediacenter/xbmc/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="83e27a2"
+PKG_VERSION="dc3bee7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/patches/xbmc-83e27a2-201-let_select_XBMCProjectM-0.1.patch

@@ -1,87 +0,0 @@
-diff -Naur xbmc-9389dc8/configure.in xbmc-9389dc8.patch/configure.in
---- xbmc-9389dc8/configure.in	2011-09-01 23:34:05.488142309 +0200
-+++ xbmc-9389dc8.patch/configure.in	2011-09-01 23:51:26.371021628 +0200
-@@ -68,6 +68,8 @@
- goom_disabled="== GOOM disabled. =="
- rsxs_enabled="== RSXS enabled. =="
- rsxs_disabled="== RSXS disabled. =="
-+xbmcprojectm_enabled="== XBMCProjectM enabled. =="
-+xbmxprojectm_disabled="== XBMCProjectM disabled. =="
- x11_enabled="== X11 enabled. =="
- x11_disabled="== X11 disabled. =="
- pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
-@@ -219,6 +221,12 @@
-   [use_rsxs=$enableval],
-   [use_rsxs=yes])
- 
-+AC_ARG_ENABLE([xbmcprojectm],
-+  [AS_HELP_STRING([--enable-xbmcprojectm],
-+  [enable XBMCProjectM visualisation (default is yes)])],
-+  [use_xbmcprojectm=$enableval],
-+  [use_xbmcprojectm=yes])
-+
- AC_ARG_ENABLE([x11],
-   [AS_HELP_STRING([--enable-x11],
-   [enable x11 (default is yes) 'Linux Only'])],
-@@ -850,6 +858,15 @@
-   fi
- fi
- 
-+# XBMCPROJECTM
-+if test "$use_xbmcprojectm" = "no" || test "$use_gl" = "no"; then
-+  AC_MSG_NOTICE($xbmcprojectm_disabled)
-+  DISABLE_XBMCPROJECTM=1
-+else
-+  AC_MSG_NOTICE($xbmcprojectm_enabled)
-+  DISABLE_XBMCPROJECTM=0
-+fi
-+
- # libRTMP
- if test "$use_librtmp" != "no"; then
-   AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
-@@ -1324,6 +1341,12 @@
-   final_message="$final_message\n  RSXS:\t\tNo"
- fi
- 
-+if test "$use_xbmcprojectm" = "yes"; then
-+  final_message="$final_message\n  XBMCProjectM:\tYes"
-+else
-+  final_message="$final_message\n  XBMCProjectM:\tNo"
-+fi
-+
- if test "$use_x11" = "yes"; then
-   final_message="$final_message\n  X11:\t\tYes"
- else
-@@ -1553,6 +1576,7 @@
- AC_SUBST(BUILD_DVDCSS)
- AC_SUBST(DISABLE_GOOM)
- AC_SUBST(DISABLE_RSXS)
-+AC_SUBST(DISABLE_XBMCPROJECTM)
- AC_SUBST(USE_EXTERNAL_FFMPEG)
- AC_SUBST(PYTHON_VERSION)
- AC_SUBST(OUTPUT_FILES)
-@@ -1797,7 +1821,7 @@
-     fi
- set +x
- fi
--], [0])
-+], [$DISABLE_XBMCPROJECTM])
- 
- XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
-   ./configure  \
-diff -Naur xbmc-9389dc8/Makefile.in xbmc-9389dc8.patch/Makefile.in
---- xbmc-9389dc8/Makefile.in	2011-09-01 23:34:05.581143554 +0200
-+++ xbmc-9389dc8.patch/Makefile.in	2011-09-01 23:52:59.832272157 +0200
-@@ -144,8 +144,10 @@
- ifeq (@USE_OPENGL@,1)
- VIS_DIRS+=\
- 	xbmc/visualizations/OpenGLSpectrum \
--	xbmc/visualizations/WaveForm \
--	xbmc/visualizations/XBMCProjectM
-+	xbmc/visualizations/WaveForm
-+ifneq (@DISABLE_XBMCPROJECTM@,1)
-+  VIS_DIRS+=xbmc/visualizations/XBMCProjectM
-+endif
- endif
- 
- ifeq (($(findstring osx,@ARCH@), osx),(@USE_OPENGL@,1))

packages/mediacenter/xbmc/patches/xbmc-83e27a2-901-advancedsettings_alwaysextractflags.patch

@@ -1,23 +0,0 @@
-diff -Naur xbmc-a8d22f6/xbmc/settings/GUISettings.cpp xbmc-a8d22f6.patch/xbmc/settings/GUISettings.cpp
---- xbmc-a8d22f6/xbmc/settings/GUISettings.cpp	2011-08-02 15:01:17.000000000 +0200
-+++ xbmc-a8d22f6.patch/xbmc/settings/GUISettings.cpp	2011-08-02 15:25:47.205925050 +0200
-@@ -654,6 +654,7 @@
-   AddInt(vid, "myvideos.selectaction", 22079, SELECT_ACTION_PLAY_OR_RESUME, SELECT_ACTION_CHOOSE, 1, SELECT_ACTION_INFO, SPIN_CONTROL_TEXT);
-   AddBool(NULL, "myvideos.treatstackasfile", 20051, true);
-   AddBool(vid, "myvideos.extractflags",20433, true);
-+  AddBool(vid, "myvideos.alwaysextractflags",20433, false);
-   AddBool(vid, "myvideos.filemetadata", 20419, true);
-   AddBool(NULL, "myvideos.extractthumb",20433, true);
- 
-diff -Naur xbmc-a8d22f6/xbmc/ThumbLoader.cpp xbmc-a8d22f6.patch/xbmc/ThumbLoader.cpp
---- xbmc-a8d22f6/xbmc/ThumbLoader.cpp	2011-08-02 15:01:19.000000000 +0200
-+++ xbmc-a8d22f6.patch/xbmc/ThumbLoader.cpp	2011-08-02 15:24:54.831265675 +0200
-@@ -146,7 +146,7 @@
-       m_item.SetThumbnailImage(m_target);
-     }
-   }
--  else if (m_item.HasVideoInfoTag() && !m_item.GetVideoInfoTag()->HasStreamDetails())
-+  else if (m_item.HasVideoInfoTag() && (!m_item.GetVideoInfoTag()->HasStreamDetails() || g_guiSettings.GetBool("myvideos.alwaysextractflags")))
-   {
-     CLog::Log(LOGDEBUG,"%s - trying to extract filestream details from video file %s", __FUNCTION__, m_path.c_str());
-     result = CDVDFileInfo::GetFileStreamDetails(&m_item);

packages/mediacenter/xbmc/patches/xbmc-dc3bee7-301-fix_so_name_detection-0.1.patch

@@ -0,0 +1,12 @@
+diff -Naur xbmc-dc3bee7/configure.in xbmc-dc3bee7.patch/configure.in
+--- xbmc-dc3bee7/configure.in	2011-09-09 01:27:11.000000000 +0200
++++ xbmc-dc3bee7.patch/configure.in	2011-09-09 03:37:55.671676295 +0200
+@@ -20,7 +20,7 @@
+ [
+   if [[ "$host_vendor" != "apple" ]]; then
+     AC_MSG_CHECKING([for lib$2 soname])
+-    $1_FILENAME=$($LD $LDFLAGS -l$2 -M -o /dev/null 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
++    $1_FILENAME=$($LD -l$2 -M -o /dev/null 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
+     if [[ ! -z $$1_FILENAME ]]; then
+       $1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
+     fi