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

Conflicts:
	packages/initramfs/sysutils/busybox-initramfs/scripts/init

packages/devel/glib/build

@@ -29,33 +29,38 @@
 cd $PKG_BUILD
 mkdir -p .build-target && cd .build-target
 
+ac_cv_func_mmap_fixed_mapped='yes' \
 ac_cv_func_posix_getpwuid_r='yes' \
 ac_cv_func_posix_getgrgid_r='yes' \
-glib_cv_uscore='no' \
+ac_cv_func_printf_unix98='yes' \
+ac_cv_func_snprintf_c99='yes' \
+ac_cv_func_vsnprintf_c99='yes' \
 glib_cv_stack_grows='no' \
+glib_cv_uscore='no' \
+glib_cv_va_val_copy='no' \
 ../configure --host=$TARGET_NAME \
              --build=$HOST_NAME \
              --prefix=/usr \
              --sysconfdir=/etc \
              --localstatedir=/var \
-             --enable-shared \
-             --disable-static \
-             --disable-debug \
              --disable-silent-rules \
+             --disable-debug \
+             --disable-static \
+             --enable-shared \
              --disable-selinux \
              --disable-fam \
              --enable-xattr \
              --enable-regex \
-             --with-gnu-ld \
+             --disable-gtk-doc \
-             --with-threads=posix \
              --disable-man \
              --disable-dtrace \
              --disable-systemtap \
              --disable-gcov \
-             --with-libiconv \
              --enable-Bsymbolic \
-             --disable-rebuilds \
+             --with-gnu-ld \
-             --disable-gtk-doc \
+             --with-threads=posix \
+             --with-pcre=system \
+             --with-libiconv \
 
 make
 

packages/devel/glib/meta

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="glib"
-PKG_VERSION="2.28.7"
+PKG_VERSION="2.28.8"
 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.28/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="zlib libiconv"
+PKG_DEPENDS="zlib libiconv pcre"
-PKG_BUILD_DEPENDS="toolchain zlib libiconv gtk-doc glib-host"
+PKG_BUILD_DEPENDS="toolchain zlib libiconv pcre gtk-doc glib-host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="glib: C support library"

packages/initramfs/sysutils/busybox-initramfs/scripts/init

@@ -188,7 +188,7 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
     if [ -n "$disk" ]; then
       mount_part "$disk" "/storage" "rw,noatime"
 
-      if [ -f "/flash/atv_single_boot" ]; then
+      if [ -f "/flash/MACH_KERNEL" ]; then
         IMAGE_KERNEL="MACH_KERNEL"
       fi
 

packages/linux/unpack

@@ -41,6 +41,8 @@ cp $KERNEL_CFG_FILE $LINUX/.config
 sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD/image/initramfs.cpio\"|" \
   $LINUX/.config
 
+# wipe out nouveau if GRAPHICS_DRIVERS contains nvidia
+echo $GRAPHIC_DRIVERS | grep "nvidia" &>/dev/null && sed -i '/NOUVEAU/ d' $LINUX/.config && echo "# CONFIG_DRM_NOUVEAU is not set" >> $LINUX/.config
 # copy some extra firmware to linux tree
   cp -R $PKG_DIR/firmware/* $LINUX/firmware
 

packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-463-add_remote_devinput-0.1.patch

@@ -1,6 +1,6 @@
-diff -Naur xbmc-Dharma-10.1-c8405db/system/Lircmap.xml xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml
+diff -Naur xbmc-10.1-Dharma/system/Lircmap.xml xbmc-10.1-Dharma.patch/system/Lircmap.xml
---- xbmc-Dharma-10.1-c8405db/system/Lircmap.xml	2011-02-15 14:28:59.646158376 +0100
+--- xbmc-10.1-Dharma/system/Lircmap.xml	2011-06-07 23:02:00.297946207 +0200
-+++ xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml	2011-02-15 14:29:58.387980799 +0100
++++ xbmc-10.1-Dharma.patch/system/Lircmap.xml	2011-06-07 23:02:43.716485530 +0200
 @@ -365,7 +365,6 @@
  
  	<remote device="linux-input-layer">
@@ -9,7 +9,7 @@ diff -Naur xbmc-Dharma-10.1-c8405db/system/Lircmap.xml xbmc-Dharma-10.1-c8405db.
  		<left>KEY_LEFT</left>
  		<right>KEY_RIGHT</right>
  		<up>KEY_UP</up>
-@@ -452,4 +451,57 @@
+@@ -452,4 +451,58 @@
  		<mypictures>yellow</mypictures>
  		<myvideo>blue</myvideo>
  	</remote>
@@ -38,6 +38,7 @@ diff -Naur xbmc-Dharma-10.1-c8405db/system/Lircmap.xml xbmc-Dharma-10.1-c8405db.
 +		<skipminus>KEY_PREVIOUS</skipminus>
 +		<title>KEY_EPG</title>
 +		<subtitle>KEY_SUBTITLE</subtitle>
++		<language>KEY_LANGUAGE</language>
 +		<info>KEY_INFO</info>
 +		<display>KEY_ZOOM</display>
 +		<mute>KEY_MUTE</mute>

packages/sysutils/ConsoleKit/init.d/34_ConsoleKit

@@ -22,12 +22,8 @@
 #
 # runlevels: openelec, textmode
 
-(
+progress "starting ConsoleKit daemon"
-  progress "starting ConsoleKit daemon"
 
-    install -m 755 -d /var/log/ConsoleKit
+  install -m 755 -d /var/log/ConsoleKit
-    install -m 755 -d /var/run/ConsoleKit
+  install -m 755 -d /var/run/ConsoleKit
 
-    console-kit-daemon
-    ck-launch-session
-)&

packages/sysutils/ConsoleKit/install

@@ -52,8 +52,10 @@ mkdir -p $INSTALL/usr/lib/ConsoleKit
 mkdir -p $INSTALL/usr/lib/ConsoleKit/run-seat.d
 mkdir -p $INSTALL/usr/lib/ConsoleKit/run-session.d
 mkdir -p $INSTALL/usr/lib/ConsoleKit/scripts
-  cp -P $PKG_BUILD/tools/linux/ck-system-restart $INSTALL/usr/lib/ConsoleKit/scripts
+#  cp -P $PKG_BUILD/tools/linux/ck-system-restart $INSTALL/usr/lib/ConsoleKit/scripts
-  cp -P $PKG_BUILD/tools/linux/ck-system-stop $INSTALL/usr/lib/ConsoleKit/scripts
+#  cp -P $PKG_BUILD/tools/linux/ck-system-stop $INSTALL/usr/lib/ConsoleKit/scripts
+  cp -P $PKG_DIR/scripts/ck-system-restart $INSTALL/usr/lib/ConsoleKit/scripts
+  cp -P $PKG_DIR/scripts/ck-system-stop $INSTALL/usr/lib/ConsoleKit/scripts
 
 mkdir -p $INSTALL/usr/share/dbus-1/interfaces
   cp -P $PKG_BUILD/src/org.freedesktop.ConsoleKit.Manager.xml $INSTALL/usr/share/dbus-1/interfaces
@@ -65,4 +67,3 @@ mkdir -p $INSTALL/usr/share/dbus-1/system-services
 
 mkdir -p $INSTALL/usr/share/polkit-1/actions
   cp -P $PKG_BUILD/data/org.freedesktop.consolekit.policy $INSTALL/usr/share/polkit-1/actions
-

packages/sysutils/ConsoleKit/scripts/ck-system-restart

@@ -0,0 +1,23 @@
+#!/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
+################################################################################
+
+reboot

packages/sysutils/ConsoleKit/scripts/ck-system-stop

@@ -0,0 +1,23 @@
+#!/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
+################################################################################
+
+poweroff

packages/sysutils/remote/eventlircd/evmap/ircore.evmap

@@ -34,4 +34,5 @@ KEY_TEXT         = KEY_TEXT
 KEY_EPG          = KEY_EPG
 
 KEY_ENTER        = KEY_OK
-KEY_PLAYPAUSE    = KEY_PLAY
+KEY_PLAYPAUSE    = KEY_PLAY
+KEY_TITLE        = KEY_SUBTITLE

packages/sysutils/util-linux/udev.d/10-fsck.rules

@@ -20,6 +20,7 @@
 ################################################################################
 
 SUBSYSTEM!="block", GOTO="end"
+DEVTYPE!="partition", GOTO="end"
 
 ACTION=="add|change", RUN+="/sbin/fsck -M -T -a /dev/%k"
 

packages/tools/atv-bootloader/build

@@ -27,7 +27,7 @@ cd $PKG_BUILD
 cp -PR $(kernel_path)/arch/x86/boot/bzImage vmlinuz
 
 make clean
-make LDFLAGS="" KERN_OBJ="vmlinuz.obj" \
+make LDFLAGS="" \
      CC="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-gcc-4.0.1" \
      LD="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-ld"
 

packages/tools/installer/scripts/installer

@@ -228,7 +228,7 @@ do_install_quick() {
             mkdir -p $TMPDIR/part1 >> $LOGFILE 2>&1
 
           msg_progress_install "40" "mounting ${INSTALL_DEVICE}1 to $TMPDIR/part1"
-            mount ${INSTALL_DEVICE}1 $TMPDIR/part1 >> $LOGFILE 2>&1
+            mount -t ext4 ${INSTALL_DEVICE}1 $TMPDIR/part1 >> $LOGFILE 2>&1
 
         # installing extlinux
           msg_progress_install "50" "installing extlinux to $TMPDIR/part1"

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

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