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

config/options

@@ -77,7 +77,7 @@ fi
 
 get_graphicdrivers() {
   if [ "$GRAPHIC_DRIVERS" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia vmware"
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do
@@ -126,6 +126,13 @@ get_graphicdrivers() {
 #      LLVM_SUPPORT="yes"
     fi
 
+    if [ "$drv" = "r200" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,r200"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r200"
+      XORG_DRIVERS="$XORG_DRIVERS ati"
+#      LLVM_SUPPORT="yes"
+    fi
+
     if [ "$drv" = "r300" ]; then
 #      DRI_DRIVERS="$DRI_DRIVERS,r300"
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"

packages/addons/multimedia/libav/changelog.txt

@@ -1,3 +1,6 @@
+0.99.3
+- update to libav-0.7 (final)
+
 0.99.2
 - change icon
 

packages/addons/multimedia/libav/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="libav"
-PKG_VERSION="0.7_beta2"
-PKG_REV="2"
+PKG_VERSION="0.7"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.libav.org"
-PKG_URL="http://libav.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://libav.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain alsa-lib zlib bzip2"
 PKG_PRIORITY="optional"

packages/graphics/Mesa/build

@@ -29,9 +29,6 @@ get_graphicdrivers
   strip_linker_plugin
   strip_lto # Mesa fails to build with LTO optimization
 
-# TODO:
-  LDFLAGS=""
-
 if [ "$LLVM_SUPPORT" = "yes" ]; then
   export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
 fi
@@ -50,6 +47,7 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
             --localstatedir=/var \
             --disable-static \
             --enable-shared \
+            --enable-shared-dricore \
             --disable-debug \
             --disable-selinux \
             --enable-xcb \

packages/graphics/Mesa/install

@@ -27,6 +27,8 @@ mkdir -p $INSTALL/usr/lib
     ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so
     ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1
   cp -P $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/libglsl.so $INSTALL/usr/lib
 
 mkdir -p $INSTALL/usr/lib/dri
   cp -P $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true

packages/network/libtirpc/build

@@ -29,8 +29,8 @@ cd $PKG_BUILD
             --sysconfdir=/etc \
             --disable-static \
             --enable-shared \
+            --disable-gss \
             --with-gnu-ld
 
 make
-
 $MAKEINSTALL

packages/network/nfs-utils/build

@@ -51,7 +51,6 @@ libblkid_is_recent="yes" \
             --without-krb5 \
             --disable-caps \
             --enable-largefile \
-            --with-mountfile=/etc/nfsmounts.conf \
             --with-gnu-ld
 
 make -C support

packages/network/nfs-utils/meta

@@ -22,7 +22,7 @@ PKG_NAME="nfs-utils"
 PKG_VERSION="1.2.3"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="OSS"
+PKG_LICENSE="GPL"
 PKG_SITE="http://nfs.sourceforge.net/"
 PKG_URL="$SOURCEFORGE_SRC/nfs/nfs-utils/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libevent libnfsidmap libtirpc util-linux"

packages/network/nfs-utils/patches/nfs-utils-1.2.3-cross.patch

@@ -1,46 +0,0 @@
-diff -Naur nfs-utils-1.1.0-old/tools/locktest/Makefile.am nfs-utils-1.1.0-new/tools/locktest/Makefile.am
---- nfs-utils-1.1.0-old/tools/locktest/Makefile.am	2007-05-10 20:40:57.000000000 -0700
-+++ nfs-utils-1.1.0-new/tools/locktest/Makefile.am	2007-08-11 19:18:59.000000000 -0700
-@@ -5,8 +5,8 @@
- 
- noinst_PROGRAMS = testlk
- testlk_SOURCES = testlk.c
--testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
--testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
--testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- MAINTAINERCLEANFILES = Makefile.in
-diff -Naur nfs-utils-1.1.0-old/tools/rpcdebug/Makefile.am nfs-utils-1.1.0-new/tools/rpcdebug/Makefile.am
---- nfs-utils-1.1.0-old/tools/rpcdebug/Makefile.am	2007-05-10 20:40:57.000000000 -0700
-+++ nfs-utils-1.1.0-new/tools/rpcdebug/Makefile.am	2007-08-11 19:19:37.000000000 -0700
-@@ -8,8 +8,8 @@
- 
- sbin_PROGRAMS = rpcdebug
- rpcdebug_SOURCES = rpcdebug.c
--rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
--rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
--rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- MAINTAINERCLEANFILES = Makefile.in
-diff -Naur nfs-utils-1.1.0-old/tools/rpcgen/Makefile.am nfs-utils-1.1.0-new/tools/rpcgen/Makefile.am
---- nfs-utils-1.1.0-old/tools/rpcgen/Makefile.am	2007-05-10 20:40:57.000000000 -0700
-+++ nfs-utils-1.1.0-new/tools/rpcgen/Makefile.am	2007-08-11 19:19:57.000000000 -0700
-@@ -9,9 +9,9 @@
- 		 rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
- 		 rpc_scan.h rpc_util.h
- 
--rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
--rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
--rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
- 
- MAINTAINERCLEANFILES = Makefile.in
- 

packages/network/samba/build

@@ -77,7 +77,7 @@ sh autogen.sh
             --without-dce-dfs \
             --without-ldap \
             --without-ads \
-            --with-dnsupdate \
+            --without-dnsupdate \
             --without-automount \
             --without-cifsmount \
             --without-cifsumount \
@@ -104,8 +104,6 @@ sh autogen.sh
             --without-setproctitle \
 
 make bin/libsmbclient.so
-make bin/mount.cifs
-make bin/umount.cifs
 
 if [ "$SAMBA_SERVER" = yes ]; then
   make bin/smbd

packages/security/libgcrypt/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libgcrypt"
-PKG_VERSION="1.4.6"
+PKG_VERSION="1.5.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/security/libgcrypt/patches/libgcrypt-1.4.6-gpg_error_libs.patch

@@ -1,22 +0,0 @@
-diff -Naur libgcrypt-1.4.6-old/tests/Makefile.am libgcrypt-1.4.6-new/tests/Makefile.am
---- libgcrypt-1.4.6-old/tests/Makefile.am	2010-07-13 07:05:56.000000000 -0700
-+++ libgcrypt-1.4.6-new/tests/Makefile.am	2010-08-10 10:00:44.000000000 -0700
-@@ -35,6 +35,7 @@
- # a built header.
- AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
- AM_CFLAGS = $(GPG_ERROR_CFLAGS)
-+AM_LDFLAGS = $(GPG_ERROR_LIBS)
- 
- LDADD = ../src/libgcrypt.la $(DL_LIBS)
- 
-diff -Naur libgcrypt-1.4.6-old/tests/Makefile.in libgcrypt-1.4.6-new/tests/Makefile.in
---- libgcrypt-1.4.6-old/tests/Makefile.in	2010-07-13 08:42:21.000000000 -0700
-+++ libgcrypt-1.4.6-new/tests/Makefile.in	2010-08-10 10:02:01.000000000 -0700
-@@ -338,6 +338,7 @@
- # a built header.
- AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
- AM_CFLAGS = $(GPG_ERROR_CFLAGS)
-+AM_LDFLAGS = $(GPG_ERROR_LIBS)
- LDADD = ../src/libgcrypt.la $(DL_LIBS)
- EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl
- all: all-am

packages/security/libgcrypt/patches/libgcrypt-1.5.0-gpg_error_libs.patch

@@ -0,0 +1,22 @@
+diff -Naur libgcrypt-1.5.0-old/tests/Makefile.am libgcrypt-1.5.0-new/tests/Makefile.am
+--- libgcrypt-1.5.0-old/tests/Makefile.am	2011-06-11 11:56:32.000000000 -0700
++++ libgcrypt-1.5.0-new/tests/Makefile.am	2011-06-30 20:08:49.000000000 -0700
+@@ -36,6 +36,7 @@
+ # a built header.
+ AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
++AM_LDFLAGS = $(GPG_ERROR_LIBS)
+ 
+ LDADD = ../src/libgcrypt.la $(DL_LIBS) ../compat/libcompat.la $(GPG_ERROR_LIBS)
+ 
+diff -Naur libgcrypt-1.5.0-old/tests/Makefile.in libgcrypt-1.5.0-new/tests/Makefile.in
+--- libgcrypt-1.5.0-old/tests/Makefile.in	2011-06-29 01:58:01.000000000 -0700
++++ libgcrypt-1.5.0-new/tests/Makefile.in	2011-06-30 20:10:01.000000000 -0700
+@@ -400,6 +400,7 @@
+ # a built header.
+ AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
++AM_LDFLAGS = $(GPG_ERROR_LIBS)
+ LDADD = ../src/libgcrypt.la $(DL_LIBS) ../compat/libcompat.la $(GPG_ERROR_LIBS)
+ EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl \
+ 	     pkcs1v2-oaep.h pkcs1v2-pss.h pkcs1v2-v15c.h pkcs1v2-v15s.h

packages/sysutils/udev/build

@@ -50,7 +50,6 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \
             --disable-keymap \
             --disable-floppy \
             --disable-edd \
-            --disable-action_modeswitch \
             --without-selinux \
             --without-systemdsystemunitdir \
             --with-firmware-path=/lib/firmware \

packages/sysutils/udev/meta

@@ -19,14 +19,15 @@
 ################################################################################
 
 PKG_NAME="udev"
-PKG_VERSION="171"
+PKG_VERSION="d971228"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
-PKG_URL="http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="glib pciutils usbutils libusb-compat"
-PKG_BUILD_DEPENDS="toolchain glib pciutils usbutils libusb-compat"
+PKG_BUILD_DEPENDS="toolchain glib gtk-doc pciutils usbutils libusb-compat"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"
 PKG_SHORTDESC="udev: A Userspace Implementation for dynamic /dev nodes"

packages/sysutils/udev/unpack

@@ -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 $SYSROOT_PREFIX/usr/share/gtk-doc/gtk-doc.make $PKG_BUILD

packages/x11/driver/xf86-video-nvidia/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-nvidia"
-PKG_VERSION="275.09.07"
+PKG_VERSION="280.04"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"

packages/x11/toolkits/gtk-doc/build

@@ -25,3 +25,5 @@
 cd $PKG_BUILD
   mkdir -p $SYSROOT_PREFIX/usr/share/aclocal
     cp gtk-doc.m4 $SYSROOT_PREFIX/usr/share/aclocal
+  mkdir -p $SYSROOT_PREFIX/usr/share/gtk-doc
+    cp gtk-doc.make $SYSROOT_PREFIX/usr/share/gtk-doc

packages/x11/xserver/xorg-server/meta

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

projects/Generic/options

@@ -163,7 +163,7 @@
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nvidia,nouveau,vmware)
 # Space separated list is supported, 
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
-  GRAPHIC_DRIVERS="i915 i965 fglrx nvidia vmware"
+  GRAPHIC_DRIVERS="i915 i965 r200 fglrx nvidia vmware"
 
 # use libdrm-master (latest git) instead latest released version
   LIBDRM_MASTER="no"

tools/mkpkg/mkpkg_udev

@@ -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 udev.git ]; then
+    git clone git://git.kernel.org/pub/scm/linux/hotplug/udev.git udev.git
+  fi
+
+  cd udev.git
+    git pull
+    GIT_REV=`git log -n1 --format=%h`
+  cd ..
+
+echo "copying sources..."
+  rm -rf udev-$GIT_REV
+  cp -R udev.git udev-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf udev-$GIT_REV/.git
+
+echo "packing sources..."
+  tar cvJf udev-$GIT_REV.tar.xz udev-$GIT_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf udev-$GIT_REV