Merge branch 'master' into openelec-pvr-master

packages/accessibility/atk/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="atk"
-PKG_VERSION="1.33.6"
+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.33/$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"

packages/mediacenter/xbmc/meta

@@ -73,3 +73,7 @@ fi
 if [ "$PS3REMOTE_SUPPORT" = yes ]; then
   PKG_DEPENDS="$PKG_DEPENDS PyBluez"
 fi
+
+# some python stuff needed for various addons
+  PKG_DEPENDS="$PKG_DEPENDS Imaging"
+  PKG_DEPENDS="$PKG_DEPENDS simplejson"

packages/multimedia/libva/meta

@@ -19,13 +19,13 @@
 ################################################################################
 
 PKG_NAME="libva"
-PKG_VERSION="bdc106e"
+PKG_VERSION="1.0.12"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freedesktop.org/wiki/Software/vaapi"
-#PKG_URL="http://cgit.freedesktop.org/libva/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://cgit.freedesktop.org/libva/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz"
+#PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libX11 libXext libXfixes libdrm Mesa"
 PKG_BUILD_DEPENDS="toolchain libX11 libXext libXfixes libdrm Mesa"
 PKG_PRIORITY="optional"

packages/network/avahi/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="avahi"
-PKG_VERSION="0.6.29"
+PKG_VERSION="0.6.30"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/python/graphics/Imaging/build

@@ -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)
+#
+#  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
+
+export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
+export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+
+cd $PKG_BUILD
+
+python setup.py build --cross-compile
+python setup.py install -O1 --skip-build --prefix /usr --root .install
+
+find .install -name "*.py" -exec rm -rf "{}" ";"
+find .install -name "*.pyo" -exec rm -rf "{}" ";"
+
+rm -rf .install/usr/bin

packages/python/graphics/Imaging/install

@@ -0,0 +1,25 @@
+#!/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
+
+cp -PR $PKG_BUILD/.install/* $INSTALL

packages/python/graphics/Imaging/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      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
+################################################################################
+
+PKG_NAME="Imaging"
+PKG_VERSION="1.1.7"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="BSD"
+PKG_SITE="http://www.pythonware.com/products/pil/"
+PKG_URL="http://effbot.org/downloads/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS="Python distribute zlib freetype $LIBJPEG"
+PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross zlib freetype $LIBJPEG"
+PKG_PRIORITY="optional"
+PKG_SECTION="python/system"
+PKG_SHORTDESC="pil: Imaging handling/processing for Python"
+PKG_LONGDESC="The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library supports many file formats, and provides powerful image processing and graphics capabilities."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/python/graphics/Imaging/patches/Imaging-1.1.7-crosscompiling-0.1.patch

@@ -0,0 +1,34 @@
+diff -Naur Imaging-1.1.7/setup.py Imaging-1.1.7.patch/setup.py
+--- Imaging-1.1.7/setup.py	2011-04-17 09:31:07.000000000 +0200
++++ Imaging-1.1.7.patch/setup.py	2011-04-17 09:54:20.880047886 +0200
+@@ -147,7 +147,6 @@
+             add_directory(library_dirs, "/opt/local/lib")
+             add_directory(include_dirs, "/opt/local/include")
+ 
+-        add_directory(library_dirs, "/usr/local/lib")
+         # FIXME: check /opt/stuff directories here?
+ 
+         prefix = sysconfig.get_config_var("prefix")
+@@ -199,22 +198,6 @@
+             add_directory(include_dirs, include_root)
+ 
+         #
+-        # add standard directories
+-
+-        # look for tcl specific subdirectory (e.g debian)
+-        if _tkinter:
+-            tcl_dir = "/usr/include/tcl" + TCL_VERSION
+-            if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
+-                add_directory(include_dirs, tcl_dir)
+-
+-        # standard locations
+-        add_directory(library_dirs, "/usr/local/lib")
+-        add_directory(include_dirs, "/usr/local/include")
+-
+-        add_directory(library_dirs, "/usr/lib")
+-        add_directory(include_dirs, "/usr/include")
+-
+-        #
+         # insert new dirs *before* default libs, to avoid conflicts
+         # between Python PYD stub libs and real libraries
+ 

packages/python/graphics/Imaging/patches/Imaging-1.1.7-setuptools-0.1.patch

@@ -0,0 +1,12 @@
+diff -Naur Imaging-1.1.7/setup.py Imaging-1.1.7.patch/setup.py
+--- Imaging-1.1.7/setup.py	2009-11-15 17:06:10.000000000 +0100
++++ Imaging-1.1.7.patch/setup.py	2011-04-17 09:31:07.545708559 +0200
+@@ -83,7 +83,7 @@
+ # --------------------------------------------------------------------
+ 
+ from distutils import sysconfig
+-from distutils.core import Extension, setup
++from setuptools import Extension, setup
+ from distutils.command.build_ext import build_ext
+ 
+ try:

packages/python/web/TwistedConch/build

@@ -0,0 +1,39 @@
+#!/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
+
+export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
+export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+
+cd $PKG_BUILD
+
+python setup.py build --cross-compile
+python setup.py install -O1 --skip-build --prefix /usr --root .install
+
+# install to toolchain because its needed for other twisted modules
+  python setup.py install -O1 --skip-build --prefix $ROOT/$TOOLCHAIN
+
+find .install -name "*.py" -exec rm -rf "{}" ";"
+find .install -name "*.pyo" -exec rm -rf "{}" ";"
+
+rm -rf .install/usr/lib/python*/site-packages/twisted/names/test

packages/python/web/TwistedConch/install

@@ -0,0 +1,25 @@
+#!/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
+
+cp -PR $PKG_BUILD/.install/* $INSTALL

packages/python/web/TwistedConch/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      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
+################################################################################
+
+PKG_NAME="TwistedConch"
+PKG_VERSION="11.0.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="MIT"
+PKG_SITE="http://twistedmatrix.com/"
+PKG_URL="http://twistedmatrix.com/Releases/Conch/11.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="Python distribute TwistedCore"
+PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross TwistedCore"
+PKG_PRIORITY="optional"
+PKG_SECTION="python/web"
+PKG_SHORTDESC="TwistedConch: an SSHv2 implementation written in Python"
+PKG_LONGDESC="TwistedConch is an SSHv2 implementation written in Python. SSH is a protocol designed to allow remote access to shells and commands, but it is generic enough to allow everything from TCP forwarding to generic filesystem access. Since conch is written in Python, it interfaces well with other Python projects, such as Imagination. Conch also includes a implementations of the telnet and vt102 protocols, as well as support for rudimentary line editing behaviors. A new implementation of Twisted's Manhole application is also included, featuring server-side input history and interactive syntax coloring."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/python/web/TwistedCore/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="TwistedCore"
-PKG_VERSION="10.1.0"
+PKG_VERSION="11.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://twistedmatrix.com/"
-PKG_URL="http://tmrc.mit.edu/mirror/twisted/Core/10.1/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://twistedmatrix.com/Releases/Core/11.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="Python distribute"
 PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross"
 PKG_PRIORITY="optional"

packages/python/web/TwistedNames/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="TwistedNames"
-PKG_VERSION="10.1.0"
+PKG_VERSION="11.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://twistedmatrix.com/"
-PKG_URL="http://tmrc.mit.edu/mirror/twisted/Names/10.1/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://twistedmatrix.com/Releases/Names/11.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="Python distribute TwistedCore"
 PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross TwistedCore"
 PKG_PRIORITY="optional"

packages/python/web/TwistedWeb/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="TwistedWeb"
-PKG_VERSION="10.1.0"
+PKG_VERSION="11.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://twistedmatrix.com/"
-PKG_URL="http://tmrc.mit.edu/mirror/twisted/Web/10.1/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://twistedmatrix.com/Releases/Web/11.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="Python distribute TwistedCore"
 PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross TwistedCore"
 PKG_PRIORITY="optional"

packages/python/web/TwistedWords/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="TwistedWords"
-PKG_VERSION="10.1.0"
+PKG_VERSION="11.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://twistedmatrix.com/"
-PKG_URL="http://tmrc.mit.edu/mirror/twisted/Words/10.1/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://twistedmatrix.com/Releases/Words/11.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="Python distribute TwistedCore"
 PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross TwistedCore"
 PKG_PRIORITY="optional"

packages/tools/nano/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="nano"
-PKG_VERSION="2.2.6"
+PKG_VERSION="2.3.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.nano-editor.org/"
-PKG_URL="http://www.nano-editor.org/dist/v2.2/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://ftp.gnu.org/gnu/nano/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="ncurses"
 PKG_BUILD_DEPENDS="toolchain ncurses"
 PKG_PRIORITY="optional"

packages/web/libmicrohttpd/meta

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

projects/Generic/linux/linux.i386.conf

@@ -2565,7 +2565,7 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
 
 #

projects/ION/linux/linux.i386.conf

@@ -2425,7 +2425,7 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
 
 #

projects/ION/linux/linux.x86_64.conf

@@ -2368,7 +2368,7 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
 
 #

projects/Intel/linux/linux.i386.conf

@@ -2424,7 +2424,7 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
 
 #

projects/Intel/linux/linux.x86_64.conf

@@ -2363,7 +2363,7 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
 
 #