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

packages/graphics/Mesa/meta

@@ -19,13 +19,13 @@
 ################################################################################
 
 PKG_NAME="Mesa"
-PKG_VERSION="7.11-443ff60"
+PKG_VERSION="7.11-rc2"
 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_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/7.11/MesaLib-$PKG_VERSION.tar.bz2"
 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"

packages/graphics/Mesa/patches/Mesa-7.11-443ff60-bug_39219.patch

@@ -1,13 +0,0 @@
-diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
-index bac0c9e..e7dba5a 100644
---- a/src/glx/dri_common.c
-+++ b/src/glx/dri_common.c
-@@ -388,7 +388,7 @@ driFetchDrawable(struct glx_context *gc, GLXDrawable glxDrawable)
- _X_HIDDEN void
- driReleaseDrawables(struct glx_context *gc)
- {
--   struct glx_display *const priv = __glXInitialize(gc->psc->dpy);
-+   const struct glx_display *priv = gc->psc->display;
-    __GLXDRIdrawable *pdraw;
- 
-    if (priv == NULL)

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="4a0d15e"
+PKG_VERSION="6713a15"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="4a0d15e"
+PKG_VERSION="6713a15"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/multimedia/libva/meta

@@ -19,13 +19,13 @@
 ################################################################################
 
 PKG_NAME="libva"
-PKG_VERSION="1.0.13"
+PKG_VERSION="270299f"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 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.xz"
 PKG_DEPENDS="libX11 libXext libXfixes libdrm Mesa"
 PKG_BUILD_DEPENDS="toolchain libX11 libXext libXfixes libdrm Mesa"
 PKG_PRIORITY="optional"

packages/network/libnfs/build

@@ -31,12 +31,8 @@ cd $PKG_BUILD
             --prefix=/usr \
             --libdir=/usr/lib \
             --sysconfdir=/etc \
-            --without-examples \
 
 make
 
 $MAKEINSTALL
-ln -sf libnfs.so.1.0.0 $SYSROOT_PREFIX/usr/lib/libnfs.so.1.0
-ln -sf libnfs.so.1.0 $SYSROOT_PREFIX/usr/lib/libnfs.so.1
-ln -sf libnfs.so.1 $SYSROOT_PREFIX/usr/lib/libnfs.so
 

packages/network/libnfs/install

@@ -23,8 +23,5 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/*.so* $INSTALL/usr/lib/
-  ln -sf libnfs.so.1.0.0 $INSTALL/usr/lib/libnfs.so.1.0
-  ln -sf libnfs.so.1.0 $INSTALL/usr/lib/libnfs.so.1
-  ln -sf libnfs.so.1 $INSTALL/usr/lib/libnfs.so
+  cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib/
 

packages/network/libnfs/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libnfs"
-PKG_VERSION="81132c6"
+PKG_VERSION="9f88cb0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/network/libnfs/patches/libnfs-81132c6-310bb382d4409c4d561025132c99b8c1850b63ad.patch

@@ -1,59 +0,0 @@
-From 310bb382d4409c4d561025132c99b8c1850b63ad Mon Sep 17 00:00:00 2001
-From: Stephan Raue <stephan@openelec.tv>
-Date: Sat, 11 Jun 2011 23:25:07 +0200
-Subject: [PATCH] add DESTDIR support, needed for crosscompiling; dont
- hardcode /usr/include - use --includedir= instead on
- configure time
-
-Signed-off-by: Stephan Raue <stephan@openelec.tv>
----
- Makefile.in |   25 ++++++++++---------------
- 1 files changed, 10 insertions(+), 15 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 64f03d8..d86a1b7 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1,6 +1,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
-+includedir = @includedir@
- bindir = @bindir@
- LIBS=@LIBS@
- INSTALLCMD = @install@ -c
-@@ -109,22 +110,16 @@ rquota/libnfs-raw-rquota.o: rquota/libnfs-raw-rquota.c rquota/libnfs-raw-rquota.
- 	$(CC) $(CFLAGS) -c rquota/libnfs-raw-rquota.c -o $@
- 
- install: $(LIBNFS_A) $(LIBNFS_SO)
--ifeq ("$(LIBDIR)x","x")
--	mkdir -p $(libdir)
--	$(INSTALLCMD) -m 755 $(LIBNFS_SO) $(libdir)
--	$(INSTALLCMD) -m 755 $(LIBNFS_A) $(libdir)
-+	mkdir -p $(DESTDIR)$(libdir)
-+	$(INSTALLCMD) -m 755 $(LIBNFS_SO) $(DESTDIR)$(libdir)
-+	$(INSTALLCMD) -m 755 $(LIBNFS_A) $(DESTDIR)$(libdir)
- 	@ldconfig@
--else
--	mkdir -p $(LIBDIR)
--	$(INSTALLCMD) -m 755 $(LIBISCSI_SO) $(LIBDIR)
--	$(INSTALLCMD) -m 755 $(LIBNFS_A) $(LIBDIR)
--endif
--	mkdir -p $(prefix)/include/nfsc
--	$(INSTALLCMD) -m 644 include/libnfs.h $(prefix)/include/nfsc
--	$(INSTALLCMD) -m 644 include/libnfs-private.h $(prefix)/include/nfsc
--	$(INSTALLCMD) -m 644 mount/libnfs-raw-mount.h $(prefix)/include/nfsc
--	$(INSTALLCMD) -m 644 nfs/libnfs-raw-nfs.h $(prefix)/include/nfsc
--	$(INSTALLCMD) -m 644 portmap/libnfs-raw-portmap.h $(prefix)/include/nfsc
-+	mkdir -p $(DESTDIR)$(includedir)/nfsc
-+	$(INSTALLCMD) -m 644 include/libnfs.h $(DESTDIR)$(includedir)/nfsc
-+	$(INSTALLCMD) -m 644 include/libnfs-private.h $(DESTDIR)$(includedir)/nfsc
-+	$(INSTALLCMD) -m 644 mount/libnfs-raw-mount.h $(DESTDIR)$(includedir)/nfsc
-+	$(INSTALLCMD) -m 644 nfs/libnfs-raw-nfs.h $(DESTDIR)$(includedir)/nfsc
-+	$(INSTALLCMD) -m 644 portmap/libnfs-raw-portmap.h $(DESTDIR)$(includedir)/nfsc
- 
- distclean: clean
- 	rm -f config.h config.log config.status configure Makefile
--- 
-1.7.5.4
-

packages/network/libnfs/patches/libnfs-81132c6-d20a6d6bcd625d0162cc7158b597e04ef3ee1379.patch

@@ -1,28 +0,0 @@
-From d20a6d6bcd625d0162cc7158b597e04ef3ee1379 Mon Sep 17 00:00:00 2001
-From: Stephan Raue <stephan@openelec.tv>
-Date: Sat, 11 Jun 2011 23:22:19 +0200
-Subject: [PATCH] Disable run of ldconfig if crosscompiling too
-
-Signed-off-by: Stephan Raue <stephan@openelec.tv>
----
- configure.ac |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9973c92..363e671 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,6 +64,10 @@ AC_ARG_WITH([ldconfig],
- 	    [  --without-ldconfig  Disable call of ldconfig on make install],
- 	    [ldconfig='echo ldconfig disabled'])
- 
-+if test x"$cross_compiling" = xyes; then
-+  ldconfig='echo crosscompiling: ldconfig disabled'
-+fi
-+
- AC_CONFIG_HEADER(config.h)
- 
- EXTRA_OBJ=""
--- 
-1.7.5.4
-

packages/python/security/pycrypto/build

@@ -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)
+#
+#  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 bdist_egg --exclude-source-files

packages/python/security/pycrypto/install

@@ -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)
+#
+#  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
+
+PKG_SRC_DIR=`ls -d $PKG_BUILD`
+
+PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`"
+export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages"
+
+$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg

packages/python/security/pycrypto/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="pycrypto"
+PKG_VERSION="2.3"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="LGPL"
+PKG_SITE="https://www.dlitz.net/software/pycrypto/"
+PKG_URL="http://ftp.dlitz.net/pub/dlitz/crypto/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS="Python distutilscross"
+PKG_BUILD_DEPENDS="toolchain Python distutilscross"
+PKG_PRIORITY="optional"
+PKG_SECTION="python/security"
+PKG_SHORTDESC="PyCrypto - The Python Cryptography Toolkit"
+PKG_LONGDESC="The Python Cryptography Toolkit describes a package containing various cryptographic modules for the Python programming language"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/python/security/pycrypto/patches/pycrypto-2.3-setuptools.patch

@@ -0,0 +1,12 @@
+diff -Naur pycrypto-2.3/setup.py pycrypto-2.3.patch/setup.py
+--- pycrypto-2.3/setup.py	2010-08-27 06:41:55.000000000 +0200
++++ pycrypto-2.3.patch/setup.py	2011-07-20 05:46:14.760364851 +0200
+@@ -37,7 +37,7 @@
+ __revision__ = "$Id$"
+ 
+ from distutils import core
+-from distutils.core import Extension, Command
++from setuptools import Extension, Command
+ from distutils.command.build_ext import build_ext
+ import os, sys
+ import struct

packages/python/web/TwistedConch/meta

@@ -25,7 +25,7 @@ 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 pyasn1"
+PKG_DEPENDS="Python distribute TwistedCore pyasn1 pycrypto"
 PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross TwistedCore"
 PKG_PRIORITY="optional"
 PKG_SECTION="python/web"

scripts/checkdeps

@@ -33,8 +33,8 @@ case $1 in
     deps_pkg="wget"
     ;;
   build)
-    deps="gcc g++ sed patch touch tar bzip2 gzip lzma perl cp gawk makeinfo gettext autopoint gperf autoconf automake m4 cvs zip unzip mkfontscale libtool diff xsltproc msgfmt"
-    deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip lzma perl coreutils gawk texinfo gettext gettext-devel gperf autoconf automake m4 cvs zip unzip xutils libtool diff xsltproc gettext"
+    deps="gcc g++ sed patch touch tar bzip2 gzip perl cp gawk makeinfo gettext autopoint gperf autoconf automake m4 cvs zip unzip mkfontscale libtool diff xsltproc msgfmt"
+    deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip perl coreutils gawk texinfo gettext gettext-devel gperf autoconf automake m4 cvs zip unzip xutils libtool diff xsltproc gettext"
     files="/usr/include/stdio.h /usr/include/ncurses.h"
     files_pkg="libc6-dev libncurses5-dev"
     ;;

tools/mkpkg/mkpkg_libva

@@ -0,0 +1,43 @@
+#!/bin/sh
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+echo "getting sources..."
+  if [ ! -d libva.git ]; then
+    git clone git://anongit.freedesktop.org/libva libva.git
+  fi
+
+  cd libva.git
+    git pull
+    GIT_REV=`git log -n1 --format=%h`
+  cd ..
+
+echo "copying sources..."
+  rm -rf libva-$GIT_REV
+  cp -R libva.git libva-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf libva-$GIT_REV/.git
+
+echo "packing sources..."
+  tar cvJf libva-$GIT_REV.tar.xz libva-$GIT_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf libva-$GIT_REV