Merge branch 'openelec-next' of github.com:OpenELEC/OpenELEC.tv into openelec-eden

This commit is contained in:
Stephan Raue 2011-08-21 01:58:08 +02:00
commit 067a861da4
33 changed files with 9303 additions and 37 deletions

View File

@ -0,0 +1,38 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
#
# 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
################################################################################
PKG_NAME="Headphones"
PKG_VERSION="ee3326e"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://github.com/rembo10/headphones"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="Python SABnzbd"
PKG_BUILD_DEPENDS="toolchain Python"
PKG_PRIORITY="optional"
PKG_SECTION="service/downloadmanager"
PKG_SHORTDESC="Headphones: Automatic music downloader for SABnzbd."
PKG_LONGDESC="Headphones: This a pretty early release of a third-party add-on for SABnzbd."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

View File

@ -43,3 +43,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/SickBeard
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/CouchPotato
cp -PR $BUILD/CouchPotato-*/* $ADDON_BUILD/$PKG_ADDON_ID/CouchPotato
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/Headphones
cp -PR $BUILD/Headphones-*/* $ADDON_BUILD/$PKG_ADDON_ID/Headphones

View File

@ -1,3 +1,9 @@
0.99.4
- add Headphones-ee3326e
0.99.3
- rebuild against fixed 'yenc', 'Cheetah' and 'pyOpenSSL'
0.99.2
- update to SABnzbd-0.6.7
- update to SickBeard-e0e8f0e

View File

@ -20,16 +20,16 @@
PKG_NAME="SABnzbd-Suite"
PKG_VERSION="0.99"
PKG_REV="2"
PKG_REV="4"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.openelec.tv"
PKG_URL=""
PKG_DEPENDS="Python"
PKG_BUILD_DEPENDS="toolchain Python SABnzbd SickBeard CouchPotato"
PKG_BUILD_DEPENDS="toolchain Python SABnzbd SickBeard CouchPotato Headphones"
PKG_PRIORITY="optional"
PKG_SECTION="service/downloadmanager"
PKG_SHORTDESC="SABnzbd-Suite is a Metapackage which combines SABnzbd, SickBeard and Couchpotato in one Addon"
PKG_SHORTDESC="SABnzbd-Suite is a Metapackage which combines SABnzbd, SickBeard, Couchpotato and Headphones in one Addon"
PKG_LONGDESC="SABnzbd-Suite makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add a .nzb file. SABnzbd+ takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction."
PKG_IS_ADDON="yes"

View File

@ -28,6 +28,7 @@
SABNZBD_SETTINGS="$ADDON_HOME/sabnzbd.ini"
SICKBEARD_SETTINGS="$ADDON_HOME/config.ini"
COUCHPOTATO_SETTINGS="$ADDON_HOME/couchpotato.ini"
HEADPHONES_SETTINGS="$ADDON_HOME/headphones.ini"
XBMC_SETTINGS="$HOME/.xbmc/userdata/guisettings.xml"
export PYTHONPATH="$PYTHONPATH:$ADDON_DIR/pylib"
@ -82,6 +83,18 @@
COUCHPOTATO_PORT="8083"
COUCHPOTATO_USEXBMC="True"
COUCHPOTATO_UPDATEXBMC="True"
################################################################################
# default headphones values
################################################################################
HEADPHONES_PORT="8084"
HEADPHONES_LAUNCHBROWSER="0"
HEADPHONES_MUSICDIR="/storage/music"
HEADPHONES_DESTDIR="/storage/music"
HEADPHONES_DOWNLOADDIR="/storage/music"
HEADPHONES_SABHOST="$SABNZBD_HOST:$SABNZBD_PORT"
HEADPHONES_SABCATEGORY="music"
################################################################################
# setup functions
@ -108,6 +121,13 @@ python $ADDON_DIR/bin/ini_tool --action=write \
--value="$3"
}
write_headphones_ini() {
python $ADDON_DIR/bin/ini_tool --action=write \
--file=$HEADPHONES_SETTINGS \
--option="$1:$2" \
--value="$3"
}
read_sabconfig() {
python $ADDON_DIR/bin/ini_tool --action=read \
--file=$SABNZBD_SETTINGS \
@ -152,6 +172,7 @@ python $ADDON_DIR/bin/ini_tool --action=write \
SABNZBD_IP=`grep SABNZBD_IP $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
SICKBEARD_IP="$SABNZBD_IP"
COUCHPOTATO_IP="$SABNZBD_IP"
HEADPHONES_IP="$SABNZBD_IP"
################################################################################
# setup sabnzbd ini file
@ -297,3 +318,34 @@ python $ADDON_DIR/bin/ini_tool --action=write \
# start couchpotato
################################################################################
python $ADDON_DIR/CouchPotato/CouchPotato.py -d --datadir $ADDON_HOME --config $COUCHPOTATO_SETTINGS
################################################################################
# setup headphones ini file
################################################################################
if [ -z "$HEADPHONES_IP" ]; then
HEADPHONES_IP="0.0.0.0"
fi
if [ ! -f "$HEADPHONES_SETTINGS" ]; then
HEADPHONES_FIRSTRUN="yes"
fi
if [ "$HEADPHONES_FIRSTRUN" = "yes" ]; then
write_headphones_ini General http_port $HEADPHONES_PORT
write_headphones_ini General http_host $HEADPHONES_IP
write_headphones_ini General launch_browser $HEADPHONES_LAUNCHBROWSER
write_headphones_ini General music_dir $HEADPHONES_MUSICDIR
write_headphones_ini General destination_dir $HEADPHONES_DESTDIR
write_headphones_ini General download_dir $HEADPHONES_DOWNLOADDIR
write_headphones_ini SABnzbd sab_host $HEADPHONES_SABHOST
write_headphones_ini SABnzbd sab_apikey $SABNZBD_APIKEY
write_headphones_ini SABnzbd sab_category $HEADPHONES_SABCATEGORY
fi
################################################################################
# start headphones
################################################################################
python $ADDON_DIR/Headphones/Headphones.py -d --datadir $ADDON_HOME --config $HEADPHONES_SETTINGS

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="dvb-firmware"
PKG_VERSION="0.0.9"
PKG_VERSION="0.0.10"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="Free-to-use"
PKG_SITE="https://github.com/OpenELEC/dvb-firmware"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"

File diff suppressed because it is too large Load Diff

View File

@ -28,9 +28,6 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
cd $PKG_BUILD
python setup.py build --cross-compile
python setup.py install -O1 --skip-build --prefix /usr --root .install
find .install -name "*.py" -exec rm -rf "{}" ";"
find .install -name "*.pyo" -exec rm -rf "{}" ";"
python setup.py install -O0 --no-compile --prefix /usr --root .install
rm -rf .install/usr/bin

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="distribute"
PKG_VERSION="0.6.19"
PKG_VERSION="0.6.21"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -28,9 +28,6 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
cd $PKG_BUILD
python setup.py build --cross-compile
python setup.py install -O1 --skip-build --prefix /usr --root .install
find .install -name "*.py" -exec rm -rf "{}" ";"
find .install -name "*.pyo" -exec rm -rf "{}" ";"
python setup.py install -O0 --no-compile --prefix /usr --root .install
rm -rf .install/usr/bin

View File

@ -28,9 +28,6 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
cd $PKG_BUILD
python setup.py build --cross-compile
python setup.py install -O1 --skip-build --prefix /usr --root .install
find .install -name "*.py" -exec rm -rf "{}" ";"
find .install -name "*.pyo" -exec rm -rf "{}" ";"
python setup.py install -O0 --no-compile --prefix /usr --root .install
rm -rf .install/usr/bin

View File

@ -28,9 +28,6 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
cd $PKG_BUILD
python setup.py build --cross-compile
python setup.py install -O1 --skip-build --prefix /usr --root .install
find .install -name "*.py" -exec rm -rf "{}" ";"
find .install -name "*.pyo" -exec rm -rf "{}" ";"
python setup.py install -O0 --no-compile --prefix /usr --root .install
rm -rf .install/usr/bin

View File

@ -44,3 +44,4 @@
KEY_DVD = KEY_DVD # DVD/VCD
KEY_MENU = KEY_EPG # Menu (used for XBMC's context menu)
KEY_K = KEY_EPG # Title (used for XBMC's context menu)

View File

@ -19,10 +19,10 @@
################################################################################
PKG_NAME="fakeroot"
PKG_VERSION="1.16"
PKG_VERSION="1.17"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_LICENSE="GPL3"
PKG_SITE="http://fakeroot.alioth.debian.org/"
PKG_URL="http://ftp.debian.org/debian/pool/main/f/fakeroot/${PKG_NAME}_${PKG_VERSION}.orig.tar.bz2"
PKG_DEPENDS=""

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xorg-server"
PKG_VERSION="1.10.3"
PKG_VERSION="1.10.4"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/i386 3.0.1 Kernel Configuration
# Linux/i386 3.0.3 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -1556,6 +1556,7 @@ CONFIG_DVB_USB_AF9015=m
# CONFIG_DVB_USB_AZ6027 is not set
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT9135=m
# CONFIG_DVB_TTUSB_BUDGET is not set
# CONFIG_DVB_TTUSB_DEC is not set
CONFIG_SMS_SIANO_MDTV=m

View File

@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/i386 3.0.1 Kernel Configuration
# Linux/i386 3.0.3 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -752,7 +752,6 @@ CONFIG_STANDALONE=y
CONFIG_FW_LOADER=y
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_EXTRA_FIRMWARE=""
CONFIG_EXTRA_FIRMWARE_DIR="firmware"
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_CONNECTOR is not set
# CONFIG_MTD is not set
@ -1774,6 +1773,7 @@ CONFIG_DVB_USB_AF9015=m
# CONFIG_DVB_USB_AZ6027 is not set
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT9135=m
# CONFIG_DVB_TTUSB_BUDGET is not set
# CONFIG_DVB_TTUSB_DEC is not set
CONFIG_SMS_SIANO_MDTV=m

View File

@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/i386 3.0.1 Kernel Configuration
# Linux/i386 3.0.3 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -1938,6 +1938,7 @@ CONFIG_DVB_USB_AF9015=m
# CONFIG_DVB_USB_AZ6027 is not set
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT9135=m
# CONFIG_DVB_TTUSB_BUDGET is not set
# CONFIG_DVB_TTUSB_DEC is not set
CONFIG_SMS_SIANO_MDTV=m

View File

@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/i386 3.0.0 Kernel Configuration
# Linux/i386 3.0.3 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -796,7 +796,6 @@ CONFIG_MISC_DEVICES=y
# CONFIG_TIFM_CORE is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set
# CONFIG_CS5535_MFGPT is not set
# CONFIG_HP_ILO is not set
# CONFIG_APDS9802ALS is not set
# CONFIG_ISL29003 is not set
@ -1817,6 +1816,7 @@ CONFIG_DVB_USB_AF9015=m
# CONFIG_DVB_USB_AZ6027 is not set
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT9135=m
# CONFIG_DVB_TTUSB_BUDGET is not set
# CONFIG_DVB_TTUSB_DEC is not set
CONFIG_SMS_SIANO_MDTV=m

View File

@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/x86_64 3.0.0 Kernel Configuration
# Linux/x86_64 3.0.3 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@ -747,7 +747,6 @@ CONFIG_MISC_DEVICES=y
# CONFIG_TIFM_CORE is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set
# CONFIG_CS5535_MFGPT is not set
# CONFIG_HP_ILO is not set
# CONFIG_APDS9802ALS is not set
# CONFIG_ISL29003 is not set
@ -1761,6 +1760,7 @@ CONFIG_DVB_USB_AF9015=m
# CONFIG_DVB_USB_AZ6027 is not set
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT9135=m
# CONFIG_DVB_TTUSB_BUDGET is not set
# CONFIG_DVB_TTUSB_DEC is not set
CONFIG_SMS_SIANO_MDTV=m

View File

@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/i386 3.0.1 Kernel Configuration
# Linux/i386 3.0.3 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -1848,6 +1848,7 @@ CONFIG_DVB_USB_RTL2832U=m
# CONFIG_DVB_USB_AZ6027 is not set
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT9135=m
# CONFIG_DVB_TTUSB_BUDGET is not set
# CONFIG_DVB_TTUSB_DEC is not set
CONFIG_SMS_SIANO_MDTV=m

View File

@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/x86_64 3.0.1 Kernel Configuration
# Linux/x86_64 3.0.3 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@ -1796,6 +1796,7 @@ CONFIG_DVB_USB_AF9015=m
# CONFIG_DVB_USB_AZ6027 is not set
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT9135=m
# CONFIG_DVB_TTUSB_BUDGET is not set
# CONFIG_DVB_TTUSB_DEC is not set
CONFIG_SMS_SIANO_MDTV=m

View File

@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/x86_64 3.0.0 Kernel Configuration
# Linux/x86_64 3.0.3 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@ -738,7 +738,6 @@ CONFIG_MISC_DEVICES=y
# CONFIG_TIFM_CORE is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set
# CONFIG_CS5535_MFGPT is not set
# CONFIG_HP_ILO is not set
# CONFIG_APDS9802ALS is not set
# CONFIG_ISL29003 is not set
@ -1628,6 +1627,7 @@ CONFIG_DVB_USB_AF9015=m
# CONFIG_DVB_USB_AZ6027 is not set
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_USB_IT9135=m
# CONFIG_DVB_TTUSB_BUDGET is not set
# CONFIG_DVB_TTUSB_DEC is not set
CONFIG_SMS_SIANO_MDTV=m

43
tools/mkpkg/mkpkg_headphones Executable file
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
################################################################################
echo "getting sources..."
if [ ! -d Headphones.git ]; then
git clone git://github.com/rembo10/headphones.git Headphones.git
fi
cd Headphones.git
git pull
GIT_REV=`git log -n1 --format=%h`
cd ..
echo "copying sources..."
rm -rf Headphones-$GIT_REV
cp -R Headphones.git Headphones-$GIT_REV
echo "cleaning sources..."
rm -rf Headphones-$GIT_REV/.git
echo "packing sources..."
tar cvJf Headphones-$GIT_REV.tar.xz Headphones-$GIT_REV
echo "remove temporary sourcedir..."
rm -rf Headphones-$GIT_REV