Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start

@@ -97,33 +97,34 @@ fi
   cd $ADDON_DIR/config
   mkdir -p $ADDON_CONFIG_DIR
 
-  # copy live plugin html content
-  mkdir -p $ADDON_CONFIG_DIR/plugins/live
-  cp -PR plugins/live/* $ADDON_CONFIG_DIR/plugins/live
-
-  # copy vdr theme
-  if [ ! -d "$ADDON_CONFIG_DIR/plugins/text2skin/" ]; then
-    mkdir -p $ADDON_CONFIG_DIR/plugins/text2skin/
-    cp -a plugins/text2skin $ADDON_CONFIG_DIR/plugins/
-    cp -a themes $ADDON_CONFIG_DIR/
-
-    # is this in conflict with something else?
-    cat >$ADDON_CONFIG_DIR/setup.conf << MYDATA
-OSDSkin = anthra_1280_OS
-OSDTheme = yabluelight
-xineliboutput.OSD.Blending = 1
-MYDATA
-  fi
-
   for dir in `find . -type d`; do
     mkdir -p $ADDON_CONFIG_DIR/$dir
   done
 
-  for config in `find . -type f -name "*.conf*"`; do
+  for config in `find . -type f`; do
     if [ ! -f $ADDON_CONFIG_DIR/$config ]; then
       cp $config $ADDON_CONFIG_DIR/$config
     fi
   done
+
+  if [ -f "$ADDON_CONFIG_DIR/setup.conf" ]; then
+    sed -i -e '/^$/d' $ADDON_CONFIG_DIR/setup.conf
+    sed -i -e '/^OSDHeight.*$/d' $ADDON_CONFIG_DIR/setup.conf
+    sed -i -e '/^OSDSkin.*$/d' $ADDON_CONFIG_DIR/setup.conf
+    sed -i -e '/^OSDTheme.*$/d' $ADDON_CONFIG_DIR/setup.conf
+    sed -i -e '/^xineliboutput.OSD.Blending.*$/d' $ADDON_CONFIG_DIR/setup.conf
+    sed -i -e '/^xineliboutput.OSD.Size.*$/d' $ADDON_CONFIG_DIR/setup.conf
+    sed -i -e '/^xineliboutput.OSD.SoftOSD.*$/d' $ADDON_CONFIG_DIR/setup.conf
+  fi
+  cat >>$ADDON_CONFIG_DIR/setup.conf << MYDATA
+OSDHeight = 1080
+OSDSkin = anthra_1280_OS
+OSDTheme = yabluelight
+xineliboutput.OSD.Blending = 1
+xineliboutput.OSD.Size = 1280x720
+xineliboutput.OSD.SoftOSD = 1
+MYDATA
+
 )
 
 if [ ! "$(pidof vdr.bin)" ];then

scripts/git_version

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+[ -f "$PKG_BUILD/git.version" ] && PKG_GIT_VERSION=`cat $PKG_BUILD/git.version`
+
+echo $PKG_GIT_VERSION
+

scripts/image

@@ -228,6 +228,10 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
         cp -R $CONFIG/release/openelec.ico $RELEASE_DIR
         echo "$TARGET_VERSION" > $RELEASE_DIR/RELEASE
 
+		if [ -n "$MEDIACENTER" ] ; then
+		    echo "XBMC commit: `scripts/git_version $MEDIACENTER`" >> $RELEASE_DIR/RELEASE
+		fi
+
       mkdir -p $RELEASE_DIR/licenses
         cp $ROOT/licenses/* $RELEASE_DIR/licenses