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

This commit is contained in:
Stephan Raue 2013-09-13 00:21:42 +02:00
commit 9d6bcec2b3
8 changed files with 19 additions and 7 deletions

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."

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

View File

@ -3275,7 +3275,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

View File

@ -3242,7 +3242,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

View File

@ -3278,7 +3278,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

View File

@ -3152,7 +3152,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

View File

@ -3277,7 +3277,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

View File

@ -3244,7 +3244,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