diff --git a/config/noobs/slides/A.png b/config/noobs/slides/A.png index 5a6cd34be6..cff9cf738b 100644 Binary files a/config/noobs/slides/A.png and b/config/noobs/slides/A.png differ diff --git a/config/noobs/slides/B.png b/config/noobs/slides/B.png index 8a04088f13..bf3e2ea5ce 100644 Binary files a/config/noobs/slides/B.png and b/config/noobs/slides/B.png differ diff --git a/config/noobs/slides/C.png b/config/noobs/slides/C.png index 1732f5128b..a18ba0eea6 100644 Binary files a/config/noobs/slides/C.png and b/config/noobs/slides/C.png differ diff --git a/config/noobs/slides/D.png b/config/noobs/slides/D.png index ee2ae20854..18e51adc8c 100644 Binary files a/config/noobs/slides/D.png and b/config/noobs/slides/D.png differ diff --git a/config/noobs/slides/E.png b/config/noobs/slides/E.png index 3c4779e017..3576f0e67a 100644 Binary files a/config/noobs/slides/E.png and b/config/noobs/slides/E.png differ diff --git a/config/noobs/slides_vga/A.png b/config/noobs/slides_vga/A.png index 3433f7c2a4..4d21099ec6 100644 Binary files a/config/noobs/slides_vga/A.png and b/config/noobs/slides_vga/A.png differ diff --git a/config/noobs/slides_vga/B.png b/config/noobs/slides_vga/B.png index 2179b9ff5c..6d80cce748 100644 Binary files a/config/noobs/slides_vga/B.png and b/config/noobs/slides_vga/B.png differ diff --git a/config/noobs/slides_vga/C.png b/config/noobs/slides_vga/C.png index e9dbcb1f0e..5f80217d13 100644 Binary files a/config/noobs/slides_vga/C.png and b/config/noobs/slides_vga/C.png differ diff --git a/config/noobs/slides_vga/D.png b/config/noobs/slides_vga/D.png index 1306648ba5..802beca09e 100644 Binary files a/config/noobs/slides_vga/D.png and b/config/noobs/slides_vga/D.png differ diff --git a/config/noobs/slides_vga/E.png b/config/noobs/slides_vga/E.png index e948f543b0..e755dd7ae2 100644 Binary files a/config/noobs/slides_vga/E.png and b/config/noobs/slides_vga/E.png differ diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 756775a155..b46fb17aa2 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-driver" -PKG_VERSION="f6bb324" +PKG_VERSION="7d8a762" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="nonfree" diff --git a/packages/mediacenter/service.openelec.settings/meta b/packages/mediacenter/service.openelec.settings/meta index fde639d454..5810543c7a 100644 --- a/packages/mediacenter/service.openelec.settings/meta +++ b/packages/mediacenter/service.openelec.settings/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="service.openelec.settings" -PKG_VERSION="0.2.12" +PKG_VERSION="0.2.13" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="prop." diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index f8f7bcebcc..148c86d33d 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="12.2-c2d3aeb" +PKG_VERSION="12.2-68a881d" if [ "$XBMC" = "master" ]; then PKG_VERSION="13.alpha-2ef8929" elif [ "$XBMC" = "xbmc-aml" ]; then diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index 9563ce20cd..2a0a1a0b7a 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="12.2-c2d3aeb" +PKG_VERSION="12.2-68a881d" if [ "$XBMC" = "master" ]; then PKG_VERSION="13.alpha-2ef8929" elif [ "$XBMC" = "xbmc-aml" ]; then diff --git a/packages/mediacenter/xbmc/patches/12.2-c2d3aeb/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk b/packages/mediacenter/xbmc/patches/12.2-68a881d/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-c2d3aeb/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-68a881d/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-c2d3aeb/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk b/packages/mediacenter/xbmc/patches/12.2-68a881d/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-c2d3aeb/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-68a881d/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-990.00-remove-windowed-display-mode.patch b/packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.00-remove-windowed-display-mode.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-990.00-remove-windowed-display-mode.patch rename to packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.00-remove-windowed-display-mode.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-990.24-wait-for-nic-on-wakeup.patch b/packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.24-wait-for-nic-on-wakeup.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-990.24-wait-for-nic-on-wakeup.patch rename to packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.24-wait-for-nic-on-wakeup.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-990.25-BP-xbmc-PR3166.patch b/packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.25-BP-xbmc-PR3166.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-990.25-BP-xbmc-PR3166.patch rename to packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.25-BP-xbmc-PR3166.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-990.26-keep-old-repo-content-if-update-fails.patch b/packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.26-keep-old-repo-content-if-update-fails.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-990.26-keep-old-repo-content-if-update-fails.patch rename to packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.26-keep-old-repo-content-if-update-fails.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.29-alsa-LOGDEBUG.patch b/packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.29-alsa-LOGDEBUG.patch new file mode 100644 index 0000000000..52fdd3eb90 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.29-alsa-LOGDEBUG.patch @@ -0,0 +1,12 @@ +diff -Naur xbmc-12.2-68a881d/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp xbmc-12.2-68a881d.patch/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +--- xbmc-12.2-68a881d/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2013-09-12 19:41:16.000000000 +0200 ++++ xbmc-12.2-68a881d.patch/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2013-09-13 00:12:05.538128585 +0200 +@@ -1180,7 +1180,7 @@ + char *errorStr; + if (vasprintf(&errorStr, fmt, arg) >= 0) + { +- CLog::Log(LOGINFO, "CAESinkALSA - ALSA: %s:%d:(%s) %s%s%s", ++ CLog::Log(LOGDEBUG, "CAESinkALSA - ALSA: %s:%d:(%s) %s%s%s", + file, line, function, errorStr, err ? ": " : "", err ? snd_strerror(err) : ""); + free(errorStr); + } diff --git a/packages/mediacenter/xbmc/scripts/cputemp b/packages/mediacenter/xbmc/scripts/cputemp index 2a6e7d556a..120bc3d463 100755 --- a/packages/mediacenter/xbmc/scripts/cputemp +++ b/packages/mediacenter/xbmc/scripts/cputemp @@ -25,7 +25,10 @@ TEMP=0 -if [ -f /sys/devices/platform/coretemp.0/temp1_input ]; then +if [ -f /sys/class/hwmon/hwmon1/temp1_input ]; then + # used on Asus systems (ie. AT5IONT-I) + TEMP=`cat /sys/class/hwmon/hwmon1/temp1_input` +elif [ -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 diff --git a/packages/sysutils/remote/eventlircd/evmap/ouya.evmap b/packages/sysutils/remote/eventlircd/evmap/ouya.evmap new file mode 100644 index 0000000000..293fff47a2 --- /dev/null +++ b/packages/sysutils/remote/eventlircd/evmap/ouya.evmap @@ -0,0 +1,20 @@ +# Ouya Bluetooth Controller + +BTN_THUMBR = KEY_INFO # Display +BTN_B = KEY_EPG # Pop UP/MENU +BTN_C = KEY_EXIT # Return +BTN_TL = KEY_OPTION # Options +BTN_A = KEY_OK # Start + +BTN_TL2 = KEY_UP # Direction Up +BTN_TR2 = KEY_DOWN # Direction Down +BTN_SELECT = KEY_LEFT # Direction Left +BTN_START = KEY_RIGHT # Direction Right + +BTN_A = KEY_PLAY # Play +BTN_X = KEY_STOP # Stop +BTN_A = KEY_PAUSE # Pause +BTN_MODE = KEY_REWIND # Reverse +BTN_THUMBL = KEY_FASTFORWARD # Forward +BTN_Y = KEY_PREVIOUS # Pre-track +BTN_Z = KEY_NEXT # Next track diff --git a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules index f341913424..3135512800 100644 --- a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules +++ b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules @@ -186,6 +186,10 @@ ATTRS{name}=="Nintendo Wii Remote", \ ATTRS{name}=="BD Remote Control", \ ENV{eventlircd_enable}="true", \ ENV{eventlircd_evmap}="ps3remote.evmap" + +ATTRS{name}=="OUYA Game Controller", \ + ENV{eventlircd_enable}="true", \ + ENV{eventlircd_evmap}="ouya.evmap" LABEL="end-bluetooth" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 6747045d47..571fed4326 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-bootloader" -PKG_VERSION="f6bb324" +PKG_VERSION="7d8a762" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="nonfree" diff --git a/packages/x11/lib/libX11/package.mk b/packages/x11/lib/libX11/package.mk index d83221c3f7..4a5c90235f 100644 --- a/packages/x11/lib/libX11/package.mk +++ b/packages/x11/lib/libX11/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libX11" -PKG_VERSION="1.6.0" +PKG_VERSION="1.6.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index b6b6f8e416..5bf159647e 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -1886,7 +1886,7 @@ CONFIG_SENSORS_W83627EHF=y # ACPI drivers # # CONFIG_SENSORS_ACPI_POWER is not set -# CONFIG_SENSORS_ATK0110 is not set +CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index 4d7c956daa..6ecbacf329 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -1882,7 +1882,7 @@ CONFIG_SENSORS_W83627EHF=y # ACPI drivers # # CONFIG_SENSORS_ACPI_POWER is not set -# CONFIG_SENSORS_ATK0110 is not set +CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index a0e4e4272a..7d5addbb39 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1996,7 +1996,7 @@ CONFIG_SENSORS_W83627EHF=y # ACPI drivers # # CONFIG_SENSORS_ACPI_POWER is not set -# CONFIG_SENSORS_ATK0110 is not set +CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y @@ -3316,7 +3316,7 @@ CONFIG_UIO=y # Microsoft Hyper-V guest support # CONFIG_STAGING=y -# CONFIG_ET131X is not set +CONFIG_ET131X=y # CONFIG_SLICOSS is not set # CONFIG_USBIP_CORE is not set # CONFIG_W35UND is not set diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 156be8f2e1..3e027b4ee6 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1973,7 +1973,7 @@ CONFIG_SENSORS_W83627EHF=y # ACPI drivers # # CONFIG_SENSORS_ACPI_POWER is not set -# CONFIG_SENSORS_ATK0110 is not set +CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y @@ -3283,7 +3283,7 @@ CONFIG_UIO=y # Microsoft Hyper-V guest support # CONFIG_STAGING=y -# CONFIG_ET131X is not set +CONFIG_ET131X=y # CONFIG_SLICOSS is not set # CONFIG_USBIP_CORE is not set # CONFIG_W35UND is not set diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index a7f68e45b0..015d3b7435 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -1993,7 +1993,7 @@ CONFIG_SENSORS_W83627EHF=y # ACPI drivers # # CONFIG_SENSORS_ACPI_POWER is not set -# CONFIG_SENSORS_ATK0110 is not set +CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y @@ -3318,7 +3318,7 @@ CONFIG_UIO=y # Microsoft Hyper-V guest support # CONFIG_STAGING=y -# CONFIG_ET131X is not set +CONFIG_ET131X=y # CONFIG_SLICOSS is not set # CONFIG_USBIP_CORE is not set # CONFIG_W35UND is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index c9bf4e926c..aa95a54a9f 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1868,7 +1868,7 @@ CONFIG_SENSORS_W83627EHF=y # ACPI drivers # # CONFIG_SENSORS_ACPI_POWER is not set -# CONFIG_SENSORS_ATK0110 is not set +CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 18a5b9902e..1bd0bd810e 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1899,7 +1899,7 @@ CONFIG_SENSORS_W83627EHF=y # ACPI drivers # # CONFIG_SENSORS_ACPI_POWER is not set -# CONFIG_SENSORS_ATK0110 is not set +CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y @@ -3191,7 +3191,7 @@ CONFIG_RTC_DRV_CMOS=y # Microsoft Hyper-V guest support # CONFIG_STAGING=y -# CONFIG_ET131X is not set +CONFIG_ET131X=y # CONFIG_SLICOSS is not set # CONFIG_USBIP_CORE is not set # CONFIG_W35UND is not set diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 2c737f721a..f2b51d4777 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -1995,7 +1995,7 @@ CONFIG_SENSORS_W83627EHF=y # ACPI drivers # # CONFIG_SENSORS_ACPI_POWER is not set -# CONFIG_SENSORS_ATK0110 is not set +CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y @@ -3318,7 +3318,7 @@ CONFIG_UIO=y # Microsoft Hyper-V guest support # CONFIG_STAGING=y -# CONFIG_ET131X is not set +CONFIG_ET131X=y # CONFIG_SLICOSS is not set # CONFIG_USBIP_CORE is not set # CONFIG_W35UND is not set diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index f7c0acdf61..fa8914409c 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -1972,7 +1972,7 @@ CONFIG_SENSORS_W83627EHF=y # ACPI drivers # # CONFIG_SENSORS_ACPI_POWER is not set -# CONFIG_SENSORS_ATK0110 is not set +CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y @@ -3285,7 +3285,7 @@ CONFIG_UIO=y # Microsoft Hyper-V guest support # CONFIG_STAGING=y -# CONFIG_ET131X is not set +CONFIG_ET131X=y # CONFIG_SLICOSS is not set # CONFIG_USBIP_CORE is not set # CONFIG_W35UND is not set