mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings
This commit is contained in:
commit
65a556955b
@ -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 xml/parsers xml/sax"
|
||||
|
||||
mkdir ./Lib
|
||||
mkdir -p ./Lib
|
||||
cp ../Lib/*.py ./Lib
|
||||
|
||||
for dirs in $INCLUDE_DIRS; do
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-addon-xvdr"
|
||||
PKG_VERSION="8fc8607"
|
||||
PKG_VERSION="0b3b2d4"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-pvr-addons"
|
||||
PKG_VERSION="5f97406"
|
||||
PKG_VERSION="96774c4"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-theme-Confluence"
|
||||
PKG_VERSION="966a6cc"
|
||||
PKG_VERSION="6fc42b2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc"
|
||||
PKG_VERSION="966a6cc"
|
||||
PKG_VERSION="6fc42b2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -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
|
@ -31,7 +31,7 @@ fi
|
||||
if [ "$DEVTOOLS" = "yes" ]; then
|
||||
DEVTOOLS_CONFIG="--enable-monitor --enable-test --enable-tools"
|
||||
else
|
||||
DEVTOOLS_CONFIG="--disable-monitor --disable-test --disable-tools"
|
||||
DEVTOOLS_CONFIG="--disable-monitor --disable-test --enable-tools"
|
||||
fi
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
@ -25,24 +25,26 @@
|
||||
mkdir -p $INSTALL/etc/dbus-1/system.d
|
||||
cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/bluetooth
|
||||
cp $PKG_BUILD/src/bluetoothd $INSTALL/usr/lib/bluetooth
|
||||
cp $PKG_BUILD/obexd/src/obexd $INSTALL/usr/lib/bluetooth
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib
|
||||
|
||||
# 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/lib
|
||||
cp -P $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/bluetooth
|
||||
cp $PKG_BUILD/src/bluetoothd $INSTALL/usr/lib/bluetooth
|
||||
cp $PKG_BUILD/obexd/src/obexd $INSTALL/usr/lib/bluetooth
|
||||
|
||||
if [ "$DEVTOOLS" = "yes" ]; then
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
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
|
||||
@ -54,6 +56,14 @@ mkdir -p $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
|
||||
cp -P $PKG_BUILD/test/* $INSTALL/usr/lib/bluez/test
|
||||
chmod +x $INSTALL/usr/lib/bluez/test/*
|
||||
|
@ -2556,7 +2556,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
|
||||
# CONFIG_SND_HDSP is not set
|
||||
# CONFIG_SND_HDSPM 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_INTEL8X0M is not set
|
||||
# CONFIG_SND_KORG1212 is not set
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# 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_X86_64=y
|
||||
@ -2501,7 +2501,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
|
||||
# CONFIG_SND_HDSP is not set
|
||||
# CONFIG_SND_HDSPM 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_INTEL8X0M is not set
|
||||
# CONFIG_SND_KORG1212 is not set
|
||||
|
@ -2514,7 +2514,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
|
||||
# CONFIG_SND_HDSP is not set
|
||||
# CONFIG_SND_HDSPM 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_INTEL8X0M is not set
|
||||
# CONFIG_SND_KORG1212 is not set
|
||||
|
@ -2442,7 +2442,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
|
||||
# CONFIG_SND_HDSP is not set
|
||||
# CONFIG_SND_HDSPM 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_INTEL8X0M is not set
|
||||
# CONFIG_SND_KORG1212 is not set
|
||||
|
@ -2565,7 +2565,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
|
||||
# CONFIG_SND_HDSP is not set
|
||||
# CONFIG_SND_HDSPM 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_INTEL8X0M is not set
|
||||
# CONFIG_SND_KORG1212 is not set
|
||||
|
@ -2494,7 +2494,7 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
|
||||
# CONFIG_SND_HDSP is not set
|
||||
# CONFIG_SND_HDSPM 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_INTEL8X0M is not set
|
||||
# CONFIG_SND_KORG1212 is not set
|
||||
|
Loading…
x
Reference in New Issue
Block a user