jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into openelec-pvr

Browse Source 
Conflicts:
	projects/ATV/options
	projects/Generic/options
	projects/ION/options
	projects/Intel/options
This commit is contained in:
Stephan Raue 2011-04-24 17:48:45 +02:00
commit fbee8d398f
624 changed files with 30104 additions and 72428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README
View File

@ -1,8 +1,8 @@
http://www.OpenELEC.tv
The Open Embedded Linux Enterainment Center – OpenELEC.tv
OpenELEC - Open Embedded Linux Enterainment Center
OpenELEC.tv runs XBMC, a complete media center solution (xbmc.org).
OpenELEC runs XBMC, a complete media center solution (xbmc.org).
The base system has been designed and built from the ground up to be as
efficient as possible – consuming only a tiny footprint, cutting edge
hardware support and a set-top box experience.
@ -52,4 +52,4 @@ freenode.
Happy XBMC'ing
OpenELEC.tv Development Team
OpenELEC Development Team

7
config/addon/addon.xml
View File

@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="@PKG_ADDON_ID@"
name="@PKG_SHORTDESC@"
name="@PKG_NAME@"
version="@ADDON_VERSION@"
provider-name="openelec.tv">
<requires>
<import addon="os.openelec.tv" version="@OS_VERSION@"/>
<import addon="xbmc.python" version="1.0"/>
@REQUIRES@
</requires>
<extension point="xbmc.python.pluginsource"
library="default.py">
<extension point="@PKG_ADDON_TYPE@"
library="default.py">
<provides>executable</provides>
</extension>
<extension point="xbmc.addon.metadata">

26
config/addon/default.py
View File

@ -1,26 +0,0 @@
################################################################################
# Copyright (C) 2009-2010 OpenELEC.tv
# http://www.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
################################################################################
import sys
import xbmcaddon
import os
if ( __name__ == "__main__" ):
os.system("sh start.sh")

42
config/arch.arm Normal file
View File

@ -0,0 +1,42 @@
# determines TARGET_CPU, if not forced by user
if [ -z "$TARGET_CPU" ]; then
TARGET_CPU=cortex-a8
fi
# TARGET_CPU:
# arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
# arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
# arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t
# arm720t arm740t strongarm strongarm110 strongarm1100
# strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t
# arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi
# arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e
# arm1136j-s arm1136jf-s mpcore mpcorenovfp arm1156t2-s
# arm1176jz-s arm1176jzf-s cortex-a8 cortex-a9 cortex-r4
# cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312.
# TARGET_FPU:
# This specifies what floating point hardware (or hardware emulation) is
# available on the target. Permissible names are:
# fpa fpe2 fpe3 maverick vfp vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16
# vfpv3xd vfpv3xd-fp16 neon neon-fp16 vfpv4 vfpv4-d16 fpv4-sp-d16
# neon-vfpv4.
# determine architecture's family
case $TARGET_CPU in
cortex-a8)
TARGET_SUBARCH=armv7-a
TARGET_ABI=eabi
TARGET_FPU="neon"
;;
cortex-a9)
TARGET_SUBARCH=armv7-a
TARGET_ABI=eabi
TARGET_FPU="neon"
;;
esac
# setup ARCH specific *FLAGS
TARGET_CFLAGS="-fPIC -march=$TARGET_SUBARCH -mtune=$TARGET_CPU -mabi=aapcs-linux"
[ -n "$TARGET_FPU" ] && TARGET_CFLAGS="$TARGET_CFLAGS -mfpu=$TARGET_FPU"
TARGET_LDFLAGS="-fPIC -march=$TARGET_SUBARCH -mtune=$TARGET_CPU"

11
config/arch.i386 Normal file
View File

@ -0,0 +1,11 @@
# determines TARGET_CPU, if not forced by user
if [ -z "$TARGET_CPU" ]; then
TARGET_CPU=i686
fi
# determine architecture's family
TARGET_SUBARCH=i686
# setup ARCH specific *FLAGS
TARGET_CFLAGS="-march=$TARGET_CPU -m32"
TARGET_LDFLAGS="-march=$TARGET_CPU -m32"

11
config/arch.x86_64 Normal file
View File

@ -0,0 +1,11 @@
# determines TARGET_CPU, if not forced by user
if [ -z "$TARGET_CPU" ]; then
TARGET_CPU=core2
fi
# determine architecture's family
TARGET_SUBARCH=x86_64
# setup ARCH specific *FLAGS
TARGET_CFLAGS="-fPIC -march=$TARGET_CPU -m64"
TARGET_LDFLAGS="-fPIC -march=$TARGET_CPU -m64"

7
config/functions
View File

@ -134,7 +134,7 @@ do_autoreconf() {
export AUTORECONF="$ROOT/$TOOLCHAIN/bin/autoreconf -v -f -i -I $ACLOCAL_DIR"
mkdir -p $ACLOCAL_DIR
autoreconf --verbose --force --install -I $ACLOCAL_DIR $@
autoreconf --force --install -I $ACLOCAL_DIR $@
fi
}
@ -154,8 +154,3 @@ strip_linker_plugin() {
# strip out usage from linker plugin
LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||"`
}
strip_kmod() {
[ -z $1 ] && echo "usage strip_kmod <dir>" && exit 1
find $1 -type f -name '*.ko' | xargs -r $STRIP --strip-debug
}

28
config/optimize
View File

@ -26,3 +26,31 @@ LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
LD_OPTIM="$LD_OPTIM -Wl,--as-needed"
if [ "$DEBUG" = yes ]; then
TARGET_CFLAGS="$TARGET_CFLAGS -ggdb"
TARGET_CXXFLAGS="$TARGET_CXXFLAGS -ggdb"
TARGET_LDFLAGS="$TARGET_LDFLAGS -ggdb"
else
TARGET_CFLAGS="$TARGET_CFLAGS -fomit-frame-pointer"
TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fomit-frame-pointer"
TARGET_LDFLAGS="$TARGET_LDFLAGS -s"
fi
TARGET_CPPFLAGS=
TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
TARGET_CXXFLAGS="$TARGET_CFLAGS"
TARGET_LDFLAGS="$TARGET_LDFLAGS $GCC_OPTIM $LD_OPTIM"
HOST_CPPFLAGS=""
HOST_CFLAGS="-O2 -Wall -pipe -I$ROOT/$TOOLCHAIN/include"
HOST_CXXFLAGS="$HOST_CFLAGS"
HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
# use -fPIC when necessary
case "`uname -m`" in
x86_64|ppc64|arm|armeb|armel)
HOST_CFLAGS="$HOST_CFLAGS -fPIC"
HOST_CXXFLAGS="$HOST_CXXFLAGS -fPIC"
HOST_LDFLAGS="$HOST_LDFLAGS -fPIC"
;;
esac

10
config/options
View File

@ -6,7 +6,7 @@ else
PROJECT="$PROJECT"
fi
# determines TARGET_ARCH, if not forced by user (i386 / x86_64 / powerpc)
# determines TARGET_ARCH, if not forced by user (i386 / x86_64 / arm)
# default is i386
if [ -z "$ARCH" ]; then
TARGET_ARCH="i386"
@ -20,7 +20,7 @@ PROJECT_DIR="$ROOT/projects"
OPENELEC_VERSION=`cat VERSION`
if [ "$OPENELEC_VERSION" = "devel" ]; then
OS_VERSION="0.90"
OS_VERSION="0.99"
else
OS_MAJOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f1 -d "."`
OS_MINOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f2 -d "."`
@ -63,7 +63,6 @@ fi
# set jpeg library depending on ARCH
if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then
LIBJPEG="libjpeg-turbo"
# LIBJPEG="jpeg"
else
LIBJPEG="jpeg"
fi
@ -89,6 +88,7 @@ get_graphicdrivers() {
[ "$drv" = "r600" ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
[ "$drv" = "radeon" ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
[ "$drv" = "nouveau" ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
[ "$drv" = "omapfb" ] && MESA_DRIVERS="$MESA_DRIVERS,swrast"
if [ "$drv" = "i915" -o "$drv" = "i965" ]; then
XORG_DRIVERS="$XORG_DRIVERS intel"
@ -107,6 +107,10 @@ get_graphicdrivers() {
XINERAMA_SUPPORT="yes"
fi
if [ "$drv" = "omapfb" ]; then
XORG_DRIVERS="$XORG_DRIVERS ompafb"
fi
if [ "$drv" = "vmware" ]; then
XINERAMA_SUPPORT="yes"
fi

78
config/path
View File

@ -1,30 +1,6 @@
set -e
# determine architecture's family
case $TARGET_ARCH in
i386)
TARGET_FAMILY=i686
;;
x86_64)
TARGET_FAMILY=x86_64
;;
esac
# determines TARGET_CPU, if not forced by user
if [ -z "$TARGET_CPU" ]; then
case $TARGET_ARCH in
i386)
TARGET_CPU=i686
;;
x86_64)
TARGET_CPU=i686
;;
esac
fi
# setup initial directorys
# setup initial directorys (relative to root)
CONFIG=config
SCRIPTS=scripts
PACKAGES=packages
@ -33,8 +9,11 @@ fi
TARGET=target
ADDONS=addons
# include ARCH specific options
. config/arch.$TARGET_ARCH
HOST_NAME=`$SCRIPTS/configtools/config.guess`
TARGET_NAME=$TARGET_FAMILY-openelec-linux-gnu
TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI}
BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION
TARGET_IMG=$ROOT/$TARGET
@ -85,9 +64,6 @@ SED="sed -i"
[ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
[ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
XORG_PATH_ENCODINGS=/usr/share/X11/encodings
XORG_PATH_FONTS=/usr/share/X11/fonts
XORG_PATH_MAPS=$XORG_PATH_FONTS/util
XORG_PATH_DRI=/usr/lib/dri
XORG_PATH_XKB=/usr/share/X11/xkb
XORG_PATH_XKB_OUTPUT=/var/lib/xkb
@ -98,8 +74,6 @@ XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
TOOLCHAIN_LANGUAGES=c
[ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++
. config/optimize
TARGET_CC=${TARGET_PREFIX}gcc
TARGET_CXX=${TARGET_PREFIX}g++
TARGET_LD=${TARGET_PREFIX}ld
@ -110,38 +84,12 @@ TARGET_RANLIB=${TARGET_PREFIX}ranlib
TARGET_OBJCOPY=${TARGET_PREFIX}objcopy
TARGET_STRIP=${TARGET_PREFIX}strip
TARGET_CPPFLAGS=
TARGET_CFLAGS="-Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
TARGET_CXXFLAGS="$TARGET_CFLAGS"
TARGET_LDFLAGS="$GCC_OPTIM $LD_OPTIM"
case $TARGET_ARCH in
i386)
TARGET_CFLAGS="$TARGET_CFLAGS -march=$TARGET_CPU -m32"
TARGET_CXXFLAGS="$TARGET_CXXFLAGS -march=$TARGET_CPU -m32"
TARGET_LDFLAGS="$TARGET_LDFLAGS -march=$TARGET_CPU -m32"
;;
x86_64)
TARGET_CFLAGS="$TARGET_CFLAGS -fPIC -march=$TARGET_CPU -m64"
TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fPIC -march=$TARGET_CPU -m64"
TARGET_LDFLAGS="$TARGET_LDFLAGS -fPIC -march=$TARGET_CPU -m64"
;;
esac
. config/optimize
TARGET_PKG_CONFIG_PATH=""
TARGET_PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
TARGET_PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
if [ "$DEBUG" = yes ]; then
TARGET_CFLAGS="$TARGET_CFLAGS -ggdb"
TARGET_CXXFLAGS="$TARGET_CXXFLAGS -ggdb"
TARGET_LDFLAGS="$TARGET_LDFLAGS -ggdb"
else
TARGET_CFLAGS="$TARGET_CFLAGS -fomit-frame-pointer"
TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fomit-frame-pointer"
TARGET_LDFLAGS="$TARGET_LDFLAGS -s"
fi
HOST_AWK=gawk
HOST_CC=$ROOT/$TOOLCHAIN/bin/host-gcc
HOST_CXX=$ROOT/$TOOLCHAIN/bin/host-g++
@ -153,20 +101,6 @@ HOST_RANLIB=ranlib
HOST_OBJCOPY=objcopy
HOST_STRIP=strip
HOST_CPPFLAGS=""
HOST_CFLAGS="-O2 -Wall -pipe -I$ROOT/$TOOLCHAIN/include"
HOST_CXXFLAGS="$HOST_CFLAGS"
HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
# use -fPIC when necessary
case "`uname -m`" in
x86_64|ppc64|arm|armeb|armel)
HOST_CFLAGS="$HOST_CFLAGS -fPIC"
HOST_CXXFLAGS="$HOST_CXXFLAGS -fPIC"
HOST_LDFLAGS="$HOST_LDFLAGS -fPIC"
;;
esac
HOST_PKG_CONFIG_PATH=""
HOST_PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig"
HOST_PKG_CONFIG_SYSROOT_DIR=""

26
config/release/create_installstick
View File

@ -110,7 +110,7 @@ fi
# find UUID
echo -n "finding UUID from $PART ..."
UUID=`blkid $PART -s UUID -o export`
UUID=`blkid $PART -s UUID -o value`
echo "$UUID"
# create bootloader
@ -121,7 +121,7 @@ fi
echo " " >> /tmp/usb_install/syslinux.cfg
echo "LABEL linux" >> /tmp/usb_install/syslinux.cfg
echo " KERNEL /KERNEL" >> /tmp/usb_install/syslinux.cfg
echo " APPEND boot=$UUID installer quiet" >> /tmp/usb_install/syslinux.cfg
echo " APPEND boot=UUID=$UUID installer quiet" >> /tmp/usb_install/syslinux.cfg
# copy files
echo "copy files to $PART..."
@ -136,14 +136,28 @@ fi
cp README /tmp/usb_install
cp RELEASE /tmp/usb_install
# syncing disk
echo "syncing disk..."
sync
# unmount partition
echo "unmounting partition $PART..."
umount "$PART"
# write mbr
echo "writing mbr..."
if [ -f /usr/lib/syslinux/mbr.bin ]; then
MBR="/usr/lib/syslinux/mbr.bin" # example: ubuntu
elif [ -f /usr/share/syslinux/mbr.bin ]; then
MBR="/usr/share/syslinux/mbr.bin" # example: fedora
else
echo "Dont find mbr.bin on Host OS"
fi
if [ -n "$MBR" ]; then
cat "$MBR" > "$DISK"
fi
# syncing disk
echo "syncing disk..."
sync
# cleaning
echo "cleaning tempdir..."
rmdir /tmp/usb_install

2
config/release/create_installstick.bat
View File

@ -91,7 +91,7 @@ echo PROMPT 0 >> %DRIVE%\syslinux.cfg
echo. >> %DRIVE%\syslinux.cfg
echo LABEL linux >> %DRIVE%\syslinux.cfg
echo KERNEL /KERNEL >> %DRIVE%\syslinux.cfg
echo APPEND boot=UUID=%DRIVEUUID% installer quiet >> %DRIVE%\syslinux.cfg
echo APPEND boot=LABEL=OPENELEC installer quiet >> %DRIVE%\syslinux.cfg
GOTO END
:BADMD5

4
packages/accessibility/atk/meta
View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="atk"
PKG_VERSION="1.32.0"
PKG_VERSION="2.0.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://library.gnome.org/devel/atk/"
PKG_URL="http://ftp.gnome.org/pub/gnome/sources/$PKG_NAME/1.32/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="http://ftp.gnome.org/pub/gnome/sources/$PKG_NAME/2.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="glib"
PKG_BUILD_DEPENDS="toolchain glib"
PKG_PRIORITY="optional"

28
packages/addons/downloadmanager/CouchPotato/addon Executable file
View File

@ -0,0 +1,28 @@
#!/bin/sh
################################################################################
# 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
################################################################################
. config/options $1
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/$1
cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/$1

2
packages/addons/downloadmanager/CouchPotato/changelog.txt Normal file
View File

@ -0,0 +1,2 @@
0.99.1
- initial version CouchPotato

BIN
packages/addons/downloadmanager/CouchPotato/icon/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

24
packages/linux-firmware/ipw2100-fw/meta → packages/addons/downloadmanager/CouchPotato/meta
View File

@ -1,6 +1,7 @@
################################################################################
# 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
@ -18,19 +19,22 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="ipw2100-fw"
PKG_VERSION="1.3"
PKG_NAME="CouchPotato"
PKG_VERSION="ded60e1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="Free-to-use"
PKG_SITE="http://ipw2100.sourceforge.net/"
PKG_LICENSE="OSS"
PKG_SITE="https://github.com/RuudBurger/CouchPotato"
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_DEPENDS="Python SABnzbd"
PKG_BUILD_DEPENDS="toolchain Python"
PKG_PRIORITY="optional"
PKG_SECTION="linux-firmware"
PKG_SHORTDESC="ipw2100-fw: Intel PRO/Wireless 2100 Driver for Linux"
PKG_LONGDESC="This project was created by Intel to enable support for the Intel PRO/Wireless 2100 Network Connection mini PCI adapter. This project (IPW2100) is intended to be a community effort as much as is possible given some working constraints (mainly, no HW documentation is available)."
PKG_IS_ADDON="no"
PKG_SECTION="downloadmanager"
PKG_SHORTDESC="CouchPotato: automated movie downloading."
PKG_LONGDESC="CouchPotato: automated movie downloading."
PKG_IS_ADDON="yes"
PKG_ADDON_TYPE="xbmc.service"
PKG_ADDON_REQUIRES="addon.downloadmanager.SABnzbd:0.99.1"
PKG_AUTORECONF="no"

186
packages/addons/downloadmanager/CouchPotato/patches/CouchPotato-ded60e1-000-add_datadir_and_config_support-0.1.patch Normal file
View File

@ -0,0 +1,186 @@
diff -Naur CouchPotato-ded60e1/app/config/db.py CouchPotato-ded60e1.patch/app/config/db.py
--- CouchPotato-ded60e1/app/config/db.py 2011-04-23 19:55:33.000000000 +0200
+++ CouchPotato-ded60e1.patch/app/config/db.py 2011-04-23 20:26:44.495557932 +0200
@@ -10,6 +10,7 @@
import datetime
import os
import sys
+import app.config
log = CPLog(__name__)
@@ -24,7 +25,7 @@
else:
path = os.path.join(os.path.abspath(os.path.curdir), 'data.db')
else:
- path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), 'data.db')
+ path = os.path.join(app.config.DATADIR, 'data.db')
engine = create_engine('sqlite:///%s' % path)
metadata = MetaData(engine)
diff -Naur CouchPotato-ded60e1/app/config/__init__.py CouchPotato-ded60e1.patch/app/config/__init__.py
--- CouchPotato-ded60e1/app/config/__init__.py 2011-04-23 19:55:33.000000000 +0200
+++ CouchPotato-ded60e1.patch/app/config/__init__.py 2011-04-23 20:26:44.480558230 +0200
@@ -0,0 +1 @@
+DATADIR=None
diff -Naur CouchPotato-ded60e1/app/controllers/log.py CouchPotato-ded60e1.patch/app/controllers/log.py
--- CouchPotato-ded60e1/app/controllers/log.py 2011-04-23 19:55:33.000000000 +0200
+++ CouchPotato-ded60e1.patch/app/controllers/log.py 2011-04-23 20:26:44.505557734 +0200
@@ -4,6 +4,7 @@
from markupsafe import escape
import cherrypy
import os
+import app.config
log = CPLog(__name__)
file = 'CouchPotato.log'
@@ -56,7 +57,7 @@
return redirect(url(controller = 'log', action = 'index'))
def logDir(self):
- return os.path.join(cherrypy.config.get('runPath'), 'logs')
+ return os.path.join(app.config.DATADIR, 'logs')
def logFile(self):
return os.path.join(self.logDir(), file)
diff -Naur CouchPotato-ded60e1/CouchPotato.py CouchPotato-ded60e1.patch/CouchPotato.py
--- CouchPotato-ded60e1/CouchPotato.py 2011-04-23 19:55:33.000000000 +0200
+++ CouchPotato-ded60e1.patch/CouchPotato.py 2011-04-23 20:26:50.127445945 +0200
@@ -3,6 +3,7 @@
import os
rundir = os.path.dirname(os.path.abspath(__file__))
+
try:
frozen = sys.frozen
except AttributeError:
@@ -20,28 +21,9 @@
sys.path.insert(0, path_base)
sys.path.insert(0, os.path.join(path_base, 'library'))
-# Configure logging
-from app.config.cplog import CPLog
-debug = os.path.isfile(os.path.join(path_base, 'debug.conf'))
-log = CPLog()
-log.config(os.path.join(rundir, 'logs'), debug)
-
-# Create cache dir
-cachedir = os.path.join(rundir, 'cache')
-if not os.path.isdir(cachedir):
- os.mkdir(cachedir)
-
-import cherrypy
-import app.config.render
-from app.config.db import initDb
-from optparse import OptionParser
-from app.config.configApp import configApp
-from app.config.routes import setup as Routes
-from app.lib.cron import CronJobs
-from app.config.updater import Updater
-from cherrypy.process import plugins
-
def server_start():
+ from optparse import OptionParser
+
p = OptionParser()
p.add_option('-d', action = "store_true",
dest = 'daemonize', help = "Run the server as a daemon")
@@ -50,19 +32,80 @@
p.add_option('-p', '--pidfile',
dest = 'pidfile', default = None,
help = "Store the process id in the given file")
+ p.add_option('--config',
+ dest = 'config', default = None,
+ help = "Path to config.ini file")
+ p.add_option('--datadir',
+ dest = 'datadir', default = None,
+ help = "Path to the data directory")
+
options, args = p.parse_args()
+
+ if options.datadir:
+ datadir = options.datadir
+
+ if not os.path.isdir(datadir):
+ os.makedirs(datadir)
+
+ else:
+ datadir = rundir
+
+ datadir = os.path.abspath(datadir)
+
+ if not os.access(datadir, os.W_OK):
+ raise SystemExit("Data dir must be writeable '" + datadir + "'")
+
+ import app.config
+ app.config.DATADIR = datadir
+
+ if options.config:
+ config = options.config
+ else:
+ config = os.path.join(datadir, 'config.ini')
+
+ config = os.path.abspath(config)
- config = os.path.join(rundir, 'config.ini')
+ if not os.access(os.path.dirname(config), os.W_OK) and not os.access(config, os.W_OK):
+ if not os.path.exists(os.path.dirname(config)):
+ os.makedirs(os.path.dirname(config))
+ else:
+ raise SystemExit("Directory for config file must be writeable")
+
+ import cherrypy
+ import app.config.render
+
+ # Configure logging
+ from app.config.cplog import CPLog
+
+ # Setup logging
+ debug = os.path.isfile(os.path.join(datadir, 'debug.conf'))
+ log = CPLog()
+ log.config(os.path.join(datadir, 'logs'), debug)
+
+ # Create cache dir
+ cachedir = os.path.join(datadir, 'cache')
+ if not os.path.isdir(cachedir):
+ os.mkdir(cachedir)
# Stop logging
if options.quiet or options.daemonize:
cherrypy.config.update({'log.screen': False})
+
# Config app
+ from app.config.configApp import configApp
ca = configApp(config)
+
+ # Setup db
+ from app.config.db import initDb
initDb()
+ from app.config.routes import setup as Routes
+ from app.lib.cron import CronJobs
+ from app.config.updater import Updater
+ from cherrypy.process import plugins
+
# Check an see if CP is already running
import socket
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -129,7 +172,7 @@
},
'/cache':{
'tools.staticdir.on': True,
- 'tools.staticdir.root': rundir,
+ 'tools.staticdir.root': datadir,
'tools.staticdir.dir': "cache",
'tools.expires.on': True,
'tools.expires.secs': 3600 * 24 * 7
@@ -173,7 +216,6 @@
if hasattr(cherrypy.engine, "console_control_handler"):
cherrypy.engine.console_control_handler.subscribe()
-
## start the app
try:
cherrypy.engine.start()

117
packages/addons/downloadmanager/CouchPotato/source/bin/ini_tool Executable file
View File

@ -0,0 +1,117 @@
#!/usr/bin/env python
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2011 Travis Glenn Hansen (travisghansen@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
################################################################################
from configobj import ConfigObj
import sys
import os
import string
python_major = sys.version_info[0]
python_minor = sys.version_info[1]
prog="ini_tool"
description="""Read/Write config files.
Examples:
%(prog)s --file config.ini --action read --option [section:]username
%(prog)s --file config.ini --action write --option [section:]username --value foo""" % {'prog':prog}
def option_required_error(option):
parser.print_usage()
print prog + ": error: " + option + " is required"
exit(2)
if python_major > 2 or (python_major == 2 and python_minor >= 7):
import argparse
parser = argparse.ArgumentParser(
prog=prog,
description=description,
formatter_class=argparse.RawDescriptionHelpFormatter,
)
parser.add_argument('--file', help='file to read/write to/from', required=True)
parser.add_argument('--action', help='read|write', required=True)
parser.add_argument('--option', help='the option key', required=True)
parser.add_argument('--value', help='value to store in the given option (only for write action)')
options = parser.parse_args()
else:
import optparse
parser = optparse.OptionParser(
prog=prog,
description=description,
)
parser.add_option('--file', help='file to read/write to/from')
parser.add_option('--action', help='read|write')
parser.add_option('--option', help='the option key')
parser.add_option('--value', help='value to store in the given option (only for write action)')
(options, args) = parser.parse_args()
if not options.file:
option_required_error("--file")
if not options.action:
option_required_error("--action")
if not options.option:
option_required_error("--option")
if options.action != "read" and options.action != "write":
print "'" + options.action + "' is not a valid action"
parser.print_help()
exit(2)
if options.action == "read" and not os.path.isfile(options.file):
print "'" + options.file + "' is not a file"
exit(2)
config = ConfigObj(options.file)
keys = string.split(options.option, ":")
key_len = len(keys)
current_section = config
if options.action == 'read':
i = 1
for key in keys:
if i == key_len:
print current_section[key]
exit(0)
else:
current_section = current_section[key]
i += 1
elif options.action == 'write':
i = 1
for key in keys:
if i == key_len:
current_section[key] = options.value
elif key not in current_section:
current_section[key] = {}
current_section = current_section[key]
i += 1
config.write()
else:
exit(1)

26
packages/addons/downloadmanager/CouchPotato/source/default.py Normal file
View File

@ -0,0 +1,26 @@
################################################################################
# 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
################################################################################
import sys
import xbmcaddon
import os
if ( __name__ == "__main__" ):
os.system("start.sh")

102
packages/addons/downloadmanager/CouchPotato/source/start.sh Executable file
View File

@ -0,0 +1,102 @@
#!/bin/sh
################################################################################
# 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
################################################################################
export PATH="$PATH:./bin"
export PYTHONPATH="$PYTHONPATH:./pylib"
COUCHPOTATO_HOME="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.CouchPotato"
SABNZBD_SETTINGS="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.SABnzbd/sabnzbd.ini"
XBMC_SETTINGS="$HOME/.xbmc/userdata/guisettings.xml"
write_ini() {
python bin/ini_tool --action=write \
--file=$COUCHPOTATO_HOME/config.ini \
--option="$1:$2" \
--value="$3"
}
read_sabconfig() {
python bin/ini_tool --action=read \
--file=$SABNZBD_SETTINGS \
--option="$1:$2"
}
read_xbmcconfig() {
grep "<$1>" $XBMC_SETTINGS | sed -e "s,[[:space:]]*<$1>,," -e "s,</$1>,,"
}
mkdir -p $COUCHPOTATO_HOME
chmod +x ./bin/*
sleep 5
if [ ! -f "$COUCHPOTATO_HOME/config.ini" ]; then
COUCHPOTATO_FIRSTRUN="yes"
fi
# default values
COUCHPOTATO_LAUNCHBROWSER="False"
COUCHPOTATO_VERSIONCHECK="False"
COUCHPOTATO_PORT="8083"
COUCHPOTATO_USEXBMC="True"
COUCHPOTATO_UPDATEXBMC="True"
# read xbmc settings
XBMC_HOST="127.0.0.1"
XBMC_PORT=`read_xbmcconfig webserverport`
XBMC_USER=`read_xbmcconfig webserverusername`
XBMC_PWD=`read_xbmcconfig webserverpassword`
# read sabnzbd settings
SABNZBD_HOST="127.0.0.1"
SABNZBD_PORT="8081"
SABNZBD_APIKEY=`read_sabconfig misc api_key`
SABNZBD_WEBUSERNAME=`read_sabconfig misc username`
SABNZBD_WEBPASSWORD=`read_sabconfig misc password`
if [ -z "$COUCHPOTATO_HOST" ]; then
COUCHPOTATO_HOST="0.0.0.0"
fi
write_ini global host $COUCHPOTATO_HOST
write_ini global port $COUCHPOTATO_PORT
write_ini global username $SABNZBD_WEBUSERNAME
write_ini global password $SABNZBD_WEBPASSWORD
write_ini global launchbrowser $COUCHPOTATO_LAUNCHBROWSER
write_ini global updater $COUCHPOTATO_VERSIONCHECK
write_ini Sabnzbd username $SABNZBD_WEBUSERNAME
write_ini Sabnzbd password $SABNZBD_WEBPASSWORD
write_ini Sabnzbd apikey $SABNZBD_APIKEY
write_ini Sabnzbd host "$SABNZBD_HOST:$SABNZBD_PORT"
write_ini XBMC enabled $COUCHPOTATO_USEXBMC
write_ini XBMC host "$XBMC_HOST:$XBMC_PORT"
write_ini XBMC username $XBMC_USER
write_ini XBMC password $XBMC_PWD
if [ "$COUCHPOTATO_FIRSTRUN" = "yes" ]; then
write_ini XBMC updateoneonly $COUCHPOTATO_UPDATEXBMC
fi
python ./CouchPotato/CouchPotato.py -d --datadir $COUCHPOTATO_HOME --config $COUCHPOTATO_HOME/config.ini

37
packages/addons/downloadmanager/SABnzbd/addon Executable file
View File

@ -0,0 +1,37 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/$1
cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/$1
cp -PR $PKG_DIR/config/settings.xml* $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
cp $BUILD/par2cmdline*/par2 $ADDON_BUILD/$PKG_ADDON_ID/bin
cp $BUILD/unrar/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin
cp $BUILD/unzip*/unzip $ADDON_BUILD/$PKG_ADDON_ID/bin
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib
cp -R $BUILD/Cheetah*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
cp -R $BUILD/pyOpenSSL*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
cp -R $BUILD/yenc*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib

2
packages/addons/downloadmanager/SABnzbd/changelog.txt Normal file
View File

@ -0,0 +1,2 @@
0.99.1
- initial version SABnzbd-0.6.0RC2

5
packages/addons/downloadmanager/SABnzbd/config/settings.xml Normal file
View File

@ -0,0 +1,5 @@
<settings>
<setting id="SABNZBD_IP" value="0.0.0.0" />
<setting id="SABNZBD_PWD" value="" />
<setting id="SABNZBD_USER" value="" />
</settings>

BIN
packages/addons/downloadmanager/SABnzbd/icon/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

19
packages/network/SABnzbd/meta → packages/addons/downloadmanager/SABnzbd/meta
View File

@ -19,18 +19,21 @@
################################################################################
PKG_NAME="SABnzbd"
PKG_VERSION="0.5.6"
PKG_VERSION="0.6.0RC2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://sabnzbd.org/"
PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
PKG_DEPENDS="Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
PKG_BUILD_DEPENDS="toolchain"
#PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus-beta/sabnzbd-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
PKG_DEPENDS="Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
PKG_BUILD_DEPENDS="toolchain Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
PKG_PRIORITY="optional"
PKG_SECTION="plugins"
PKG_SHORTDESC="SABnzbd: makes Usenet as simple and streamlined as possible by automating everything we can."
PKG_LONGDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an .nzb. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction."
PKG_IS_ADDON="no"
PKG_SECTION="downloadmanager"
PKG_SHORTDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can."
PKG_LONGDESC="SABnzbd 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"
PKG_ADDON_TYPE="xbmc.service"
PKG_AUTORECONF="no"

214
packages/addons/downloadmanager/SABnzbd/patches/SABnzbd-0.6.0RC2-001_remove_default_settings-0.2.patch Normal file
View File

@ -0,0 +1,214 @@
diff -Naur SABnzbd-0.6.0RC2/interfaces/Plush/templates/config_directories.tmpl SABnzbd-0.6.0RC2.patch/interfaces/Plush/templates/config_directories.tmpl
--- SABnzbd-0.6.0RC2/interfaces/Plush/templates/config_directories.tmpl 2011-04-10 16:06:26.000000000 +0200
+++ SABnzbd-0.6.0RC2.patch/interfaces/Plush/templates/config_directories.tmpl 2011-04-22 15:08:09.323174151 +0200
@@ -109,49 +109,6 @@
</fieldset>
</div><!-- /component-group1 -->
- <div id="core-component-group2" class="component-group clearfix">
- <div class="component-group-desc">
- <h3>$T('systemFolders')</h3>
- <p><small>$T('base-folder'):<br/>$my_lcldata</small></p>
- </div>
- <fieldset class="component-group-list">
- <div class="field-pair">
- <label class="nocheck clearfix" for="admin_dir">
- <span class="component-title">$T('opt-admin_dir')</span>
- <input type="text" size="50" name="admin_dir" id="admin_dir" value="$admin_dir">
- </label>
- <label class="nocheck clearfix">
- <span class="component-title">&nbsp;</span>
- <span class="component-desc">$T('explain-admin_dir1')</span>
- </label>
- <label class="nocheck clearfix">
- <span class="component-title">&nbsp;</span>
- <span class="component-desc">$T('explain-admin_dir2')</span>
- </label>
- </div>
- <div class="field-pair alt">
- <label class="nocheck clearfix" for="log_dir">
- <span class="component-title">$T('opt-log_dir')</span>
- <input type="text" size="50" name="log_dir" id="log_dir" value="$log_dir">
- </label>
- <label class="nocheck clearfix">
- <span class="component-title">&nbsp;</span>
- <span class="component-desc">$T('explain-log_dir')</span>
- </label>
- </div>
- <div class="field-pair">
- <label class="nocheck clearfix" for="nzb_backup_dir">
- <span class="component-title">$T('opt-nzb_backup_dir')</span>
- <input type="text" size="50" name="nzb_backup_dir" id="nzb_backup_dir" value="$nzb_backup_dir">
- </label>
- <label class="nocheck clearfix">
- <span class="component-title">&nbsp;</span>
- <span class="component-desc">$T('explain-nzb_backup_dir')</span>
- </label>
- </div>
- </fieldset>
- </div><!-- /component-group2 -->
-
<div class="component-group-last clearfix">
<div class="component-group-desc">
<h3>&nbsp;</h3>
diff -Naur SABnzbd-0.6.0RC2/interfaces/Plush/templates/config_general.tmpl SABnzbd-0.6.0RC2.patch/interfaces/Plush/templates/config_general.tmpl
--- SABnzbd-0.6.0RC2/interfaces/Plush/templates/config_general.tmpl 2011-04-10 16:06:26.000000000 +0200
+++ SABnzbd-0.6.0RC2.patch/interfaces/Plush/templates/config_general.tmpl 2011-04-22 14:59:06.304131312 +0200
@@ -14,82 +14,6 @@
</div>
<fieldset class="component-group-list">
<div class="field-pair">
- <label class="nocheck clearfix" for="host">
- <span class="component-title">$T('opt-host')</span>
- <input type="text" name="host" id="host" value="$host"/>
- </label>
- <label class="nocheck clearfix">
- <span class="component-title">&nbsp;</span>
- <span class="component-desc">$T('explain-host')</span>
- </label>
- </div>
- <div class="field-pair alt">
- <label class="nocheck clearfix" for="port">
- <span class="component-title">$T('opt-port')</span>
- <input type="text" name="port" id="port" size=8 value="$port"/>
- </label>
- <label class="nocheck clearfix">
- <span class="component-title">&nbsp;</span>
- <span class="component-desc">$T('explain-port')</span>
- </label>
- </div>
- <div class="field-pair">
- <label class="nocheck clearfix" for="username">
- <span class="component-title">$T('opt-web_username')</span>
- <input type="text" name="username" id="username" value="$username"/>
- </label>
- <label class="nocheck clearfix">
- <span class="component-title">&nbsp;</span>
- <span class="component-desc">$T('explain-web_username')</span>
- </label>
- </div>
- <div class="field-pair alt">
- <label class="nocheck clearfix" for="password">
- <span class="component-title">$T('opt-web_password')</span>
- <input type="password" name="password" id="password" value="$password"/>
- </label>
- <label class="nocheck clearfix">
- <span class="component-title">&nbsp;</span>
- <span class="component-desc">$T('explain-web_password')</span>
- </label>
- </div>
- <div class="field-pair">
- <label class="nocheck clearfix" for="web_dir">
- <span class="component-title">$T('opt-web_dir')</span>
- <select name="web_dir" id="web_dir">
- <!--#for $webline in $web_list#-->
- <!--#if $webline.lower() == $web_dir.lower()#-->
- <option value="$webline" selected>$webline</option>
- <!--#else#-->
- <option value="$webline">$webline</option>
- <!--#end if#-->
- <!--#end for#-->
- </select>
- </label>
- <label class="nocheck clearfix">
- <span class="component-title">&nbsp;</span>
- <span class="component-desc">$T('explain-web_dir')</span>
- </label>
- </div>
- <div class="field-pair alt">
- <label class="nocheck clearfix" for="web_dir2">
- <span class="component-title">$T('opt-web_dir2')</span>
- <select name="web_dir2" id="web_dir2">
- <!--#for $webline in $web_list2#-->
- <!--#if $webline.lower() == $web_dir2.lower()#-->
- <option value="$webline" selected>$webline</option>
- <!--#else#-->
- <option value="$webline">$webline</option>
- <!--#end if#-->
- <!--#end for#-->
- </select>
- </label>
- <label class="nocheck clearfix">
- <span class="component-title">&nbsp;</span>
- <span class="component-desc">$T('explain-web_dir2')</span>
- </label>
- </div>
- <div class="field-pair">
<label class="nocheck clearfix" for="language">
<span class="component-title">$T('opt-language')</span>
<select name="language" id="language" id="language" class="select">
@@ -129,13 +53,6 @@
<span class="component-desc">$T('explain-nzbkey')</span>
</label>
</div>
- <div class="field-pair alt">
- <label class="clearfix" for="disable_api_key">
- <input type="checkbox" name="disable_api_key" id="disable_api_key" value="1" <!--#if $disable_api_key > 0 then 'checked="1"' else ""#--> />
- <span class="component-title">$T('opt-disableApikey')</span>
- <span class="component-desc">$T('explain-disableApikey')</span>
- </label>
- </div>
</fieldset>
</div><!-- /component-group1 -->
@@ -152,36 +69,6 @@
<span class="component-desc">$T('explain-enable_https')</span>
</label>
</div>
- <div class="field-pair alt">
- <label class="nocheck clearfix" for="https_port">
- <span class="component-title">$T('opt-https_port')</span>
- <input type="text" name="https_port" id="https_port" size="8" value="$https_port"/>
- </label>
- <label class="nocheck clearfix">
- <span class="component-title">&nbsp;</span>
- <span class="component-desc">$T('explain-https_port')</span>
- </label>
- </div>
- <div class="field-pair">
- <label class="nocheck clearfix" for="https_cert">
- <span class="component-title">$T('opt-https_cert')</span>
- <input type="text" name="https_cert" id="https_cert" value="$https_cert"/>
- </label>
- <label class="nocheck clearfix">
- <span class="component-title">&nbsp;</span>
- <span class="component-desc">$T('explain-https_cert')</span>
- </label>
- </div>
- <div class="field-pair alt">
- <label class="nocheck clearfix" for="https_key">
- <span class="component-title">$T('opt-https_key')</span>
- <input type="text" name="https_key" id="https_key" value="$https_key"/>
- </label>
- <label class="nocheck clearfix">
- <span class="component-title">&nbsp;</span>
- <span class="component-desc">$T('explain-https_key')</span>
- </label>
- </div>
</fieldset>
</div><!-- /component-group2 -->
diff -Naur SABnzbd-0.6.0RC2/interfaces/Plush/templates/config_switches.tmpl SABnzbd-0.6.0RC2.patch/interfaces/Plush/templates/config_switches.tmpl
--- SABnzbd-0.6.0RC2/interfaces/Plush/templates/config_switches.tmpl 2011-04-10 16:06:26.000000000 +0200
+++ SABnzbd-0.6.0RC2.patch/interfaces/Plush/templates/config_switches.tmpl 2011-04-22 15:21:32.791455752 +0200
@@ -12,20 +12,6 @@
<h3>$T('swtag-general')</h3>
</div>
<fieldset class="component-group-list">
- <div class="field-pair">
- <input type="checkbox" name="check_new_rel" id="check_new_rel" value="1" <!--#if $check_new_rel > 0 then "checked=1" else ""#--> />
- <label class="clearfix" for="check_new_rel">
- <span class="component-title">$T('opt-check_new_rel')</span>
- <span class="component-desc">$T('explain-check_new_rel')</span>
- </label>
- </div>
- <div class="field-pair alt">
- <input type="checkbox" name="auto_browser" id="auto_browser" value="1" <!--#if $auto_browser > 0 then "checked=1" else ""#--> />
- <label class="clearfix" for="auto_browser">
- <span class="component-title">$T('opt-auto_browser')</span>
- <span class="component-desc">$T('explain-auto_browser')</span>
- </label>
- </div>
<!--#if $have_ampm#-->
<div class="field-pair">
<input type="checkbox" name="ampm" id="ampm" value="1" <!--#if $ampm > 0 then "checked=1" else ""#--> />

117
packages/addons/downloadmanager/SABnzbd/source/bin/ini_tool Executable file
View File

@ -0,0 +1,117 @@
#!/usr/bin/env python
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2011 Travis Glenn Hansen (travisghansen@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
################################################################################
from configobj import ConfigObj
import sys
import os
import string
python_major = sys.version_info[0]
python_minor = sys.version_info[1]
prog="ini_tool"
description="""Read/Write config files.
Examples:
%(prog)s --file config.ini --action read --option [section:]username
%(prog)s --file config.ini --action write --option [section:]username --value foo""" % {'prog':prog}
def option_required_error(option):
parser.print_usage()
print prog + ": error: " + option + " is required"
exit(2)
if python_major > 2 or (python_major == 2 and python_minor >= 7):
import argparse
parser = argparse.ArgumentParser(
prog=prog,
description=description,
formatter_class=argparse.RawDescriptionHelpFormatter,
)
parser.add_argument('--file', help='file to read/write to/from', required=True)
parser.add_argument('--action', help='read|write', required=True)
parser.add_argument('--option', help='the option key', required=True)
parser.add_argument('--value', help='value to store in the given option (only for write action)')
options = parser.parse_args()
else:
import optparse
parser = optparse.OptionParser(
prog=prog,
description=description,
)
parser.add_option('--file', help='file to read/write to/from')
parser.add_option('--action', help='read|write')
parser.add_option('--option', help='the option key')
parser.add_option('--value', help='value to store in the given option (only for write action)')
(options, args) = parser.parse_args()
if not options.file:
option_required_error("--file")
if not options.action:
option_required_error("--action")
if not options.option:
option_required_error("--option")
if options.action != "read" and options.action != "write":
print "'" + options.action + "' is not a valid action"
parser.print_help()
exit(2)
if options.action == "read" and not os.path.isfile(options.file):
print "'" + options.file + "' is not a file"
exit(2)
config = ConfigObj(options.file)
keys = string.split(options.option, ":")
key_len = len(keys)
current_section = config
if options.action == 'read':
i = 1
for key in keys:
if i == key_len:
print current_section[key]
exit(0)
else:
current_section = current_section[key]
i += 1
elif options.action == 'write':
i = 1
for key in keys:
if i == key_len:
current_section[key] = options.value
elif key not in current_section:
current_section[key] = {}
current_section = current_section[key]
i += 1
config.write()
else:
exit(1)

26
packages/addons/downloadmanager/SABnzbd/source/default.py Normal file
View File

@ -0,0 +1,26 @@
################################################################################
# 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
################################################################################
import sys
import xbmcaddon
import os
if ( __name__ == "__main__" ):
os.system("sh start.sh")

12
packages/addons/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- SABnzbd -->
<string id="1000">SABnzbd</string>
<string id="1010">Gebruikers instellingen</string>
<string id="1022">Gebruikersnaam</string>
<string id="1023">Wachtwoord</string>
<string id="2010">Netwerk instellingen</string>
<string id="2021">Toegestane IP adressen</string>
</strings>

12
packages/addons/downloadmanager/SABnzbd/source/resources/language/English/strings.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- SABnzbd -->
<string id="1000">SABnzbd</string>
<string id="1010">User Settings</string>
<string id="1022">Username</string>
<string id="1023">Password</string>
<string id="2010">Network Settings</string>
<string id="2021">Allowed IP addresses</string>
</strings>

12
packages/addons/downloadmanager/SABnzbd/source/resources/language/French/strings.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- SABnzbd -->
<string id="1000">SABnzbd</string>
<string id="1010">Préférences utilisateur</string>
<string id="1022">Nom d'utilisateur</string>
<string id="1023">Mot de passe</string>
<string id="2010">Préférences réseau</string>
<string id="2021">Adresses IP autorisées</string>
</strings>

12
packages/addons/downloadmanager/SABnzbd/source/resources/language/German/strings.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- SABnzbd -->
<string id="1000">SABnzbd</string>
<string id="1010">Benutzer Einstellungen</string>
<string id="1022">Benutzername</string>
<string id="1023">Passwort</string>
<string id="2010">Netzwerk Einstellungen</string>
<string id="2021">Erlaubte IP Adressen</string>
</strings>

12
packages/addons/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- SABnzbd -->
<string id="1000">SABnzbd</string>
<string id="1010">Bruker Instillinger</string>
<string id="1022">Brukernavn</string>
<string id="1023">Passord</string>
<string id="2010">Nettverksinstillinger</string>
<string id="2021">Tilatte IP addresser</string>
</strings>

15
packages/addons/downloadmanager/SABnzbd/source/resources/settings.xml Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
<!-- SABnzbd -->
<category label="1000">
<setting label="1010" type="lsep"/>
<setting type="sep" />
<setting id="SABNZBD_USER" type="text" label="1022" default="openelec"/>
<setting id="SABNZBD_PWD" type="text" label="1023" default="openelec"/>
<setting label="2010" type="lsep"/>
<setting type="sep" />
<setting id="SABNZBD_IP" type="text" label="2021" default="0.0.0.0"/>
</category>
</settings>

110
packages/addons/downloadmanager/SABnzbd/source/start.sh Executable file
View File

@ -0,0 +1,110 @@
#!/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
################################################################################
export PATH="$PATH:./bin"
export PYTHONPATH="$PYTHONPATH:./pylib"
SABNZBD_HOME="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.SABnzbd"
SABNZBD_SETTINGS="$SABNZBD_HOME/settings.xml"
SABNZBD_DISABLEAPIKEY="0"
SABNZBD_CHECKRELEASE="0"
SABNZBD_LAUNCHBROWSER="0"
SABNZBD_HTTPPORT="8081"
SABNZBD_HTTPSPORT="9081"
SABNZBD_HTTPSCERT="server.cert"
SABNZBD_HTTPSKEY="server.key"
SABNZBD_SKIN="Plush"
SABNZBD_SKIN2="Plush"
SABNZBD_WEBCOLOR="gold"
SABNZBD_WEBCOLOR2="gold"
SABNZBD_LOGDIR="logs"
SABNZBD_ADMINDIR="admin"
SABNZBD_BACKUPDIR="backup"
SABNZBD_INCOMPLETEDIR="/storage/downloads/incomplete"
SABNZBD_COMPLETEDIR="/storage/downloads"
SABNZBD_WATCHDIR="/storage/downloads/watch"
write_ini() {
python bin/ini_tool --action=write \
--file=$SABNZBD_HOME/sabnzbd.ini \
--option="$1:$2" \
--value="$3"
}
mkdir -p $SABNZBD_HOME
chmod +x ./bin/*
if [ ! -f "$SABNZBD_SETTINGS" ]; then
cp settings-default.xml $SABNZBD_SETTINGS
fi
if [ ! -f "$SABNZBD_HOME/sabnzbd.ini" ]; then
SABNZBD_FIRSTRUN="yes"
fi
# use settings from xbmc setup dialog
SABNZBD_USER=`grep SABNZBD_USER $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
SABNZBD_PWD=`grep SABNZBD_PWD $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
SABNZBD_IP=`grep SABNZBD_IP $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
if [ -z "$SABNZBD_IP" ]; then
SABNZBD_IP="0.0.0.0"
fi
write_ini misc disable_api_key $SABNZBD_DISABLEAPIKEY
write_ini misc check_new_rel $SABNZBD_CHECKRELEASE
write_ini misc auto_browser $SABNZBD_LAUNCHBROWSER
write_ini misc username $SABNZBD_USER
write_ini misc password $SABNZBD_PWD
write_ini misc port $SABNZBD_HTTPPORT
write_ini misc https_port $SABNZBD_HTTPSPORT
write_ini misc https_cert $SABNZBD_HTTPSCERT
write_ini misc https_key $SABNZBD_HTTPSKEY
write_ini misc host $SABNZBD_IP
write_ini misc web_dir $SABNZBD_SKIN
write_ini misc web_dir2 $SABNZBD_SKIN2
write_ini misc web_color $SABNZBD_WEBCOLOR
write_ini misc web_color2 $SABNZBD_WEBCOLOR2
write_ini misc log_dir $SABNZBD_LOGDIR
write_ini misc admin_dir $SABNZBD_ADMINDIR
write_ini misc nzb_backup_dir $SABNZBD_BACKUPDIR
if [ "$SABNZBD_FIRSTRUN" = "yes" ]; then
mkdir -p "$SABNZBD_INCOMPLETEDIR"
mkdir -p "$SABNZBD_COMPLETEDIR"
mkdir -p "$SABNZBD_WATCHDIR"
write_ini misc download_dir $SABNZBD_INCOMPLETEDIR
write_ini misc complete_dir $SABNZBD_COMPLETEDIR
write_ini misc dirscan_dir $SABNZBD_WATCHDIR
write_ini servers:localhost name "localhost"
write_ini servers:localhost host "localhost"
write_ini servers:localhost port "119"
write_ini servers:localhost enable "0"
fi
python ./SABnzbd/SABnzbd.py -d -f $SABNZBD_HOME/sabnzbd.ini -l 0

30
packages/addons/downloadmanager/SickBeard/addon Executable file
View File

@ -0,0 +1,30 @@
#!/bin/sh
################################################################################
# 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
################################################################################
. config/options $1
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/$1
cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/$1
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib
cp -R $BUILD/Cheetah*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib

2
packages/addons/downloadmanager/SickBeard/changelog.txt Normal file
View File

@ -0,0 +1,2 @@
0.99.1
- initial version SickBeard-48caf04

BIN
packages/addons/downloadmanager/SickBeard/icon/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

40
packages/addons/downloadmanager/SickBeard/meta Normal file
View File

@ -0,0 +1,40 @@
################################################################################
# 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="SickBeard"
PKG_VERSION="48caf04"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="https://github.com/midgetspy/Sick-Beard"
PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_DEPENDS="Python SABnzbd Cheetah"
PKG_BUILD_DEPENDS="toolchain Python Cheetah"
PKG_PRIORITY="optional"
PKG_SECTION="downloadmanager"
PKG_SHORTDESC="SickBeard: automated TV show downloading."
PKG_LONGDESC="SickBeard: automated TV show downloading."
PKG_IS_ADDON="yes"
PKG_ADDON_TYPE="xbmc.service"
PKG_ADDON_REQUIRES="addon.downloadmanager.SABnzbd:0.99.1"
PKG_AUTORECONF="no"

44
packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-001-remove_logo_update-header_and_donate_button-0.1.patch Normal file
View File

@ -0,0 +1,44 @@
diff -Naur SickBeard-48caf04/data/interfaces/default/config.tmpl SickBeard-48caf04.patch/data/interfaces/default/config.tmpl
--- SickBeard-48caf04/data/interfaces/default/config.tmpl 2011-04-22 19:15:10.000000000 +0200
+++ SickBeard-48caf04.patch/data/interfaces/default/config.tmpl 2011-04-23 03:57:14.515808144 +0200
@@ -24,9 +24,4 @@
</table>
</div>
-<table class="infoTable" cellspacing="1" border="0" cellpadding="0"><tr>
- <td><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donateCC_LG.gif" alt="[donate]" /></a></td>
- <td>Sickbeard is free, but you can contribute by giving a <b><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;">donation</a></b>.</td>
-</tr></table>
-
#include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl")
diff -Naur SickBeard-48caf04/data/interfaces/default/inc_top.tmpl SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl
--- SickBeard-48caf04/data/interfaces/default/inc_top.tmpl 2011-04-22 19:15:10.000000000 +0200
+++ SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl 2011-04-23 03:59:09.088665913 +0200
@@ -147,19 +147,6 @@
</head>
<body>
-#if $sickbeard.NEWEST_VERSION_STRING:
-<div id="upgrade-notification">
- <div>
- <span class="notify-text">$sickbeard.NEWEST_VERSION_STRING</span>
- </div>
-</div>
-<div id="header-fix"></div>
-#end if
-<div id="header">
- <a name="top"></a>
- <span id="logo"><a href="$sbRoot/home/" title="Sick Beard homepage"><img alt="Sick Beard" src="$sbRoot/images/sickbeard_small.png" width="150" /></a></span>
- <span id="versiontext">alpha $sickbeard.version.SICKBEARD_VERSION</span>
-</div>
<ul id="MainMenu" class="sf-menu">
<li id="NAVsystem" class="first"><a href="#" class="navIcon"><img src="$sbRoot/images/menu/system18.png" alt="" width="18" height="18" /></a>
<ul>
@@ -197,7 +184,6 @@
<li><a href="$sbRoot/errorlogs/viewlog"><img src="$sbRoot/images/menu/viewlog16.png" alt="" width="16" height="16" />View Log</a></li>
</ul>
</li>
- <li id="donate"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donate_LG.gif" alt="[donate]" /></a></li>
</ul>
#if $varExists('submenu'):
<div id="SubMenu">

74
packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-002-remove_default_settings-0.3.patch Normal file
View File

@ -0,0 +1,74 @@
diff -Naur SickBeard-48caf04/data/interfaces/default/config_notifications.tmpl SickBeard-48caf04.patch/data/interfaces/default/config_notifications.tmpl
--- SickBeard-48caf04/data/interfaces/default/config_notifications.tmpl 2011-04-23 03:55:23.000000000 +0200
+++ SickBeard-48caf04.patch/data/interfaces/default/config_notifications.tmpl 2011-04-23 18:01:29.330455515 +0200
@@ -484,48 +484,6 @@
</div>
-
- <div id="core-component-group7" class="component-group clearfix">
- <div class="component-group-desc">
- <h3><a href="http://library.gnome.org/devel/libnotify/" onclick="window.open(this.href, '_blank'); return false;"><img src="$sbRoot/images/notifiers/libnotify.gif" alt="Libnotify" title="Libnotify" width="16" height="16" /> Libnotify</a></h3>
- <p>The standard desktop notification API for Linux/*nix systems. This notifier will only function if the pynotify module is installed (Ubuntu/Debian package <a href="apt:python-notify">python-notify</a>).</p>
- </div>
-
- <fieldset class="component-group-list">
- <div class="field-pair">
- <input type="checkbox" class="enabler" name="use_libnotify" id="use_libnotify" #if $sickbeard.USE_LIBNOTIFY then "checked=\"checked\"" else ""# />
- <label class="clearfix" for="use_libnotify">
- <span class="component-title">Enable</span>
- <span class="component-desc">Should Sick Beard send Libnotify notifications?</span>
- </label>
- </div>
-
- <div id="content_use_libnotify">
- <div class="field-pair">
- <input type="checkbox" name="libnotify_notify_onsnatch" id="libnotify_notify_onsnatch" #if $sickbeard.LIBNOTIFY_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# />
- <label class="clearfix" for="libnotify_notify_onsnatch">
- <span class="component-title">Notify on Snatch</span>
- <span class="component-desc">Send notification when we start a download?</span>
- </label>
- </div>
-
- <div class="field-pair">
- <input type="checkbox" name="libnotify_notify_ondownload" id="libnotify_notify_ondownload" #if $sickbeard.LIBNOTIFY_NOTIFY_ONDOWNLOAD then "checked=\"checked\"" else ""# />
- <label class="clearfix" for="libnotify_notify_ondownload">
- <span class="component-title">Notify on Download</span>
- <span class="component-desc">Send notification when we finish a download?</span>
- </label>
- </div>
-
- <div class="testNotification" id="testLibnotify-result">Click below to test.</div>
- <input type="button" value="Test Libnotify" id="testLibnotify" />
- <input type="submit" class="config_submitter" value="Save Changes" />
-
- </div><!-- /content_use_libnotify //-->
-
- </fieldset>
- </div><!-- /component-group //-->
-
<div id="core-component-group8" class="component-group clearfix">
<div class="component-group-desc">
diff -Naur SickBeard-48caf04/data/interfaces/default/inc_top.tmpl SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl
--- SickBeard-48caf04/data/interfaces/default/inc_top.tmpl 2011-04-23 03:59:09.000000000 +0200
+++ SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl 2011-04-23 14:24:01.035048035 +0200
@@ -172,7 +172,6 @@
</li>
<li id="NAVconfig"><a href="$sbRoot/config">Config</a>
<ul>
- <li><a href="$sbRoot/config/general/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />General</a></li>
<li><a href="$sbRoot/config/search/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Search Settings</a></li>
<li><a href="$sbRoot/config/providers/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Search Providers</a></li>
<li><a href="$sbRoot/config/postProcessing/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Post Processing</a></li>
diff -Naur SickBeard-48caf04/sickbeard/webserve.py SickBeard-48caf04.patch/sickbeard/webserve.py
--- SickBeard-48caf04/sickbeard/webserve.py 2011-04-23 03:55:23.000000000 +0200
+++ SickBeard-48caf04.patch/sickbeard/webserve.py 2011-04-23 17:55:09.270813146 +0200
@@ -583,7 +583,6 @@
ConfigMenu = [
- { 'title': 'General', 'path': 'config/general/' },
{ 'title': 'Search Settings', 'path': 'config/search/' },
{ 'title': 'Search Providers', 'path': 'config/providers/' },
{ 'title': 'Post Processing', 'path': 'config/postProcessing/' },

117
packages/addons/downloadmanager/SickBeard/source/bin/ini_tool Executable file
View File

@ -0,0 +1,117 @@
#!/usr/bin/env python
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2011 Travis Glenn Hansen (travisghansen@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
################################################################################
from configobj import ConfigObj
import sys
import os
import string
python_major = sys.version_info[0]
python_minor = sys.version_info[1]
prog="ini_tool"
description="""Read/Write config files.
Examples:
%(prog)s --file config.ini --action read --option [section:]username
%(prog)s --file config.ini --action write --option [section:]username --value foo""" % {'prog':prog}
def option_required_error(option):
parser.print_usage()
print prog + ": error: " + option + " is required"
exit(2)
if python_major > 2 or (python_major == 2 and python_minor >= 7):
import argparse
parser = argparse.ArgumentParser(
prog=prog,
description=description,
formatter_class=argparse.RawDescriptionHelpFormatter,
)
parser.add_argument('--file', help='file to read/write to/from', required=True)
parser.add_argument('--action', help='read|write', required=True)
parser.add_argument('--option', help='the option key', required=True)
parser.add_argument('--value', help='value to store in the given option (only for write action)')
options = parser.parse_args()
else:
import optparse
parser = optparse.OptionParser(
prog=prog,
description=description,
)
parser.add_option('--file', help='file to read/write to/from')
parser.add_option('--action', help='read|write')
parser.add_option('--option', help='the option key')
parser.add_option('--value', help='value to store in the given option (only for write action)')
(options, args) = parser.parse_args()
if not options.file:
option_required_error("--file")
if not options.action:
option_required_error("--action")
if not options.option:
option_required_error("--option")
if options.action != "read" and options.action != "write":
print "'" + options.action + "' is not a valid action"
parser.print_help()
exit(2)
if options.action == "read" and not os.path.isfile(options.file):
print "'" + options.file + "' is not a file"
exit(2)
config = ConfigObj(options.file)
keys = string.split(options.option, ":")
key_len = len(keys)
current_section = config
if options.action == 'read':
i = 1
for key in keys:
if i == key_len:
print current_section[key]
exit(0)
else:
current_section = current_section[key]
i += 1
elif options.action == 'write':
i = 1
for key in keys:
if i == key_len:
current_section[key] = options.value
elif key not in current_section:
current_section[key] = {}
current_section = current_section[key]
i += 1
config.write()
else:
exit(1)

26
packages/addons/downloadmanager/SickBeard/source/default.py Normal file
View File

@ -0,0 +1,26 @@
################################################################################
# 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
################################################################################
import sys
import xbmcaddon
import os
if ( __name__ == "__main__" ):
os.system("sh start.sh")

111
packages/addons/downloadmanager/SickBeard/source/start.sh Executable file
View File

@ -0,0 +1,111 @@
#!/bin/sh
################################################################################
# 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
################################################################################
export PATH="$PATH:./bin"
export PYTHONPATH="$PYTHONPATH:./pylib"
SICKBEARD_HOME="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.SickBeard"
SABNZBD_SETTINGS="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.SABnzbd/sabnzbd.ini"
XBMC_SETTINGS="$HOME/.xbmc/userdata/guisettings.xml"
write_ini() {
python bin/ini_tool --action=write \
--file=$SICKBEARD_HOME/config.ini \
--option="$1:$2" \
--value="$3"
}
read_sabconfig() {
python bin/ini_tool --action=read \
--file=$SABNZBD_SETTINGS \
--option="$1:$2"
}
read_xbmcconfig() {
grep "<$1>" $XBMC_SETTINGS | sed -e "s,[[:space:]]*<$1>,," -e "s,</$1>,,"
}
mkdir -p $SICKBEARD_HOME
chmod +x ./bin/*
sleep 5
if [ ! -f "$SICKBEARD_HOME/config.ini" ]; then
SICKBEARD_FIRSTRUN="yes"
fi
# default values
SICKBEARD_LOGDIR="log"
SICKBEARD_CACHEDIR="cache"
SICKBEARD_PORT="8082"
SICKBEARD_LAUNCHBROWSER="0"
SICKBEARD_VERSIONCHECK="0"
SICKBEARD_USEIPV6="0"
SICKBEARD_WEBLOG="0"
SICKBEARD_USEXBMC="1"
SICKBEARD_METADATAXBMC="1|1|1|1|1|1"
# read xbmc settings
XBMC_HOST="127.0.0.1"
XBMC_PORT=`read_xbmcconfig webserverport`
XBMC_USER=`read_xbmcconfig webserverusername`
XBMC_PWD=`read_xbmcconfig webserverpassword`
# read sabnzbd settings
SABNZBD_HOST="127.0.0.1"
SABNZBD_PORT="8081"
SABNZBD_APIKEY=`read_sabconfig misc api_key`
SABNZBD_WEBUSERNAME=`read_sabconfig misc username`
SABNZBD_WEBPASSWORD=`read_sabconfig misc password`
if [ -z "$SICKBEARD_HOST" ]; then
SICKBEARD_HOST="0.0.0.0"
fi
write_ini General launch_browser $SICKBEARD_LAUNCHBROWSER
write_ini General version_notify $SICKBEARD_VERSIONCHECK
write_ini General log_dir $SICKBEARD_LOGDIR
write_ini General cache_dir $SICKBEARD_CACHEDIR
write_ini General web_port $SICKBEARD_PORT
write_ini General web_host $SICKBEARD_HOST
write_ini General web_ipv6 $SICKBEARD_USEIPV6
write_ini General web_log $SICKBEARD_WEBLOG
write_ini General web_username $SABNZBD_WEBUSERNAME
write_ini General web_password $SABNZBD_WEBPASSWORD
write_ini SABnzbd sab_username $SABNZBD_WEBUSERNAME
write_ini SABnzbd sab_password $SABNZBD_WEBPASSWORD
write_ini SABnzbd sab_apikey $SABNZBD_APIKEY
write_ini SABnzbd sab_host "http://$SABNZBD_HOST:$SABNZBD_PORT/"
write_ini XBMC use_xbmc $SICKBEARD_USEXBMC
write_ini XBMC xbmc_host "$XBMC_HOST:$XBMC_PORT"
write_ini XBMC xbmc_username $XBMC_USER
write_ini XBMC xbmc_password $XBMC_PWD
if [ "$SICKBEARD_FIRSTRUN" = "yes" ]; then
write_ini General metadata_xbmc $SICKBEARD_METADATAXBMC
fi
python ./SickBeard/SickBeard.py --daemon --datadir $SICKBEARD_HOME

12
packages/network/transmission/install → packages/addons/downloadmanager/transmission/addon
View File

@ -22,10 +22,10 @@
. config/options $1
mkdir -p $INSTALL/usr/sbin
cp $PKG_BUILD/daemon/transmission-daemon $INSTALL/usr/sbin
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
cp $PKG_BUILD/daemon/transmission-daemon $ADDON_BUILD/$PKG_ADDON_ID/bin
mkdir -p $INSTALL/usr/share/transmission/web
cp -R $PKG_BUILD/web/* $INSTALL/usr/share/transmission/web
find $INSTALL/usr/share/transmission/web -name "Makefile*" -exec rm -rf {} ";"
rm -rf $INSTALL/usr/share/transmission/web/LICENSE
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/web
cp -R $PKG_BUILD/web/* $ADDON_BUILD/$PKG_ADDON_ID/web
find $ADDON_BUILD/$PKG_ADDON_ID/web -name "Makefile*" -exec rm -rf {} ";"
rm -rf $ADDON_BUILD/$PKG_ADDON_ID/web/LICENSE

5
packages/network/transmission/build → packages/addons/downloadmanager/transmission/build
View File

@ -25,6 +25,8 @@
# transmission (svn 11666) fails to build with LTO support
strip_lto
export LDFLAGS="$LDFLAGS -liconv"
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
@ -42,7 +44,8 @@ cd $PKG_BUILD
--disable-nls \
--disable-cli \
--disable-mac \
--enable-lightweight \
--enable-daemon \
--with-gnu-ld \
make
make V=1

2
packages/addons/downloadmanager/transmission/changelog.txt Normal file
View File

@ -0,0 +1,2 @@
0.99.1
- initial version transmission-2.20

BIN
packages/addons/downloadmanager/transmission/icon/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

15
packages/network/transmission/meta → packages/addons/downloadmanager/transmission/meta
View File

@ -19,19 +19,20 @@
################################################################################
PKG_NAME="transmission"
PKG_VERSION="11666"
PKG_VERSION="2.20"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.transmissionbt.com/"
#PKG_URL="http://download.m0k.org/transmission/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="zlib openssl curl libevent connman"
PKG_BUILD_DEPENDS="toolchain zlib openssl curl libevent"
PKG_URL="http://download.transmissionbt.com/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="zlib libiconv openssl curl libevent"
PKG_BUILD_DEPENDS="toolchain libiconv zlib openssl curl libevent"
PKG_PRIORITY="optional"
PKG_SECTION="system"
PKG_SECTION="downloadmanager"
PKG_SHORTDESC="transmission: a fast, easy and free BitTorrent client"
PKG_LONGDESC="transmission is a fast, easy and free BitTorrent client"
PKG_IS_ADDON="no"
PKG_IS_ADDON="yes"
PKG_ADDON_TYPE="xbmc.service"
PKG_AUTORECONF="yes"

26
packages/addons/downloadmanager/transmission/source/default.py Normal file
View File

@ -0,0 +1,26 @@
################################################################################
# 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
################################################################################
import sys
import xbmcaddon
import os
if ( __name__ == "__main__" ):
os.system("sh start.sh")

13
packages/addons/downloadmanager/transmission/source/resources/language/Dutch/strings.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- Transmission -->
<string id="1000">Transmission</string>
<string id="1010">Gebruikers instellingen</string>
<string id="1021">Gebruik verificatie</string>
<string id="1022">Gebruikersnaam</string>
<string id="1023">Wachtwoord</string>
<string id="2010">Netwerk instellingen</string>
<string id="2021">Toegestane IP adressen (gescheiden met een ',')</string>
</strings>

13
packages/addons/downloadmanager/transmission/source/resources/language/English/strings.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- Transmission -->
<string id="1000">Transmission</string>
<string id="1010">User Settings</string>
<string id="1021">Use authentification</string>
<string id="1022">Username</string>
<string id="1023">Password</string>
<string id="2010">Network Settings</string>
<string id="2021">Allowed IP addresses (comma-delimited)</string>
</strings>

13
packages/addons/downloadmanager/transmission/source/resources/language/French/strings.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- Transmission -->
<string id="1000">Transmission</string>
<string id="1010">Préférences utilisateur</string>
<string id="1021">Utiliser une authentification</string>
<string id="1022">Nom d'utilisateur</string>
<string id="1023">Mot de passe</string>
<string id="2010">Préférences réseau</string>
<string id="2021">Adresses IP autorisées (séparées par des virgules)</string>
</strings>

13
packages/addons/downloadmanager/transmission/source/resources/language/German/strings.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- Transmission -->
<string id="1000">Transmission</string>
<string id="1010">Benutzer Einstellungen</string>
<string id="1021">Authentifizierung verwenden</string>
<string id="1022">Benutzername</string>
<string id="1023">Passwort</string>
<string id="2010">Netzwerk Einstellungen</string>
<string id="2021">Erlaubte IP Adressen (durch Komma getrennt)</string>
</strings>

13
packages/addons/downloadmanager/transmission/source/resources/language/Norwegian/strings.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- Transmission -->
<string id="1000">Transmission</string>
<string id="1010">Bruker Instillinger</string>
<string id="1021">Bruk inlogging</string>
<string id="1022">Brukernavn</string>
<string id="1023">Passord</string>
<string id="2010">Nettverksinstillinger</string>
<string id="2021">Tilatte IP addresser (komma-avgrenser)</string>
</strings>

16
packages/addons/downloadmanager/transmission/source/resources/settings.xml Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
<!-- Transmission -->
<category label="1000">
<setting label="1010" type="lsep"/>
<setting type="sep" />
<setting id="TRANSMISSION_AUTH" type="bool" label="1021" default="false" />
<setting id="TRANSMISSION_USER" type="text" label="1022" default="openelec" enable="eq(-1,true)"/>
<setting id="TRANSMISSION_PWD" type="text" label="1023" default="openelec" enable="eq(-2,true)"/>
<setting label="2010" type="lsep"/>
<setting type="sep" />
<setting id="TRANSMISSION_IP" type="text" label="2021" default="*.*.*.*"/>
</category>
</settings>

63
packages/addons/downloadmanager/transmission/source/start.sh Executable file
View File

@ -0,0 +1,63 @@
#!/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
################################################################################
export TRANSMISSION_WEB_HOME="./web"
export PATH="$PATH:./bin"
OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.transmission/settings.xml"
if [ ! -f "$OPENELEC_SETTINGS" ]; then
cp settings.xml $OPENELEC_SETTINGS
fi
TRANSMISSION_START=`grep TRANSMISSION_START $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
TRANSMISSION_AUTH=`grep TRANSMISSION_AUTH $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
TRANSMISSION_USER=`grep TRANSMISSION_USER $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
TRANSMISSION_PWD=`grep TRANSMISSION_PWD $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
TRANSMISSION_IP=`grep TRANSMISSION_IP $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
mkdir -p /storage/downloads
mkdir -p /storage/downloads/incoming
mkdir -p /storage/downloads/watch
if [ -z "$TRANSMISSION_IP" ]; then
TRANSMISSION_IP="*.*.*.*"
fi
TRANSMISSION_ARG="$TRANSMISSION_ARG -w /storage/downloads"
TRANSMISSION_ARG="$TRANSMISSION_ARG --incomplete-dir /storage/downloads/incoming"
TRANSMISSION_ARG="$TRANSMISSION_ARG --watch-dir /storage/downloads/watch"
TRANSMISSION_ARG="$TRANSMISSION_ARG -e /var/log/transmission.log"
TRANSMISSION_ARG="$TRANSMISSION_ARG -g /storage/.cache/transmission"
TRANSMISSION_ARG="$TRANSMISSION_ARG -a $TRANSMISSION_IP"
if [ "$TRANSMISSION_AUTH" = "true" ]; then
TRANSMISSION_ARG="$TRANSMISSION_ARG -t"
TRANSMISSION_ARG="$TRANSMISSION_ARG -u $TRANSMISSION_USER"
TRANSMISSION_ARG="$TRANSMISSION_ARG -v $TRANSMISSION_PWD"
else
TRANSMISSION_ARG="$TRANSMISSION_ARG -T"
fi
chmod +x ./bin/transmission-daemon
transmission-daemon $TRANSMISSION_ARG

2
packages/audio/alsa-lib/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="alsa-lib"
PKG_VERSION="1.0.23"
PKG_VERSION="1.0.24.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

2
packages/audio/alsa-utils/install
View File

@ -34,5 +34,3 @@ mkdir -p $INSTALL/usr/share/alsa/init
cp $PKG_BUILD/alsactl/init/* $INSTALL/usr/share/alsa/init
rm -rf $INSTALL/usr/share/alsa/init/Makefile*
mkdir -p $INSTALL/lib/udev/rules.d
cp $PKG_DIR/config/rules.d/* $INSTALL/lib/udev/rules.d

2
packages/audio/alsa-utils/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="alsa-utils"
PKG_VERSION="1.0.23"
PKG_VERSION="1.0.24.2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

0
packages/audio/alsa-utils/config/rules.d/40-alsa.rules → packages/audio/alsa-utils/udev.d/40-alsa.rules
View File

1
packages/audio/faad2/build
View File

@ -31,6 +31,7 @@ cd $PKG_BUILD
--without-xmms \
--without-drm \
--without-mpeg4ip \
--with-gnu-ld
make

35
packages/audio/faad2/patches/faad2-2.7-stdio.patch
View File

@ -1,35 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 10_faad-stdio.dpatch by <matthew@ibis.bells>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad faad2-2.6.1~/frontend/faad.man faad2-2.6.1/frontend/faad.man
--- faad2-2.6.1~/frontend/faad.man 2008-06-17 04:27:16.000000000 +0100
+++ faad2-2.6.1/frontend/faad.man 2008-06-17 04:27:17.000000000 +0100
@@ -73,7 +73,7 @@
Quiet \- Suppresses status messages during processing.
.TP
.B \-t ", \-\^\-oldformat"
-Sets the processing to use the old MPEG\(hy4 AAC ADTS format when outputting in said format.
+Sets the processing output to be sent to the standard out. Only raw PCM may be sent to the standard out, as headers cannot currently be streamed.
.TP
.B \-w ", \-\^\-stdio"
Sets the processing output to be sent to the standard out.
diff -urNad faad2-2.6.1~/frontend/main.c faad2-2.6.1/frontend/main.c
--- faad2-2.6.1~/frontend/main.c 2007-11-01 12:33:29.000000000 +0000
+++ faad2-2.6.1/frontend/main.c 2008-06-17 03:58:33.000000000 +0100
@@ -1190,9 +1190,10 @@
}
/* only allow raw data on stdio */
- if (writeToStdio == 1)
+ if (writeToStdio && (format != 2))
{
- format = 2;
+ faad_fprintf(stderr, "Only raw PCM data (2) may be sent to the standard out.\n");
+ return 1;
}
/* point to the specified file name */

7
packages/audio/flac/build
View File

@ -23,22 +23,21 @@
. config/options $1
cd $PKG_BUILD
do_autoreconf -I m4
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--disable-static \
--enable-shared \
--disable-rpath \
--with-gnu-ld \
--disable-altivec \
--disable-doxygen-docs \
--disable-thorough-tests \
--disable-cpplibs \
--disable-xmms-plugin \
--disable-oggtest \
--with-ogg=$SYSROOT_PREFIX/usr
--with-ogg="$SYSROOT_PREFIX/usr" \
--with-libiconv-prefix="$SYSROOT_PREFIX/usr" \
--with-gnu-ld
make
$MAKEINSTALL

8
packages/audio/flac/meta
View File

@ -24,13 +24,13 @@ PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"
PKG_SITE="http://flac.sourceforge.net/"
PKG_URL="$SOURCEFORGE_SRC/flac/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS="libogg"
PKG_BUILD_DEPENDS="toolchain libogg libiconv"
PKG_URL="http://downloads.xiph.org/releases/flac/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS="libiconv libogg"
PKG_BUILD_DEPENDS="toolchain libiconv libogg"
PKG_PRIORITY="optional"
PKG_SECTION="audio"
PKG_SHORTDESC="flac: An Free Lossless Audio Codec"
PKG_LONGDESC="Grossly oversimplified, FLAC is similar to MP3, but lossless, meaning that audio is compressed in FLAC without throwing away any information. This is similar to how Zip works, except with FLAC you will get much better compression because it is designed specifically for audio."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
PKG_AUTORECONF="yes"

24
packages/audio/flac/patches/flac-1.2.1-configure.patch Normal file
View File

@ -0,0 +1,24 @@
diff -Naur flac-1.2.1-old/configure.in flac-1.2.1-new/configure.in
--- flac-1.2.1-old/configure.in 2007-09-13 08:48:42.000000000 -0700
+++ flac-1.2.1-new/configure.in 2010-08-17 20:51:01.000000000 -0700
@@ -21,6 +21,8 @@
AC_INIT(src/flac/main.c)
AM_INIT_AUTOMAKE(flac, 1.2.1)
+AC_CONFIG_MACRO_DIR([m4])
+
# Don't automagically regenerate autoconf/automake generated files unless
# explicitly requested. Eases autobuilding -mdz
AM_MAINTAINER_MODE
diff -Naur flac-1.2.1-old/Makefile.am flac-1.2.1-new/Makefile.am
--- flac-1.2.1-old/Makefile.am 2007-09-16 12:29:29.000000000 -0700
+++ flac-1.2.1-new/Makefile.am 2010-08-17 20:51:27.000000000 -0700
@@ -30,6 +30,8 @@
AUTOMAKE_OPTIONS = foreign 1.7
+ACLOCAL_AMFLAGS = -I m4
+
SUBDIRS = doc include m4 man src examples test build obj
DISTCLEANFILES = libtool-disable-static

56
packages/audio/lame/build Executable file
View File

@ -0,0 +1,56 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
# dont build parallel
MAKEFLAGS=-j1
cd $PKG_BUILD
GTK_CONFIG='no' \
ac_cv_c_stack_direction=-1 \
alex_cv_ieee854_float80=no \
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--disable-static \
--enable-shared \
--enable-nasm \
--disable-cpml \
--disable-gtktest \
--disable-efence \
--disable-analyzer-hooks \
--enable-decoder \
--enable-decode-layer1 \
--enable-decode-layer2 \
--disable-frontend \
--disable-mp3x \
--disable-mp3rtp \
--disable-brhist \
--disable-all-float \
--enable-expopt=no \
--enable-debug=no \
--with-gnu-ld \
--with-fileio=lame
make
$MAKEINSTALL

2
packages/devel/talloc/install → packages/audio/lame/install
View File

@ -23,4 +23,4 @@
. config/options $1
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/libtalloc.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/libmp3lame/.libs/libmp3lame.so* $INSTALL/usr/lib

12
packages/audio/faac/meta → packages/audio/lame/meta
View File

@ -18,19 +18,19 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="faac"
PKG_VERSION="1.28"
PKG_NAME="lame"
PKG_VERSION="3.98.4"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"
PKG_SITE="http://www.audiocoding.com/"
PKG_URL="$SOURCEFORGE_SRC/faac/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_SITE="http://lame.sourceforge.net/"
PKG_URL="$SOURCEFORGE_SRC/lame/lame/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="audio"
PKG_SHORTDESC="faac: An MPEG-4 AAC encoder"
PKG_LONGDESC="The FAAC project includes the AAC encoder supporting several MPEG-4 object types (LC, Main, LTP, HE AAC, PS) and file formats (ADTS AAC, raw AAC, MP4), multichannel and gapless encoding as well as MP4 metadata tags. The codecs are compatible with standard-compliant audio applications using one or more of these profiles."
PKG_SHORTDESC="lame: LAME Ain't an Mp3 Encoder"
PKG_LONGDESC="LAME originally stood for LAME Ain't an Mp3 Encoder. The goal of the LAME project is to use the open source model to improve the psycho acoustics, noise shaping and speed of MP3. Another goal of the LAME project is to use these improvements for the basis of a patent free audio compression codec for the GNU project."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"

242
packages/audio/lame/patches/lame-3.98.4-am_path_gtk.patch Normal file
View File

@ -0,0 +1,242 @@
diff -Naur lame-3.98.4/configure.in lame-3.98.4.patch/configure.in
--- lame-3.98.4/configure.in 2010-03-22 21:40:17.000000000 +0100
+++ lame-3.98.4.patch/configure.in 2011-03-25 12:11:44.982662225 +0100
@@ -21,6 +21,8 @@
AC_INIT([lame],[3.98.4],[lame-dev@lists.sf.net])
AC_CONFIG_SRCDIR([libmp3lame/lame.c])
+AC_CONFIG_MACRO_DIR([m4])
+
dnl check system
AC_CANONICAL_HOST
@@ -385,7 +387,7 @@
dnl configure use of features
-AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
+AM_PATH_GTK_2_0(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
dnl ElectricFence malloc debugging
AC_MSG_CHECKING(use of ElectricFence malloc debugging)
diff -Naur lame-3.98.4/m4/gtk-2.0.m4 lame-3.98.4.patch/m4/gtk-2.0.m4
--- lame-3.98.4/m4/gtk-2.0.m4 1970-01-01 01:00:00.000000000 +0100
+++ lame-3.98.4.patch/m4/gtk-2.0.m4 2010-12-22 03:34:53.000000000 +0100
@@ -0,0 +1,196 @@
+# Configure paths for GTK+
+# Owen Taylor 1997-2001
+
+dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
+dnl pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GTK_2_0],
+[dnl
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
+ , enable_gtktest=yes)
+
+ pkg_config_args=gtk+-2.0
+ for module in . $4
+ do
+ case "$module" in
+ gthread)
+ pkg_config_args="$pkg_config_args gthread-2.0"
+ ;;
+ esac
+ done
+
+ no_gtk=""
+
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+ if test x$PKG_CONFIG != xno ; then
+ if pkg-config --atleast-pkgconfig-version 0.7 ; then
+ :
+ else
+ echo "*** pkg-config too old; version 0.7 or better required."
+ no_gtk=yes
+ PKG_CONFIG=no
+ fi
+ else
+ no_gtk=yes
+ fi
+
+ min_gtk_version=ifelse([$1], ,2.0.0,$1)
+ AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
+
+ if test x$PKG_CONFIG != xno ; then
+ ## don't try to run the test against uninstalled libtool libs
+ if $PKG_CONFIG --uninstalled $pkg_config_args; then
+ echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
+ enable_gtktest=no
+ fi
+
+ if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+ :
+ else
+ no_gtk=yes
+ fi
+ fi
+
+ if test x"$no_gtk" = x ; then
+ GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+ GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+ gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ if test "x$enable_gtktest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$GTK_LIBS $LIBS"
+dnl
+dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+ rm -f conf.gtktest
+ AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+ int major, minor, micro;
+ char *tmp_version;
+
+ fclose (fopen ("conf.gtktest", "w"));
+
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
+ tmp_version = g_strdup("$min_gtk_version");
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+ printf("%s, bad version string\n", "$min_gtk_version");
+ exit(1);
+ }
+
+ if ((gtk_major_version != $gtk_config_major_version) ||
+ (gtk_minor_version != $gtk_config_minor_version) ||
+ (gtk_micro_version != $gtk_config_micro_version))
+ {
+ printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ printf ("*** was found! If pkg-config was correct, then it is best\n");
+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+ printf("*** required on your system.\n");
+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+ printf("*** to point to the correct configuration files\n");
+ }
+ else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+ (gtk_minor_version != GTK_MINOR_VERSION) ||
+ (gtk_micro_version != GTK_MICRO_VERSION))
+ {
+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+ printf("*** library (version %d.%d.%d)\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ }
+ else
+ {
+ if ((gtk_major_version > major) ||
+ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+ {
+ return 0;
+ }
+ else
+ {
+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+ major, minor, micro);
+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+ printf("***\n");
+ printf("*** If you have already installed a sufficiently new version, this error\n");
+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
+ printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
+ printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+ printf("*** so that the correct libraries are found at run-time))\n");
+ }
+ }
+ return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ if test "x$no_gtk" = x ; then
+ AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
+ ifelse([$2], , :, [$2])
+ else
+ AC_MSG_RESULT(no)
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** A new enough version of pkg-config was not found."
+ echo "*** See http://pkgconfig.sourceforge.net"
+ else
+ if test -f conf.gtktest ; then
+ :
+ else
+ echo "*** Could not run GTK+ test program, checking why..."
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$LIBS $GTK_LIBS"
+ AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+ [ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
+ echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
+ echo "*** is required on your system"
+ echo "***"
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ GTK_CFLAGS=""
+ GTK_LIBS=""
+ ifelse([$3], , :, [$3])
+ fi
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ rm -f conf.gtktest
+])
diff -Naur lame-3.98.4/Makefile.am lame-3.98.4.patch/Makefile.am
--- lame-3.98.4/Makefile.am 2010-02-26 23:33:06.000000000 +0100
+++ lame-3.98.4.patch/Makefile.am 2011-03-25 12:15:37.951078720 +0100
@@ -2,6 +2,8 @@
include $(top_srcdir)/Makefile.am.global
+ACLOCAL_AMFLAGS = -I m4
+
.PHONY: test
SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM \
diff -Naur lame-3.98.4/Makefile.am.global lame-3.98.4.patch/Makefile.am.global
--- lame-3.98.4/Makefile.am.global 2006-06-03 15:07:36.000000000 +0200
+++ lame-3.98.4.patch/Makefile.am.global 2011-03-25 12:15:25.020333213 +0100
@@ -3,5 +3,4 @@
# global section for every Makefile.am
AUTOMAKE_OPTIONS = 1.9 foreign $(top_srcdir)/ansi2knr
-
# end global section

1
packages/audio/libcdio/build
View File

@ -44,6 +44,7 @@ cd $PKG_BUILD
--with-iso-info \
--with-iso-read \
--without-versioned-libs \
--with-libiconv-prefix="$SYSROOT_PREFIX/usr" \
make -C lib
make -C include

4
packages/audio/libcdio/meta
View File

@ -25,8 +25,8 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/libcdio/"
PKG_URL="http://ftp.gnu.org/gnu/libcdio/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_DEPENDS="libiconv"
PKG_BUILD_DEPENDS="toolchain libiconv"
PKG_PRIORITY="optional"
PKG_SECTION="audio"
PKG_SHORTDESC="libcdio: A CD-ROM reading and control library"

1
packages/audio/libvorbis/build
View File

@ -32,5 +32,4 @@ cd $PKG_BUILD
--with-ogg=$SYSROOT_PREFIX/usr
make
$MAKEINSTALL

4
packages/audio/wavpack/meta
View File

@ -25,8 +25,8 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.wavpack.com"
PKG_URL="http://www.wavpack.com/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_DEPENDS="libiconv"
PKG_BUILD_DEPENDS="toolchain libiconv"
PKG_PRIORITY="optional"
PKG_SECTION="audio"
PKG_SHORTDESC="wavpack: a completely open audio compression format"

5
packages/databases/mysql/build
View File

@ -22,6 +22,9 @@
. config/options $1
# mysql fails to build with LTO support
strip_lto
cd $PKG_BUILD
ac_cv_c_stack_direction=-1 \
ac_cv_sys_restartable_syscalls=yes \
@ -43,8 +46,6 @@ ac_cv_sys_restartable_syscalls=yes \
--with-big-tables \
--with-mysqld-user=mysqld \
--with-extra-charsets=all \
--with-charset=utf8 \
--with-collation=utf8_unicode_ci \
--with-pthread \
--with-named-thread-libs=-lpthread \
--enable-thread-safe-client \

5
packages/databases/mysql/install
View File

@ -23,4 +23,7 @@
. config/options $1
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/libmysql/.libs/libmysqlclient.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/libmysql/.libs/libmysqlclient.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/share/mysql/charsets
cp -R $PKG_BUILD/sql/share/charsets/*.xml $INSTALL/usr/share/mysql/charsets

2
packages/databases/mysql/meta
View File

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

0
packages/databases/mysql/patches/mysql-5.1.54-010_crosscompiling.patch → packages/databases/mysql/patches/mysql-5.1.55-010_crosscompiling.patch
View File

1
packages/databases/sqlite/build
View File

@ -37,7 +37,6 @@ cd $PKG_BUILD
--enable-dynamic-extensions \
--with-gnu-ld
make
$STRIP .libs/sqlite3

2
packages/databases/sqlite/meta
View File

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

33
packages/databases/sqlite/patches/sqlite-3.7.3-010_ldflags.patch
View File

@ -1,33 +0,0 @@
diff -Naur sqlite-3.6.13/Makefile.in sqlite-3.6.13.patch/Makefile.in
--- sqlite-3.6.13/Makefile.in 2009-04-13 10:57:54.000000000 +0200
+++ sqlite-3.6.13.patch/Makefile.in 2009-04-19 18:49:22.036813333 +0200
@@ -158,6 +158,11 @@
STRIP = @STRIP@
THREADSAFE_FLAGS = @THREADSAFE_FLAGS@
VERSION = @VERSION@
+
+# OE overrides
+#
+TARGET_LFLAGS = $(config_TARGET_LFLAGS)
+
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
@@ -283,7 +288,7 @@
rm -f "$${dir}/so_locations"; \
done
libsqlite3.la: $(libsqlite3_la_OBJECTS) $(libsqlite3_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libsqlite3_la_LDFLAGS) $(libsqlite3_la_OBJECTS) $(libsqlite3_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(libdir) $(libsqlite3_la_LDFLAGS) $(libsqlite3_la_OBJECTS) $(libsqlite3_la_LIBADD) $(TARGET_LFLAGS) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@@ -314,7 +319,7 @@
done
sqlite3$(EXEEXT): $(sqlite3_OBJECTS) $(sqlite3_DEPENDENCIES)
@rm -f sqlite3$(EXEEXT)
- $(LINK) $(sqlite3_LDFLAGS) $(sqlite3_OBJECTS) $(sqlite3_LDADD) $(LIBS)
+ $(LINK) $(sqlite3_LDFLAGS) $(sqlite3_OBJECTS) $(sqlite3_LDADD) $(TARGET_LFLAGS) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)

3
packages/debug/gdb/build
View File

@ -22,6 +22,8 @@
. config/options $1
strip_lto
export bash_cv_have_mbstate_t=set
export CC_FOR_BUILD="$HOST_CC"
@ -38,5 +40,6 @@ mkdir -p objdir && cd objdir
--without-x \
--disable-tui \
--disable-libada \
--disable-werror \
make

2
packages/debug/w_scan/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="w_scan"
PKG_VERSION="20101204"
PKG_VERSION="20110306"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

9
packages/devel/flex/build → packages/devel/attr/build
View File

@ -3,6 +3,7 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#      Copyright (C) 2010-2011 Roman Weber (roman@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
@ -23,17 +24,15 @@
. config/options $1
cd $PKG_BUILD
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--exec-prefix=/usr \
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
--disable-static \
--enable-shared \
--disable-static \
make
$MAKEINSTALL
cp -P libattr/.libs/*.so* $SYSROOT_PREFIX/usr/lib/

28
packages/devel/attr/install Executable file
View File

@ -0,0 +1,28 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#      Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/libattr/.libs/*.so* $INSTALL/usr/lib

35
packages/devel/attr/meta Normal file
View File

@ -0,0 +1,35 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#      Copyright (C) 2010-2011 Roman Weber (roman@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
################################################################################
PKG_NAME="attr"
PKG_VERSION="2.4.44"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE=""
PKG_URL="http://download.savannah.gnu.org/releases-noredirect/attr/$PKG_NAME-$PKG_VERSION.src.tar.gz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="accessibility"
PKG_SHORTDESC="attr: Extended Attributes Of Filesystem Objects"
PKG_LONGDESC="Extended attributes are name:value pairs associated permanently with files and directories, similar to the environment strings associated with a process. An attribute may be defined or undefined. If it is defined, its value may be empty or non-empty. Extended attributes are extensions to the normal attributes which are associated with all inodes in the system (i.e. the stat(2) data). They are often used to provide additional functionality to a filesystem - for example, additional security features such as Access Control Lists (ACLs) may be implemented using extended attributes."
PKG_IS_ADDON="no"

2
packages/devel/boost/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="boost"
PKG_VERSION="1_45_0"
PKG_VERSION="1_46_0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

2
packages/devel/glib-host/meta
View File

@ -26,7 +26,7 @@ PKG_LICENSE="LGPL"
PKG_SITE="http://www.gtk.org/"
PKG_URL=""
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain dbus-host gtk-doc"
PKG_BUILD_DEPENDS="toolchain gtk-doc"
PKG_PRIORITY="optional"
PKG_SECTION="devel"
PKG_SHORTDESC="glib-host: C support library"

5
packages/devel/glib/build
View File

@ -52,6 +52,7 @@ glib_cv_stack_grows='no' \
--disable-dtrace \
--disable-systemtap \
--disable-gcov \
--with-libiconv \
--enable-Bsymbolic \
--disable-rebuilds \
--disable-gtk-doc \
@ -60,10 +61,8 @@ make
$MAKEINSTALL
#mkdir -p $SYSROOT_PREFIX/usr/include/glib-2.0
# cp glib/glibconfig.h $SYSROOT_PREFIX/usr/include/glib-2.0
mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
cp g*-2.0.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
mkdir -p $SYSROOT_PREFIX/usr/share/aclocal
cp ../m4macros/glib-gettext.m4 $SYSROOT_PREFIX/usr/share/aclocal
cp ../m4macros/glib-gettext.m4 $SYSROOT_PREFIX/usr/share/aclocal

1
packages/devel/glib/install
View File

@ -38,4 +38,3 @@ mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/.build-target/gio/.libs/libgio*.so* $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libgio*.so*T
cp $PKG_BUILD/.build-target/glib/libcharset/charset.alias $INSTALL/usr/lib

8
packages/devel/glib/meta
View File

@ -19,14 +19,14 @@
################################################################################
PKG_NAME="glib"
PKG_VERSION="2.27.5"
PKG_VERSION="2.28.6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"
PKG_SITE="http://www.gtk.org/"
PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.27/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="zlib dbus"
PKG_BUILD_DEPENDS="toolchain zlib dbus gtk-doc glib-host"
PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.28/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="zlib libiconv"
PKG_BUILD_DEPENDS="toolchain zlib libiconv gtk-doc glib-host"
PKG_PRIORITY="optional"
PKG_SECTION="devel"
PKG_SHORTDESC="glib: C support library"

36
packages/devel/libcap/build Executable file
View File

@ -0,0 +1,36 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#      Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
cd $PKG_BUILD
setup_toolchain host
make CC=$HOST_CC -C libcap _makenames
setup_toolchain target
make CC=$TARGET_CC
$MAKEINSTALL -j1 RAISE_SETFCAP=no

27
packages/devel/libcap/install Executable file
View File

@ -0,0 +1,27 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#      Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/libcap/*.so* $INSTALL/usr/lib

35
packages/devel/libcap/meta Normal file
View File

@ -0,0 +1,35 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#      Copyright (C) 2010-2011 Roman Weber (roman@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
################################################################################
PKG_NAME="libcap"
PKG_VERSION="2.20"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE=""
PKG_URL="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="attr"
PKG_BUILD_DEPENDS="toolchain attr"
PKG_PRIORITY="optional"
PKG_SECTION="devel"
PKG_SHORTDESC="libcap: A library for getting and setting POSIX.1e capabilities"
PKG_LONGDESC="As of Linux 2.2.0, the power of the superuser has been partitioned into a set of discrete capabilities (in other places, these capabilities are know as privileges). The contents of the libcap package are a library and a number of simple programs that are intended to show how an application/daemon can be protected (with wrappers) or rewritten to take advantage of this fine grained approach to constraining the danger to your system from programs running as 'root'."
PKG_IS_ADDON="no"

17
packages/devel/libiconv/build
View File

@ -23,5 +23,18 @@
. config/options $1
cd $PKG_BUILD
mkdir -p $SYSROOT_PREFIX/usr/share/aclocal
cp srcm4/*.m4 $SYSROOT_PREFIX/usr/share/aclocal
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--sysconfdir=/etc \
--disable-static \
--enable-shared \
--disable-nls \
--disable-extra-encodings \
--with-gnu-ld
make
$MAKEINSTALL
mkdir -p $SYSROOT_PREFIX/usr/share/aclocal
cp srcm4/*.m4 $SYSROOT_PREFIX/usr/share/aclocal

28
packages/devel/libiconv/install Executable file
View File

@ -0,0 +1,28 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/libcharset/lib/.libs/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/lib/charset.alias $INSTALL/usr/lib

8
packages/graphics/Mesa/meta
View File

@ -19,14 +19,14 @@
################################################################################
PKG_NAME="Mesa"
PKG_VERSION="7.10"
PKG_VERSION="7.10.2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.mesa3d.org/"
PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="libXdamage libdrm talloc expat libXext libXfixes libXxf86vm libxcb libX11"
PKG_BUILD_DEPENDS="toolchain Python libxml2-host talloc expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libXxf86vm libxcb libX11"
PKG_BUILD_DEPENDS="toolchain Python makedepend libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
PKG_PRIORITY="optional"
PKG_SECTION="graphics"
PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API"
@ -36,6 +36,6 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
if [ "$MESA_MASTER" = "yes" ]; then
PKG_VERSION="20110110"
PKG_VERSION="6067a2a"
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
fi

15
packages/graphics/Mesa/patches/Mesa-7.10.2-__atom.patch Normal file
View File

@ -0,0 +1,15 @@
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/r200/r200_cmdbuf.c Mesa-7.10.1-new/src/mesa/drivers/dri/r200/r200_cmdbuf.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/r200/r200_cmdbuf.c 2011-03-02 17:30:39.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/r200/r200_cmdbuf.c 2011-03-02 17:31:59.000000000 -0800
@@ -47,9 +47,8 @@
*/
#define insert_at_tail_if(atom_list, atom) \
do { \
- struct radeon_state_atom* __atom = (atom); \
- if (__atom->check) \
- insert_at_tail((atom_list), __atom); \
+ if ((atom)->check) \
+ insert_at_tail((atom_list), (atom)); \
} while(0)
void r200SetUpAtomList( r200ContextPtr rmesa )

208
packages/graphics/Mesa/patches/Mesa-7.10.2-libdrm_nouveau.patch Normal file
View File

@ -0,0 +1,208 @@
diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nv50/nv50_context.h Mesa-7.10.1-new/src/gallium/drivers/nv50/nv50_context.h
--- Mesa-7.10.1-old/src/gallium/drivers/nv50/nv50_context.h 2010-12-15 15:02:44.000000000 -0800
+++ Mesa-7.10.1-new/src/gallium/drivers/nv50/nv50_context.h 2011-03-02 17:31:09.000000000 -0800
@@ -15,6 +15,8 @@
#include "nouveau/nouveau_winsys.h"
#include "nouveau/nouveau_gldefs.h"
+/* Hack to silence warnings caused by nouveau/nouveau_stateobj.h using BEGIN_BIND marcro */
+#include <nouveau/nv04_pushbuf.h>
#include "nouveau/nouveau_stateobj.h"
#include "nv50_reg.h"
diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nvfx/nv04_2d.c Mesa-7.10.1-new/src/gallium/drivers/nvfx/nv04_2d.c
--- Mesa-7.10.1-old/src/gallium/drivers/nvfx/nv04_2d.c 2011-01-25 15:52:45.000000000 -0800
+++ Mesa-7.10.1-new/src/gallium/drivers/nvfx/nv04_2d.c 2011-03-02 17:31:09.000000000 -0800
@@ -39,6 +39,7 @@
#include <nouveau/nouveau_bo.h>
#include <nouveau/nouveau_notifier.h>
#include <nouveau/nouveau_grobj.h>
+#include <nouveau/nv04_pushbuf.h>
#include "nv04_2d.h"
#include "nouveau/nv_object.xml.h"
diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_buffer.c Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_buffer.c
--- Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_buffer.c 2010-12-15 15:02:44.000000000 -0800
+++ Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_buffer.c 2011-03-02 17:31:09.000000000 -0800
@@ -1,4 +1,3 @@
-
#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "util/u_math.h"
diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_screen.c Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_screen.c
--- Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_screen.c 2011-01-25 15:52:45.000000000 -0800
+++ Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_screen.c 2011-03-02 17:31:09.000000000 -0800
@@ -10,6 +10,8 @@
#include "nvfx_resource.h"
#include "nvfx_tex.h"
+#include "nouveau/nv04_pushbuf.h"
+
#define NV30_3D_CHIPSET_3X_MASK 0x00000003
#define NV34_3D_CHIPSET_3X_MASK 0x00000010
#define NV35_3D_CHIPSET_3X_MASK 0x000001e0
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv04_driver.h Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv04_driver.h
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv04_driver.h 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv04_driver.h 2011-03-02 17:31:09.000000000 -0800
@@ -28,6 +28,7 @@
#define __NV04_DRIVER_H__
#include "nv04_context.h"
+#include "nv04_pushbuf.h"
enum {
NOUVEAU_STATE_BLEND = NUM_NOUVEAU_STATE,
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_render.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_render.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_render.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_render.c 2011-03-02 17:31:09.000000000 -0800
@@ -27,6 +27,7 @@
#include "nouveau_driver.h"
#include "nouveau_context.h"
#include "nv10_3d.xml.h"
+#include "nv04_driver.h"
#include "nv10_driver.h"
#define NUM_VERTEX_ATTRS 8
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_fb.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2011-03-02 17:31:09.000000000 -0800
@@ -30,6 +30,7 @@
#include "nouveau_util.h"
#include "nv_object.xml.h"
#include "nv10_3d.xml.h"
+#include "nv04_driver.h"
#include "nv10_driver.h"
static inline unsigned
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_frag.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_frag.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_frag.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_frag.c 2011-03-02 17:31:09.000000000 -0800
@@ -30,6 +30,7 @@
#include "nv10_3d.xml.h"
#include "nouveau_util.h"
#include "nv10_driver.h"
+#include "nv04_driver.h"
#include "nv20_driver.h"
#define RC_IN_SHIFT_A 24
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c 2011-03-02 17:31:09.000000000 -0800
@@ -29,6 +29,7 @@
#include "nouveau_gldefs.h"
#include "nouveau_util.h"
#include "nv10_3d.xml.h"
+#include "nv04_driver.h"
#include "nv10_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_raster.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_raster.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_raster.c 2011-01-25 15:52:45.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_raster.c 2011-03-02 17:31:09.000000000 -0800
@@ -29,6 +29,7 @@
#include "nouveau_gldefs.h"
#include "nouveau_util.h"
#include "nv10_3d.xml.h"
+#include "nv04_driver.h"
#include "nv10_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tex.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tex.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tex.c 2011-03-02 17:31:09.000000000 -0800
@@ -30,6 +30,7 @@
#include "nouveau_texture.h"
#include "nv10_3d.xml.h"
#include "nouveau_util.h"
+#include "nv04_driver.h"
#include "nv10_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c 2011-03-02 17:31:09.000000000 -0800
@@ -29,6 +29,7 @@
#include "nouveau_gldefs.h"
#include "nouveau_util.h"
#include "nv10_3d.xml.h"
+#include "nv04_driver.h"
#include "nv10_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_render.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_render.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_render.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_render.c 2011-03-02 17:31:09.000000000 -0800
@@ -27,6 +27,7 @@
#include "nouveau_driver.h"
#include "nouveau_context.h"
#include "nv20_3d.xml.h"
+#include "nv04_driver.h"
#include "nv20_driver.h"
#define NUM_VERTEX_ATTRS 16
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_fb.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_fb.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_fb.c 2011-03-02 17:31:09.000000000 -0800
@@ -30,6 +30,7 @@
#include "nouveau_gldefs.h"
#include "nouveau_util.h"
#include "nv20_3d.xml.h"
+#include "nv04_driver.h"
#include "nv20_driver.h"
static inline unsigned
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_frag.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_frag.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_frag.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_frag.c 2011-03-02 17:31:09.000000000 -0800
@@ -28,6 +28,7 @@
#include "nouveau_context.h"
#include "nv20_3d.xml.h"
#include "nv10_driver.h"
+#include "nv04_driver.h"
#include "nv20_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c 2011-03-02 17:31:09.000000000 -0800
@@ -28,6 +28,7 @@
#include "nouveau_context.h"
#include "nouveau_gldefs.h"
#include "nv20_3d.xml.h"
+#include "nv04_driver.h"
#include "nv20_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_raster.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_raster.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_raster.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_raster.c 2011-03-02 17:31:09.000000000 -0800
@@ -29,6 +29,7 @@
#include "nouveau_gldefs.h"
#include "nouveau_util.h"
#include "nv20_3d.xml.h"
+#include "nv04_driver.h"
#include "nv20_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tex.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tex.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tex.c 2011-03-02 17:31:09.000000000 -0800
@@ -30,6 +30,7 @@
#include "nouveau_texture.h"
#include "nv20_3d.xml.h"
#include "nouveau_util.h"
+#include "nv04_driver.h"
#include "nv20_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c 2011-03-02 17:31:09.000000000 -0800
@@ -29,6 +29,7 @@
#include "nouveau_gldefs.h"
#include "nouveau_util.h"
#include "nv20_3d.xml.h"
+#include "nv04_driver.h"
#include "nv10_driver.h"
#include "nv20_driver.h"

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