xbmc-pvr: update with latest changes

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

packages/mediacenter/xbmc-pvr/init.d/92_setup-xbmc

@@ -108,12 +108,20 @@ 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
 #
 
   # Always sync to vblank
-    if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "RADEON" ] ; then
+    if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "AMD" ] ; then
       cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF
     <videoscreen>
         <vsync>2</vsync>

packages/mediacenter/xbmc-pvr/install

@@ -74,6 +74,17 @@ mkdir -p $PYTHON_LIBDIR/site-packages/xbmc
   mkdir -p $INSTALL/etc/pm/sleep.d
     cp $PKG_DIR/sleep.d/* $INSTALL/etc/pm/sleep.d
 
+# 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
   mkdir -p $INSTALL/usr/bin
     cp $PKG_BUILD/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote $INSTALL/usr/bin/xbmc-wiiremote

packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-b485416-454-disable_backslash-0.1.patch

@@ -0,0 +1,12 @@
+diff -Naur xbmc-10.1-Dharma/system/keymaps/keyboard.xml xbmc-10.1-Dharma.patch/system/keymaps/keyboard.xml
+--- xbmc-10.1-Dharma/system/keymaps/keyboard.xml	2011-03-08 02:49:23.000000000 +0100
++++ xbmc-10.1-Dharma.patch/system/keymaps/keyboard.xml	2011-07-23 18:04:59.406603684 +0200
+@@ -75,7 +75,7 @@
+       <seven>Number7</seven>
+       <eight>Number8</eight>
+       <nine>Number9</nine>
+-      <backslash>ToggleFullScreen</backslash>
++<!--      <backslash>ToggleFullScreen</backslash>   -->
+       <browser_home>XBMC.ActivateWindow(Home)</browser_home>
+       <browser_favorites>ActivateWindow(Favourites)</browser_favorites>
+       <browser_refresh/>

packages/mediacenter/xbmc-pvr/profile.d/xbmc.conf

@@ -27,3 +27,11 @@
 XBMC_HOME="/usr/share/xbmc"
 
 export XBMC_HOME
+
+GPUDEVICE=$(lspci -n | grep 0300)
+GPUTYPE="OTHER"
+[ "$(echo $GPUDEVICE | grep 8086)" ] && GPUTYPE="INTEL"   # 8086 == INTEL
+[ "$(echo $GPUDEVICE | grep 10de)" ] && GPUTYPE="NVIDIA"  # 10de == NVIDIA
+[ "$(echo $GPUDEVICE | grep 1002)" ] && GPUTYPE="AMD"     # 1002 == AMD
+
+export GPUTYPE

packages/mediacenter/xbmc-pvr/scripts/cputemp

@@ -23,7 +23,7 @@
 TEMP="0"
 
 if [ -f /usr/bin/sensors ]; then
-  TEMP=`/usr/bin/sensors -u | tail -n6 | grep temp1_input | awk '{print $2 }' |awk '{printf("%d\n",$1 + 0.5);}'`
+  TEMP=`/usr/bin/sensors -u | tail -n6 | grep temp._input | awk '{print $2 }' |awk '{printf("%d\n",$1 + 0.5);}'`
 fi
 
 echo "${TEMP} C"