From b225c9eb2dcae5cfc27d03bacfcdc66518156078 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Sun, 29 Nov 2009 06:07:23 +0100
Subject: [PATCH] xbmc: - update to support eglibc and uClibc - build with
 xrandr support, now works with eglibc - install icon.png, needed with eglibc
 support (why?)

---
 packages/mediacenter/xbmc/build   |  6 +++---
 packages/mediacenter/xbmc/install | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 33830948d2..3f092983a5 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -21,7 +21,7 @@ $SCRIPTS/build libXt
 $SCRIPTS/build libXtst
 $SCRIPTS/build libXmu
 $SCRIPTS/build libXinerama
-### $SCRIPTS/build libXrandr
+$SCRIPTS/build libXrandr
 
 $SCRIPTS/build $MESA #GL/GLU
 $SCRIPTS/build glew
@@ -80,7 +80,7 @@ autoconf
             --disable-vdpau \
             --disable-profiling \
             --disable-joystick \
-               --disable-xrandr \
+               --enable-xrandr \
             --disable-ccache \
             --disable-pulse \
             --enable-faac \
@@ -101,7 +101,7 @@ autoconf
 
 make externals
 make xbmc.bin
-# make xbmc-xrandr
+make xbmc-xrandr
 
 # make -C tools/TexturePacker \
 #   CC=$HOST_CC \
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index 178a2e4f98..56c4ca3f26 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -21,7 +21,7 @@ $SCRIPTS/install libXt
 $SCRIPTS/install libXtst
 $SCRIPTS/install libXmu
 $SCRIPTS/install libXinerama
-### $SCRIPTS/install libXrandr
+$SCRIPTS/install libXrandr
 
 $SCRIPTS/install $MESA
 $SCRIPTS/install glew
@@ -60,12 +60,15 @@ $SCRIPTS/install samba
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
+XBMC_TARGET_SYSTEM="linux"
+[ $TARGET_LIBC = "uClibc" ] && XBMC_TARGET_SYSTEM="uclibc"
+
 mkdir -p $INSTALL/usr/bin
   ln -s /usr/share/xbmc/xbmc.bin $INSTALL/usr/bin/xbmc
 
 mkdir -p $INSTALL/usr/share/xbmc
   cp -PR $PKG_BUILD/xbmc.bin $INSTALL/usr/share/xbmc/xbmc.bin
-#  cp -PR $PKG_BUILD/xbmc-xrandr $INSTALL/usr/share/xbmc/xbmc-xrandr
+  cp -PR $PKG_BUILD/xbmc-xrandr $INSTALL/usr/share/xbmc/xbmc-xrandr
 #  cp -PR $PKG_BUILD/.install-data/share/xbmc/* $INSTALL/usr/share/xbmc/
 
 mkdir -p $INSTALL/usr/share/xbmc/language
@@ -77,6 +80,7 @@ mkdir -p $INSTALL/usr/share/xbmc/media/Fonts
 
 mkdir -p $INSTALL/usr/share/xbmc/media
   cp -PR $PKG_BUILD/media/weather.rar $INSTALL/usr/share/xbmc/media/
+  cp -PR $PKG_BUILD/media/icon.png $INSTALL/usr/share/xbmc/media/
   cp -PR $PKG_DIR/splash/Splash.png $INSTALL/usr/share/xbmc/media/
 
 mkdir -p $INSTALL/usr/share/xbmc/scripts
@@ -91,7 +95,8 @@ mkdir -p $INSTALL/usr/share/xbmc/sounds
   cp -PR $PKG_BUILD/sounds/* $INSTALL/usr/share/xbmc/sounds
 
 mkdir -p $INSTALL/usr/share/xbmc/system
-  cp -PR $PKG_BUILD/system/*uclibc.so $INSTALL/usr/share/xbmc/system
+
+  cp -PR $PKG_BUILD/system/*$XBMC_TARGET_SYSTEM.so $INSTALL/usr/share/xbmc/system
   cp -PR $PKG_BUILD/system/*.xml $INSTALL/usr/share/xbmc/system
   cp -PR $PKG_BUILD/system/*.conf $INSTALL/usr/share/xbmc/system