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

This commit is contained in:
Stephan Raue
2012-02-13 16:43:11 +01:00
32 changed files with 146 additions and 39 deletions

View File

@@ -19,12 +19,12 @@
################################################################################
PKG_NAME="libvorbis"
PKG_VERSION="1.3.2"
PKG_VERSION="1.3.3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"
PKG_SITE="http://www.vorbis.com/"
PKG_URL="http://downloads.xiph.org/releases/vorbis/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="http://downloads.xiph.org/releases/vorbis/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="libogg"
PKG_BUILD_DEPENDS="toolchain libogg"
PKG_PRIORITY="optional"

View File

@@ -23,14 +23,16 @@
. config/options $1
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--exec-prefix=/usr \
--sysconfdir=/etc \
--datadir=/usr/share \
--enable-shared \
--disable-static \
mkdir -p .build-target && cd .build-target
../configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--exec-prefix=/usr \
--sysconfdir=/etc \
--datadir=/usr/share \
--enable-shared \
--disable-static \
make

View File

@@ -23,5 +23,5 @@
. config/options $1
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib
cp -PR $PKG_BUILD/.build-target/src/.libs/*.so* $INSTALL/usr/lib

View File

@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="pcre"
PKG_VERSION="8.21"
PKG_VERSION="8.30"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libdrm"
PKG_VERSION="2.4.30"
PKG_VERSION="2.4.31"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@@ -11,11 +11,13 @@
library="default.py" />
<extension point="xbmc.addon.metadata">
<summary lang="en">OpenELEC OS Settings Dialog</summary>
<summary lang="da">OpenELEC OS Indstillinger</summary>
<summary lang="tr">OpenELEC OS Ayarları İletişim Kutusu</summary>
<summary lang="pl">OpenELEC OS Panel ustawień</summary>
<description lang="en">OpenElec OS Settings Dialog</description>
<description lang="da">OpenElec OS Indstillinger</description>
<description lang="tr">OpenElec OS Ayarları İletişim Kutusu</description>
<description lang="pl">OpenELEC OS Panel ustawień</description>
<platform>all</platform>
</extension>
</addon>
</addon>

View File

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- System -->
<string id="2000">System</string>
<string id="2010">Tastatur</string>
<string id="2011">Tastatur layout</string>
<string id="2012">Alternativ tastatur layout (valgfrit)</string>
<string id="2020">System Opdatering</string>
<string id="2021">System Opdatering</string>
<string id="2050">LCD/VFD</string>
<string id="2051">Valg af LCD driver</string>
<!-- Network -->
<string id="2100">Netværk</string>
<string id="2101">Netværk 2</string>
<string id="2110">Generelle indstillinger</string>
<string id="2111">Hostnavn</string>
<string id="2120">Netværks Adapter</string>
<string id="2121">Netværks forbindelse</string>
<string id="2122">Netværks Interface</string>
<string id="2130">IP indstillinger</string>
<string id="2131">Statisk IP adresse</string>
<string id="2132">Netmaske Præfixlængde</string>
<string id="2133">Netværks gateway</string>
<string id="2134">DNS server 1</string>
<string id="2135">DNS server 2</string>
<string id="2136">DNS server 3</string>
<string id="2150">WLAN indstillinger</string>
<string id="2151">WLAN SSID</string>
<string id="2152">Skjult Netværk</string>
<string id="2153">WLAN Sikkerhed</string>
<string id="2154">WLAN Kodeord</string>
<!-- SAMBA -->
<string id="5000">Samba</string>
<string id="5010">Opstart</string>
<string id="5011">Start Samba ved opstart af systemet</string>
</strings>

View File

@@ -0,0 +1,43 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
$SCRIPTS/unpack lzo
LZO_DIR=`ls -d $BUILD/lzo-[0-9]*`
setup_toolchain host
cd $LZO_DIR
mkdir -p .build-host && cd .build-host
../configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN \
--sysconfdir=$ROOT/$TOOLCHAIN/etc \
--datadir=/usr/share \
--enable-shared \
--disable-static \
make
make install

View File

@@ -19,12 +19,12 @@
################################################################################
PKG_NAME="automake"
PKG_VERSION="1.11.2"
PKG_VERSION="1.11.3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://sources.redhat.com/automake/"
PKG_URL="http://ftp.gnu.org/gnu/automake/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="http://ftp.gnu.org/gnu/automake/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="ccache autoconf"
PKG_PRIORITY="optional"

View File

@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="intltool"
PKG_VERSION="0.50.0"
PKG_VERSION="0.50.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@@ -29,6 +29,7 @@ LDFLAGS="$LDFLAGS -fwhole-program"
cd $BUILD/$1*/squashfs-tools
make mksquashfs \
XZ_SUPPORT=1 \
LZO_SUPPORT=1 \
INCLUDEDIR="-I. -I$ROOT/$TOOLCHAIN/include"
mkdir -p $ROOT/$TOOLCHAIN/bin

View File

@@ -27,7 +27,7 @@ PKG_SITE="http://squashfs.sourceforge.net/"
PKG_URL="$SOURCEFORGE_SRC/squashfs/squashfs/${PKG_NAME}${PKG_VERSION}/${PKG_NAME}${PKG_VERSION}.tar.gz"
#PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="ccache zlib-host xz"
PKG_BUILD_DEPENDS="ccache zlib-host lzo-host xz"
PKG_PRIORITY="optional"
PKG_SECTION="toolchain/sysutils"
PKG_SHORTDESC="squashfs-tools: A compressed read-only filesystem for Linux"

View File

@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="pixman"
PKG_VERSION="0.24.2"
PKG_VERSION="0.24.4"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@@ -98,7 +98,6 @@ CONFIG_SPARSE_IRQ=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32

View File

@@ -107,6 +107,9 @@
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"
# SquashFS compression method (gzip / lzo / xz)
SQUASHFS_COMPRESSION="gzip"
# Mediacenter to use (xbmc / no)
if [ "$PVR" = yes ]; then
MEDIACENTER="xbmc-pvr"

View File

@@ -98,7 +98,6 @@ CONFIG_SPARSE_IRQ=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@@ -2260,6 +2259,7 @@ CONFIG_SND_DMA_SGBUF=y
# CONFIG_SND_OPL4_LIB_SEQ is not set
# CONFIG_SND_SBAWE_SEQ is not set
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_MPU401_UART=m
CONFIG_SND_AC97_CODEC=m
# CONFIG_SND_DRIVERS is not set
CONFIG_SND_PCI=y
@@ -2278,6 +2278,7 @@ CONFIG_SND_PCI=y
# CONFIG_SND_BT87X is not set
CONFIG_SND_CA0106=m
# CONFIG_SND_CMIPCI is not set
CONFIG_SND_OXYGEN_LIB=m
# CONFIG_SND_OXYGEN is not set
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
@@ -2902,7 +2903,7 @@ CONFIG_HFSPLUS_FS=m
CONFIG_SQUASHFS=y
# CONFIG_SQUASHFS_XATTR is not set
CONFIG_SQUASHFS_ZLIB=y
# CONFIG_SQUASHFS_LZO is not set
CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
# CONFIG_SQUASHFS_EMBEDDED is not set

View File

@@ -2206,6 +2206,7 @@ CONFIG_SND_DMA_SGBUF=y
# CONFIG_SND_OPL4_LIB_SEQ is not set
# CONFIG_SND_SBAWE_SEQ is not set
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_MPU401_UART=m
CONFIG_SND_AC97_CODEC=m
# CONFIG_SND_DRIVERS is not set
CONFIG_SND_PCI=y
@@ -2224,6 +2225,7 @@ CONFIG_SND_PCI=y
# CONFIG_SND_BT87X is not set
CONFIG_SND_CA0106=m
# CONFIG_SND_CMIPCI is not set
CONFIG_SND_OXYGEN_LIB=m
# CONFIG_SND_OXYGEN is not set
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
@@ -2847,7 +2849,7 @@ CONFIG_HFSPLUS_FS=m
CONFIG_SQUASHFS=y
# CONFIG_SQUASHFS_XATTR is not set
CONFIG_SQUASHFS_ZLIB=y
# CONFIG_SQUASHFS_LZO is not set
CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
# CONFIG_SQUASHFS_EMBEDDED is not set

View File

@@ -107,6 +107,9 @@
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"
# SquashFS compression method (gzip / lzo / xz)
SQUASHFS_COMPRESSION="gzip"
# Mediacenter to use (xbmc / no)
if [ "$PVR" = yes ]; then
MEDIACENTER="xbmc-pvr"

View File

@@ -98,7 +98,6 @@ CONFIG_SPARSE_IRQ=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@@ -3091,7 +3090,7 @@ CONFIG_HFSPLUS_FS=m
CONFIG_SQUASHFS=y
# CONFIG_SQUASHFS_XATTR is not set
CONFIG_SQUASHFS_ZLIB=y
# CONFIG_SQUASHFS_LZO is not set
CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
# CONFIG_SQUASHFS_EMBEDDED is not set

View File

@@ -107,6 +107,9 @@
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"
# SquashFS compression method (gzip / lzo / xz)
SQUASHFS_COMPRESSION="gzip"
# Mediacenter to use (xbmc / no)
if [ "$PVR" = yes ]; then
MEDIACENTER="xbmc-pvr"

View File

@@ -98,7 +98,6 @@ CONFIG_SPARSE_IRQ=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@@ -3093,7 +3092,7 @@ CONFIG_HFSPLUS_FS=m
CONFIG_SQUASHFS=y
# CONFIG_SQUASHFS_XATTR is not set
CONFIG_SQUASHFS_ZLIB=y
# CONFIG_SQUASHFS_LZO is not set
CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
# CONFIG_SQUASHFS_EMBEDDED is not set

View File

@@ -107,6 +107,9 @@
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"
# SquashFS compression method (gzip / lzo / xz)
SQUASHFS_COMPRESSION="gzip"
# Mediacenter to use (xbmc / no)
if [ "$PVR" = yes ]; then
MEDIACENTER="xbmc-pvr"

View File

@@ -98,7 +98,6 @@ CONFIG_SPARSE_IRQ=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@@ -2880,7 +2879,7 @@ CONFIG_HFSPLUS_FS=m
CONFIG_SQUASHFS=y
# CONFIG_SQUASHFS_XATTR is not set
CONFIG_SQUASHFS_ZLIB=y
# CONFIG_SQUASHFS_LZO is not set
CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
# CONFIG_SQUASHFS_EMBEDDED is not set

View File

@@ -100,7 +100,6 @@ CONFIG_SPARSE_IRQ=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@@ -2818,7 +2817,7 @@ CONFIG_HFSPLUS_FS=m
CONFIG_SQUASHFS=y
# CONFIG_SQUASHFS_XATTR is not set
CONFIG_SQUASHFS_ZLIB=y
# CONFIG_SQUASHFS_LZO is not set
CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
# CONFIG_SQUASHFS_EMBEDDED is not set

View File

@@ -107,6 +107,9 @@
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"
# SquashFS compression method (gzip / lzo / xz)
SQUASHFS_COMPRESSION="gzip"
# Mediacenter to use (xbmc / no)
if [ "$PVR" = yes ]; then
MEDIACENTER="xbmc-pvr"

View File

@@ -98,7 +98,6 @@ CONFIG_SPARSE_IRQ=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@@ -2940,7 +2939,7 @@ CONFIG_HFSPLUS_FS=m
CONFIG_SQUASHFS=y
# CONFIG_SQUASHFS_XATTR is not set
CONFIG_SQUASHFS_ZLIB=y
# CONFIG_SQUASHFS_LZO is not set
CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
# CONFIG_SQUASHFS_EMBEDDED is not set

View File

@@ -100,7 +100,6 @@ CONFIG_SPARSE_IRQ=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@@ -2879,7 +2878,7 @@ CONFIG_HFSPLUS_FS=m
CONFIG_SQUASHFS=y
# CONFIG_SQUASHFS_XATTR is not set
CONFIG_SQUASHFS_ZLIB=y
# CONFIG_SQUASHFS_LZO is not set
CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
# CONFIG_SQUASHFS_EMBEDDED is not set

View File

@@ -107,6 +107,9 @@
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"
# SquashFS compression method (gzip / lzo / xz)
SQUASHFS_COMPRESSION="gzip"
# Mediacenter to use (xbmc / no)
if [ "$PVR" = yes ]; then
MEDIACENTER="xbmc-pvr"

View File

@@ -100,7 +100,6 @@ CONFIG_SPARSE_IRQ=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
@@ -2653,7 +2652,7 @@ CONFIG_HFSPLUS_FS=m
CONFIG_SQUASHFS=y
# CONFIG_SQUASHFS_XATTR is not set
CONFIG_SQUASHFS_ZLIB=y
# CONFIG_SQUASHFS_LZO is not set
CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
# CONFIG_SQUASHFS_EMBEDDED is not set

View File

@@ -107,6 +107,9 @@
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"
# SquashFS compression method (gzip / lzo / xz)
SQUASHFS_COMPRESSION="gzip"
# Mediacenter to use (xbmc / no)
if [ "$PVR" = yes ]; then
MEDIACENTER="xbmc-pvr"

View File

@@ -185,9 +185,12 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
fi
# create squashfs file
if [ -z "$SQUASHFS_COMPRESSION" ]; then
SQUASHFS_COMPRESSION="gzip"
fi
echo "rm -rf $TARGET_IMG/$IMAGE_NAME.system" >> $FAKEROOT_SCRIPT
# echo "$ROOT/$TOOLCHAIN/bin/mksquashfs $BUILD/image/system $TARGET_IMG/$IMAGE_NAME.system -noappend -comp xz" >> $FAKEROOT_SCRIPT
echo "$ROOT/$TOOLCHAIN/bin/mksquashfs $BUILD/image/system $TARGET_IMG/$IMAGE_NAME.system -noappend" >> $FAKEROOT_SCRIPT
echo "$ROOT/$TOOLCHAIN/bin/mksquashfs $BUILD/image/system $TARGET_IMG/$IMAGE_NAME.system -noappend -comp $SQUASHFS_COMPRESSION" >> $FAKEROOT_SCRIPT
# run fakeroot
$ROOT/$TOOLCHAIN/bin/fakeroot -- $FAKEROOT_SCRIPT