Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

2025-07-29 05:36:47 +00:00 · 2011-10-06 01:57:03 +02:00 · 2011-10-06 01:57:03 +02:00 · 6577a5e62a
commit 6577a5e62a
parent 3eb7b54b2f 559f632e9f
26 changed files with 41 additions and 11 deletions
--- a/packages/audio/alsa-plugins/meta
+++ b/packages/audio/alsa-plugins/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="alsa-plugins"
-PKG_VERSION="1.0.23"
+PKG_VERSION="1.0.24"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/devel/libiconv/build
+++ b/packages/devel/libiconv/build
@ -22,6 +22,9 @@

 . config/options $1

+# libiconv-1.14 fails to build with LTO support
+  strip_lto
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
            --build=$HOST_NAME \
--- a/packages/devel/libiconv/meta
+++ b/packages/devel/libiconv/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="libiconv"
-PKG_VERSION="1.13.1"
+PKG_VERSION="1.14"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/linux/meta
+++ b/packages/linux/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="linux"
-PKG_VERSION="3.1-rc8"
+PKG_VERSION="3.1-rc9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/linux/patches/linux-3.1-rc9-000_crosscompile.patch
+++ b/packages/linux/patches/linux-3.1-rc9-000_crosscompile.patch
--- a/packages/linux/patches/linux-3.1-rc9-003-no_dev_console.patch
+++ b/packages/linux/patches/linux-3.1-rc9-003-no_dev_console.patch
--- a/packages/linux/patches/linux-3.1-rc9-004_lower_undefined_mode_timeout.patch
+++ b/packages/linux/patches/linux-3.1-rc9-004_lower_undefined_mode_timeout.patch
--- a/packages/linux/patches/linux-3.1-rc9-006_enable_utf8.patch
+++ b/packages/linux/patches/linux-3.1-rc9-006_enable_utf8.patch
--- a/packages/linux/patches/linux-3.1-rc9-007_die_floppy_die.patch
+++ b/packages/linux/patches/linux-3.1-rc9-007_die_floppy_die.patch
--- a/packages/linux/patches/linux-3.1-rc9-009_disable_i8042_check_on_apple_mac.patch
+++ b/packages/linux/patches/linux-3.1-rc9-009_disable_i8042_check_on_apple_mac.patch
--- a/packages/linux/patches/linux-3.1-rc9-050_add_appleir_usb_driver.patch
+++ b/packages/linux/patches/linux-3.1-rc9-050_add_appleir_usb_driver.patch
--- a/packages/linux/patches/linux-3.1-rc9-052-aureal_remote_quirk-0.1.patch
+++ b/packages/linux/patches/linux-3.1-rc9-052-aureal_remote_quirk-0.1.patch
--- a/packages/linux/patches/linux-3.1-rc9-053-ati_remote-0.1.patch
+++ b/packages/linux/patches/linux-3.1-rc9-053-ati_remote-0.1.patch
--- a/packages/linux/patches/linux-3.1-rc9-053_ati-remote_all_keys_and_keychange-0.1.patch
+++ b/packages/linux/patches/linux-3.1-rc9-053_ati-remote_all_keys_and_keychange-0.1.patch
--- a/packages/linux/patches/linux-3.1-rc9-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch
+++ b/packages/linux/patches/linux-3.1-rc9-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch
--- a/packages/linux/patches/linux-3.1-rc9-058-add_rtl2832u_dvb-usb_driver-0.1.patch
+++ b/packages/linux/patches/linux-3.1-rc9-058-add_rtl2832u_dvb-usb_driver-0.1.patch
--- a/packages/linux/patches/linux-3.1-rc9-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch
+++ b/packages/linux/patches/linux-3.1-rc9-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch
--- a/packages/linux/patches/linux-3.1-rc9-060-fix_dib0700_buffer_access-0.1.patch
+++ b/packages/linux/patches/linux-3.1-rc9-060-fix_dib0700_buffer_access-0.1.patch
--- a/packages/linux/patches/linux-3.1-rc9-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch
+++ b/packages/linux/patches/linux-3.1-rc9-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch
--- a/packages/linux/patches/linux-3.1-rc9-071-silence_i915_agp-module-0.1.patch
+++ b/packages/linux/patches/linux-3.1-rc9-071-silence_i915_agp-module-0.1.patch
--- a/packages/linux/patches/linux-3.1-rc9-716_mm-zero_swappiness.patch
+++ b/packages/linux/patches/linux-3.1-rc9-716_mm-zero_swappiness.patch
--- a/packages/mediacenter/xbmc/scripts/cputemp
+++ b/packages/mediacenter/xbmc/scripts/cputemp
@ -1,8 +1,8 @@
 #!/bin/sh

 ################################################################################
-#      Copyright (C) 2009-2010 OpenELEC.tv
-#      http://www.openelec.tv
+#      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
@ -20,10 +20,32 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################

-TEMP="0"
+# inspired by
+# https://github.com/xtranophilist/gnome-shell-extension-cpu-temperature/blob/master/extension.js

-if [ -f /usr/bin/sensors ]; then
-  TEMP=`/usr/bin/sensors -u | grep -A 1 "Core " | tail -n 1 | awk '{printf("%d\n",$2 + 0.5);}'`
+TEMP=0
+
+if [ -f /sys/devices/platform/coretemp.0/temp1_input ]; then
+  # used with coretemp
+  TEMP=`cat /sys/devices/platform/coretemp.0/temp1_input`
+elif [ -f /sys/devices/platform/coretemp.0/temp2_input ]; then
+  # used with coretemp
+  TEMP=`cat /sys/devices/platform/coretemp.0/temp2_input`
+elif [ -f /sys/bus/acpi/devices/LNXTHERM\:00/thermal_zone/temp ]; then
+  # used on some intel systems
+  TEMP=`cat /sys/bus/acpi/devices/LNXTHERM\:00/thermal_zone/temp`
+elif [ -f /sys/devices/virtual/thermal/thermal_zone0/temp ]; then
+  # used on some intel systems
+  TEMP=`cat /sys/devices/virtual/thermal/thermal_zone0/temp`
+elif [ -f /sys/class/hwmon/hwmon0/temp1_input ]; then
+  # hwmon for new 2.6.39, 3.0 linux kernels
+  TEMP=`cat /sys/class/hwmon/hwmon0/temp1_input`
+elif [ -f /sys/class/hwmon/hwmon0/device/temp1_input ]; then
+  # used on AMD systems
+  TEMP=`cat /sys/class/hwmon/hwmon0/device/temp1_input`
+elif [ -f /sys/class/hwmon/hwmon0/device/temp2_input ]; then
+  # used on ION systems
+  TEMP=`cat /sys/class/hwmon/hwmon0/device/temp2_input`
 fi

-echo "${TEMP} C"
+echo "$(( $TEMP / 1000 )) C"
--- a/packages/sysutils/remote/eventlircd/evmap/03_0bc7_0006.evmap
+++ b/packages/sysutils/remote/eventlircd/evmap/03_0bc7_0006.evmap
@ -49,7 +49,7 @@
 KEY_HOME            = KEY_PROG1       # Start Key
 KEY_D               = KEY_PROG1       # Start Key (World)

- KEY_MENU            = KEY_EXIT        # Back
+# KEY_MENU            = KEY_EXIT        # Back
 KEY_BACK            = KEY_EXIT        # Back
 KEY_FRONT           = KEY_EXIT        # Back
 KEY_END             = KEY_DELETE      # Button "RC"
--- a/packages/sysutils/upower/build
+++ b/packages/sysutils/upower/build
@ -23,6 +23,7 @@
 . config/options $1

 cd $PKG_BUILD
+intltoolize --force
 ./configure --host=$TARGET_NAME \
            --build=$HOST_NAME \
            --prefix=/usr \
--- a/packages/sysutils/upower/meta
+++ b/packages/sysutils/upower/meta
@ -33,4 +33,4 @@ PKG_SHORTDESC="upower: a modular hardware abstraction layer designed for use in
 PKG_LONGDESC="Upower is a modular hardware abstraction layer designed for use in Linux systems that is designed to simplify device management and replace the current monolithic Linux HAL. Upower includes the ability to enumerate system devices and send notifications when hardware is added or removed from the computer system."
 PKG_IS_ADDON="no"

-PKG_AUTORECONF="no"
+PKG_AUTORECONF="yes"
--- a/packages/tools/autoupdate/scripts/autoupdate.devel
+++ b/packages/tools/autoupdate/scripts/autoupdate.devel
@ -79,6 +79,10 @@ if [ ! -f /var/lock/update.lock ]; then
  # compare installed version with latest released version
    THIS_VERSION="`echo "$THIS_VERSION" | cut -d "-" -f3 | tr -d "r"`"

+    if [ -Z $NEW_VERSION ]; then
+      NEW_VERSION="$THIS_VERSION"
+    fi
+
    if [ "$THIS_VERSION" -lt "$NEW_VERSION" ]; then

      if [ "$AUTOUPDATE" = "manually" -o "$AUTOUPDATE" = "manual" ]; then