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

Conflicts:
	packages/mediacenter/xbmc-theme-Confluence/meta
	packages/mediacenter/xbmc/meta
This commit is contained in:
Stephan Raue 2013-05-25 14:01:09 +02:00
commit 48182d1e7a
43 changed files with 75 additions and 29 deletions

View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="CouchPotatoServer"
PKG_VERSION="f946389"
PKG_VERSION="5c0d8a7"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="Headphones"
PKG_VERSION="ebbe908"
PKG_VERSION="452cf15"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -1,3 +1,6 @@
3.0.5
- update to makemkv-1.8.2
3.0.4
- update to makemkv-1.8.0

View File

@ -19,8 +19,8 @@
################################################################################
PKG_NAME="makemkv"
PKG_VERSION="1.8.0"
PKG_REV="4"
PKG_VERSION="1.8.2"
PKG_REV="5"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"

View File

@ -1,5 +1,6 @@
3.0.9 (in progress)
- update to CouchPotatoServe-f946389
3.0.9
- update to CouchPotatoServe-5c0d8a7
- update to Headphones-452cf15
- remove CouchPotato (v1)
3.0.8

View File

@ -20,13 +20,13 @@
PKG_NAME="SABnzbd-Suite"
PKG_VERSION="3.0"
PKG_REV="8"
PKG_REV="9"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.openelec.tv"
PKG_URL=""
PKG_DEPENDS="Python"
PKG_BUILD_DEPENDS="toolchain Python SABnzbd SickBeard CouchPotato Headphones CouchPotatoServer"
PKG_BUILD_DEPENDS="toolchain Python SABnzbd SickBeard Headphones CouchPotatoServer"
PKG_PRIORITY="optional"
PKG_SECTION="service/downloadmanager"
PKG_SHORTDESC="SABnzbd-Suite is a Metapackage which combines SABnzbd, SickBeard, Couchpotato and Headphones in one Addon"

View File

@ -415,7 +415,7 @@
echo "Creating empty file, this can take a long time..."
/sysroot/bin/busybox dd if=/dev/zero of="$storage_loop_file" bs=1M count=$STORAGE_USE &>/dev/null
echo "Formating to EXT4 filesystem, this can take a long time..."
LD_LIBRARY_PATH=/sysroot/usr/lib /sysroot/usr/bin/mkfs.ext4 -F -L StorageLive "$storage_loop_file" &>/dev/null
LD_LIBRARY_PATH=/sysroot/usr/lib /sysroot/sbin/mkfs.ext4 -F -L StorageLive "$storage_loop_file" &>/dev/null
/bin/busybox sync
umount /sysroot
else
@ -423,7 +423,7 @@
echo "Creating empty file, this can take a long time..."
/flash/bin/busybox dd if=/dev/zero of="$storage_loop_file" bs=1M count=$STORAGE_USE &>/dev/null
echo "Formating to EXT4 filesystem, this can take a long time..."
LD_LIBRARY_PATH=/flash/usr/lib /flash/usr/bin/mkfs.ext4 -F -L StorageLive "$storage_loop_file" &>/dev/null
LD_LIBRARY_PATH=/flash/usr/lib /flash/sbin/mkfs.ext4 -F -L StorageLive "$storage_loop_file" &>/dev/null
/bin/busybox sync
fi

View File

@ -27,7 +27,7 @@ elif [ "$LINUX" = "3.6" ]; then
elif [ "$LINUX" = "3.8" ]; then
PKG_VERSION="3.8.13"
else
PKG_VERSION="3.9.2"
PKG_VERSION="3.9.3"
fi
PKG_REV="1"

View File

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

View File

@ -21,7 +21,7 @@
PKG_NAME="xbmc-pvr-addons"
PKG_VERSION="frodo-d37ec1d"
if [ "$XBMC" = "master" ]; then
PKG_VERSION="ed5ff3c"
PKG_VERSION="fb8d0d9"
fi
PKG_REV="1"
PKG_ARCH="any"

View File

@ -21,7 +21,7 @@
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="12.2.0"
if [ "$XBMC" = "master" ]; then
PKG_VERSION="f81d56e"
PKG_VERSION="9ac3e4c"
elif [ "$XBMC" = "xbmc-aml" ]; then
PKG_VERSION="aml-frodo-d9119f2"
fi

View File

@ -21,7 +21,7 @@
PKG_NAME="xbmc"
PKG_VERSION="12.2.0"
if [ "$XBMC" = "master" ]; then
PKG_VERSION="f81d56e"
PKG_VERSION="9ac3e4c"
elif [ "$XBMC" = "xbmc-aml" ]; then
PKG_VERSION="aml-frodo-d9119f2"
fi

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.9.0 Kernel Configuration
# Linux/x86_64 3.9.3 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@ -2803,6 +2803,9 @@ CONFIG_LEDS_TRIGGERS=y
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/i386 3.9.0 Kernel Configuration
# Linux/i386 3.9.3 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -2675,6 +2675,9 @@ CONFIG_LEDS_TRIGGERS=y
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/i386 3.9.0 Kernel Configuration
# Linux/i386 3.9.3 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -2992,6 +2992,9 @@ CONFIG_LEDS_TRIGGERS=y
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.9.0 Kernel Configuration
# Linux/x86_64 3.9.3 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@ -2939,6 +2939,9 @@ CONFIG_LEDS_TRIGGERS=y
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/i386 3.9.0 Kernel Configuration
# Linux/i386 3.9.3 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -3162,6 +3162,9 @@ CONFIG_LEDS_TRIGGERS=y
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.9.0 Kernel Configuration
# Linux/x86_64 3.9.3 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@ -3113,6 +3113,9 @@ CONFIG_LEDS_TRIGGERS=y
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/i386 3.9.0 Kernel Configuration
# Linux/i386 3.9.3 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -3165,6 +3165,9 @@ CONFIG_LEDS_TRIGGERS=y
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/i386 3.9.0 Kernel Configuration
# Linux/i386 3.9.3 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -3046,6 +3046,9 @@ CONFIG_LEDS_TRIGGERS=y
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.9.0 Kernel Configuration
# Linux/x86_64 3.9.3 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@ -2973,6 +2973,9 @@ CONFIG_LEDS_TRIGGERS=y
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/i386 3.9.0 Kernel Configuration
# Linux/i386 3.9.3 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -3098,6 +3098,9 @@ CONFIG_LEDS_TRIGGERS=y
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.9.0 Kernel Configuration
# Linux/x86_64 3.9.3 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@ -3026,6 +3026,9 @@ CONFIG_LEDS_TRIGGERS=y
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.9.0 Kernel Configuration
# Linux/x86_64 3.9.3 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@ -2743,6 +2743,9 @@ CONFIG_LEDS_TRIGGERS=y
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/i386 3.9.0 Kernel Configuration
# Linux/i386 3.9.3 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -3165,6 +3165,9 @@ CONFIG_LEDS_TRIGGERS=y
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.9.0 Kernel Configuration
# Linux/x86_64 3.9.3 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@ -3116,6 +3116,9 @@ CONFIG_LEDS_TRIGGERS=y
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
#