Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2012-11-23 13:40:06 +01:00
commit 0d4e94420b
14 changed files with 15 additions and 15 deletions

View File

@ -25,8 +25,8 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://upower.freedesktop.org/"
PKG_URL="http://upower.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="systemd glib dbus dbus-glib polkit pm-utils"
PKG_BUILD_DEPENDS="toolchain systemd glib dbus dbus-glib gobject-introspection polkit"
PKG_DEPENDS="systemd glib dbus dbus-glib polkit pm-utils libusb"
PKG_BUILD_DEPENDS="toolchain systemd glib dbus dbus-glib gobject-introspection polkit libusb"
PKG_PRIORITY="optional"
PKG_SECTION="system"
PKG_SHORTDESC="upower: a modular hardware abstraction layer designed for use in Linux systems that is designed to simplify device management."

View File

@ -1712,7 +1712,7 @@ CONFIG_BCMA_POSSIBLE=y
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support

View File

@ -1945,7 +1945,7 @@ CONFIG_BCMA_POSSIBLE=y
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support

View File

@ -1894,7 +1894,7 @@ CONFIG_BCMA_POSSIBLE=y
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support

View File

@ -2029,7 +2029,7 @@ CONFIG_LPC_SCH=y
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support

View File

@ -2027,7 +2027,7 @@ CONFIG_LPC_SCH=y
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support

View File

@ -1900,7 +1900,7 @@ CONFIG_LPC_SCH=y
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support

View File

@ -1835,7 +1835,7 @@ CONFIG_LPC_SCH=y
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support

View File

@ -1917,7 +1917,7 @@ CONFIG_LPC_SCH=y
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support

View File

@ -1853,7 +1853,7 @@ CONFIG_LPC_SCH=y
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support

View File

@ -1319,7 +1319,7 @@ CONFIG_BCMA_POSSIBLE=y
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support

View File

@ -1755,7 +1755,7 @@ CONFIG_LPC_SCH=y
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support

View File

@ -1919,7 +1919,7 @@ CONFIG_LPC_SCH=y
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support

View File

@ -1854,7 +1854,7 @@ CONFIG_LPC_SCH=y
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_PALMAS is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support