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

This commit is contained in:
Stephan Raue 2012-12-28 17:11:04 +01:00
commit 1405b245ea
113 changed files with 2295 additions and 535 deletions

View File

@ -335,7 +335,10 @@ show_config() {
config_message="$config_message\n - Default Hostname:\t\t\t $HOSTNAME"
config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD"
config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER"
if [ "$BOOTLOADER" = "u-boot" ]; then
config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG"
config_message="$config_message\n - U-Boot config file:\t\t\t $UBOOT_CONFIGFILE"
fi
config_message="$config_message\n - UDisks support:\t\t\t $UDISKS"
config_message="$config_message\n - UPower support:\t\t\t $UPOWER"
config_message="$config_message\n - Update support:\t\t\t $UPDATE_SUPPORT"

View File

@ -38,6 +38,10 @@ get_graphicdrivers() {
fi
for drv in $GRAPHIC_DRIVERS; do
if [ "$drv" = "dove" ]; then
XORG_DRIVERS="$XORG_DRIVERS dove"
fi
if [ "$drv" = "fglrx" ]; then
XORG_DRIVERS="$XORG_DRIVERS fglrx"
COMPOSITE_SUPPORT="yes"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="vdr-dynamite"
PKG_VERSION="10d78a8"
PKG_VERSION="914af24"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="vdr-plugin-dvbapi"
PKG_VERSION="e3200c8"
PKG_VERSION="e87e15f"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="vdr-plugin-streamdev"
PKG_VERSION="6a47e20"
PKG_VERSION="9135cde"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="vdr-plugin-vnsiserver"
PKG_VERSION="e3c185b"
PKG_VERSION="e3cd383"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="vdr-plugin-xvdr"
PKG_VERSION="c2fa08a"
PKG_VERSION="c43033c"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="vdr-sc"
PKG_VERSION="613"
PKG_VERSION="620"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -26,11 +26,10 @@ PKG_LICENSE="GPL-2"
PKG_SITE="http://pycurl.sourceforge.net/"
PKG_URL="http://pycurl.sourceforge.net/download/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS="Python curl"
PKG_BUILD_DEPENDS="toolchain Python distutilscross curl"
PKG_BUILD_DEPENDS="toolchain Python distutilscross curl libgcrypt"
PKG_PRIORITY="optional"
PKG_SECTION="python/web"
PKG_SHORTDESC="pycurl: a Python interface to libcurl"
PKG_LONGDESC="PycURL is a Python interface to libcurl. PycURL can be used to fetch objects identified by a URL from a Python program, similar to the urllib Python module. PycURL is mature, very fast, and supports a lot of features."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

View File

@ -0,0 +1,11 @@
diff -uNr pycurl-7.19.0-orig/setup.py pycurl-7.19.0-new/setup.py
--- pycurl-7.19.0-orig/setup.py 2012-12-21 19:20:27.000000000 +0100
+++ pycurl-7.19.0-new/setup.py 2012-12-21 19:31:11.000000000 +0100
@@ -104,6 +104,7 @@
if e[2:] == 'ssl':
define_macros.append(('HAVE_CURL_OPENSSL', 1))
if e[2:] == 'gnutls':
+ libraries.append("gcrypt")
define_macros.append(('HAVE_CURL_GNUTLS', 1))
elif e[:2] == "-L":
library_dirs.append(e[2:])

View File

@ -1,4 +1,4 @@
3.0.1
3.0.2
- pycrypto is installed per default now
3.0.1

View File

@ -1,3 +1,11 @@
3.0.3
- update to vdr-sc-620
- update to vdr-plugin-xvdr-c43033c
- update to vdr-plugin-vnsiserver-e3cd383
- update to vdr-plugin-streamdev-9135cde
- update to vdr-plugin-dvbapi-e87e15f
- update to vdr-dynamite-914af24
3.0.2
- update to vdr-plugin-xmltv2vdr-8be374e
- update to vdr-plugin-xvdr-c2fa08a

View File

@ -21,7 +21,7 @@
PKG_NAME="vdr-addon"
PKG_VERSION="3.0"
PKG_REV="2"
PKG_REV="3"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.openelec.tv"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="mysql"
PKG_VERSION="5.1.66"
PKG_VERSION="5.1.67"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="sqlite"
PKG_VERSION="autoconf-3071500"
PKG_VERSION="autoconf-3071501"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="PublicDomain"

View File

@ -0,0 +1,33 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
cd $PKG_BUILD
make -f Makefile_general libbmm.so.0u
mkdir -p $SYSROOT_PREFIX/usr/lib
cp -PR libbmm.so* $SYSROOT_PREFIX/usr/lib
mkdir -p $SYSROOT_PREFIX/usr/include
cp -PR bmm_lib.h $SYSROOT_PREFIX/usr/include

View File

@ -0,0 +1,29 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/libbmm.so* $INSTALL/usr/lib
mkdir -p $INSTALL/lib/udev/rules.d
cp -PR $PKG_BUILD/etc/udev/rules.d/*.rules $INSTALL/lib/udev/rules.d

View File

@ -0,0 +1,36 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="marvell-libbmm"
PKG_VERSION="0.2.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="free to use"
PKG_SITE="http://www.marvell.com"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="system"
PKG_SHORTDESC="marvell-libbmm: Allocate, manage and share large block of physical continuous memory."
PKG_LONGDESC="marvell-libbmm: Allocate, manage and share large block of physical continuous memory."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

View File

@ -0,0 +1,27 @@
diff -Naur libbmm-0.2.0/Makefile_general libbmm-0.2.0.patch/Makefile_general
--- libbmm-0.2.0/Makefile_general 2011-03-07 18:48:46.000000000 +0100
+++ libbmm-0.2.0.patch/Makefile_general 2012-12-24 20:19:47.791960702 +0100
@@ -30,20 +30,20 @@
uninstall-host uninstall-target
.c.o:
- ${CC} -fPIC -o $@ -c $<
+ ${CC} -fPIC ${CFLAGS} -o $@ -c $<
all: compile install-host install-target
compile: bmm_test libbmm.so libbmm.a
bmm_test: libbmm.so.$(ABI_VERSION) ${bmm_test_obj}
- ${CC} -o $@ ${bmm_test_obj} -L. -lbmm
+ ${CC} ${LDLAGS} -o $@ ${bmm_test_obj} -L. -lbmm
libbmm.a: ${bmm_lib_obj}
${AR} -rcs $@ ${bmm_lib_obj}
libbmm.so.$(ABI_VERSION): ${bmm_lib_obj}
- ${CC} -g -s -shared -Wl,-soname,$@ -o $@.$(ABI_REVISION) ${bmm_lib_obj}
+ ${CC} -g -s ${LDFLAGS} -shared -Wl,-soname,$@ -o $@.$(ABI_REVISION) ${bmm_lib_obj}
ln -s $@.$(ABI_REVISION) $@
ln -s $@.$(ABI_REVISION) libbmm.so

View File

@ -0,0 +1,27 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
cd $PKG_BUILD
make libvmeta.so

View File

@ -0,0 +1,26 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/libvmeta.so* $INSTALL/usr/lib

View File

@ -0,0 +1,36 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="marvell-libvmeta"
PKG_VERSION="3.8.3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="free to use"
PKG_SITE="http://www.marvell.com"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="marvell-libbmm"
PKG_BUILD_DEPENDS="toolchain marvell-libbmm"
PKG_PRIORITY="optional"
PKG_SECTION="system"
PKG_SHORTDESC="marvell-libvmeta: vmeta library on marvell dove platform."
PKG_LONGDESC="marvell-libvmeta: vmeta library on marvell dove platform."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

View File

@ -0,0 +1,21 @@
diff -Naur marvell-libvmeta-3.8.3/Makefile marvell-libvmeta-3.8.3.patch/Makefile
--- marvell-libvmeta-3.8.3/Makefile 2011-03-07 18:51:17.000000000 +0100
+++ marvell-libvmeta-3.8.3.patch/Makefile 2012-12-27 01:14:34.043086675 +0100
@@ -22,7 +22,7 @@
uninstall-host uninstall-target
.c.o:
- ${CC} -fPIC -o $@ -c $<
+ ${CC} ${CFLAGS} -fPIC -o $@ -c $<
all: compile install-host install-target
@@ -32,7 +32,7 @@
${AR} -rcs $@ ${vmeta_lib_obj}
libvmeta.so: ${vmeta_lib_obj}
- ${CC} -g -s -shared -Wl,-soname,$@ -o $@ ${vmeta_lib_obj} -lbmm
+ ${CC} -g -s ${LDFLAGS} -shared -Wl,-soname,$@ -o $@ ${vmeta_lib_obj} -lbmm
clean: clean-local

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="bcm2835-driver"
PKG_VERSION="3bd073e"
PKG_VERSION="76d0ac3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="nonfree"

View File

@ -0,0 +1,36 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then
LIBGLES_LIBDIR="soft/lib"
elif [ "$TARGET_FLOAT" = "hard" ]; then
LIBGLES_LIBDIR="hard/lib"
fi
cd $PKG_BUILD
mkdir -p $SYSROOT_PREFIX/usr/include
cp -PR include/* $SYSROOT_PREFIX/usr/include
mkdir -p $SYSROOT_PREFIX/usr/lib
cp -PR $LIBGLES_LIBDIR/*.so* $SYSROOT_PREFIX/usr/lib

View File

@ -0,0 +1,32 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then
LIBGLES_LIBDIR="soft/lib"
elif [ "$TARGET_FLOAT" = "hard" ]; then
LIBGLES_LIBDIR="hard/lib"
fi
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/$LIBGLES_LIBDIR/*.so* $INSTALL/usr/lib

View File

@ -0,0 +1,36 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="marvell-libgfx"
PKG_VERSION="20121001"
PKG_REV="1"
PKG_ARCH="arm"
PKG_LICENSE="nonfree"
PKG_SITE="http://www.marvell.com"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="libXfixes libXdamage"
PKG_BUILD_DEPENDS="toolchain libXfixes libXdamage"
PKG_PRIORITY="optional"
PKG_SECTION="graphics"
PKG_SHORTDESC="marvell-libgfx: OpenGL-ES and OpenMAX driver for Marvell Dove"
PKG_LONGDESC="marvell-libgfx: OpenGL-ES and OpenMAX driver for Marvell Dove"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="php"
PKG_VERSION="5.4.8"
PKG_VERSION="5.4.10"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OpenSource"

View File

@ -0,0 +1,29 @@
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Fri, 31 Aug 2012 21:06:17 +0000 (+0200)
Subject: r8169: add D-Link DGE-560T identifiers.
X-Git-Tag: v3.7-rc1~145^2~236
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-stable.git;a=commitdiff_plain;h=2a35cfa591ac63f17815c2d9432b799e37527980;hp=da210f559019ba1cd4ebee2a28ad158bfb95bab2
r8169: add D-Link DGE-560T identifiers.
This one includes a 8168. Not to be confused with the sky2 driven
one whose PCI vendor and device ID are the same.
Reported-by: Neyuki Inaya <in@joblog.ru>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index b47d5b3..0c96604 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -287,6 +287,8 @@ static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = {
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), 0, 0, RTL_CFG_1 },
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 },
+ { PCI_VENDOR_ID_DLINK, 0x4300,
+ PCI_VENDOR_ID_DLINK, 0x4b10, 0, 0, RTL_CFG_1 },
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4302), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_AT, 0xc107), 0, 0, RTL_CFG_0 },

View File

@ -12,7 +12,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|imonlcd|mdm166a|MtxOrb|dm140|lis" sort="yes" default="none" />
<setting id="LCD_DRIVER" type="labelenum" label="2051" values="none|irtrans|imon|imonlcd|mdm166a|MtxOrb|dm140|lis|hd44780" sort="yes" default="none" />
<setting label="2060" type="lsep"/>
<setting type="sep" />
<setting id="HDD_STANDBY" type="bool" label="2061" default="false" />

View File

@ -28,7 +28,7 @@ cd $PKG_BUILD
touch NEWS AUTHORS ChangeLog
do_autoreconf
CXXFLAGS="-DZLIB_INTERNAL=1" \
CXXFLAGS="$CXXFLAGS -DZLIB_INTERNAL=1" \
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr/share/xbmc \

View File

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

View File

@ -39,6 +39,9 @@ fi
if [ "$OPENGLES_SUPPORT" = yes ]; then
XBMC_OPENGLES="--enable-gles"
if [ "$OPENGLES" = "marvell-libgfx" ]; then
XBMC_PLATFORM_SUPPORT="--with-platform=marvell-dove"
fi
else
XBMC_OPENGLES="--disable-gles"
fi
@ -85,9 +88,6 @@ fi
if [ "$CEC_SUPPORT" = yes ]; then
XBMC_CEC="--enable-libcec"
if [ "$OPENMAX" = "bcm2835-driver" ]; then
XBMC_CEC="$XBMC_CEC --enable-rpi-cec-api"
fi
else
XBMC_CEC="--disable-libcec"
fi

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="74b907c"
PKG_VERSION="c0320c2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
@ -71,6 +71,10 @@ if [ "$OPENGLES_SUPPORT" = yes ]; then
# for OpenGL-ES support
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS $OPENGLES"
PKG_DEPENDS="$PKG_DEPENDS $OPENGLES"
if [ "$OPENGLES" = "marvell-libgfx" ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS marvell-libvmeta marvell-ipp"
PKG_DEPENDS="$PKG_DEPENDS marvell-libvmeta marvell-ipp"
fi
fi
# for dbus support

View File

@ -30,10 +30,3 @@ if [ ! $TARGET_ARCH = arm ]; then
`echo $PKG_BUILD | cut -f1 -d\ ` -p1
done
fi
echo "### Applying project based patches ###"
for patch in `ls $PROJECT_DIR/$PROJECT/patches/$1`; do
cat $PROJECT_DIR/$PROJECT/patches/$1/$patch | patch -d \
`echo $PKG_BUILD | cut -f1 -d\ ` -p1
done

View File

@ -0,0 +1,28 @@
From 06d713fefaf19cb4dfb83126ba1c078d6dcabc67 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 25 Dec 2012 08:35:36 +0100
Subject: [PATCH] ffmpeg: backport latm: fix initialization on some streams
when no extradata is available:
d039b6074ca68da9b6dc88d8bb40056fee9fecb6
---
libavcodec/aacdec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 5c6404e..ad2991b 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2403,7 +2403,8 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
if (bits_consumed < 0)
return AVERROR_INVALIDDATA;
- if (ac->m4ac.sample_rate != m4ac.sample_rate ||
+ if (!latmctx->initialized ||
+ ac->m4ac.sample_rate != m4ac.sample_rate ||
ac->m4ac.chan_config != m4ac.chan_config) {
av_log(avctx, AV_LOG_INFO, "audio config changed\n");
--
1.7.10

View File

@ -0,0 +1,24 @@
From 9066d83f0f237d90fe0c2d9b6202bb8cd59a6562 Mon Sep 17 00:00:00 2001
From: Allan Kristensen <allank@tigerdyr.com>
Date: Fri, 21 Dec 2012 21:04:18 +0100
Subject: [PATCH] [ffmpeg] fixed missing S_DVBSUB subtitles
---
libavformat/matroska.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 2f5b617..11c2fa5 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -59,6 +59,7 @@
{"S_ASS" , CODEC_ID_SSA},
{"S_SSA" , CODEC_ID_SSA},
{"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE},
+ {"S_DVBSUB" , CODEC_ID_DVB_SUBTITLE},
{"S_HDMV/PGS" , CODEC_ID_HDMV_PGS_SUBTITLE},
{"V_DIRAC" , CODEC_ID_DIRAC},
--
1.7.10

View File

@ -0,0 +1,284 @@
From 3b1409c1a1f0ce486f95087fa0b6ff5bfb841464 Mon Sep 17 00:00:00 2001
From: GreenOnyx <gonyx@mchsi.com>
Date: Thu, 27 Dec 2012 00:18:40 -0600
Subject: [PATCH] ffmpeg: Fixed forced subtitles display in PGS stream
Associated ffmpeg commits:
https://github.com/FFmpeg/FFmpeg/commit/36436a4032b022f5439fa86a0986065d24cd51fd
Add option forced_subs_only for Bluray subtitles.
2012-01-30 04:25:59
https://github.com/FFmpeg/FFmpeg/commit/1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9
PGS subtitles: Expose forced flag
2012-10-20 11:56:11
https://github.com/FFmpeg/FFmpeg/commit/1c5805521c3e406886341d752ebf38f8d41e1d13
PGS subtitles: Set AVSubtitle pts value
2012-11-02 11:30:39
https://github.com/FFmpeg/FFmpeg/commit/6549a9b75333027f66cdaac450a66b6a6186fc6e
pgssubdec: remove unused variable
2012-11-28 10:20:08
https://github.com/FFmpeg/FFmpeg/commit/1f46b50a9591f68b697e943f829c79a4f4829dd6
Added AVClass for AVSubtitleRect
2012-04-18 01:08:25
---
libavcodec/avcodec.h | 18 +++++++++++++
libavcodec/dvdsubdec.c | 1 +
libavcodec/options.c | 25 +++++++++++++++++
libavcodec/pgssubdec.c | 53 ++++++++++++++++++++++++++-----------
4 files changed, 81 insertions(+), 16 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 6996c92..585414b 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3245,6 +3245,12 @@ enum AVFieldOrder {
int64_t pts_correction_num_faulty_dts; /// Number of incorrect DTS values so far
int64_t pts_correction_last_pts; /// PTS of the last frame
int64_t pts_correction_last_dts; /// DTS of the last frame
+ /**
+ * Requests that only forced subpictures be decoded.
+ * - decoding: set by user
+ * - encoding: unused
+ */
+ int forced_subs_only;
} AVCodecContext;
@@ -3488,6 +3494,8 @@ enum AVSubtitleType {
SUBTITLE_ASS,
};
+#define AV_SUBTITLE_FLAG_FORCED 0x00000001
+
typedef struct AVSubtitleRect {
int x; ///< top left corner of pict, undefined when pict is not set
int y; ///< top left corner of pict, undefined when pict is not set
@@ -3510,6 +3518,8 @@ enum AVSubtitleType {
* struct.
*/
char *ass;
+
+ int flags;
} AVSubtitleRect;
typedef struct AVSubtitle {
@@ -4895,6 +4905,14 @@ enum AVLockOp {
const AVClass *avcodec_get_frame_class(void);
/**
+ * Get the AVClass for AVSubtitleRect. It can be used in combination with
+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
+ *
+ * @see av_opt_find().
+ */
+const AVClass *avcodec_get_subtitle_rect_class(void);
+
+/**
* @return a positive value if s is open (i.e. avcodec_open2() was called on it
* with no corresponding avcodec_close()), 0 otherwise.
*/
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index d0d13ee..46a0b8d 100644
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -375,6 +375,7 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header,
sub_header->rects[0]->h = h;
sub_header->rects[0]->type = SUBTITLE_BITMAP;
sub_header->rects[0]->pict.linesize[0] = w;
+ sub_header->rects[0]->flags = is_menu ? AV_SUBTITLE_FLAG_FORCED : 0;
}
}
if (next_cmd_pos < cmd_pos) {
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 5f940a0..ae62e75 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -730,3 +730,28 @@ const AVClass *avcodec_get_frame_class(void)
{
return &av_frame_class;
}
+
+#define SROFFSET(x) offsetof(AVSubtitleRect,x)
+
+static const AVOption subtitle_rect_options[]={
+{"x", "", SROFFSET(x), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0},
+{"y", "", SROFFSET(y), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0},
+{"w", "", SROFFSET(w), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0},
+{"h", "", SROFFSET(h), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0},
+{"type", "", SROFFSET(type), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0},
+{"flags", "", SROFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, 1, 0, "flags"},
+{"forced", "", SROFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, 1, 0},
+{NULL},
+};
+
+static const AVClass av_subtitle_rect_class = {
+ .class_name = "AVSubtitleRect",
+ .item_name = NULL,
+ .option = subtitle_rect_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+const AVClass *avcodec_get_subtitle_rect_class(void)
+{
+ return &av_subtitle_rect_class;
+}
\ No newline at end of file
diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
index 02e650a..83d7f43 100644
--- a/libavcodec/pgssubdec.c
+++ b/libavcodec/pgssubdec.c
@@ -29,6 +29,7 @@
#include "bytestream.h"
#include "libavutil/colorspace.h"
#include "libavutil/imgutils.h"
+#include "libavutil/opt.h"
#define RGBA(r,g,b,a) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
@@ -44,12 +45,14 @@ enum SegmentType {
int x;
int y;
int picture_id;
+ int composition;
} PGSSubPictureReference;
typedef struct PGSSubPresentation {
int id_number;
int object_count;
PGSSubPictureReference *objects;
+ int64_t pts;
} PGSSubPresentation;
typedef struct PGSSubPicture {
@@ -61,10 +64,11 @@ enum SegmentType {
} PGSSubPicture;
typedef struct PGSSubContext {
+ AVClass *class;
PGSSubPresentation presentation;
uint32_t clut[256];
PGSSubPicture pictures[UINT16_MAX];
- int64_t pts;
+ int forced_subs_only;
} PGSSubContext;
static av_cold int init_decoder(AVCodecContext *avctx)
@@ -284,10 +288,10 @@ static void parse_palette_segment(AVCodecContext *avctx,
* @param buf pointer to the packet to process
* @param buf_size size of packet to process
* @todo TODO: Implement cropping
- * @todo TODO: Implement forcing of subtitles
*/
static void parse_presentation_segment(AVCodecContext *avctx,
- const uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size,
+ int64_t pts)
{
PGSSubContext *ctx = avctx->priv_data;
@@ -296,6 +300,8 @@ static void parse_presentation_segment(AVCodecContext *avctx,
uint16_t object_index;
+ ctx->presentation.pts = pts;
+
av_dlog(avctx, "Video Dimensions %dx%d\n",
w, h);
if (av_image_check_size(w, h, 0, avctx) >= 0)
@@ -336,12 +342,10 @@ static void parse_presentation_segment(AVCodecContext *avctx,
PGSSubPictureReference *reference = &ctx->presentation.objects[object_index];
reference->picture_id = bytestream_get_be16(&buf);
- /*
- * Skip 2 bytes of unknown:
- * window_id_ref,
- * composition_flag (0x80 - object cropped, 0x40 - object forced)
- */
- buf += 2;
+ /* Skip window_id_ref */
+ buf++;
+ /* composition_flag (0x80 - object cropped, 0x40 - object forced) */
+ reference->composition = bytestream_get_byte(&buf);
reference->x = bytestream_get_be16(&buf);
reference->y = bytestream_get_be16(&buf);
@@ -388,10 +392,10 @@ static int display_end_segment(AVCodecContext *avctx, void *data,
* not been cleared by a subsequent empty display command.
*/
- pts = ctx->pts != AV_NOPTS_VALUE ? ctx->pts : sub->pts;
+ pts = ctx->presentation.pts != AV_NOPTS_VALUE ? ctx->presentation.pts : sub->pts;
memset(sub, 0, sizeof(*sub));
sub->pts = pts;
- ctx->pts = AV_NOPTS_VALUE;
+ ctx->presentation.pts = AV_NOPTS_VALUE;
// Blank if last object_count was 0.
if (!ctx->presentation.object_count)
@@ -427,6 +431,10 @@ static int display_end_segment(AVCodecContext *avctx, void *data,
sub->rects[rect]->nb_colors = 256;
sub->rects[rect]->pict.data[1] = av_mallocz(AVPALETTE_SIZE);
+ /* Copy the forced flag */
+ sub->rects[rect]->flags = (ctx->presentation.objects[rect].composition & 0x40) != 0 ? AV_SUBTITLE_FLAG_FORCED : 0;
+
+ if (!ctx->forced_subs_only || ctx->presentation.objects[rect].composition & 0x40)
memcpy(sub->rects[rect]->pict.data[1], ctx->clut, sub->rects[rect]->nb_colors * sizeof(uint32_t));
}
@@ -436,7 +444,6 @@ static int display_end_segment(AVCodecContext *avctx, void *data,
static int decode(AVCodecContext *avctx, void *data, int *data_size,
AVPacket *avpkt)
{
- PGSSubContext *ctx = avctx->priv_data;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
AVSubtitle *sub = data;
@@ -483,8 +490,7 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size,
parse_picture_segment(avctx, buf, segment_length);
break;
case PRESENTATION_SEGMENT:
- parse_presentation_segment(avctx, buf, segment_length);
- ctx->pts = sub->pts;
+ parse_presentation_segment(avctx, buf, segment_length, sub->pts);
break;
case WINDOW_SEGMENT:
/*
@@ -511,6 +517,20 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size,
return buf_size;
}
+#define OFFSET(x) offsetof(PGSSubContext, x)
+#define SD AV_OPT_FLAG_SUBTITLE_PARAM | AV_OPT_FLAG_DECODING_PARAM
+static const AVOption options[] = {
+ {"forced_subs_only", "Only show forced subtitles", OFFSET(forced_subs_only), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, SD},
+ { NULL },
+};
+
+static const AVClass pgsdec_class = {
+ .class_name = "PGS subtitle decoder",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
AVCodec ff_pgssub_decoder = {
.name = "pgssub",
.type = AVMEDIA_TYPE_SUBTITLE,
@@ -519,5 +539,6 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size,
.init = init_decoder,
.close = close_decoder,
.decode = decode,
- .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"),
-};
+ .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"),
+ .priv_class = &pgsdec_class,
+};
\ No newline at end of file
--
1.7.10

View File

@ -1,10 +0,0 @@
--- a/libavformat/matroska.c 2012-07-07 03:11:59.514972002 -0700
+++ b/libavformat/matroska.c 2012-07-07 03:12:49.054969249 -0700
@@ -59,6 +59,7 @@
{"S_ASS" , CODEC_ID_SSA},
{"S_SSA" , CODEC_ID_SSA},
{"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE},
+ {"S_DVBSUB" , CODEC_ID_DVB_SUBTITLE},
{"S_HDMV/PGS" , CODEC_ID_HDMV_PGS_SUBTITLE},
{"V_DIRAC" , CODEC_ID_DIRAC},

View File

@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
PKG_SITE="http://freedesktop.org/wiki/Software/VDPAU"
PKG_URL="http://people.freedesktop.org/~aplattner/vdpau/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS="libX11"
PKG_BUILD_DEPENDS="toolchain libX11"
PKG_BUILD_DEPENDS="toolchain libX11 dri2proto libXext"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"
PKG_SHORTDESC="libvdpau: a Video Decode and Presentation API for UNIX."

View File

@ -0,0 +1,44 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then
VMETA_LIBDIR="vmeta/soft/lib"
elif [ "$TARGET_FLOAT" = "hard" ]; then
VMETA_LIBDIR="vmeta/hard/lib"
fi
# dont build parallel
MAKEFLAGS=-j1
cd $PKG_BUILD
cd example/misc/build/wmmx2_linux
make -f makefile_miscGen
cd -
mkdir -p $SYSROOT_PREFIX/usr/include/marvell-ipp
cp -PR include/* $SYSROOT_PREFIX/usr/include/marvell-ipp
mkdir -p $SYSROOT_PREFIX/usr/lib
cp -P lib/libmiscgen.so $SYSROOT_PREFIX/usr/lib
cp -PR $VMETA_LIBDIR/*.so* $SYSROOT_PREFIX/usr/lib

View File

@ -0,0 +1,37 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then
VMETA_LIBDIR="vmeta/soft/lib"
elif [ "$TARGET_FLOAT" = "hard" ]; then
VMETA_LIBDIR="vmeta/hard/lib"
fi
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/$VMETA_LIBDIR/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/lib/libmiscgen.so $SYSROOT_PREFIX/usr/lib
mkdir -p $INSTALL/lib/udev/rules.d
cp -PR $PKG_BUILD/etc/*.rules $INSTALL/lib/udev/rules.d

View File

@ -0,0 +1,36 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="marvell-ipp"
PKG_VERSION="0.2.1"
PKG_REV="1"
PKG_ARCH="arm"
PKG_LICENSE="nonfree"
PKG_SITE="http://www.marvell.com"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="marvell-libvmeta"
PKG_BUILD_DEPENDS="toolchain marvell-libvmeta"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"
PKG_SHORTDESC="marvell-ipp: Marvell IPP Codecs"
PKG_LONGDESC="marvell-ipp: Marvell IPP Codecs"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

View File

@ -0,0 +1,41 @@
diff -Naur marvell-ipp-0.2.1/example/Rules.make marvell-ipp-0.2.1.patch/example/Rules.make
--- marvell-ipp-0.2.1/example/Rules.make 2011-03-07 18:51:40.000000000 +0100
+++ marvell-ipp-0.2.1.patch/example/Rules.make 2012-12-26 23:48:51.811467005 +0100
@@ -28,26 +28,26 @@
#PATH_GNU_BIN=/usr/local/arm-marvell-linux-gnueabi/bin
PATH_GNU_BIN=/usr/local/arm-marvell-linux-gnueabi-4.4.4/bin
TOOLCHAIN_PREFIX=arm-marvell-linux-gnueabi
-CFLAGS= -mcpu=marvell-f
+#CFLAGS= -mcpu=marvell-f
endif
#==============================================================================
# GNU binaries (server admin update)
#==============================================================================
-CC=$(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc
-CXX=$(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc
-AR=$(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-ar
-AS=$(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-as
-LN=$(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc
+CC ?= $(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc
+CXX?= $(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc
+AR ?= $(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-ar
+AS ?= $(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-as
+LN ?= $(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc
#==============================================================================
# GNU build options: (build engineer update)
#==============================================================================
-CFLAGS+= -O3 -Wall -mabi=aapcs-linux -fPIC -D_IPP_LINUX
-CXXFLAGS= $(CFLAGS)
-ASFLAGS= -k -mcpu=iwmmxt2
-ARFLAGS=
-LNFLAGS= -lpthread -ldl -lm -lrt $(PGO_FLAGS) -Wl,-R ./
+CFLAGS += -O3 -Wall -mabi=aapcs-linux -fPIC -D_IPP_LINUX
+CXXFLAGS ?= $(CFLAGS)
+ASFLAGS ?= -k -mcpu=iwmmxt2
+ARFLAGS =
+LNFLAGS ?= -lpthread -ldl -lm -lrt $(PGO_FLAGS) -Wl,-R ./
#==============================================================================
# User root path (user update)

View File

@ -22,7 +22,7 @@
. config/options $1
cd $PKG_BUILD/librtmp
cd $PKG_BUILD
make prefix=/usr \
incdir=/usr/include/librtmp \
@ -34,7 +34,8 @@ make prefix=/usr \
CRYPTO="OPENSSL" \
OPT="" \
XCFLAGS="$CFLAGS" \
XLDFLAGS="$LDFLAGS"
XLDFLAGS="$LDFLAGS" \
XLIBS="-lm"
$MAKEINSTALL prefix=/usr \
incdir=/usr/include/librtmp \
@ -46,4 +47,5 @@ $MAKEINSTALL prefix=/usr \
CRYPTO="OPENSSL" \
OPT="" \
XCFLAGS="$CFLAGS" \
XLDFLAGS="$LDFLAGS"
XLDFLAGS="$LDFLAGS" \
XLIBS="-lm"

View File

@ -22,6 +22,12 @@
. config/options $1
mkdir -p $INSTALL/usr/bin
cp -P $PKG_BUILD/rtmpdump $INSTALL/usr/bin
cp -P $PKG_BUILD/rtmpgw $INSTALL/usr/bin
cp -P $PKG_BUILD/rtmpsrv $INSTALL/usr/bin
cp -P $PKG_BUILD/rtmpsuck $INSTALL/usr/bin
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/librtmp/*.so* $INSTALL/usr/lib

View File

@ -27,7 +27,7 @@ if [ "$PPTP_SUPPORT" = yes ]; then
export PPPD="/usr/sbin/pppd"
export PPTP="/usr/sbin/pptp"
else
CONNMAN_PPP="--disable-pptp"
CONNMAN_PPTP="--disable-pptp"
fi
if [ "$OPENVPN_SUPPORT" = yes ]; then

View File

@ -51,3 +51,22 @@ mkdir -p $INSTALL/usr/sbin
mkdir -p $INSTALL/usr/config
cp $PKG_DIR/config/hosts.conf $INSTALL/usr/config
if [ "$PPTP_SUPPORT" = yes -o "$OPENVPN_SUPPORT" = yes ]; then
mkdir -p $INSTALL/etc/dbus-1/system.d
cp $PKG_BUILD/vpn/connman-vpn-dbus.conf $INSTALL/etc/dbus-1/system.d
mkdir -p $INSTALL/usr/lib/connman/plugins-vpn
cp -P $PKG_BUILD/vpn/plugins/.libs/*.so $INSTALL/usr/lib/connman/plugins-vpn || true
mkdir -p $INSTALL/usr/sbin
cp -P $PKG_BUILD/vpn/connman-vpnd $INSTALL/usr/sbin
mkdir -p $INSTALL/usr/share/dbus-1/system-services
cp -P $PKG_BUILD/vpn/net.connman.vpn.service $INSTALL/usr/share/dbus-1/system-services
fi
if [ "$OPENVPN_SUPPORT" = yes ]; then
mkdir -p $INSTALL/usr/lib/connman/scripts
cp -P $PKG_BUILD/scripts/openvpn-script $INSTALL/usr/lib/connman/scripts
fi

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="connman"
PKG_VERSION="1.9"
PKG_VERSION="1.10"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="freetype"
PKG_VERSION="2.4.10"
PKG_VERSION="2.4.11"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -51,6 +51,7 @@ cd $PKG_BUILD
--disable-pam \
--disable-acl \
--enable-xattr \
--without-python \
--disable-gcrypt \
--disable-audit \
--disable-libcryptsetup \

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="gettext"
PKG_VERSION="0.18.1.1"
PKG_VERSION="0.18.2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -1,42 +0,0 @@
diff --git a/gettext-runtime/gnulib-lib/stdio.in.h b/gettext-runtime/gnulib-lib/stdio.in.h
index c43848e..ae05c26 100644
--- a/gettext-runtime/gnulib-lib/stdio.in.h
+++ b/gettext-runtime/gnulib-lib/stdio.in.h
@@ -141,7 +141,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
#undef gets
+#if HAVE_RAW_DECL_GETS
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+#endif
#if @GNULIB_FOPEN@
# if @REPLACE_FOPEN@
diff --git a/gettext-tools/gnulib-lib/stdio.in.h b/gettext-tools/gnulib-lib/stdio.in.h
index c43848e..ae05c26 100644
--- a/gettext-tools/gnulib-lib/stdio.in.h
+++ b/gettext-tools/gnulib-lib/stdio.in.h
@@ -141,7 +141,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
#undef gets
+#if HAVE_RAW_DECL_GETS
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+#endif
#if @GNULIB_FOPEN@
# if @REPLACE_FOPEN@
diff --git a/gettext-tools/libgettextpo/stdio.in.h b/gettext-tools/libgettextpo/stdio.in.h
index c43848e..ae05c26 100644
--- a/gettext-tools/libgettextpo/stdio.in.h
+++ b/gettext-tools/libgettextpo/stdio.in.h
@@ -141,7 +141,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
#undef gets
+#if HAVE_RAW_DECL_GETS
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+#endif
#if @GNULIB_FOPEN@
# if @REPLACE_FOPEN@

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="sed"
PKG_VERSION="4.2.1"
PKG_VERSION="4.2.2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="bcm2835-bootloader"
PKG_VERSION="3bd073e"
PKG_VERSION="76d0ac3"
PKG_REV="1"
PKG_ARCH="arm"
PKG_LICENSE="nonfree"

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="syslinux"
PKG_VERSION="5.00"
PKG_VERSION="4.06"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://syslinux.zytor.com/"
PKG_URL="http://www.kernel.org/pub/linux/utils/boot/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_URL="http://www.kernel.org/pub/linux/utils/boot/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain util-linux e2fsprogs"
PKG_PRIORITY="optional"

View File

@ -35,9 +35,13 @@ if [ -z "$UBOOT_CONFIG" ]; then
exit 1
fi
if [ -z "$UBOOT_CONFIGFILE" ]; then
UBOOT_CONFIGFILE="boot.scr"
fi
cd $PKG_BUILD
make CROSS_COMPILE="$TARGET_PREFIX" ARCH="$TARGET_ARCH" "$UBOOT_CONFIG"
make CROSS_COMPILE="$TARGET_PREFIX" ARCH="$TARGET_ARCH" $UBOOT_CONFIG
make CROSS_COMPILE="$TARGET_PREFIX" ARCH="$TARGET_ARCH" HOSTCC="$HOST_CC" HOSTSTRIP="true"
mkdir -p $ROOT/$TOOLCHAIN/bin
@ -51,5 +55,5 @@ if [ -r "$BOOT_CFG" ]; then
-C none \
-n "$DISTRONAME Boot" \
-d boot.cfg \
boot.ini
$UBOOT_CONFIGFILE
fi

View File

View File

@ -22,6 +22,10 @@
. config/options $1
if [ -z "$UBOOT_CONFIGFILE" ]; then
UBOOT_CONFIGFILE="boot.scr"
fi
mkdir -p $INSTALL/usr/share/u-boot
cp $PKG_BUILD/u-boot.bin $INSTALL/usr/share/u-boot
@ -33,8 +37,6 @@ if [ -f "$PKG_BUILD/boot.cfg" ]; then
cp $PKG_BUILD/boot.cfg $INSTALL/usr/share/u-boot
fi
if [ -f "$PKG_BUILD/boot.ini" ]; then
cp $PKG_BUILD/boot.ini $INSTALL/usr/share/u-boot
# some boards read boot.scr by default
cp $PKG_BUILD/boot.ini $INSTALL/usr/share/u-boot/boot.scr
if [ -f "$PKG_BUILD/$UBOOT_CONFIGFILE" ]; then
cp $PKG_BUILD/$UBOOT_CONFIGFILE $INSTALL/usr/share/u-boot
fi

View File

@ -34,3 +34,9 @@ PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems, us
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
if [ "$PROJECT" = "CuBox" ]; then
PKG_VERSION="cubox-f826edd"
PKG_SITE="https://github.com/rabeeh/u-boot/tree/"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
fi

30
packages/tools/u-boot/release Executable file
View File

@ -0,0 +1,30 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
if [ -z "$UBOOT_CONFIGFILE" ]; then
UBOOT_CONFIGFILE="boot.scr"
fi
mkdir -p $RELEASE_DIR/3rdparty/bootloader
cp -PR $BUILD/u-boot-*/$UBOOT_CONFIGFILE $RELEASE_DIR/3rdparty/bootloader

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libmicrohttpd"
PKG_VERSION="0.9.22"
PKG_VERSION="0.9.24"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -0,0 +1,60 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
xorg_drv_configure_prepend
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_SUPPORT_RANDR=1"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_SUPPORT_EXA=1"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DDUMP_RAW_VIDEO=1"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_USE_OFFSCREEN_HEAP=0"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_MODE=2"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_ENABLE_UP_DOWNLOAD=0"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_FORCE_HW_LOAD=0"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_ALLOC_PIXMAP_FROM_SYSTEM=0"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_PERF_PROFILING=0"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_TRACE_FALLBACK=1"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_XBGR_SUPPORT=1"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_SUPPORT_RGB_FORMAT=1"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_TEX_VIDEO=1"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_OVERLAY_VIDEO=2"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_DEFERRED_STALL_GPU=1"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_USE_FAKE_FENCE_STALL=1"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_RANDR_EDID_MODES=1"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_CRTC_SUPPORT_ROTATION=1"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_PLATFORM_INFO=1"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_MIXED_VIDEO=1"
MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_SOURCE_VERSION='\"0.1.0\"'"
CFLAGS="$CFLAGS $MARVEL_CFLAGS -I$SYSROOT_PREFIX/usr/include/HAL"
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--sysconfdir=/etc \
--enable-shared \
--disable-static \
--with-xorg-module-dir=$XORG_PATH_MODULES
make

View File

@ -0,0 +1,53 @@
Section "Monitor"
Identifier "DVI"
Option "Position" "0 0"
Option "Enable" "true"
Option "PreferredMode" "1920x1080"
# Option "PreferredMode" "1280x720"
# Option "Rotate" "left"
# Option "NoDDCValue" "true"
# Option "PreferredMode" "800x600"
EndSection
Section "Monitor"
Identifier "VGA"
Option "Position" "0 0"
Option "Enable" "true"
Option "PreferredMode" "1920x1080"
# Option "PreferredMode" "1280x720"
# Option "PreferredMode" "800x600"
EndSection
Section "Device"
Identifier "Driver0"
Screen 0
Driver "dovefb"
Option "debug" "false"
# Option "ShadowFB" "TRUE"
# Option "UseGPU" "FALSE"
Option "ExaAccel" "FALSE"
Option "Solid" "TRUE"
Option "Copy" "TRUE"
Option "Composite" "FALSE"
Option "SWSolid" "FALSE"
Option "SWCopy" "FALSE"
Option "Commit" "FALSE"
Option "XvAccel" "TRUE"
Option "HWCursor" "false"
Option "EncFunc" "7"
Option "UseDriverBuiltInMode" "TRUE"
Option "EnableDualDisplay" "true"
Option "Monitor-VGA" "VGA"
Option "Monitor-lvds" "DVI"
EndSection
Section "Screen"
Device "Driver0"
Identifier "Primary Screen"
DefaultDepth 32
DefaultFbBpp 32
SubSection "Display"
Viewport 0 0
Virtual 2048 2048
EndSubSection
EndSection

View File

@ -0,0 +1,29 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
cp -P $PKG_BUILD/src/.libs/dovefb_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
mkdir -p $INSTALL/etc/X11
cp $PKG_DIR/config/*.conf $INSTALL/etc/X11

View File

@ -0,0 +1,36 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="xf86-video-dove"
PKG_VERSION="0.3.4"
PKG_REV="1"
PKG_ARCH="arm"
PKG_LICENSE="OSS"
PKG_SITE="http://www.solid-run.com"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="marvell-libgfx"
PKG_BUILD_DEPENDS="toolchain randrproto renderproto videoproto xproto fontsproto marvell-libgfx xorg-server"
PKG_PRIORITY="optional"
PKG_SECTION="x11/driver"
PKG_SHORTDESC="xf86-video-dove: The Xorg driver for Marvell Dove video chips"
PKG_LONGDESC="The Xorg driver for Marvell Dove video chips."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xf86-video-intel"
PKG_VERSION="2.20.16"
PKG_VERSION="2.20.17"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="OSS"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="pango"
PKG_VERSION="1.32.4"
PKG_VERSION="1.32.5"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -27,6 +27,7 @@ GOTO="end_video"
# check for drivers dont use the pci substem
LABEL="subsystem_drivers"
KERNEL=="dovefb", ENV{xorg_driver}="dove", GOTO="start_xorg"
KERNEL=="fglrx_pci", ENV{xorg_driver}="fglrx", GOTO="start_xorg"
KERNEL=="fglrx_legacy_pci", ENV{xorg_driver}="fglrx-legacy", GOTO="start_xorg"
KERNEL=="nvidia", ENV{xorg_driver}="nvidia", GOTO="start_xorg"

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/i386 3.6.10 Kernel Configuration
# Linux/i386 3.6.11 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -1586,7 +1586,6 @@ CONFIG_SERIAL_CORE=y
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
CONFIG_DEVPORT=y
# CONFIG_BRCM_CHAR_DRIVERS is not set
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
# CONFIG_I2C_COMPAT is not set
@ -1689,7 +1688,6 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_AVS is not set
# CONFIG_HWMON is not set
CONFIG_THERMAL=y
# CONFIG_THERMAL_BCM2835 is not set
# CONFIG_WATCHDOG is not set
CONFIG_SSB_POSSIBLE=y
@ -2477,7 +2475,6 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
CONFIG_USB_UHCI_HCD=y
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_DWCOTG is not set
# CONFIG_USB_HCD_SSB is not set
# CONFIG_USB_CHIPIDEA is not set
@ -2511,7 +2508,6 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
# CONFIG_USB_STORAGE_ENE_UB6250 is not set
# CONFIG_USB_UAS is not set
# CONFIG_USB_LIBUSUAL is not set
#
@ -2780,7 +2776,6 @@ CONFIG_LIRC_STAGING=y
# CONFIG_LIRC_BT829 is not set
CONFIG_LIRC_IGORPLUGUSB=m
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_RPI is not set
# CONFIG_LIRC_SASEM is not set
# CONFIG_LIRC_SERIAL is not set
# CONFIG_LIRC_SIR is not set

View File

@ -92,6 +92,9 @@
# Configuration for u-boot
UBOOT_CONFIG=""
# Target Configfile for u-boot
UBOOT_CONFIGFILE=""
# Kernel to use. values can be:
# default: default mainline kernel
# ti-omap4: Ti's OMAP4 kernel

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/i386 3.6.10 Kernel Configuration
# Linux/i386 3.6.11 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -1650,7 +1650,6 @@ CONFIG_SERIAL_CORE=y
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
CONFIG_DEVPORT=y
# CONFIG_BRCM_CHAR_DRIVERS is not set
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
# CONFIG_I2C_COMPAT is not set
@ -1858,7 +1857,6 @@ CONFIG_SENSORS_FAM15H_POWER=y
# CONFIG_SENSORS_W83627HF is not set
CONFIG_SENSORS_W83627EHF=y
# CONFIG_SENSORS_APPLESMC is not set
# CONFIG_SENSORS_BCM2835 is not set
#
# ACPI drivers
@ -1867,7 +1865,6 @@ CONFIG_SENSORS_W83627EHF=y
# CONFIG_SENSORS_ATK0110 is not set
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
# CONFIG_THERMAL_BCM2835 is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
@ -2786,7 +2783,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
# CONFIG_USB_UHCI_HCD is not set
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_DWCOTG is not set
# CONFIG_USB_HCD_SSB is not set
# CONFIG_USB_CHIPIDEA is not set
@ -2820,7 +2816,6 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
# CONFIG_USB_STORAGE_ENE_UB6250 is not set
CONFIG_USB_UAS=m
# CONFIG_USB_LIBUSUAL is not set
#
@ -3090,7 +3085,6 @@ CONFIG_LIRC_STAGING=y
# CONFIG_LIRC_BT829 is not set
CONFIG_LIRC_IGORPLUGUSB=m
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_RPI is not set
# CONFIG_LIRC_SASEM is not set
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.6.10 Kernel Configuration
# Linux/x86_64 3.6.11 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@ -1601,7 +1601,6 @@ CONFIG_SERIAL_CORE=y
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
CONFIG_DEVPORT=y
# CONFIG_BRCM_CHAR_DRIVERS is not set
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
# CONFIG_I2C_COMPAT is not set
@ -1808,7 +1807,6 @@ CONFIG_SENSORS_FAM15H_POWER=y
# CONFIG_SENSORS_W83627HF is not set
CONFIG_SENSORS_W83627EHF=y
# CONFIG_SENSORS_APPLESMC is not set
# CONFIG_SENSORS_BCM2835 is not set
#
# ACPI drivers
@ -1817,7 +1815,6 @@ CONFIG_SENSORS_W83627EHF=y
# CONFIG_SENSORS_ATK0110 is not set
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
# CONFIG_THERMAL_BCM2835 is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
@ -2726,7 +2723,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
# CONFIG_USB_UHCI_HCD is not set
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_DWCOTG is not set
# CONFIG_USB_HCD_SSB is not set
# CONFIG_USB_CHIPIDEA is not set
@ -2760,7 +2756,6 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
# CONFIG_USB_STORAGE_ENE_UB6250 is not set
CONFIG_USB_UAS=m
# CONFIG_USB_LIBUSUAL is not set
#
@ -3030,7 +3025,6 @@ CONFIG_LIRC_STAGING=y
# CONFIG_LIRC_BT829 is not set
CONFIG_LIRC_IGORPLUGUSB=m
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_RPI is not set
# CONFIG_LIRC_SASEM is not set
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y

View File

@ -91,6 +91,9 @@
# Configuration for u-boot
UBOOT_CONFIG=""
# Target Configfile for u-boot
UBOOT_CONFIGFILE=""
# Kernel to use. values can be:
# default: default mainline kernel
# ti-omap4: Ti's OMAP4 kernel
@ -280,7 +283,7 @@
# 'all' compiles all drivers;
# 'all,!xxx,!yyy' de-selects previously selected drivers
# "none" for disable LCD support
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140"
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780"
# Modules to install in initramfs for early boot
INITRAMFS_MODULES="uvesafb xhci-hcd"

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/i386 3.6.10 Kernel Configuration
# Linux/i386 3.6.11 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -1732,7 +1732,6 @@ CONFIG_SERIAL_CORE=y
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
CONFIG_DEVPORT=y
# CONFIG_BRCM_CHAR_DRIVERS is not set
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
# CONFIG_I2C_COMPAT is not set
@ -1941,7 +1940,6 @@ CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_W83627HF is not set
CONFIG_SENSORS_W83627EHF=y
# CONFIG_SENSORS_APPLESMC is not set
# CONFIG_SENSORS_BCM2835 is not set
#
# ACPI drivers
@ -1950,7 +1948,6 @@ CONFIG_SENSORS_W83627EHF=y
# CONFIG_SENSORS_ATK0110 is not set
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
# CONFIG_THERMAL_BCM2835 is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
@ -2909,7 +2906,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=y
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_DWCOTG is not set
# CONFIG_USB_HCD_SSB is not set
# CONFIG_USB_CHIPIDEA is not set
@ -2943,7 +2939,6 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
# CONFIG_USB_STORAGE_ENE_UB6250 is not set
CONFIG_USB_UAS=m
# CONFIG_USB_LIBUSUAL is not set
#
@ -3260,7 +3255,6 @@ CONFIG_LIRC_STAGING=y
# CONFIG_LIRC_BT829 is not set
CONFIG_LIRC_IGORPLUGUSB=m
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_RPI is not set
# CONFIG_LIRC_SASEM is not set
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y

View File

@ -91,6 +91,9 @@
# Configuration for u-boot
UBOOT_CONFIG=""
# Target Configfile for u-boot
UBOOT_CONFIGFILE=""
# Kernel to use. values can be:
# default: default mainline kernel
# ti-omap4: Ti's OMAP4 kernel
@ -280,7 +283,7 @@
# 'all' compiles all drivers;
# 'all,!xxx,!yyy' de-selects previously selected drivers
# "none" for disable LCD support
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140"
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780"
# Modules to install in initramfs for early boot
INITRAMFS_MODULES="uvesafb xhci-hcd"

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/i386 3.6.10 Kernel Configuration
# Linux/i386 3.6.11 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -1730,7 +1730,6 @@ CONFIG_SERIAL_CORE=y
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
CONFIG_DEVPORT=y
# CONFIG_BRCM_CHAR_DRIVERS is not set
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
# CONFIG_I2C_COMPAT is not set
@ -1939,7 +1938,6 @@ CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_W83627HF is not set
CONFIG_SENSORS_W83627EHF=y
# CONFIG_SENSORS_APPLESMC is not set
# CONFIG_SENSORS_BCM2835 is not set
#
# ACPI drivers
@ -1948,7 +1946,6 @@ CONFIG_SENSORS_W83627EHF=y
# CONFIG_SENSORS_ATK0110 is not set
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
# CONFIG_THERMAL_BCM2835 is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
@ -2911,7 +2908,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=y
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_DWCOTG is not set
# CONFIG_USB_HCD_SSB is not set
# CONFIG_USB_CHIPIDEA is not set
@ -2945,7 +2941,6 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
# CONFIG_USB_STORAGE_ENE_UB6250 is not set
CONFIG_USB_UAS=m
# CONFIG_USB_LIBUSUAL is not set
#
@ -3262,7 +3257,6 @@ CONFIG_LIRC_STAGING=y
# CONFIG_LIRC_BT829 is not set
CONFIG_LIRC_IGORPLUGUSB=m
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_RPI is not set
# CONFIG_LIRC_SASEM is not set
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y

View File

@ -91,6 +91,9 @@
# Configuration for u-boot
UBOOT_CONFIG=""
# Target Configfile for u-boot
UBOOT_CONFIGFILE=""
# Kernel to use. values can be:
# default: default mainline kernel
# ti-omap4: Ti's OMAP4 kernel
@ -280,7 +283,7 @@
# 'all' compiles all drivers;
# 'all,!xxx,!yyy' de-selects previously selected drivers
# "none" for disable LCD support
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140"
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780"
# Modules to install in initramfs for early boot
INITRAMFS_MODULES="uvesafb xhci-hcd"

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/i386 3.6.10 Kernel Configuration
# Linux/i386 3.6.11 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -1657,7 +1657,6 @@ CONFIG_SERIAL_CORE=y
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
CONFIG_DEVPORT=y
# CONFIG_BRCM_CHAR_DRIVERS is not set
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
# CONFIG_I2C_COMPAT is not set
@ -1864,7 +1863,6 @@ CONFIG_SENSORS_CORETEMP=m
# CONFIG_SENSORS_W83627HF is not set
CONFIG_SENSORS_W83627EHF=y
# CONFIG_SENSORS_APPLESMC is not set
# CONFIG_SENSORS_BCM2835 is not set
#
# ACPI drivers
@ -1873,7 +1871,6 @@ CONFIG_SENSORS_W83627EHF=y
# CONFIG_SENSORS_ATK0110 is not set
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
# CONFIG_THERMAL_BCM2835 is not set
# CONFIG_WATCHDOG is not set
CONFIG_SSB_POSSIBLE=y
@ -2761,7 +2758,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=y
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_DWCOTG is not set
# CONFIG_USB_HCD_SSB is not set
# CONFIG_USB_CHIPIDEA is not set
@ -2795,7 +2791,6 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
# CONFIG_USB_STORAGE_ENE_UB6250 is not set
# CONFIG_USB_UAS is not set
# CONFIG_USB_LIBUSUAL is not set
#
@ -3104,7 +3099,6 @@ CONFIG_LIRC_STAGING=y
# CONFIG_LIRC_BT829 is not set
CONFIG_LIRC_IGORPLUGUSB=m
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_RPI is not set
# CONFIG_LIRC_SASEM is not set
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.6.10 Kernel Configuration
# Linux/x86_64 3.6.11 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@ -1593,7 +1593,6 @@ CONFIG_SERIAL_CORE=y
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
CONFIG_DEVPORT=y
# CONFIG_BRCM_CHAR_DRIVERS is not set
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
# CONFIG_I2C_COMPAT is not set
@ -1799,7 +1798,6 @@ CONFIG_SENSORS_CORETEMP=m
# CONFIG_SENSORS_W83627HF is not set
CONFIG_SENSORS_W83627EHF=y
# CONFIG_SENSORS_APPLESMC is not set
# CONFIG_SENSORS_BCM2835 is not set
#
# ACPI drivers
@ -1808,7 +1806,6 @@ CONFIG_SENSORS_W83627EHF=y
# CONFIG_SENSORS_ATK0110 is not set
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
# CONFIG_THERMAL_BCM2835 is not set
# CONFIG_WATCHDOG is not set
CONFIG_SSB_POSSIBLE=y
@ -2686,7 +2683,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=y
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_DWCOTG is not set
# CONFIG_USB_HCD_SSB is not set
# CONFIG_USB_CHIPIDEA is not set
@ -2720,7 +2716,6 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
# CONFIG_USB_STORAGE_ENE_UB6250 is not set
# CONFIG_USB_UAS is not set
# CONFIG_USB_LIBUSUAL is not set
#
@ -3028,7 +3023,6 @@ CONFIG_LIRC_STAGING=y
# CONFIG_LIRC_BT829 is not set
CONFIG_LIRC_IGORPLUGUSB=m
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_RPI is not set
# CONFIG_LIRC_SASEM is not set
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y

View File

@ -91,6 +91,9 @@
# Configuration for u-boot
UBOOT_CONFIG=""
# Target Configfile for u-boot
UBOOT_CONFIGFILE=""
# Kernel to use. values can be:
# default: default mainline kernel
# ti-omap4: Ti's OMAP4 kernel
@ -280,7 +283,7 @@
# 'all' compiles all drivers;
# 'all,!xxx,!yyy' de-selects previously selected drivers
# "none" for disable LCD support
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140"
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780"
# Modules to install in initramfs for early boot
INITRAMFS_MODULES="uvesafb xhci-hcd"

Some files were not shown because too many files have changed in this diff Show More