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

This commit is contained in:
Stephan Raue 2011-05-04 17:27:47 +02:00
commit 6f72b0c5fc
32 changed files with 1168 additions and 4509 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="linux"
PKG_VERSION="2.6.39-rc5"
PKG_VERSION="2.6.39-rc6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="os.openelec.settings"
name="OpenELEC OS Settings"
version="0.0.7"
version="0.0.8"
provider-name="openelec.tv">
<requires>
<import addon="os.openelec.tv" version="@OS_VERSION@"/>

View File

@ -27,7 +27,7 @@ __author__ = "OpenELEC"
__url__ = "http://www.openelec.tv"
__svn_url__ = ""
__credits__ = ""
__version__ = "0.0.7"
__version__ = "0.0.8"
__XBMC_Revision__ = "22240"
__settings__ = xbmcaddon.Addon(id='os.openelec.settings')

View File

@ -11,7 +11,7 @@
<setting id="UPDATE_AUTO" type="labelenum" label="2021" values="no|manual|auto" sort="yes" default="manual" />
<setting label="2050" type="lsep"/>
<setting type="sep" />
<setting id="LCD_DRIVER" type="labelenum" label="2051" values="none|irtrans|imon" sort="yes" default="none" />
<setting id="LCD_DRIVER" type="labelenum" label="2051" values="none|irtrans|imon|imonlcd" sort="yes" default="none" />
<setting label="2060" type="lsep"/>
<setting type="sep" />
<setting id="WAKEUP_VIDEODBUPDATE" type="bool" label="2061" default="false" />

View File

@ -55,6 +55,12 @@ mkdir -p $INSTALL/usr/share/xbmc/media
# cp $PKG_DIR/splash/splash.png $INSTALL/usr/share/xbmc/media/Splash.png
# fi
# cleanup and python addon fixes
mkdir -p $INSTALL/usr/share/xbmc/addons/script.module.pil/lib
ln -s `ls -d $INSTALL/usr/lib/python*/site-packages | sed -e "s,$INSTALL,,"`/PIL \
$INSTALL/usr/share/xbmc/addons/script.module.pil/lib/PIL
rm -rf $INSTALL/usr/share/xbmc/addons/script.module.pysqlite
mkdir -p $INSTALL/usr/share/xbmc/addons
cp -R $PKG_DIR/config/os.openelec.tv $INSTALL/usr/share/xbmc/addons
$SED "s|@ADDON_OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/xbmc/addons/os.openelec.tv/addon.xml

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="bluez"
PKG_VERSION="4.92"
PKG_VERSION="4.93"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.18.4
# Tue Apr 12 14:24:15 2011
# Tue May 3 19:22:30 2011
#
CONFIG_HAVE_DOT_CONFIG=y
@ -966,7 +966,7 @@ CONFIG_FEATURE_SH_EXTRA_QUIET=y
#
CONFIG_SYSLOGD=y
CONFIG_FEATURE_ROTATE_LOGFILE=y
# CONFIG_FEATURE_REMOTE_LOG is not set
CONFIG_FEATURE_REMOTE_LOG=y
CONFIG_FEATURE_SYSLOGD_DUP=y
CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
CONFIG_FEATURE_IPC_SYSLOG=y

File diff suppressed because it is too large Load Diff

View File

@ -32,4 +32,4 @@ mkdir -p $INSTALL/usr/lib/lcdproc
cp $PKG_BUILD/server/drivers/*.so $INSTALL/usr/lib/lcdproc
mkdir -p $INSTALL/etc
cp $PKG_BUILD/LCDd.conf $INSTALL/etc
cp $PKG_DIR/config/LCDd.conf $INSTALL/etc

View File

@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/i386 2.6.39-rc5-git2 Kernel Configuration
# Linux/i386 2.6.39-rc5-git4 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -2579,10 +2579,10 @@ CONFIG_FUSE_FS=y
#
# CD-ROM/DVD Filesystems
#
CONFIG_ISO9660_FS=y
CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
CONFIG_UDF_FS=y
CONFIG_UDF_FS=m
CONFIG_UDF_NLS=y
#

View File

@ -208,7 +208,7 @@
# 'all' compiles all drivers;
# 'all,!xxx,!yyy' de-selects previously selected drivers
# "none" for disable LCD support
LCD_DRIVER="irtrans,imon"
LCD_DRIVER="irtrans,imon,imonlcd"
# additional Firmware to use (dvb-firmware, wlan-firmware)
# Space separated list is supported,

View File

@ -208,7 +208,7 @@
# 'all' compiles all drivers;
# 'all,!xxx,!yyy' de-selects previously selected drivers
# "none" for disable LCD support
LCD_DRIVER="irtrans,imon"
LCD_DRIVER="irtrans,imon,imonlcd"
# additional Firmware to use (dvb-firmware, wlan-firmware)
# Space separated list is supported,