Merge remote branch 'upstream/master' into openelec-pvr

packages/audio/alsa-lib/meta

@@ -19,13 +19,12 @@
 ################################################################################
 
 PKG_NAME="alsa-lib"
-PKG_VERSION="1.0.24"
+PKG_VERSION="1.0.24.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.alsa-project.org/"
-#PKG_URL="ftp://ftp.alsa-project.org/pub/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://ftp.alsa-project.org/pub/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="ftp://ftp.alsa-project.org/pub/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/audio/alsa-utils/meta

@@ -19,13 +19,12 @@
 ################################################################################
 
 PKG_NAME="alsa-utils"
-PKG_VERSION="1.0.24"
+PKG_VERSION="1.0.24.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.alsa-project.org/"
-#PKG_URL="ftp://ftp.alsa-project.org/pub/utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://ftp.alsa-project.org/pub/utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="ftp://ftp.alsa-project.org/pub/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="alsa-lib"
 PKG_BUILD_DEPENDS="toolchain alsa-lib"
 PKG_PRIORITY="optional"

packages/graphics/Mesa/meta

@@ -26,7 +26,7 @@ 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_BUILD_DEPENDS="toolchain Python makedepend libxml2-host talloc 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"

packages/linux/patches/linux-2.6.37-072-commit_ff2f078_fix.patch

@@ -0,0 +1,19 @@
+diff -Naur linux-2.6.37-old/drivers/usb/core/hcd.c linux-2.6.37-new/drivers/usb/core/hcd.c
+--- linux-2.6.37-old/drivers/usb/core/hcd.c	2011-01-04 16:50:19.000000000 -0800
++++ linux-2.6.37-new/drivers/usb/core/hcd.c	2011-01-30 20:06:09.000000000 -0800
+@@ -1956,7 +1956,6 @@
+ 
+ 	dev_dbg(&rhdev->dev, "usb %s%s\n",
+ 			(msg.event & PM_EVENT_AUTO ? "auto-" : ""), "resume");
+-	clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags);
+ 	if (!hcd->driver->bus_resume)
+ 		return -ENOENT;
+ 	if (hcd->state == HC_STATE_RUNNING)
+@@ -1964,6 +1963,7 @@
+ 
+ 	hcd->state = HC_STATE_RESUMING;
+ 	status = hcd->driver->bus_resume(hcd);
++	clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags);
+ 	if (status == 0) {
+ 		/* TRSMRCY = 10 msec */
+ 		msleep(10);

packages/mediacenter/xbmc/install

@@ -64,6 +64,10 @@ mkdir -p $INSTALL/usr/share/xbmc/addons
 mkdir -p $PYTHON_LIBDIR/site-packages/xbmc
   cp -R $PKG_BUILD/tools/EventClients/lib/python/* $PYTHON_LIBDIR/site-packages/xbmc
 
+# install powermanagement hooks
+  mkdir -p $INSTALL/etc/pm/sleep.d
+    cp $PKG_DIR/sleep.d/* $INSTALL/etc/pm/sleep.d
+
 if [ "$WIIMOTE_SUPPORT" = yes ]; then
   mkdir -p $INSTALL/usr/bin
     cp $PKG_BUILD/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote $INSTALL/usr/bin/xbmc-wiiremote

packages/mediacenter/xbmc/sleep.d/61xbmc_lirc

@@ -0,0 +1,34 @@
+#!/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
+################################################################################
+
+. /etc/profile
+
+case "$1" in
+  hibernate|suspend)
+    xbmc-send --host=127.0.0.1 -a "LIRC.Stop"
+    ;;
+  thaw|resume)
+    xbmc-send --host=127.0.0.1 -a "LIRC.Start"
+    ;;
+  *) exit $NA
+    ;;
+esac

packages/mediacenter/xbmc/sleep.d/62xbmc-lcd

@@ -0,0 +1,34 @@
+#!/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
+################################################################################
+
+. /etc/profile
+
+case "$1" in
+  hibernate|suspend)
+    xbmc-send --host=127.0.0.1 -a "LCD.Suspend"
+    ;;
+  thaw|resume)
+    xbmc-send --host=127.0.0.1 -a "LCD.Resume"
+    ;;
+  *) exit $NA
+    ;;
+esac

packages/multimedia/hts-tvheadend/install

@@ -24,3 +24,6 @@
 
 mkdir -p $INSTALL/usr/bin
   cp -P $PKG_BUILD/build.Linux/tvheadend $INSTALL/usr/bin
+
+mkdir -p $INSTALL/etc/pm/sleep.d
+  cp $PKG_DIR/sleep.d/* $INSTALL/etc/pm/sleep.d

packages/multimedia/hts-tvheadend/sleep.d/50tvheadend

@@ -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
+################################################################################
+
+. /etc/profile
+
+case "$1" in
+  hibernate|suspend)
+    if [ $(pidof tvheadend) ];then
+      progress "Shutting down HTS TVHeadend for suspending..."
+      killall tvheadend
+    fi
+    ;;
+  thaw|resume)
+    . /etc/init.d/81_tvheadend
+    ;;
+  *) exit $NA
+    ;;
+esac

packages/multimedia/libva/install

@@ -31,5 +31,5 @@ mkdir -p $INSTALL/usr/lib/va
 
 if [ "$DEVTOOLS" = yes ]; then
   mkdir -p $INSTALL/usr/bin
-    cp $PKG_BUILD/test/.libs/vainfo $INSTALL/usr/bin
+    cp $PKG_BUILD/test/vainfo/.libs/vainfo $INSTALL/usr/bin
 fi

packages/multimedia/libva/meta

@@ -19,12 +19,13 @@
 ################################################################################
 
 PKG_NAME="libva"
-PKG_VERSION="1.0.7"
+PKG_VERSION="20110127"
 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="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/install

@@ -38,7 +38,7 @@ mkdir -p $INSTALL/etc/avahi/services
 #  cp $PKG_BUILD/avahi-daemon/sftp-ssh.service $INSTALL/etc/avahi/services
 #  cp $PKG_BUILD/avahi-daemon/ssh.service $INSTALL/etc/avahi/services
   cp $PKG_DIR/config/http.service $INSTALL/etc/avahi/services
-  cp $PKG_DIR/config/samba.service $INSTALL/etc/avahi/services
+#  cp $PKG_DIR/config/samba.service $INSTALL/etc/avahi/services
 
 mkdir -p $INSTALL/etc/dbus-1/system.d
   cp $PKG_BUILD/avahi-daemon/avahi-dbus.conf $INSTALL/etc/dbus-1/system.d

packages/network/connman/build

@@ -42,8 +42,8 @@ ac_cv_path_WPASUPPLICANT="/sbin/wpa_supplicant" \
             --disable-openconnect \
             --disable-portal \
             --disable-openvpn \
+            --disable-vpnc \
             --enable-loopback=builtin \
-            --enable-dnsproxy=builtin \
             --disable-pacrunner \
             --disable-google \
             --enable-meego=builtin \
@@ -51,7 +51,7 @@ ac_cv_path_WPASUPPLICANT="/sbin/wpa_supplicant" \
             --disable-iospm \
             --enable-ntpd=builtin \
             --with-ntpd="/usr/sbin/ntpd" \
-            --disable-systemd \
+            --disable-nmcompat \
             --disable-polkit \
             --enable-client \
             --disable-tools \

packages/network/connman/config/resolv.conf

@@ -0,0 +1,2 @@
+# Generated by Connection Manager
+nameserver 127.0.0.1

packages/network/connman/init.d/21_network

@@ -115,6 +115,5 @@ fi
   # starting Connection manager
     progress "starting Connection manager"
 
-    touch /var/run/resolv.conf
     /usr/sbin/connmand
 )&

packages/network/connman/install

@@ -27,10 +27,14 @@ add_group system 430
 
 mkdir -p $INSTALL/etc
   cp $PKG_DIR/config/services $INSTALL/etc
+  cp $PKG_DIR/config/resolv.conf $INSTALL/etc
 
 mkdir -p $INSTALL/etc/dbus-1/system.d
   cp $PKG_BUILD/src/connman.conf $INSTALL/etc/dbus-1/system.d
 
+mkdir -p $INSTALL/etc/pm/sleep.d
+  cp $PKG_DIR/sleep.d/* $INSTALL/etc/pm/sleep.d
+
 mkdir -p $INSTALL/usr/sbin
   cp -P $PKG_BUILD/src/connmand $INSTALL/usr/sbin
 

packages/network/connman/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="0.67"
+PKG_VERSION="0.68"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/network/connman/sleep.d/50connman

@@ -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
+################################################################################
+
+. /etc/profile
+
+case "$1" in
+  hibernate|suspend)
+    if [ $(pidof connmand) ];then
+      progress "Shutting down Connection Manager for suspending..."
+      killall connmand
+    fi
+    ;;
+  thaw|resume)
+    . /etc/init.d/21_network
+    ;;
+  *) exit $NA
+    ;;
+esac

packages/network/netmount/init.d/59_netmount

@@ -22,7 +22,9 @@
 #
 # runlevels: openelec, textmode
 
-wait_for_network
+(
+  wait_for_network
 
-progress "mounting Network shares"
+  progress "mounting Network shares"
-  netmount
+    netmount
+)&

packages/print/freetype/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.freetype.org"
-PKG_URL="http://mirror.lihnidos.org/GNU/savannah/freetype/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://download.savannah.gnu.org/releases/freetype/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="zlib"
 PKG_BUILD_DEPENDS="toolchain zlib"
 PKG_PRIORITY="optional"

packages/sysutils/busybox/config/busybox.conf

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.18.1
+# Busybox version: 1.18.2
-# Sat Jan 15 17:33:54 2011
+# Tue Feb  1 00:10:08 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -629,10 +629,10 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0
 # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
 # CONFIG_FEATURE_CHAT_CLR_ABORT is not set
 # CONFIG_CHRT is not set
-CONFIG_CROND=y
+# CONFIG_CROND is not set
-CONFIG_FEATURE_CROND_D=y
+# CONFIG_FEATURE_CROND_D is not set
 # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
+CONFIG_FEATURE_CROND_DIR=""
 # CONFIG_CRONTAB is not set
 # CONFIG_DC is not set
 # CONFIG_FEATURE_DC_LIBM is not set

packages/sysutils/busybox/install

@@ -50,9 +50,8 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
   # /etc/fstab is needed by...
     touch $INSTALL/etc/fstab
 
-  # /etc/resolve.conf and /etc/hosts must be writeable
+  # /etc/hosts must be writeable
     ln -sf /var/cache/hosts $INSTALL/etc/hosts
-    ln -sf /var/cache/resolv.conf $INSTALL/etc/resolv.conf
 
   # /etc/mtab is needed by udisks etc...
     ln -sf /proc/self/mounts $INSTALL/etc/mtab

packages/sysutils/util-linux/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="util-linux"
-PKG_VERSION="2.19-rc1"
+PKG_VERSION="2.19-rc3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/tools/autoupdate/install

@@ -48,6 +48,5 @@ mkdir -p $INSTALL/etc
     cp $PROJECT_DIR/$PROJECT/autoupdate/update.conf $INSTALL/etc
   fi
 
-mkdir -p $INSTALL/etc/crontabs
+mkdir -p $INSTALL/etc/pm/sleep.d
-  echo -e "1 */6 * * *\t/usr/bin/autoupdate" >> $INSTALL/etc/crontabs/root
+  cp $PKG_DIR/sleep.d/* $INSTALL/etc/pm/sleep.d
-

packages/tools/autoupdate/sleep.d/90autoupdate

@@ -1,3 +1,5 @@
+#!/bin/sh
+
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
@@ -18,12 +20,12 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-#
+. /etc/profile
-# start cron daemon
-#
-# runlevels: openelec, textmode
 
-(
+case "$1" in
-  progress "Starting cron daemon"
+  thaw|resume)
-    crond -bS -c /etc/crontabs
+    autoupdate &
-)&
+    ;;
+  *) exit $NA
+    ;;
+esac

packages/x11/proto/xproto-host/build

@@ -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
+
+$SCRIPTS/unpack xproto
+
+XPROTO_DIR=`ls -d $BUILD/xproto-[0-9]*`
+
+setup_toolchain host
+
+cd $XPROTO_DIR
+mkdir -p .objdir-host && cd .objdir-host
+
+../configure --prefix=$ROOT/$TOOLCHAIN
+
+make
+make install

packages/x11/proto/xproto-host/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="xproto-host"
+PKG_VERSION=""
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.x.org/"
+PKG_URL=""
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain util-macros"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/proto"
+PKG_SHORTDESC="xproto: KB extension headers"
+PKG_LONGDESC="X11 extension headers"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/x11/proto/xproto/build

@@ -22,12 +22,12 @@
 
 . config/options $1
 
-$SCRIPTS/build toolchain
-
 cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
+mkdir -p .objdir-target && cd .objdir-target
-            --build=$HOST_NAME \
+
-            --prefix=/usr \
+../configure --host=$TARGET_NAME \
+             --build=$HOST_NAME \
+             --prefix=/usr \
 
 make
 $MAKEINSTALL

packages/x11/util/makedepend/build

@@ -0,0 +1,32 @@
+#!/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
+
+setup_toolchain host
+
+cd $PKG_BUILD
+
+./configure --prefix=$ROOT/$TOOLCHAIN \
+
+make
+make install

packages/x11/util/makedepend/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="makedepend"
+PKG_VERSION="1.0.3"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.X.org"
+PKG_URL="http://xorg.freedesktop.org/archive/individual/util/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain xproto-host"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/util"
+PKG_SHORTDESC="makedepend: Creates dependencies in makefiles"
+PKG_LONGDESC="Creates dependencies in makefiles, a left-over of the historic imake build system."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/x11/xserver/xorg-server/meta

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

projects/Generic/options

@@ -155,7 +155,7 @@
   VDPAU="yes"
 
 # Use VAAPI video acceleration (needs intel i965 driver and a supported card)
-  VAAPI="no"
+  VAAPI="yes"
 
 # Use Broadcom CrystalHD Decoder Card for video acceleration 
 # (needs Kernelsupport for Broadcom Decoder Card and a supported card)

projects/Intel/options

@@ -155,7 +155,7 @@
   VDPAU="no"
 
 # Use VAAPI video acceleration (needs intel i965 driver and a supported card)
-  VAAPI="no"
+  VAAPI="yes"
 
 # Use Broadcom CrystalHD Decoder Card for video acceleration 
 # (needs Kernelsupport for Broadcom Decoder Card and a supported card)

scripts/checkdeps

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