From 1615603a375c56eabfa7e99542138b93217d2ea5 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 26 Jul 2011 11:49:20 +0200
Subject: [PATCH] xbmc: add support for project specific xbmc configuration,
 add support for extra font files for subtitle

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/mediacenter/xbmc/init.d/92_setup-xbmc |  8 ++++++++
 packages/mediacenter/xbmc/install              | 11 +++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/mediacenter/xbmc/init.d/92_setup-xbmc b/packages/mediacenter/xbmc/init.d/92_setup-xbmc
index b67bde73bb..99cdca20f2 100644
--- a/packages/mediacenter/xbmc/init.d/92_setup-xbmc
+++ b/packages/mediacenter/xbmc/init.d/92_setup-xbmc
@@ -108,6 +108,14 @@ EOF
     </debug>
 EOF
 
+#
+# include project specific options
+#
+
+  if [ -f /usr/share/xbmc/config/guisettings.xml ]; then
+    cat /usr/share/xbmc/config/guisettings.xml >> $HOME/.xbmc/userdata/guisettings.xml
+  fi
+
 #
 # common setup for amd and nvidia graphic
 #
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index 02a562dbca..fcfb59bd33 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -74,8 +74,15 @@ mkdir -p $PYTHON_LIBDIR/site-packages/xbmc
   mkdir -p $INSTALL/etc/pm/sleep.d
     cp $PKG_DIR/sleep.d/* $INSTALL/etc/pm/sleep.d
 
-if [ "$XBMC_ALTERNATE_FONT" = yes ]; then
-  cp $PKG_DIR/fonts/cwheib-1.ttf $INSTALL/usr/share/xbmc/media/Fonts/arial.ttf
+# install project specific configs
+  if [ -f $PROJECT_DIR/$PROJECT/xbmc/*.xml ]; then
+    mkdir -p $INSTALL/usr/share/xbmc/config
+      cp -R $PROJECT_DIR/$PROJECT/xbmc/* $INSTALL/usr/share/xbmc/config
+  fi
+
+if [ "$XBMC_EXTRA_FONTS" = yes ]; then
+  mkdir -p $INSTALL/usr/share/xbmc/media/Fonts
+    cp $PKG_DIR/fonts/*.ttf $INSTALL/usr/share/xbmc/media/Fonts
 fi
 
 if [ "$WIIMOTE_SUPPORT" = yes ]; then