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

This commit is contained in:
Stephan Raue 2013-03-18 15:16:19 +01:00
commit 469f5defaf
14 changed files with 26 additions and 61 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="12.0.7"
PKG_VERSION="12.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="12.0.7"
PKG_VERSION="12.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -4,4 +4,4 @@
# Background scanning will start every 5 minutes unless
# the scan list is empty. In that case, a simple backoff
# mechanism starting from 10s up to 5 minutes will run.
BackgroundScanning = false
BackgroundScanning = true

View File

@ -24,10 +24,11 @@
cd $PKG_BUILD
rm -rf mach_kernel vmlinuz initrd.gz
cp -PR $(kernel_path)/arch/x86/boot/bzImage vmlinuz
make clean
make LDFLAGS="" \
make LDFLAGS="" KERN_OBJ=vmlinuz.obj \
CC="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-gcc-4.0.1" \
LD="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-ld"

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="atv-bootloader"
PKG_VERSION="r518"
PKG_VERSION="r520"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://code.google.com/p/atv-bootloader/"
PKG_URL="http://travisghansen.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain darwin-cross linux"
PKG_PRIORITY="optional"

View File

@ -1,12 +0,0 @@
diff -Naur atv-bootloader-r518/Makefile atv-bootloader-r518.patch/Makefile
--- atv-bootloader-r518/Makefile 2010-03-09 20:17:22.000000000 +0100
+++ atv-bootloader-r518.patch/Makefile 2011-05-21 15:26:26.509551389 +0200
@@ -22,7 +22,7 @@
# start.o must be 1st in the link order (ld below)
OBJ = start.o vsprintf.o console.o utils.o elilo_code.o darwin_code.o linux_code.o boot_loader.o
-KERN_OBJ= vmlinuz.obj initrd.obj
+KERN_OBJ:= vmlinuz.obj initrd.obj
mach_kernel: $(KERN_OBJ) $(OBJ)
$(LD) $(LDFLAGS) -arch $(ARCH) -o mach_kernel $(OBJ) $(KERN_OBJ) \

View File

@ -1,29 +0,0 @@
diff -Naur atv-bootloader-r518/Makefile atv-bootloader-r518.patch/Makefile
--- atv-bootloader-r518/Makefile 2010-03-09 20:17:22.000000000 +0100
+++ atv-bootloader-r518.patch/Makefile 2011-05-21 14:04:05.592144598 +0200
@@ -11,12 +11,12 @@
# if Linxu, use the darwin-cross tools to compile/link
ifeq ($(OSTYPE),Linux)
- CC = /opt/darwin-cross/bin/i386-apple-darwin8-gcc-4.0
- LD = /opt/darwin-cross/bin/i386-apple-darwin8-ld
+ CC := /opt/darwin-cross/bin/i386-apple-darwin8-gcc-4.0
+ LD := /opt/darwin-cross/bin/i386-apple-darwin8-ld
else
- CC = /usr/bin/gcc-4.0
- LD = /usr/bin/ld
- LDFLAGS = -classic_linker
+ CC := /usr/bin/gcc-4.0
+ LD := /usr/bin/ld
+ LDFLAGS = -classic_linker
endif
# start.o must be 1st in the link order (ld below)
@@ -53,7 +53,4 @@
clean:
rm -f *.o $(KERN_OBJ) mach_kernel
-
-
#xxd mach_kernel | sed -e "s/ffff ffff 1000/0100 0000 1000/" | xxd -r - mach_kernel
-

View File

@ -55,10 +55,10 @@ CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
# CONFIG_KERNEL_GZIP is not set
CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_BZIP2 is not set
# CONFIG_KERNEL_LZMA is not set
CONFIG_KERNEL_XZ=y
# CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_LZO is not set
CONFIG_DEFAULT_HOSTNAME="openelec"
CONFIG_SWAP=y
@ -133,7 +133,7 @@ CONFIG_RD_GZIP=y
# CONFIG_RD_LZO is not set
CONFIG_INITRAMFS_COMPRESSION_NONE=y
# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
CONFIG_EXPERT=y
@ -2067,7 +2067,7 @@ CONFIG_AGP_INTEL=y
# CONFIG_AGP_VIA is not set
# CONFIG_AGP_EFFICEON is not set
CONFIG_VGA_ARB=y
CONFIG_VGA_ARB_MAX_GPUS=1
CONFIG_VGA_ARB_MAX_GPUS=2
# CONFIG_VGA_SWITCHEROO is not set
# CONFIG_DRM is not set
# CONFIG_STUB_POULSBO is not set
@ -2076,7 +2076,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
# CONFIG_FB_DDC is not set
# CONFIG_FB_BOOT_VESA_SUPPORT is not set
CONFIG_FB_BOOT_VESA_SUPPORT=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
@ -2090,7 +2090,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
#
@ -2103,9 +2103,9 @@ CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_VGA16 is not set
CONFIG_FB_UVESA=m
# CONFIG_FB_VESA is not set
CONFIG_FB_EFI=y
# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_N411 is not set
# CONFIG_FB_HGA is not set
# CONFIG_FB_S1D13XXX is not set
@ -2157,8 +2157,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
# Console display driver support
#
CONFIG_VGA_CONSOLE=y
CONFIG_VGACON_SOFT_SCROLLBACK=y
CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256
# CONFIG_VGACON_SOFT_SCROLLBACK is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
@ -3053,6 +3052,7 @@ CONFIG_TRACING_SUPPORT=y
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
CONFIG_HAVE_ARCH_KMEMCHECK=y
# CONFIG_KMEMCHECK is not set
# CONFIG_TEST_KSTRTOX is not set
CONFIG_STRICT_DEVMEM=y
# CONFIG_X86_VERBOSE_BOOTUP is not set

View File

@ -87,7 +87,7 @@
# Bootloader to use (syslinux / u-boot / atv-bootloader)
# BOOTLOADER="atv-bootloader" disabled for now
BOOTLOADER=""
BOOTLOADER="atv-bootloader"
# Configuration for u-boot
UBOOT_CONFIG=""

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<advancedsettings>
<splash>false</splash>
<showexitbutton>false</showexitbutton>
<cputempcommand>gputemp</cputempcommand>
<gputempcommand>gputemp</gputempcommand>

View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="12.0.7"
PKG_VERSION="12.1"
GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git"
DEST_DIR="$PKG_NAME-frodo"

View File

@ -100,6 +100,12 @@ Function CustomCreate
StrCpy $R0 ''
${GetDrives} "FDD" GetDrivesCallBack
GetDlgItem $1 $HWNDPARENT 1
${If} $R0 == ""
EnableWindow $1 0
${Else}
EnableWindow $1 1
${EndIf}
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Type' 'DropList'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Left' '30'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Top' '25'