Merge remote branch 'upstream/master' into openelec-pvr

packages/linux-firmware/dvb-firmware/build

@@ -22,5 +22,6 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/lib/firmware
+cd $PKG_BUILD
-  cp -PR $PKG_BUILD/*.fw* $INSTALL/lib/firmware
+
+DESTDIR=.install ./install

packages/linux-firmware/dvb-firmware/install

@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/lib/firmware
+mkdir -p $INSTALL
-  cp -P $PKG_BUILD/* $INSTALL/lib/firmware
+  cp -PR $PKG_BUILD/.install/* $INSTALL

packages/linux-firmware/dvb-firmware/meta

@@ -18,19 +18,19 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="b43-fw"
+PKG_NAME="dvb-firmware"
-PKG_VERSION="20110211"
+PKG_VERSION="0.0.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"
-PKG_SITE="http://www.broadcom.com"
+PKG_SITE="https://github.com/OpenELEC/dvb-firmware"
 PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
+PKG_SECTION="firmware"
-PKG_SHORTDESC="b43-fw: Broadcom B43 Firmware"
+PKG_SHORTDESC="dvb-firmware: firmwares for various DVB drivers"
-PKG_LONGDESC="b43-fw: Broadcom B43 Firmware"
+PKG_LONGDESC="dvb-firmware: firmwares for various DVB drivers"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"

packages/linux-firmware/install

@@ -1,38 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options
-
-if [ "$FIRMWARE" = "external" ]; then
-  mkdir -p $INSTALL/lib/firmware
-    cp -R $PKG_BUILD/* $INSTALL/lib/firmware
-fi
-
-for firmware in $ADDITIONAL_FIRMWARE; do
-  [ $firmware = b43 ] && $SCRIPTS/install b43-fw
-  [ $firmware = ipw2100 ] && $SCRIPTS/install ipw2100-fw
-  [ $firmware = ipw2200 ] && $SCRIPTS/install ipw2200-fw
-  [ $firmware = zd1211 ] && $SCRIPTS/install zd1211-firmware
-  [ $firmware = dvb-firmware ] && $SCRIPTS/install linuxtv-dvb-firmware
-done
-
-exit 0

packages/linux-firmware/ipw2100-fw/meta

@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="ipw2100-fw"
-PKG_VERSION="1.3"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="Free-to-use"
-PKG_SITE="http://ipw2100.sourceforge.net/"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="ipw2100-fw: Intel PRO/Wireless 2100 Driver for Linux"
-PKG_LONGDESC="This project was created by Intel to enable support for the Intel PRO/Wireless 2100 Network Connection mini PCI adapter. This project (IPW2100) is intended to be a community effort as much as is possible given some working constraints (mainly, no HW documentation is available)."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/linux-firmware/ipw2200-fw/meta

@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="ipw2200-fw"
-PKG_VERSION="3.1"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="Free-to-use"
-PKG_SITE="http://ipw2200.sourceforge.net/"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tgz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="ipw2200-fw: Intel PRO/Wireless 2200 Driver for Linux"
-PKG_LONGDESC="This project was created by Intel to enable support for the Intel PRO/Wireless 2200 Network Connection mini PCI adapter. This project (IPW2200) is intended to be a community effort as much as is possible given some working constraints (mainly, no HW documentation is available)."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/linux-firmware/meta

@@ -18,19 +18,19 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="linux-firmware"
+PKG_NAME="firmware"
-PKG_VERSION="20110222"
+PKG_VERSION=""
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=tree"
+PKG_SITE=""
-PKG_URL="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL=""
-PKG_DEPENDS=""
+PKG_DEPENDS="$FIRMWARE"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
+PKG_SECTION="firmware"
-PKG_SHORTDESC="linux-firmware: various free firmware drivers"
+PKG_SHORTDESC="firmware: various free firmware drivers"
-PKG_LONGDESC="linux-firmware is a package to install various free firmware drivers"
+PKG_LONGDESC="firmware is a meta-package to install various free firmware drivers"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"

packages/linux-firmware/wlan-firmware/build

@@ -22,5 +22,6 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/lib/firmware/b43
+cd $PKG_BUILD
-  cp -P $PKG_BUILD/* $INSTALL/lib/firmware/b43
+
+DESTDIR=.install ./install

packages/linux-firmware/wlan-firmware/install

@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/lib/firmware
+mkdir -p $INSTALL
-  cp -PR $PKG_BUILD/* $INSTALL/lib/firmware
+  cp -PR $PKG_BUILD/.install/* $INSTALL

packages/linux-firmware/wlan-firmware/meta

@@ -18,19 +18,19 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="linuxtv-dvb-firmware"
+PKG_NAME="wlan-firmware"
-PKG_VERSION="20110212"
+PKG_VERSION="0.0.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"
-PKG_SITE="http://www.linuxtv.org"
+PKG_SITE="https://github.com/OpenELEC/wlan-firmware"
 PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
+PKG_SECTION="firmware"
-PKG_SHORTDESC="linuxtv-dvb-firmware: firmwarefiles for various DVB Cards."
+PKG_SHORTDESC="wlan-firmware: firmwares for various WLAN drivers"
-PKG_LONGDESC="firmwarefiles for various DVB Cards."
+PKG_LONGDESC="wlan-firmware: firmwares for various WLAN drivers"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"

packages/linux-firmware/zd1211-firmware/install

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/lib/firmware/zd1211
-  cp -P $BUILD/$PKG_NAME/zd1211* $INSTALL/lib/firmware/zd1211

packages/linux-firmware/zd1211-firmware/meta

@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="zd1211-firmware"
-PKG_VERSION="1.4"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="Free-to-use"
-PKG_SITE="http://sourceforge.net/projects/zd1211/"
-PKG_URL="$SOURCEFORGE_SRC/zd1211/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="zd1211-firmware: firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip Firmware"
-PKG_LONGDESC="zd1211-firmware: firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip Firmware"
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/linux/install

@@ -37,12 +37,10 @@ for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v mo
   rm -f $i
 done
 
-if [ "$FIRMWARE" = "internal" ]; then
+# copy kernel firmwares (if present and requested)
-  # copy kernel firmwares (if present and requested)
+  mkdir -p $INSTALL/lib/firmware
-    mkdir -p $INSTALL/lib/firmware
+  [ -d $PKG_BUILD/modules/lib/firmware ] && \
-      [ -d $PKG_BUILD/modules/lib/firmware ] && \
+    cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || true
-        cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || true
-fi
 
 mkdir -p $INSTALL/etc
   cp $PKG_DIR/config/modules $INSTALL/etc

packages/linux/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="linux"
-PKG_VERSION="2.6.38-rc6"
+PKG_VERSION="2.6.38-rc7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux/patches/linux-2.6.38-rc7-054_fix_nuvoton_wakeup-0.1.patch

@@ -0,0 +1,12 @@
+diff -Naur linux-2.6.38-rc6/drivers/media/rc/nuvoton-cir.h linux-2.6.38-rc6.patch/drivers/media/rc/nuvoton-cir.h
+--- linux-2.6.38-rc6/drivers/media/rc/nuvoton-cir.h	2011-02-22 02:25:52.000000000 +0100
++++ linux-2.6.38-rc6.patch/drivers/media/rc/nuvoton-cir.h	2011-02-28 14:26:20.385871213 +0100
+@@ -306,7 +306,7 @@
+ #define CIR_WAKE_IRFIFOSTS_RX_FULL	0x10
+ 
+ /* CIR Wake FIFO buffer is 67 bytes long */
+-#define CIR_WAKE_FIFO_LEN		67
++#define CIR_WAKE_FIFO_LEN		65
+ /* CIR Wake byte comparison tolerance */
+ #define CIR_WAKE_CMP_TOLERANCE		5
+ 

packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+<!-- System -->
+<string id="2000">System</string>
+<string id="2010">Tastatur</string>
+<string id="2011">Tastaturlayout</string>
+<string id="2020">System Aktualisierung</string>
+<string id="2021">Automatische Aktualisierung</string>
+<string id="2050">LCD/VFD</string>
+<string id="2051">LCD Treiber</string>
+<string id="2060">Beim Aufwachen</string>
+<string id="2061">Video-Datenbank automatisch aktualisieren</string>
+<string id="2062">Musik-Datenbank automatisch aktualisieren</string>
+
+<!-- Network -->
+<string id="2100">Netzwerk</string>
+<string id="2110">Allgemein</string>
+<string id="2111">Gerätename</string>
+<string id="2120">Netzwerk Adapter</string>
+<string id="2121">Netzwerk Technologie</string>
+<string id="2122">Netzwerk Gerät</string>
+<string id="2130">IP Einstellungen</string>
+<string id="2131">Statische IP Adresse</string>
+<string id="2132">Netzmaske Präfixlänge</string>
+<string id="2133">Netzwerk Gateway</string>
+<string id="2134">DNS Server 1</string>
+<string id="2135">DNS Server 2</string>
+<string id="2136">DNS Server 3</string>
+<string id="2150">WLAN Einstellungen</string>
+<string id="2151">WLAN SSID</string>
+<string id="2152">Verstecktes Netzwerk</string>
+<string id="2153">WLAN Sicherheit</string>
+<string id="2154">WLAN Passwort</string>
+
+<!-- TV_SERVER -->
+<string id="4100">TV/PVR</string>
+<string id="4110">TV Server</string>
+<string id="4111">Starte TV Server beim Booten</string>
+
+<!-- SAMBA -->
+<string id="5000">Samba</string>
+<string id="5010">Samba Server</string>
+<string id="5011">Starte Samba beim Booten</string>
+
+<!-- Transmission -->
+<string id="5100">Transmission</string>
+<string id="5110">Transmission Bittorrent</string>
+<string id="5111">Starte Transmission beim Booten</string>
+<string id="5120">Benutzer Einstellungen</string>
+<string id="5121">Authentifizierung verwenden</string>
+<string id="5122">Benutzername</string>
+<string id="5123">Passwort</string>
+<string id="5130">Netzwerk Einstellungen</string>
+<string id="5131">Erlaubte IP Adressen (durch Komma getrennt)</string>
+
+<!-- SABnzbd -->
+<string id="5200">SABnzbd</string>
+<string id="5210">SABnzbd Newsgroup Downloader</string>
+<string id="5211">Starte SABnzbd beim Booten</string>
+
+</strings>

packages/mediacenter/xbmc/init.d/93_xbmc

@@ -28,6 +28,11 @@ XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
 
 progress "starting XBMC"
 
+# hack for Boxee Remote
+if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then
+  export SDL_MOUSE_RELATIVE=0
+fi
+
 # starting autoupdate
   [ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate &
 

packages/mediacenter/xbmc/scripts/gputemp

@@ -23,7 +23,7 @@
 TEMP="0"
 
 if lspci -n | grep 0300 | grep -q 10de; then
-  [ -f /usr/bin/nvidia-smi ] && TEMP=`/usr/bin/nvidia-smi -a | grep 'Temperature' | awk '{print $3}'`
+  [ -f /usr/bin/nvidia-smi ] && TEMP=`/usr/bin/nvidia-smi -q -x | grep 'gpu_temp' | awk '{ print $1 }' | sed 's,<gpu_temp>,,g'`
 fi
 
 echo "${TEMP} C"

packages/network/connman/meta

@@ -19,12 +19,13 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="0.70"
+PKG_VERSION="3634185"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.connman.net"
-PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="glib dbus udev iptables wpa_supplicant ntp netstatus"
 PKG_BUILD_DEPENDS="toolchain glib dbus udev iptables"
 PKG_PRIORITY="optional"

packages/network/samba/config/smb.conf

@@ -33,6 +33,16 @@
   syslog only = yes
   name resolve order = lmhosts wins bcast host
 
+[printers]
+  comment = All Printers
+  path = /var/spool/samba
+  browseable = no
+  guest ok = no
+  writable = no
+  printable = yes
+  printcap name = /dev/null
+  load printers = no
+
 # Using the following configurations as a template allows you to add
 # writable shares of disks and paths under /storage
 

packages/tools/autoupdate/scripts/autoupdate.devel

@@ -21,6 +21,7 @@
 ################################################################################
 
 OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
+TMP_DIR="$HOME/.xbmc/temp"
 
 if [ -f /etc/update.conf ]; then
   . /etc/update.conf
@@ -42,10 +43,10 @@ fi
 download () {
   case "$DL_METHOD" in
           wget)
-            wget -c $1 -P /tmp
+            wget -c $1 -P $TMP_DIR
             ;;
           scp)
-            scp $SCP_ARG "$1" /tmp
+            scp $SCP_ARG "$1" $TMP_DIR
             ;;
         esac
 }
@@ -67,13 +68,13 @@ if [ ! -f /var/lock/update.lock ]; then
     THIS_VERSION="`cat /etc/version`"
 
   # get infofile with the latest released version
-    rm -rf /tmp/latest
+    rm -rf $TMP_DIR/latest
     download "$UPDATEURL/latest"
 
-    NEW_IMAGE="`cat /tmp/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`"
+    NEW_IMAGE="`cat $TMP_DIR/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`"
     NEW_VERSION="`echo "$NEW_IMAGE" | cut -d "-" -f5 | tr -d "r"`"
 
-    rm -rf /tmp/latest
+    rm -rf $TMP_DIR/latest
 
   # compare installed version with latest released version
     THIS_VERSION="`echo "$THIS_VERSION" | cut -d "-" -f3 | tr -d "r"`"
@@ -94,20 +95,21 @@ if [ ! -f /var/lock/update.lock ]; then
         touch /var/lock/update.lock
 
       # downloading the new version
+        rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
         download "$UPDATEURL/$NEW_IMAGE.tar.bz2"
 
       # extract the image
-        rm -rf /tmp/$NEW_IMAGE
+        rm -rf $TMP_DIR/$NEW_IMAGE
-        tar -xjvf /tmp/$NEW_IMAGE.tar.bz2 -C /tmp
+        tar -xjvf $TMP_DIR/$NEW_IMAGE.tar.bz2 -C $TMP_DIR
 
       # move KERNEL and SYSTEM to an temporary file
         mkdir -p /storage/.update
 
-        [ -f /tmp/$NEW_IMAGE/target/KERNEL ] && \
+        [ -f $TMP_DIR/$NEW_IMAGE/target/KERNEL ] && \
-          mv /tmp/$NEW_IMAGE/target/KERNEL /storage/.update/KERNEL.tmp
+          mv $TMP_DIR/$NEW_IMAGE/target/KERNEL /storage/.update/KERNEL.tmp
 
-        [ -f /tmp/$NEW_IMAGE/target/SYSTEM ] && \
+        [ -f $TMP_DIR/$NEW_IMAGE/target/SYSTEM ] && \
-          mv /tmp/$NEW_IMAGE/target/SYSTEM /storage/.update/SYSTEM.tmp
+          mv $TMP_DIR/$NEW_IMAGE/target/SYSTEM /storage/.update/SYSTEM.tmp
         sync
 
       # move KERNEL and SYSTEM to the right place
@@ -115,8 +117,8 @@ if [ ! -f /var/lock/update.lock ]; then
         mv /storage/.update/SYSTEM.tmp /storage/.update/SYSTEM
 
       # cleanup tmp files
-        rm -rf /tmp/$NEW_IMAGE
+        rm -rf $TMP_DIR/$NEW_IMAGE
-        rm -rf /tmp/$NEW_IMAGE.tar.bz2
+        rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
         rm -rf /storage/.update/*.tmp
 
       # we are ready (hopefully)

packages/tools/autoupdate/scripts/autoupdate.release

@@ -21,6 +21,7 @@
 ################################################################################
 
 OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
+TMP_DIR="$HOME/.xbmc/temp"
 
 if [ -f /etc/update.conf ]; then
   . /etc/update.conf
@@ -42,10 +43,10 @@ fi
 download () {
   case "$DL_METHOD" in
           wget)
-            wget -c $1 -P /tmp
+            wget -c $1 -P $TMP_DIR
             ;;
           scp)
-            scp $SCP_ARG "$1" /tmp
+            scp $SCP_ARG "$1" $TMP_DIR
             ;;
         esac
 }
@@ -70,13 +71,13 @@ if [ ! -f /var/lock/update.lock ]; then
     THIS_PATCH="`echo "$THIS_VERSION" | cut -d "." -f3`"
 
   # get infofile with the latest released version
-    rm -rf /tmp/latest
+    rm -rf $TMP_DIR/latest
     download "$UPDATEURL/latest"
 
-    NEW_IMAGE="`cat /tmp/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`"
+    NEW_IMAGE="`cat $TMP_DIR/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`"
     NEW_VERSION="`echo "$NEW_IMAGE" | cut -d "-" -f3`"
 
-    rm -rf /tmp/latest
+    rm -rf $TMP_DIR/latest
 
   # compare installed version with latest released version
     NEW_MAJOR="`echo "$NEW_VERSION" | cut -d "." -f1`"
@@ -101,20 +102,21 @@ if [ ! -f /var/lock/update.lock ]; then
         touch /var/lock/update.lock
 
       # downloading the new version
+        rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
         download "$UPDATEURL/$NEW_IMAGE.tar.bz2"
 
       # extract the image
-        rm -rf /tmp/$NEW_IMAGE
+        rm -rf $TMP_DIR/$NEW_IMAGE
-        tar -xjvf /tmp/$NEW_IMAGE.tar.bz2 -C /tmp
+        tar -xjvf $TMP_DIR/$NEW_IMAGE.tar.bz2 -C $TMP_DIR
 
       # move KERNEL and SYSTEM to an temporary file
         mkdir -p /storage/.update
 
-        [ -f /tmp/$NEW_IMAGE/target/KERNEL ] && \
+        [ -f $TMP_DIR/$NEW_IMAGE/target/KERNEL ] && \
-          mv /tmp/$NEW_IMAGE/target/KERNEL /storage/.update/KERNEL.tmp
+          mv $TMP_DIR/$NEW_IMAGE/target/KERNEL /storage/.update/KERNEL.tmp
 
-        [ -f /tmp/$NEW_IMAGE/target/SYSTEM ] && \
+        [ -f $TMP_DIR/$NEW_IMAGE/target/SYSTEM ] && \
-          mv /tmp/$NEW_IMAGE/target/SYSTEM /storage/.update/SYSTEM.tmp
+          mv $TMP_DIR/$NEW_IMAGE/target/SYSTEM /storage/.update/SYSTEM.tmp
         sync
 
       # move KERNEL and SYSTEM to the right place
@@ -122,8 +124,8 @@ if [ ! -f /var/lock/update.lock ]; then
         mv /storage/.update/SYSTEM.tmp /storage/.update/SYSTEM
 
       # cleanup tmp files
-        rm -rf /tmp/$NEW_IMAGE
+        rm -rf $TMP_DIR/$NEW_IMAGE
-        rm -rf /tmp/$NEW_IMAGE.tar.bz2
+        rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
         rm -rf /storage/.update/*.tmp
 
       # we are ready (hopefully)

packages/x11/driver/xf86-video-nvidia/build

@@ -24,3 +24,7 @@
 
 cd $PKG_BUILD/kernel
   make module CC=$CC SYSSRC=$(kernel_path) SYSOUT=$(kernel_path)
+
+cd ..
+# linking libnvidia-ml.so.$PKG_VERSION to libnvidia-ml.so.1
+  ln -sf libnvidia-ml.so.$PKG_VERSION libnvidia-ml.so.1

packages/x11/driver/xf86-video-nvidia/install

@@ -38,6 +38,7 @@ mkdir -p $INSTALL/etc/X11
 
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/libnvidia-glcore.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/libnvidia-ml.so* $INSTALL/usr/lib
   cp -P $PKG_BUILD/tls/libnvidia-tls.so* $INSTALL/usr/lib
 # rename to not conflicting with Mesa libGL.so
   cp -P $PKG_BUILD/libGL.so* $INSTALL/usr/lib/libGL_nvidia.so.1

packages/x11/proto/xextproto/meta

@@ -19,13 +19,12 @@
 ################################################################################
 
 PKG_NAME="xextproto"
-PKG_VERSION="20110223"
+PKG_VERSION="7.2.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.x.org/"
-#PKG_URL="http://xorg.freedesktop.org/archive/individual/proto/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://xorg.freedesktop.org/archive/individual/proto/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain util-macros"
 PKG_PRIORITY="optional"

projects/ATV/options

@@ -181,13 +181,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="none"
 
-# build internal (in Kernel) or external Firmware (internal / external)"
+# additional Firmware to use (dvb-firmware, wlan-firmware)
-  FIRMWARE="external"
-
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware b43"
+# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
-  ADDITIONAL_FIRMWARE="dvb-firmware zd1211"
+  FIRMWARE="dvb-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"

projects/Generic/options

@@ -181,13 +181,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon"
 
-# build internal (in Kernel) or external Firmware (internal / external)"
+# additional Firmware to use (dvb-firmware, wlan-firmware)
-  FIRMWARE="external"
-
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware b43"
+# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
-  ADDITIONAL_FIRMWARE="b43 ipw2100 ipw2200 dvb-firmware zd1211"
+  FIRMWARE="dvb-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"

projects/ION/options

@@ -181,13 +181,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon"
 
-# build internal (in Kernel) or external Firmware (internal / external)"
+# additional Firmware to use (dvb-firmware, wlan-firmware)
-  FIRMWARE="external"
-
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware, b43"
+# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
-  ADDITIONAL_FIRMWARE="dvb-firmware zd1211"
+  FIRMWARE="dvb-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"

projects/Intel/options

@@ -181,13 +181,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon"
 
-# build internal (in Kernel) or external Firmware (internal / external)"
+# additional Firmware to use (dvb-firmware, wlan-firmware)
-  FIRMWARE="external"
-
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware b43"
+# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
-  ADDITIONAL_FIRMWARE="b43 dvb-firmware zd1211"
+  FIRMWARE="dvb-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"