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

This commit is contained in:
Stephan Raue 2013-01-24 22:55:37 +01:00
commit 65a556955b
26 changed files with 47 additions and 62 deletions

View File

@ -86,7 +86,7 @@ INCLUDE_DIRS="$INCLUDE_DIRS email/mime encodings hotshot importlib json logging"
INCLUDE_DIRS="$INCLUDE_DIRS multiprocessing plat-linux2 sqlite3 xml xml/dom xml/etree" INCLUDE_DIRS="$INCLUDE_DIRS multiprocessing plat-linux2 sqlite3 xml xml/dom xml/etree"
INCLUDE_DIRS="$INCLUDE_DIRS xml/parsers xml/sax" INCLUDE_DIRS="$INCLUDE_DIRS xml/parsers xml/sax"
mkdir ./Lib mkdir -p ./Lib
cp ../Lib/*.py ./Lib cp ../Lib/*.py ./Lib
for dirs in $INCLUDE_DIRS; do for dirs in $INCLUDE_DIRS; do

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc-addon-xvdr" PKG_NAME="xbmc-addon-xvdr"
PKG_VERSION="8fc8607" PKG_VERSION="0b3b2d4"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc-pvr-addons" PKG_NAME="xbmc-pvr-addons"
PKG_VERSION="5f97406" PKG_VERSION="96774c4"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc-theme-Confluence" PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="966a6cc" PKG_VERSION="6fc42b2"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc" PKG_NAME="xbmc"
PKG_VERSION="966a6cc" PKG_VERSION="6fc42b2"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -1,25 +0,0 @@
#!/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
################################################################################
for i in `ls xbmc-*.patch`; do
mv $i `echo $i | sed "s,$1,$2,g"`
done

View File

@ -31,7 +31,7 @@ fi
if [ "$DEVTOOLS" = "yes" ]; then if [ "$DEVTOOLS" = "yes" ]; then
DEVTOOLS_CONFIG="--enable-monitor --enable-test --enable-tools" DEVTOOLS_CONFIG="--enable-monitor --enable-test --enable-tools"
else else
DEVTOOLS_CONFIG="--disable-monitor --disable-test --disable-tools" DEVTOOLS_CONFIG="--disable-monitor --disable-test --enable-tools"
fi fi
cd $PKG_BUILD cd $PKG_BUILD

View File

@ -25,35 +25,45 @@
mkdir -p $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/etc/dbus-1/system.d
cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d
mkdir -p $INSTALL/lib/udev
cp $PKG_BUILD/tools/hid2hci $INSTALL/lib/udev
mkdir -p $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/tools/97-hid2hci.rules $INSTALL/lib/udev/rules.d
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/lib/bluetooth mkdir -p $INSTALL/usr/lib/bluetooth
cp $PKG_BUILD/src/bluetoothd $INSTALL/usr/lib/bluetooth cp $PKG_BUILD/src/bluetoothd $INSTALL/usr/lib/bluetooth
cp $PKG_BUILD/obexd/src/obexd $INSTALL/usr/lib/bluetooth cp $PKG_BUILD/obexd/src/obexd $INSTALL/usr/lib/bluetooth
if [ "$DEVTOOLS" = "yes" ]; then mkdir -p $INSTALL/usr/lib
mkdir -p $INSTALL/usr/bin cp -P $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib
cp $PKG_BUILD/tools/bccmd $INSTALL/usr/bin
cp $PKG_BUILD/client/bluetoothctl $INSTALL/usr/bin
cp $PKG_BUILD/monitor/btmon $INSTALL/usr/bin
cp $PKG_BUILD/tools/ciptool $INSTALL/usr/bin
cp $PKG_BUILD/tools/hciattach $INSTALL/usr/bin
cp $PKG_BUILD/tools/hciconfig $INSTALL/usr/bin
cp $PKG_BUILD/tools/hcidump $INSTALL/usr/bin
cp $PKG_BUILD/tools/hcitool $INSTALL/usr/bin
cp $PKG_BUILD/tools/l2ping $INSTALL/usr/bin
cp $PKG_BUILD/tools/l2test $INSTALL/usr/bin
cp $PKG_BUILD/tools/rctest $INSTALL/usr/bin
cp $PKG_BUILD/tools/rfcomm $INSTALL/usr/bin
cp $PKG_BUILD/tools/sdptool $INSTALL/usr/bin
# client
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/client/bluetoothctl $INSTALL/usr/bin
# tools
mkdir -p $INSTALL/lib/udev
cp $PKG_BUILD/tools/hid2hci $INSTALL/lib/udev
mkdir -p $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/tools/97-hid2hci.rules $INSTALL/lib/udev/rules.d
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/tools/bccmd $INSTALL/usr/bin
cp $PKG_BUILD/tools/ciptool $INSTALL/usr/bin
cp $PKG_BUILD/tools/hciattach $INSTALL/usr/bin
cp $PKG_BUILD/tools/hciconfig $INSTALL/usr/bin
cp $PKG_BUILD/tools/hcidump $INSTALL/usr/bin
cp $PKG_BUILD/tools/hcitool $INSTALL/usr/bin
cp $PKG_BUILD/tools/l2ping $INSTALL/usr/bin
cp $PKG_BUILD/tools/l2test $INSTALL/usr/bin
cp $PKG_BUILD/tools/rctest $INSTALL/usr/bin
cp $PKG_BUILD/tools/rfcomm $INSTALL/usr/bin
cp $PKG_BUILD/tools/sdptool $INSTALL/usr/bin
# test
if [ "$DEVTOOLS" = "yes" ]; then
# monitor
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/monitor/btmon $INSTALL/usr/bin
# test
mkdir -p $INSTALL/usr/lib/bluez/test mkdir -p $INSTALL/usr/lib/bluez/test
cp -P $PKG_BUILD/test/* $INSTALL/usr/lib/bluez/test cp -P $PKG_BUILD/test/* $INSTALL/usr/lib/bluez/test
chmod +x $INSTALL/usr/lib/bluez/test/* chmod +x $INSTALL/usr/lib/bluez/test/*

View File

@ -2556,7 +2556,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
# CONFIG_SND_HDSP is not set # CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set # CONFIG_SND_HDSPM is not set
# CONFIG_SND_ICE1712 is not set # CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set CONFIG_SND_ICE1724=m
# CONFIG_SND_INTEL8X0 is not set # CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_INTEL8X0M is not set
# CONFIG_SND_KORG1212 is not set # CONFIG_SND_KORG1212 is not set

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.7.3 Kernel Configuration # Linux/x86_64 3.7.4 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -2501,7 +2501,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
# CONFIG_SND_HDSP is not set # CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set # CONFIG_SND_HDSPM is not set
# CONFIG_SND_ICE1712 is not set # CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set CONFIG_SND_ICE1724=m
# CONFIG_SND_INTEL8X0 is not set # CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_INTEL8X0M is not set
# CONFIG_SND_KORG1212 is not set # CONFIG_SND_KORG1212 is not set

View File

@ -2514,7 +2514,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
# CONFIG_SND_HDSP is not set # CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set # CONFIG_SND_HDSPM is not set
# CONFIG_SND_ICE1712 is not set # CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set CONFIG_SND_ICE1724=m
# CONFIG_SND_INTEL8X0 is not set # CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_INTEL8X0M is not set
# CONFIG_SND_KORG1212 is not set # CONFIG_SND_KORG1212 is not set

View File

@ -2442,7 +2442,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
# CONFIG_SND_HDSP is not set # CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set # CONFIG_SND_HDSPM is not set
# CONFIG_SND_ICE1712 is not set # CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set CONFIG_SND_ICE1724=m
# CONFIG_SND_INTEL8X0 is not set # CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_INTEL8X0M is not set
# CONFIG_SND_KORG1212 is not set # CONFIG_SND_KORG1212 is not set

View File

@ -2565,7 +2565,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
# CONFIG_SND_HDSP is not set # CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set # CONFIG_SND_HDSPM is not set
# CONFIG_SND_ICE1712 is not set # CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set CONFIG_SND_ICE1724=m
# CONFIG_SND_INTEL8X0 is not set # CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_INTEL8X0M is not set
# CONFIG_SND_KORG1212 is not set # CONFIG_SND_KORG1212 is not set

View File

@ -2494,7 +2494,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
# CONFIG_SND_HDSP is not set # CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set # CONFIG_SND_HDSPM is not set
# CONFIG_SND_ICE1712 is not set # CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set CONFIG_SND_ICE1724=m
# CONFIG_SND_INTEL8X0 is not set # CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_INTEL8X0M is not set
# CONFIG_SND_KORG1212 is not set # CONFIG_SND_KORG1212 is not set