jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-30 14:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into openelec-systemd

Browse Source
This commit is contained in:
Stefan Saraev 2013-09-13 13:15:59 +03:00
commit 448880a143
38 changed files with 61 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
config/noobs/slides/A.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 644 KiB

After

Width:  |  Height:  |  Size: 51 KiB

BIN
config/noobs/slides/B.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 657 KiB

After

Width:  |  Height:  |  Size: 53 KiB

BIN
config/noobs/slides/C.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 658 KiB

After

Width:  |  Height:  |  Size: 55 KiB

BIN
config/noobs/slides/D.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 643 KiB

After

Width:  |  Height:  |  Size: 46 KiB

BIN
config/noobs/slides/E.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 650 KiB

After

Width:  |  Height:  |  Size: 52 KiB

BIN
config/noobs/slides_vga/A.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 121 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
config/noobs/slides_vga/B.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
config/noobs/slides_vga/C.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
config/noobs/slides_vga/D.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
config/noobs/slides_vga/E.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 123 KiB

After

Width:  |  Height:  |  Size: 25 KiB

2
packages/graphics/bcm2835-driver/package.mk
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="bcm2835-driver" PKG_NAME="bcm2835-driver"
PKG_VERSION="f6bb324" PKG_VERSION="7d8a762"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"

2
packages/mediacenter/service.openelec.settings/meta
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="service.openelec.settings" PKG_NAME="service.openelec.settings"
PKG_VERSION="0.2.12" PKG_VERSION="0.2.13"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="prop." PKG_LICENSE="prop."

2
packages/mediacenter/xbmc-theme-Confluence/meta
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc-theme-Confluence" PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="12.2-c2d3aeb" PKG_VERSION="12.2-68a881d"
if [ "$XBMC" = "master" ]; then if [ "$XBMC" = "master" ]; then
PKG_VERSION="13.alpha-2ef8929" PKG_VERSION="13.alpha-2ef8929"
elif [ "$XBMC" = "xbmc-aml" ]; then elif [ "$XBMC" = "xbmc-aml" ]; then

2
packages/mediacenter/xbmc/package.mk
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc" PKG_NAME="xbmc"
PKG_VERSION="12.2-c2d3aeb" PKG_VERSION="12.2-68a881d"
if [ "$XBMC" = "master" ]; then if [ "$XBMC" = "master" ]; then
PKG_VERSION="13.alpha-2ef8929" PKG_VERSION="13.alpha-2ef8929"
elif [ "$XBMC" = "xbmc-aml" ]; then elif [ "$XBMC" = "xbmc-aml" ]; then

0
packages/mediacenter/xbmc/patches/12.2-c2d3aeb/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk → packages/mediacenter/xbmc/patches/12.2-68a881d/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk
View File

0
packages/mediacenter/xbmc/patches/12.2-c2d3aeb/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk → packages/mediacenter/xbmc/patches/12.2-68a881d/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk
View File

0
packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch → packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-452-change_lcd_content-0.1.patch → packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-452-change_lcd_content-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-453-add_openelec.tv_RSS_news-0.1.patch → packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-453-add_openelec.tv_RSS_news-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-990.00-remove-windowed-display-mode.patch → packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.00-remove-windowed-display-mode.patch
View File

0
packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-990.24-wait-for-nic-on-wakeup.patch → packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.24-wait-for-nic-on-wakeup.patch
View File

0
packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-990.25-BP-xbmc-PR3166.patch → packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.25-BP-xbmc-PR3166.patch
View File

0
packages/mediacenter/xbmc/patches/12.2-c2d3aeb/xbmc-990.26-keep-old-repo-content-if-update-fails.patch → packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.26-keep-old-repo-content-if-update-fails.patch
View File

12
packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.29-alsa-LOGDEBUG.patch Normal file
View File

@ -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);
}

5
packages/mediacenter/xbmc/scripts/cputemp
View File

@ -25,7 +25,10 @@
TEMP=0 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 # used with coretemp
TEMP=`cat /sys/devices/platform/coretemp.0/temp1_input` TEMP=`cat /sys/devices/platform/coretemp.0/temp1_input`
elif [ -f /sys/devices/platform/coretemp.0/temp2_input ]; then elif [ -f /sys/devices/platform/coretemp.0/temp2_input ]; then

20
packages/sysutils/remote/eventlircd/evmap/ouya.evmap Normal file
View File

@ -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

4
packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules
View File

@ -187,6 +187,10 @@ ATTRS{name}=="BD Remote Control", \
ENV{eventlircd_enable}="true", \ ENV{eventlircd_enable}="true", \
ENV{eventlircd_evmap}="ps3remote.evmap" ENV{eventlircd_evmap}="ps3remote.evmap"
ATTRS{name}=="OUYA Game Controller", \
ENV{eventlircd_enable}="true", \
ENV{eventlircd_evmap}="ouya.evmap"
LABEL="end-bluetooth" LABEL="end-bluetooth"
LABEL="end" LABEL="end"

2
packages/tools/bcm2835-bootloader/package.mk
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="bcm2835-bootloader" PKG_NAME="bcm2835-bootloader"
PKG_VERSION="f6bb324" PKG_VERSION="7d8a762"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="arm" PKG_ARCH="arm"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"

2
packages/x11/lib/libX11/package.mk
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="libX11" PKG_NAME="libX11"
PKG_VERSION="1.6.0" PKG_VERSION="1.6.2"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="OSS" PKG_LICENSE="OSS"

2
projects/Fusion/linux/linux.i386.conf
View File

@ -1886,7 +1886,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers # ACPI drivers
# #
# CONFIG_SENSORS_ACPI_POWER is not set # CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y

2
projects/Fusion/linux/linux.x86_64.conf
View File

@ -1882,7 +1882,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers # ACPI drivers
# #
# CONFIG_SENSORS_ACPI_POWER is not set # CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y

4
projects/Generic/linux/linux.i386.conf
View File

@ -1996,7 +1996,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers # ACPI drivers
# #
# CONFIG_SENSORS_ACPI_POWER is not set # CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
@ -3316,7 +3316,7 @@ CONFIG_UIO=y
# Microsoft Hyper-V guest support # Microsoft Hyper-V guest support
# #
CONFIG_STAGING=y CONFIG_STAGING=y
# CONFIG_ET131X is not set CONFIG_ET131X=y
# CONFIG_SLICOSS is not set # CONFIG_SLICOSS is not set
# CONFIG_USBIP_CORE is not set # CONFIG_USBIP_CORE is not set
# CONFIG_W35UND is not set # CONFIG_W35UND is not set

4
projects/Generic/linux/linux.x86_64.conf
View File

@ -1973,7 +1973,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers # ACPI drivers
# #
# CONFIG_SENSORS_ACPI_POWER is not set # CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
@ -3283,7 +3283,7 @@ CONFIG_UIO=y
# Microsoft Hyper-V guest support # Microsoft Hyper-V guest support
# #
CONFIG_STAGING=y CONFIG_STAGING=y
# CONFIG_ET131X is not set CONFIG_ET131X=y
# CONFIG_SLICOSS is not set # CONFIG_SLICOSS is not set
# CONFIG_USBIP_CORE is not set # CONFIG_USBIP_CORE is not set
# CONFIG_W35UND is not set # CONFIG_W35UND is not set

4
projects/Generic_OSS/linux/linux.i386.conf
View File

@ -1993,7 +1993,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers # ACPI drivers
# #
# CONFIG_SENSORS_ACPI_POWER is not set # CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
@ -3318,7 +3318,7 @@ CONFIG_UIO=y
# Microsoft Hyper-V guest support # Microsoft Hyper-V guest support
# #
CONFIG_STAGING=y CONFIG_STAGING=y
# CONFIG_ET131X is not set CONFIG_ET131X=y
# CONFIG_SLICOSS is not set # CONFIG_SLICOSS is not set
# CONFIG_USBIP_CORE is not set # CONFIG_USBIP_CORE is not set
# CONFIG_W35UND is not set # CONFIG_W35UND is not set

2
projects/ION/linux/linux.x86_64.conf
View File

@ -1868,7 +1868,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers # ACPI drivers
# #
# CONFIG_SENSORS_ACPI_POWER is not set # CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y

4
projects/Intel/linux/linux.x86_64.conf
View File

@ -1899,7 +1899,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers # ACPI drivers
# #
# CONFIG_SENSORS_ACPI_POWER is not set # CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
@ -3191,7 +3191,7 @@ CONFIG_RTC_DRV_CMOS=y
# Microsoft Hyper-V guest support # Microsoft Hyper-V guest support
# #
CONFIG_STAGING=y CONFIG_STAGING=y
# CONFIG_ET131X is not set CONFIG_ET131X=y
# CONFIG_SLICOSS is not set # CONFIG_SLICOSS is not set
# CONFIG_USBIP_CORE is not set # CONFIG_USBIP_CORE is not set
# CONFIG_W35UND is not set # CONFIG_W35UND is not set

4
projects/Virtual/linux/linux.i386.conf
View File

@ -1995,7 +1995,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers # ACPI drivers
# #
# CONFIG_SENSORS_ACPI_POWER is not set # CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
@ -3318,7 +3318,7 @@ CONFIG_UIO=y
# Microsoft Hyper-V guest support # Microsoft Hyper-V guest support
# #
CONFIG_STAGING=y CONFIG_STAGING=y
# CONFIG_ET131X is not set CONFIG_ET131X=y
# CONFIG_SLICOSS is not set # CONFIG_SLICOSS is not set
# CONFIG_USBIP_CORE is not set # CONFIG_USBIP_CORE is not set
# CONFIG_W35UND is not set # CONFIG_W35UND is not set

4
projects/Virtual/linux/linux.x86_64.conf
View File

@ -1972,7 +1972,7 @@ CONFIG_SENSORS_W83627EHF=y
# ACPI drivers # ACPI drivers
# #
# CONFIG_SENSORS_ACPI_POWER is not set # CONFIG_SENSORS_ACPI_POWER is not set
# CONFIG_SENSORS_ATK0110 is not set CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
@ -3285,7 +3285,7 @@ CONFIG_UIO=y
# Microsoft Hyper-V guest support # Microsoft Hyper-V guest support
# #
CONFIG_STAGING=y CONFIG_STAGING=y
# CONFIG_ET131X is not set CONFIG_ET131X=y
# CONFIG_SLICOSS is not set # CONFIG_SLICOSS is not set
# CONFIG_USBIP_CORE is not set # CONFIG_USBIP_CORE is not set
# CONFIG_W35UND is not set # CONFIG_W35UND is not set