Merge branch 'master' into openelec-pvr-master

README

@@ -1,8 +1,8 @@
 http://www.OpenELEC.tv
 
-The Open Embedded Linux Enterainment Center – OpenELEC.tv
+OpenELEC - Open Embedded Linux Enterainment Center
 
-OpenELEC.tv runs XBMC, a complete media center solution (xbmc.org).
+OpenELEC runs XBMC, a complete media center solution (xbmc.org).
 The base system has been designed and built from the ground up to be as
 efficient as possible – consuming only a tiny footprint, cutting edge
 hardware support and a set-top box experience.
@@ -52,4 +52,4 @@ freenode.
 
 Happy XBMC'ing
 
-OpenELEC.tv Development Team
+OpenELEC Development Team

config/arch.x86_64

@@ -8,5 +8,4 @@
 
 # setup ARCH specific *FLAGS
   TARGET_CFLAGS="-fPIC -march=$TARGET_CPU -m64"
-  TARGET_CXXFLAGS="$TARGET_CFLAGS"
   TARGET_LDFLAGS="-fPIC -march=$TARGET_CPU -m64"

config/optimize

@@ -25,3 +25,32 @@ GCC_OPTIM="$GCC_OPTIM -flto"
 LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
 LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
 LD_OPTIM="$LD_OPTIM -Wl,--as-needed"
+
+if [ "$DEBUG" = yes ]; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -ggdb"
+  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -ggdb"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -ggdb"
+else
+  TARGET_CFLAGS="$TARGET_CFLAGS -fomit-frame-pointer"
+  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fomit-frame-pointer"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -s"
+fi
+
+TARGET_CPPFLAGS=
+TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
+TARGET_CXXFLAGS="$TARGET_CFLAGS"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $GCC_OPTIM $LD_OPTIM"
+
+HOST_CPPFLAGS=""
+HOST_CFLAGS="-O2 -Wall -pipe -I$ROOT/$TOOLCHAIN/include"
+HOST_CXXFLAGS="$HOST_CFLAGS"
+HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
+
+# use -fPIC when necessary
+  case "`uname -m`" in
+    x86_64|ppc64|arm|armeb|armel)
+    HOST_CFLAGS="$HOST_CFLAGS -fPIC"
+    HOST_CXXFLAGS="$HOST_CXXFLAGS -fPIC"
+    HOST_LDFLAGS="$HOST_LDFLAGS -fPIC"
+    ;;
+  esac

config/path

@@ -86,21 +86,6 @@ TARGET_STRIP=${TARGET_PREFIX}strip
 
 . config/optimize
 
-TARGET_CPPFLAGS=
-TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
-TARGET_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$TARGET_LDFLAGS $GCC_OPTIM $LD_OPTIM"
-
-if [ "$DEBUG" = yes ]; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -ggdb"
-  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -ggdb"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -ggdb"
-else
-  TARGET_CFLAGS="$TARGET_CFLAGS -fomit-frame-pointer"
-  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fomit-frame-pointer"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -s"
-fi
-
 TARGET_PKG_CONFIG_PATH=""
 TARGET_PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
 TARGET_PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
@@ -116,20 +101,6 @@ HOST_RANLIB=ranlib
 HOST_OBJCOPY=objcopy
 HOST_STRIP=strip
 
-HOST_CPPFLAGS=""
-HOST_CFLAGS="-O2 -Wall -pipe -I$ROOT/$TOOLCHAIN/include"
-HOST_CXXFLAGS="$HOST_CFLAGS"
-HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
-
-# use -fPIC when necessary
-  case "`uname -m`" in
-    x86_64|ppc64|arm|armeb|armel)
-    HOST_CFLAGS="$HOST_CFLAGS -fPIC"
-    HOST_CXXFLAGS="$HOST_CXXFLAGS -fPIC"
-    HOST_LDFLAGS="$HOST_LDFLAGS -fPIC"
-    ;;
-  esac
-
 HOST_PKG_CONFIG_PATH=""
 HOST_PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig"
 HOST_PKG_CONFIG_SYSROOT_DIR=""

packages/audio/flac/build

@@ -23,14 +23,12 @@
 . config/options $1
 
 cd $PKG_BUILD
-do_autoreconf -I m4
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
             --disable-static \
             --enable-shared \
             --disable-rpath \
-            --with-gnu-ld \
             --disable-altivec \
             --disable-doxygen-docs \
             --disable-thorough-tests \

packages/audio/flac/meta

@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://flac.sourceforge.net/"
-PKG_URL="$SOURCEFORGE_SRC/flac/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://downloads.xiph.org/releases/flac/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="libiconv libogg"
 PKG_BUILD_DEPENDS="toolchain libiconv libogg"
 PKG_PRIORITY="optional"
@@ -33,4 +33,4 @@ PKG_SHORTDESC="flac: An Free Lossless Audio Codec"
 PKG_LONGDESC="Grossly oversimplified, FLAC is similar to MP3, but lossless, meaning that audio is compressed in FLAC without throwing away any information. This is similar to how Zip works, except with FLAC you will get much better compression because it is designed specifically for audio."
 PKG_IS_ADDON="no"
 
-PKG_AUTORECONF="no"
+PKG_AUTORECONF="yes"

packages/audio/flac/patches/flac-1.2.1-configure.patch

@@ -0,0 +1,24 @@
+diff -Naur flac-1.2.1-old/configure.in flac-1.2.1-new/configure.in
+--- flac-1.2.1-old/configure.in	2007-09-13 08:48:42.000000000 -0700
++++ flac-1.2.1-new/configure.in	2010-08-17 20:51:01.000000000 -0700
+@@ -21,6 +21,8 @@
+ AC_INIT(src/flac/main.c)
+ AM_INIT_AUTOMAKE(flac, 1.2.1)
+ 
++AC_CONFIG_MACRO_DIR([m4])
++
+ # Don't automagically regenerate autoconf/automake generated files unless
+ # explicitly requested.  Eases autobuilding -mdz
+ AM_MAINTAINER_MODE
+diff -Naur flac-1.2.1-old/Makefile.am flac-1.2.1-new/Makefile.am
+--- flac-1.2.1-old/Makefile.am	2007-09-16 12:29:29.000000000 -0700
++++ flac-1.2.1-new/Makefile.am	2010-08-17 20:51:27.000000000 -0700
+@@ -30,6 +30,8 @@
+ 
+ AUTOMAKE_OPTIONS = foreign 1.7
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ SUBDIRS = doc include m4 man src examples test build obj
+ 
+ DISTCLEANFILES = libtool-disable-static

packages/audio/lame/build

@@ -0,0 +1,56 @@
+#!/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
+
+# dont build parallel
+  MAKEFLAGS=-j1
+
+cd $PKG_BUILD
+GTK_CONFIG='no' \
+ac_cv_c_stack_direction=-1 \
+alex_cv_ieee854_float80=no \
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --disable-static \
+            --enable-shared \
+            --enable-nasm \
+            --disable-cpml \
+            --disable-gtktest \
+            --disable-efence \
+            --disable-analyzer-hooks \
+            --enable-decoder \
+            --enable-decode-layer1 \
+            --enable-decode-layer2 \
+            --disable-frontend \
+            --disable-mp3x \
+            --disable-mp3rtp \
+            --disable-brhist \
+            --disable-all-float \
+            --enable-expopt=no \
+            --enable-debug=no \
+            --with-gnu-ld \
+            --with-fileio=lame
+
+make
+$MAKEINSTALL

packages/audio/lame/install

@@ -0,0 +1,26 @@
+#!/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
+
+mkdir -p $INSTALL/usr/lib
+  cp -P $PKG_BUILD/libmp3lame/.libs/libmp3lame.so* $INSTALL/usr/lib

packages/audio/lame/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="lame"
+PKG_VERSION="3.98.4"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="LGPL"
+PKG_SITE="http://lame.sourceforge.net/"
+PKG_URL="$SOURCEFORGE_SRC/lame/lame/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="audio"
+PKG_SHORTDESC="lame: LAME Ain't an Mp3 Encoder"
+PKG_LONGDESC="LAME originally stood for LAME Ain't an Mp3 Encoder. The goal of the LAME project is to use the open source model to improve the psycho acoustics, noise shaping and speed of MP3. Another goal of the LAME project is to use these improvements for the basis of a patent free audio compression codec for the GNU project."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

packages/audio/lame/patches/lame-3.98.4-am_path_gtk.patch

@@ -0,0 +1,242 @@
+diff -Naur lame-3.98.4/configure.in lame-3.98.4.patch/configure.in
+--- lame-3.98.4/configure.in	2010-03-22 21:40:17.000000000 +0100
++++ lame-3.98.4.patch/configure.in	2011-03-25 12:11:44.982662225 +0100
+@@ -21,6 +21,8 @@
+ AC_INIT([lame],[3.98.4],[lame-dev@lists.sf.net])
+ AC_CONFIG_SRCDIR([libmp3lame/lame.c])
+ 
++AC_CONFIG_MACRO_DIR([m4])
++
+ dnl check system
+ AC_CANONICAL_HOST
+ 
+@@ -385,7 +387,7 @@
+ 
+ dnl configure use of features
+ 
+-AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
++AM_PATH_GTK_2_0(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
+ 
+ dnl ElectricFence malloc debugging
+ AC_MSG_CHECKING(use of ElectricFence malloc debugging)
+diff -Naur lame-3.98.4/m4/gtk-2.0.m4 lame-3.98.4.patch/m4/gtk-2.0.m4
+--- lame-3.98.4/m4/gtk-2.0.m4	1970-01-01 01:00:00.000000000 +0100
++++ lame-3.98.4.patch/m4/gtk-2.0.m4	2010-12-22 03:34:53.000000000 +0100
+@@ -0,0 +1,196 @@
++# Configure paths for GTK+
++# Owen Taylor     1997-2001
++
++dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
++dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
++dnl pass to pkg-config
++dnl
++AC_DEFUN([AM_PATH_GTK_2_0],
++[dnl 
++dnl Get the cflags and libraries from pkg-config
++dnl
++AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
++		    , enable_gtktest=yes)
++
++  pkg_config_args=gtk+-2.0
++  for module in . $4
++  do
++      case "$module" in
++         gthread) 
++             pkg_config_args="$pkg_config_args gthread-2.0"
++         ;;
++      esac
++  done
++
++  no_gtk=""
++
++  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++
++  if test x$PKG_CONFIG != xno ; then
++    if pkg-config --atleast-pkgconfig-version 0.7 ; then
++      :
++    else
++      echo "*** pkg-config too old; version 0.7 or better required."
++      no_gtk=yes
++      PKG_CONFIG=no
++    fi
++  else
++    no_gtk=yes
++  fi
++
++  min_gtk_version=ifelse([$1], ,2.0.0,$1)
++  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
++
++  if test x$PKG_CONFIG != xno ; then
++    ## don't try to run the test against uninstalled libtool libs
++    if $PKG_CONFIG --uninstalled $pkg_config_args; then
++	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
++	  enable_gtktest=no
++    fi
++
++    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
++	  :
++    else
++	  no_gtk=yes
++    fi
++  fi
++
++  if test x"$no_gtk" = x ; then
++    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
++    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
++    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++    if test "x$enable_gtktest" = "xyes" ; then
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $GTK_CFLAGS"
++      LIBS="$GTK_LIBS $LIBS"
++dnl
++dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
++dnl checks the results of pkg-config to some extent)
++dnl
++      rm -f conf.gtktest
++      AC_TRY_RUN([
++#include <gtk/gtk.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++int 
++main ()
++{
++  int major, minor, micro;
++  char *tmp_version;
++
++  fclose (fopen ("conf.gtktest", "w"));
++
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = g_strdup("$min_gtk_version");
++  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++     printf("%s, bad version string\n", "$min_gtk_version");
++     exit(1);
++   }
++
++  if ((gtk_major_version != $gtk_config_major_version) ||
++      (gtk_minor_version != $gtk_config_minor_version) ||
++      (gtk_micro_version != $gtk_config_micro_version))
++    {
++      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
++             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
++             gtk_major_version, gtk_minor_version, gtk_micro_version);
++      printf ("*** was found! If pkg-config was correct, then it is best\n");
++      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
++      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
++      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
++      printf("*** required on your system.\n");
++      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
++      printf("*** to point to the correct configuration files\n");
++    } 
++  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
++	   (gtk_minor_version != GTK_MINOR_VERSION) ||
++           (gtk_micro_version != GTK_MICRO_VERSION))
++    {
++      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
++	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
++      printf("*** library (version %d.%d.%d)\n",
++	     gtk_major_version, gtk_minor_version, gtk_micro_version);
++    }
++  else
++    {
++      if ((gtk_major_version > major) ||
++        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
++        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
++      {
++        return 0;
++       }
++     else
++      {
++        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
++               gtk_major_version, gtk_minor_version, gtk_micro_version);
++        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
++	       major, minor, micro);
++        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
++        printf("***\n");
++        printf("*** If you have already installed a sufficiently new version, this error\n");
++        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
++        printf("*** being found. The easiest way to fix this is to remove the old version\n");
++        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
++        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
++        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++        printf("*** so that the correct libraries are found at run-time))\n");
++      }
++    }
++  return 1;
++}
++],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++       CFLAGS="$ac_save_CFLAGS"
++       LIBS="$ac_save_LIBS"
++     fi
++  fi
++  if test "x$no_gtk" = x ; then
++     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
++     ifelse([$2], , :, [$2])     
++  else
++     AC_MSG_RESULT(no)
++     if test "$PKG_CONFIG" = "no" ; then
++       echo "*** A new enough version of pkg-config was not found."
++       echo "*** See http://pkgconfig.sourceforge.net"
++     else
++       if test -f conf.gtktest ; then
++        :
++       else
++          echo "*** Could not run GTK+ test program, checking why..."
++	  ac_save_CFLAGS="$CFLAGS"
++	  ac_save_LIBS="$LIBS"
++          CFLAGS="$CFLAGS $GTK_CFLAGS"
++          LIBS="$LIBS $GTK_LIBS"
++          AC_TRY_LINK([
++#include <gtk/gtk.h>
++#include <stdio.h>
++],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
++        [ echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
++          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++	  echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
++        [ echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
++          CFLAGS="$ac_save_CFLAGS"
++          LIBS="$ac_save_LIBS"
++       fi
++     fi
++     GTK_CFLAGS=""
++     GTK_LIBS=""
++     ifelse([$3], , :, [$3])
++  fi
++  AC_SUBST(GTK_CFLAGS)
++  AC_SUBST(GTK_LIBS)
++  rm -f conf.gtktest
++])
+diff -Naur lame-3.98.4/Makefile.am lame-3.98.4.patch/Makefile.am
+--- lame-3.98.4/Makefile.am	2010-02-26 23:33:06.000000000 +0100
++++ lame-3.98.4.patch/Makefile.am	2011-03-25 12:15:37.951078720 +0100
+@@ -2,6 +2,8 @@
+ 
+ include $(top_srcdir)/Makefile.am.global
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ .PHONY: test
+ 
+ SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM \
+diff -Naur lame-3.98.4/Makefile.am.global lame-3.98.4.patch/Makefile.am.global
+--- lame-3.98.4/Makefile.am.global	2006-06-03 15:07:36.000000000 +0200
++++ lame-3.98.4.patch/Makefile.am.global	2011-03-25 12:15:25.020333213 +0100
+@@ -3,5 +3,4 @@
+ # global section for every Makefile.am
+ 
+ AUTOMAKE_OPTIONS = 1.9 foreign $(top_srcdir)/ansi2knr
+-
+ # end global section

packages/audio/libvorbis/build

@@ -32,5 +32,4 @@ cd $PKG_BUILD
             --with-ogg=$SYSROOT_PREFIX/usr
 
 make
-
 $MAKEINSTALL

packages/devel/glib/build

@@ -52,7 +52,7 @@ glib_cv_stack_grows='no' \
              --disable-dtrace \
              --disable-systemtap \
              --disable-gcov \
-             --with-libiconv=gnu \
+             --with-libiconv \
              --enable-Bsymbolic \
              --disable-rebuilds \
              --disable-gtk-doc \

packages/devel/glib/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="glib"
-PKG_VERSION="2.28.2"
+PKG_VERSION="2.28.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/devel/glib/patches/glib-2.28.2-linux_magic_h.patch

@@ -1,24 +0,0 @@
-diff -Naur glib-2.28.1-old/configure.ac glib-2.28.1-new/configure.ac
---- glib-2.28.1-old/configure.ac	2011-02-17 20:33:11.000000000 -0800
-+++ glib-2.28.1-new/configure.ac	2011-02-18 09:19:32.000000000 -0800
-@@ -858,6 +858,7 @@
- AC_CHECK_HEADERS([sys/vfs.h sys/mount.h sys/vmount.h sys/statfs.h sys/statvfs.h])
- AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h sys/sysctl.h fstab.h])
- AC_CHECK_HEADERS([sys/uio.h sys/mkdev.h])
-+AC_CHECK_HEADERS([linux/magic.h])
- 
- # check for structure fields
- AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec])
-diff -Naur glib-2.28.1-old/glib/gfileutils.c glib-2.28.1-new/glib/gfileutils.c
---- glib-2.28.1-old/glib/gfileutils.c	2011-02-11 07:23:12.000000000 -0800
-+++ glib-2.28.1-new/glib/gfileutils.c	2011-02-18 09:19:32.000000000 -0800
-@@ -54,7 +54,9 @@
- #include "glibintl.h"
- 
- #ifdef __linux__ /* for btrfs check */
-+#ifdef HAVE_LINUX_MAGIC_H
- #include <linux/magic.h>
-+#endif
- #include <sys/vfs.h>
- #endif
- 

packages/graphics/Mesa/meta

@@ -36,6 +36,6 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 if [ "$MESA_MASTER" = "yes" ]; then
-  PKG_VERSION="0f84dda"
+  PKG_VERSION="ee8d182"
   PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 fi

packages/graphics/libdrm/meta

@@ -36,6 +36,6 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 if [ "$LIBDRM_MASTER" = "yes" ]; then
-  PKG_VERSION="20101222"
+  PKG_VERSION="5cb554a"
   PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 fi

packages/linux-firmware/dvb-firmware/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dvb-firmware"
-PKG_VERSION="0.0.2"
+PKG_VERSION="0.0.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"

packages/linux/build

@@ -22,7 +22,7 @@
 
 . config/options $1
 
-export INSTALL=$(kernel_path)
+export INSTALL=$(kernel_path)/initramfs
 $SCRIPTS/install busybox-initramfs
 
 if [ "$BOOTLOADER" = "u-boot" ]; then

packages/linux/config/initramfs

@@ -1,15 +1,14 @@
 dir /dev 755 0 0
-#nod /dev/tty1 644 0 0 c 4 1
-#nod /dev/console 644 0 0 c 5 1
 
 dir /bin 755 1000 1000
 slink /bin/sh busybox 777 0 0
 file /bin/busybox initramfs/bin/busybox 4755 0 0
-file /bin/ply-image initramfs/bin/ply-image 755 0 0
 
-# dir /lib 755 1000 1000
-# file /lib/ld-uClibc.so.0 initramfs/lib/ld-uClibc.so.0 755 0 0
-# file /lib/libc.so.0 initramfs/lib/libc.so.0 755 0 0
+dir /sbin 755 1000 1000
+file /sbin/ply-image initramfs/sbin/ply-image 755 0 0
+
+dir /splash 755 1000 1000
+file /splash/splash.png initramfs/splash/splash.png 644 0 0
 
 dir /proc 755 0 0
 dir /sys 755 0 0
@@ -18,4 +17,3 @@ dir /sysroot 755 0 0
 dir /storage 755 0 0
 
 file /init initramfs/init 755 0 0
-file /splash.png initramfs/splash.png 644 0 0

packages/linux/install

@@ -44,3 +44,4 @@ mkdir -p $INSTALL/etc
   cp $PKG_DIR/config/modules $INSTALL/etc
 
 mkdir -p $INSTALL/etc/modprobe.d
+  cp $PKG_DIR/modprobe.d/*.conf $INSTALL/etc/modprobe.d

packages/linux/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="linux"
-PKG_VERSION="2.6.38"
+PKG_VERSION="2.6.38.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -37,13 +37,12 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 if [ "$LINUX_NEXT" = "yes" -a "$LINUX" = "default" ]; then
-  PKG_VERSION="2.6.39-next-20110321"
-  PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2"
-#  PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
-  PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+  PKG_VERSION="2.6.39-rc1"
+#  PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2"
+  PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
 fi
 
 if [ "$LINUX" = "ti-omap4" ]; then
-  PKG_VERSION="2.6.35-ti.980.1r14"
+  PKG_VERSION="2.6.38-ti-omap4"
   PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 fi

packages/linux/modprobe.d/ath9k.conf

@@ -0,0 +1,5 @@
+# /etc/modprobe.d/ath9k: setup modload options for module ath9k.
+# see:
+# http://openelec.tv/forum/28-issue-reports/4644-addons-download-not-working#4778
+
+options ath9k nohwcrypt=1

packages/linux/patches/linux-2.6.38.2-050_add_appleir_usb_driver.patch

@@ -0,0 +1,702 @@
+From e11e9e78799a7641fe0dc5289f35f2604a4b71a3 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sun, 17 Jan 2010 00:40:15 +0000
+Subject: [PATCH] Input: add appleir USB driver
+
+This driver was originally written by James McKenzie, updated by
+Greg Kroah-Hartman, further updated by myself, with suspend support
+added.
+
+More recent versions of the IR receiver are also supported through
+a patch by Alex Karpenko. The patch also adds support for the 2nd
+and 5th generation of the controller, and the menu key on newer
+brushed metal remotes.
+
+Tested on a MacbookAir1,1
+
+Signed-off-by: Bastien Nocera <hadess@hadess.net>
+---
+ Documentation/input/appleir.txt |   46 ++++
+ drivers/hid/hid-apple.c         |    4 -
+ drivers/hid/hid-core.c          |    7 +-
+ drivers/hid/hid-ids.h           |    5 +-
+ drivers/input/misc/Kconfig      |   13 +
+ drivers/input/misc/Makefile     |    1 +
+ drivers/input/misc/appleir.c    |  519 +++++++++++++++++++++++++++++++++++++++
+ 7 files changed, 588 insertions(+), 7 deletions(-)
+ create mode 100644 Documentation/input/appleir.txt
+ create mode 100644 drivers/input/misc/appleir.c
+
+diff --git a/Documentation/input/appleir.txt b/Documentation/input/appleir.txt
+new file mode 100644
+index 0000000..db637fb
+--- /dev/null
++++ b/Documentation/input/appleir.txt
+@@ -0,0 +1,46 @@
++Apple IR receiver Driver (appleir)
++----------------------------------
++	Copyright (C) 2009 Bastien Nocera <hadess@hadess.net>
++
++The appleir driver is a kernel input driver to handle Apple's IR
++receivers (and associated remotes) in the kernel.
++
++The driver is an input driver which only handles "official" remotes
++as built and sold by Apple.
++
++Authors
++-------
++
++James McKenzie (original driver)
++Alex Karpenko (05ac:8242 support)
++Greg Kroah-Hartman (cleanups and original submission)
++Bastien Nocera (further cleanups, brushed metal "enter"
++button support and suspend support)
++
++Supported hardware
++------------------
++
++- All Apple laptops and desktops from 2005 onwards, except:
++  - the unibody Macbook (2009)
++  - Mac Pro (all versions)
++- Apple TV (all revisions prior to September 2010)
++
++The remote will only support the 6 (old white) or 7 (brushed metal) buttons
++of the remotes as sold by Apple. See the next section if you want to use
++other remotes or want to use lirc with the device instead of the kernel driver.
++
++Using lirc (native) instead of the kernel driver
++------------------------------------------------
++
++First, you will need to disable the kernel driver for the receiver.
++
++This can be achieved by passing quirks to the usbhid driver.
++The quirk line would be:
++usbhid.quirks=0x05ac:0x8242:0x40000010
++
++With 0x05ac being the vendor ID (Apple, you shouldn't need to change this)
++With 0x8242 being the product ID (check the output of lsusb for your hardware)
++And 0x10 being "HID_QUIRK_HIDDEV_FORCE" and 0x40000000 being "HID_QUIRK_NO_IGNORE"
++
++This should force the creation of a hiddev device for the receiver, and
++make it usable under lirc.
+diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
+index bba05d0..0059d5a 100644
+--- a/drivers/hid/hid-apple.c
++++ b/drivers/hid/hid-apple.c
+@@ -361,10 +361,6 @@ static void apple_remove(struct hid_device *hdev)
+ }
+ 
+ static const struct hid_device_id apple_devices[] = {
+-	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL),
+-		.driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },
+-	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4),
+-		.driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE),
+ 		.driver_data = APPLE_MIGHTYMOUSE | APPLE_INVERT_HWHEEL },
+ 
+diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
+index baa25ad..abc5bd7 100644
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1244,8 +1244,6 @@ static const struct hid_device_id hid_blacklist[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
+-	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },
+-	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
+ 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI) },
+@@ -1577,6 +1575,11 @@ static const struct hid_device_id hid_ignore_list[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_24) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL2) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL3) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL5) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM)},
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM2)},
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index 11af537..360a5ca 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -100,8 +100,11 @@
+ #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b
+ #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a
+ #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b
+-#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL	0x8241
++#define USB_DEVICE_ID_APPLE_IRCONTROL	0x8240
++#define USB_DEVICE_ID_APPLE_IRCONTROL2	0x1440
++#define USB_DEVICE_ID_APPLE_IRCONTROL3	0x8241
+ #define USB_DEVICE_ID_APPLE_IRCONTROL4	0x8242
++#define USB_DEVICE_ID_APPLE_IRCONTROL5	0x8243
+ 
+ #define USB_VENDOR_ID_ASUS		0x0486
+ #define USB_DEVICE_ID_ASUS_T91MT	0x0185
+diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
+index 60de906..2f2f2e7 100644
+--- a/drivers/input/misc/Kconfig
++++ b/drivers/input/misc/Kconfig
+@@ -209,6 +209,19 @@ config INPUT_KEYSPAN_REMOTE
+ 	  To compile this driver as a module, choose M here: the module will
+ 	  be called keyspan_remote.
+ 
++config INPUT_APPLEIR
++	tristate "Apple infrared receiver (built in)"
++	depends on USB_ARCH_HAS_HCD
++	select USB
++	help
++	  Say Y here if you want to use a Apple infrared remote control. All
++	  the Apple computers from 2005 onwards include such a port, except
++	  the unibody Macbook (2009), and Mac Pros. This receiver is also
++	  used in the Apple TV set-top box prior to the 2010 model.
++
++	  To compile this driver as a module, choose M here: the module will
++	  be called appleir.
++
+ config INPUT_POWERMATE
+ 	tristate "Griffin PowerMate and Contour Jog support"
+ 	depends on USB_ARCH_HAS_HCD
+diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
+index 1fe1f6c..d5ef2b9 100644
+--- a/drivers/input/misc/Makefile
++++ b/drivers/input/misc/Makefile
+@@ -13,6 +13,7 @@ obj-$(CONFIG_INPUT_ADXL34X)		+= adxl34x.o
+ obj-$(CONFIG_INPUT_ADXL34X_I2C)		+= adxl34x-i2c.o
+ obj-$(CONFIG_INPUT_ADXL34X_SPI)		+= adxl34x-spi.o
+ obj-$(CONFIG_INPUT_APANEL)		+= apanel.o
++obj-$(CONFIG_INPUT_APPLEIR)		+= appleir.o
+ obj-$(CONFIG_INPUT_ATI_REMOTE)		+= ati_remote.o
+ obj-$(CONFIG_INPUT_ATI_REMOTE2)		+= ati_remote2.o
+ obj-$(CONFIG_INPUT_ATLAS_BTNS)		+= atlas_btns.o
+diff --git a/drivers/input/misc/appleir.c b/drivers/input/misc/appleir.c
+new file mode 100644
+index 0000000..3817a3c
+--- /dev/null
++++ b/drivers/input/misc/appleir.c
+@@ -0,0 +1,519 @@
++/*
++ * appleir: USB driver for the apple ir device
++ *
++ * Original driver written by James McKenzie
++ * Ported to recent 2.6 kernel versions by Greg Kroah-Hartman <gregkh@suse.de>
++ *
++ * Copyright (C) 2006 James McKenzie
++ * Copyright (C) 2008 Greg Kroah-Hartman <greg@kroah.com>
++ * Copyright (C) 2008 Novell Inc.
++ *
++ * 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, version 2.
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/input.h>
++#include <linux/usb/input.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/usb.h>
++#include <linux/usb/input.h>
++#include <asm/unaligned.h>
++#include <asm/byteorder.h>
++
++#define DRIVER_VERSION "v1.2"
++#define DRIVER_AUTHOR "James McKenzie"
++#define DRIVER_DESC "Apple infrared receiver driver"
++#define DRIVER_LICENSE "GPL"
++
++MODULE_AUTHOR(DRIVER_AUTHOR);
++MODULE_DESCRIPTION(DRIVER_DESC);
++MODULE_LICENSE(DRIVER_LICENSE);
++
++#define USB_VENDOR_ID_APPLE			0x05ac
++#define USB_DEVICE_ID_APPLE_IRCONTROL		0x8240
++#define USB_DEVICE_ID_APPLE_IRCONTROL2		0x1440
++#define USB_DEVICE_ID_APPLE_IRCONTROL3		0x8241
++#define USB_DEVICE_ID_APPLE_IRCONTROL4		0x8242
++#define USB_DEVICE_ID_APPLE_IRCONTROL5		0x8243
++
++#define URB_SIZE	32
++
++#define MAX_KEYS	9
++#define MAX_KEYS_MASK	(MAX_KEYS - 1)
++
++#define dbginfo(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0)
++
++static int debug;
++module_param(debug, int, 0644);
++MODULE_PARM_DESC(debug, "Enable extra debug messages and information");
++
++/* I have two devices both of which report the following */
++/* 25 87 ee 83 0a  	+  */
++/* 25 87 ee 83 0c  	-  */
++/* 25 87 ee 83 09	<< */
++/* 25 87 ee 83 06	>> */
++/* 25 87 ee 83 05	>" */
++/* 25 87 ee 83 03	menu */
++/* 26 00 00 00 00	for key repeat*/
++
++/* Thomas Glanzmann reports the following responses */
++/* 25 87 ee ca 0b	+  */
++/* 25 87 ee ca 0d	-  */
++/* 25 87 ee ca 08	<< */
++/* 25 87 ee ca 07	>> */
++/* 25 87 ee ca 04	>" */
++/* 25 87 ee ca 02 	menu */
++/* 26 00 00 00 00       for key repeat*/
++/* He also observes the following event sometimes */
++/* sent after a key is release, which I interpret */
++/* as a flat battery message */
++/* 25 87 e0 ca 06	flat battery */
++
++/* Alexandre Karpenko reports the following responses for Device ID 0x8242 */
++/* 25 87 ee 47 0b	+  */
++/* 25 87 ee 47 0d	-  */
++/* 25 87 ee 47 08	<< */
++/* 25 87 ee 47 07	>> */
++/* 25 87 ee 47 04	>" */
++/* 25 87 ee 47 02 	menu */
++/* 26 87 ee 47 ** 	for key repeat (** is the code of the key being held) */
++
++/* Bastien Nocera's "new" remote */
++/* 25 87 ee 91 5f	followed by
++ * 25 87 ee 91 05	gives you >"
++ *
++ * 25 87 ee 91 5c	followed by
++ * 25 87 ee 91 05	gives you the middle button */
++
++static const unsigned short appleir_key_table[] = {
++	KEY_RESERVED,
++	KEY_MENU,
++	KEY_PLAYPAUSE,
++	KEY_FORWARD,
++	KEY_BACK,
++	KEY_VOLUMEUP,
++	KEY_VOLUMEDOWN,
++	KEY_ENTER,
++	KEY_RESERVED,
++};
++
++struct appleir {
++	struct input_dev *input_dev;
++	unsigned short keymap[ARRAY_SIZE(appleir_key_table)];
++	u8 *data;
++	dma_addr_t dma_buf;
++	struct usb_device *usbdev;
++	unsigned int flags;
++	struct urb *urb;
++	struct timer_list key_up_timer;
++	int current_key;
++	int prev_key_idx;
++	char phys[32];
++};
++
++static DEFINE_MUTEX(appleir_mutex);
++
++enum {
++	APPLEIR_OPENED = 0x1,
++	APPLEIR_SUSPENDED = 0x2,
++};
++
++static struct usb_device_id appleir_ids[] = {
++	{ USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) },
++	{ USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL2) },
++	{ USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL3) },
++	{ USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
++	{ USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL5) },
++	{}
++};
++MODULE_DEVICE_TABLE(usb, appleir_ids);
++
++static void dump_packet(struct appleir *appleir, char *msg, u8 *data, int len)
++{
++	int i;
++
++	printk(KERN_ERR "appleir: %s (%d bytes)", msg, len);
++
++	for (i = 0; i < len; ++i)
++		printk(" %02x", data[i]);
++	printk(" (should be command %d)\n", (data[4] >> 1) & MAX_KEYS_MASK);
++}
++
++static int get_key(int data)
++{
++	switch (data) {
++	case 0x02:
++	case 0x03:
++		/* menu */
++		return 1;
++	case 0x04:
++	case 0x05:
++		/* >" */
++		return 2;
++	case 0x06:
++	case 0x07:
++		/* >> */
++		return 3;
++	case 0x08:
++	case 0x09:
++		/* << */
++		return 4;
++	case 0x0a:
++	case 0x0b:
++		/* + */
++		return 5;
++	case 0x0c:
++	case 0x0d:
++		/* - */
++		return 6;
++	case 0x5c:
++		/* Middle button, on newer remotes,
++		 * part of a 2 packet-command */
++		return -7;
++	default:
++		return -1;
++	}
++}
++
++static void key_up(struct appleir *appleir, int key)
++{
++	dbginfo(&appleir->input_dev->dev, "key %d up\n", key);
++	input_report_key(appleir->input_dev, key, 0);
++	input_sync(appleir->input_dev);
++}
++
++static void key_down(struct appleir *appleir, int key)
++{
++	dbginfo(&appleir->input_dev->dev, "key %d down\n", key);
++	input_report_key(appleir->input_dev, key, 1);
++	input_sync(appleir->input_dev);
++}
++
++static void battery_flat(struct appleir *appleir)
++{
++	dev_err(&appleir->input_dev->dev, "possible flat battery?\n");
++}
++
++static void key_up_tick(unsigned long data)
++{
++	struct appleir *appleir = (struct appleir *)data;
++
++	if (appleir->current_key) {
++		key_up(appleir, appleir->current_key);
++		appleir->current_key = 0;
++	}
++}
++
++static void new_data(struct appleir *appleir, u8 *data, int len)
++{
++	static const u8 keydown[] = { 0x25, 0x87, 0xee };
++	static const u8 keyrepeat[] = { 0x26, };
++	static const u8 flatbattery[] = { 0x25, 0x87, 0xe0 };
++
++	if (debug)
++		dump_packet(appleir, "received", data, len);
++
++	if (len != 5)
++		return;
++
++	if (!memcmp(data, keydown, sizeof(keydown))) {
++		int index;
++
++		/* If we already have a key down, take it up before marking
++		   this one down */
++		if (appleir->current_key)
++			key_up(appleir, appleir->current_key);
++
++		/* Handle dual packet commands */
++		if (appleir->prev_key_idx > 0)
++			index = appleir->prev_key_idx;
++		else
++			index = get_key(data[4]);
++
++		if (index > 0) {
++			appleir->current_key = appleir->keymap[index];
++
++			key_down(appleir, appleir->current_key);
++			/* Remote doesn't do key up, either pull them up, in the test
++			   above, or here set a timer which pulls them up after 1/8 s */
++			mod_timer(&appleir->key_up_timer, jiffies + HZ / 8);
++			appleir->prev_key_idx = 0;
++			return;
++		} else if (index == -7) {
++			/* Remember key for next packet */
++			appleir->prev_key_idx = 0 - index;
++			return;
++		}
++	}
++
++	appleir->prev_key_idx = 0;
++
++	if (!memcmp(data, keyrepeat, sizeof(keyrepeat))) {
++		key_down(appleir, appleir->current_key);
++		/* Remote doesn't do key up, either pull them up, in the test
++		   above, or here set a timer which pulls them up after 1/8 s */
++		mod_timer(&appleir->key_up_timer, jiffies + HZ / 8);
++		return;
++	}
++
++	if (!memcmp(data, flatbattery, sizeof(flatbattery))) {
++		battery_flat(appleir);
++		/* Fall through */
++	}
++
++	dump_packet(appleir, "unknown packet", data, len);
++}
++
++static void appleir_urb(struct urb *urb)
++{
++	struct appleir *appleir = urb->context;
++	int status = urb->status;
++	int retval;
++
++	switch (status) {
++	case 0:
++		new_data(appleir, urb->transfer_buffer, urb->actual_length);
++		break;
++	case -ECONNRESET:
++	case -ENOENT:
++	case -ESHUTDOWN:
++		/* This urb is terminated, clean up */
++		dbginfo(&appleir->input_dev->dev, "%s - urb shutting down with status: %d", __func__,
++			urb->status);
++		return;
++	default:
++		dbginfo(&appleir->input_dev->dev, "%s - nonzero urb status received: %d", __func__,
++			urb->status);
++	}
++
++	retval = usb_submit_urb(urb, GFP_ATOMIC);
++	if (retval)
++		err("%s - usb_submit_urb failed with result %d", __func__,
++		    retval);
++}
++
++static int appleir_open(struct input_dev *dev)
++{
++	struct appleir *appleir = input_get_drvdata(dev);
++	struct usb_interface *intf = usb_ifnum_to_if(appleir->usbdev, 0);
++	int r;
++
++	r = usb_autopm_get_interface(intf);
++	if (r) {
++		dev_err(&intf->dev,
++			"%s(): usb_autopm_get_interface() = %d\n", __func__, r);
++		return r;
++	}
++
++	mutex_lock(&appleir_mutex);
++
++	if (usb_submit_urb(appleir->urb, GFP_ATOMIC)) {
++		r = -EIO;
++		goto fail;
++	}
++
++	appleir->flags |= APPLEIR_OPENED;
++
++	mutex_unlock(&appleir_mutex);
++
++	usb_autopm_put_interface(intf);
++
++	return 0;
++fail:
++	mutex_unlock(&appleir_mutex);
++	usb_autopm_put_interface(intf);
++	return r;
++}
++
++static void appleir_close(struct input_dev *dev)
++{
++	struct appleir *appleir = input_get_drvdata(dev);
++
++	mutex_lock(&appleir_mutex);
++
++	if (!(appleir->flags & APPLEIR_SUSPENDED)) {
++		usb_kill_urb(appleir->urb);
++		del_timer_sync(&appleir->key_up_timer);
++	}
++
++	appleir->flags &= ~APPLEIR_OPENED;
++
++	mutex_unlock(&appleir_mutex);
++}
++
++static int appleir_probe(struct usb_interface *intf,
++			 const struct usb_device_id *id)
++{
++	struct usb_device *dev = interface_to_usbdev(intf);
++	struct usb_endpoint_descriptor *endpoint;
++	struct appleir *appleir = NULL;
++	struct input_dev *input_dev;
++	int retval = -ENOMEM;
++	int i;
++
++	appleir = kzalloc(sizeof(struct appleir), GFP_KERNEL);
++	if (!appleir)
++		goto allocfail;
++
++	appleir->data = usb_alloc_coherent(dev, URB_SIZE, GFP_KERNEL,
++					 &appleir->dma_buf);
++	if (!appleir->data)
++		goto usbfail;
++
++	appleir->urb = usb_alloc_urb(0, GFP_KERNEL);
++	if (!appleir->urb)
++		goto urbfail;
++
++	appleir->usbdev = dev;
++
++	input_dev = input_allocate_device();
++	if (!input_dev)
++		goto inputfail;
++
++	appleir->input_dev = input_dev;
++
++	usb_make_path(dev, appleir->phys, sizeof(appleir->phys));
++	strlcpy(appleir->phys, "/input0", sizeof(appleir->phys));
++
++	input_dev->name = "Apple Infrared Remote Controller";
++	input_dev->phys = appleir->phys;
++	usb_to_input_id(dev, &input_dev->id);
++	input_dev->dev.parent = &intf->dev;
++	input_dev->keycode = appleir->keymap;
++	input_dev->keycodesize = sizeof(unsigned short);
++	input_dev->keycodemax = ARRAY_SIZE(appleir->keymap);
++
++	input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
++
++	memcpy(appleir->keymap, appleir_key_table, sizeof(appleir->keymap));
++	for (i = 0; i < ARRAY_SIZE(appleir_key_table); i++)
++		set_bit(appleir->keymap[i], input_dev->keybit);
++	clear_bit(KEY_RESERVED, input_dev->keybit);
++
++	input_set_drvdata(input_dev, appleir);
++	input_dev->open = appleir_open;
++	input_dev->close = appleir_close;
++
++	endpoint = &intf->cur_altsetting->endpoint[0].desc;
++
++	usb_fill_int_urb(appleir->urb, dev,
++			 usb_rcvintpipe(dev, endpoint->bEndpointAddress),
++			 appleir->data, 8,
++			 appleir_urb, appleir, endpoint->bInterval);
++
++	appleir->urb->transfer_dma = appleir->dma_buf;
++	appleir->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
++
++	setup_timer(&appleir->key_up_timer,
++		    key_up_tick, (unsigned long) appleir);
++
++	retval = input_register_device(appleir->input_dev);
++	if (retval)
++		goto inputfail;
++
++	usb_set_intfdata(intf, appleir);
++
++	return 0;
++
++inputfail:
++	input_free_device(appleir->input_dev);
++
++urbfail:
++	usb_free_urb(appleir->urb);
++
++usbfail:
++	usb_free_coherent(dev, URB_SIZE, appleir->data,
++			appleir->dma_buf);
++
++allocfail:
++	kfree(appleir);
++
++	return retval;
++}
++
++static void appleir_disconnect(struct usb_interface *intf)
++{
++	struct appleir *appleir = usb_get_intfdata(intf);
++
++	usb_set_intfdata(intf, NULL);
++	input_unregister_device(appleir->input_dev);
++	usb_free_urb(appleir->urb);
++	usb_free_coherent(interface_to_usbdev(intf), URB_SIZE,
++			appleir->data, appleir->dma_buf);
++	kfree(appleir);
++}
++
++static int appleir_suspend(struct usb_interface *interface,
++			   pm_message_t message)
++{
++	struct appleir *appleir = usb_get_intfdata(interface);
++
++	mutex_lock(&appleir_mutex);
++	if (appleir->flags & APPLEIR_OPENED)
++		usb_kill_urb(appleir->urb);
++
++	appleir->flags |= APPLEIR_SUSPENDED;
++
++	mutex_unlock(&appleir_mutex);
++
++	return 0;
++}
++
++static int appleir_resume(struct usb_interface *interface)
++{
++	struct appleir *appleir;
++	int r = 0;
++
++	appleir = usb_get_intfdata(interface);
++
++	mutex_lock(&appleir_mutex);
++	if (appleir->flags & APPLEIR_OPENED) {
++		struct usb_endpoint_descriptor *endpoint;
++
++		endpoint = &interface->cur_altsetting->endpoint[0].desc;
++		usb_fill_int_urb(appleir->urb, appleir->usbdev,
++				 usb_rcvintpipe(appleir->usbdev, endpoint->bEndpointAddress),
++				 appleir->data, 8,
++				 appleir_urb, appleir, endpoint->bInterval);
++		appleir->urb->transfer_dma = appleir->dma_buf;
++		appleir->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
++
++		/* And reset the USB device */
++		if (usb_submit_urb(appleir->urb, GFP_ATOMIC))
++			r = -EIO;
++	}
++
++	appleir->flags &= ~APPLEIR_SUSPENDED;
++
++	mutex_unlock(&appleir_mutex);
++
++	return r;
++}
++
++static struct usb_driver appleir_driver = {
++	.name                 = "appleir",
++	.probe                = appleir_probe,
++	.disconnect           = appleir_disconnect,
++	.suspend              = appleir_suspend,
++	.resume               = appleir_resume,
++	.reset_resume         = appleir_resume,
++	.id_table             = appleir_ids,
++};
++
++static int __init appleir_init(void)
++{
++	return usb_register(&appleir_driver);
++}
++
++static void __exit appleir_exit(void)
++{
++	usb_deregister(&appleir_driver);
++}
++
++module_init(appleir_init);
++module_exit(appleir_exit);
+-- 
+1.7.2.2
+

packages/linux/patches/linux-2.6.39-next-20110321-322-panda_remove_unused_power_regulators.patch

@@ -1,69 +0,0 @@
-the pandaboard does not use the VUSIM or VAUX1 power regulators on the TWL6030
-and are left floating. if the VUSIM and VAUX1 power regulators are initilized,
-noise on the unloaded regulators generates an overcurrent interrupt causing the
-system to power down. this patch removes the initialization of the unused power
-regulators of VUSIM and VAUX1.
-
-Signed-off-by: David Anders <x0132446@ti.com>
----
- arch/arm/mach-omap2/board-omap4panda.c |   28 ----------------------------
- 1 files changed, 0 insertions(+), 28 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
-index e944025..abc913b 100644
---- a/arch/arm/mach-omap2/board-omap4panda.c
-+++ b/arch/arm/mach-omap2/board-omap4panda.c
-@@ -220,19 +220,6 @@ static int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers)
- 	return 0;
- }
- 
--static struct regulator_init_data omap4_panda_vaux1 = {
--	.constraints = {
--		.min_uV			= 1000000,
--		.max_uV			= 3000000,
--		.apply_uV		= true,
--		.valid_modes_mask	= REGULATOR_MODE_NORMAL
--					| REGULATOR_MODE_STANDBY,
--		.valid_ops_mask	 = REGULATOR_CHANGE_VOLTAGE
--					| REGULATOR_CHANGE_MODE
--					| REGULATOR_CHANGE_STATUS,
--	},
--};
--
- static struct regulator_init_data omap4_panda_vaux2 = {
- 	.constraints = {
- 		.min_uV			= 1200000,
-@@ -288,19 +275,6 @@ static struct regulator_init_data omap4_panda_vpp = {
- 	},
- };
- 
--static struct regulator_init_data omap4_panda_vusim = {
--	.constraints = {
--		.min_uV			= 1200000,
--		.max_uV			= 2900000,
--		.apply_uV		= true,
--		.valid_modes_mask	= REGULATOR_MODE_NORMAL
--					| REGULATOR_MODE_STANDBY,
--		.valid_ops_mask	 = REGULATOR_CHANGE_VOLTAGE
--					| REGULATOR_CHANGE_MODE
--					| REGULATOR_CHANGE_STATUS,
--	},
--};
--
- static struct regulator_init_data omap4_panda_vana = {
- 	.constraints = {
- 		.min_uV			= 2100000,
-@@ -356,12 +330,10 @@ static struct twl4030_platform_data omap4_panda_twldata = {
- 	/* Regulators */
- 	.vmmc		= &omap4_panda_vmmc,
- 	.vpp		= &omap4_panda_vpp,
--	.vusim		= &omap4_panda_vusim,
- 	.vana		= &omap4_panda_vana,
- 	.vcxio		= &omap4_panda_vcxio,
- 	.vdac		= &omap4_panda_vdac,
- 	.vusb		= &omap4_panda_vusb,
--	.vaux1		= &omap4_panda_vaux1,
- 	.vaux2		= &omap4_panda_vaux2,
- 	.vaux3		= &omap4_panda_vaux3,
- 	.usb		= &omap4_usbphy_data,
--- 1.7.0.4 

packages/linux/patches/linux-2.6.39-rc1-000_crosscompile.patch

@@ -0,0 +1,22 @@
+--- linux-2.6.24-rc2.orig/arch/x86/boot/tools/build.c	2007-10-06 12:26:14.000000000 +0200
++++ linux-2.6.24-rc2/arch/x86/boot/tools/build.c	2007-10-06 12:27:36.000000000 +0200
+@@ -29,7 +29,6 @@
+ #include <stdarg.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <sys/sysmacros.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
+@@ -42,6 +41,11 @@
+ #define DEFAULT_MAJOR_ROOT 0
+ #define DEFAULT_MINOR_ROOT 0
+ 
++#undef major
++#define major(dev) ((int)(((dev) >> 8) & 0xff))
++#undef minor
++#define minor(dev) ((int)((dev) & 0xff))
++
+ /* Minimal number of setup sectors */
+ #define SETUP_SECT_MIN 5
+ #define SETUP_SECT_MAX 64

packages/linux/patches/linux-2.6.39-rc1-002_bash_only_feature.patch

@@ -0,0 +1,15 @@
+Index: linux-2.6.16/scripts/gen_initramfs_list.sh
+===================================================================
+--- linux-2.6.16.orig/scripts/gen_initramfs_list.sh	2006-03-20 18:41:34.000000000 +0100
++++ linux-2.6.16/scripts/gen_initramfs_list.sh	2006-03-20 18:42:40.000000000 +0100
+@@ -56,9 +56,7 @@
+ 
+ parse() {
+ 	local location="$1"
+-	local name="${location/${srcdir}//}"
+-	# change '//' into '/'
+-	name="${name//\/\///}"
++	local name="$(echo "$location" | sed -e 's%$srcdir%%' -e 's%//*%/%g')"
+ 	local mode="$2"
+ 	local uid="$3"
+ 	local gid="$4"

packages/linux/patches/linux-2.6.39-rc1-003-no_dev_console.patch

@@ -0,0 +1,20 @@
+diff -Naur linux-2.6.34-rc7/init/main.c linux-2.6.34-rc7.patch/init/main.c
+--- linux-2.6.34-rc7/init/main.c	2010-05-10 03:36:28.000000000 +0200
++++ linux-2.6.34-rc7.patch/init/main.c	2010-05-15 12:28:34.767241760 +0200
+@@ -886,8 +886,14 @@
+ 	do_basic_setup();
+ 
+ 	/* Open the /dev/console on the rootfs, this should never fail */
+-	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
+-		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
++	char *console = "/dev_console";
++
++	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) {
++		sys_mknod(console, S_IFCHR|0600, (TTYAUX_MAJOR<<8)|1);
++		if (sys_open(console, O_RDWR, 0) < 0)
++			printk(KERN_WARNING "Warning: unable to open an initial console.\n");
++		sys_unlink(console);
++	}
+ 
+ 	(void) sys_dup(0);
+ 	(void) sys_dup(0);

packages/linux/patches/linux-2.6.39-rc1-004_lower_undefined_mode_timeout.patch

@@ -0,0 +1,24 @@
+diff -Naur linux-2.6.23-rc9.orig/arch/i386/boot/tty.c linux-2.6.23-rc9/arch/i386/boot/tty.c
+--- linux-2.6.23-rc9.orig/arch/x86/boot/tty.c	2007-10-06 12:26:14.000000000 +0200
++++ linux-2.6.23-rc9/arch/x86/boot/tty.c	2007-10-06 12:37:47.000000000 +0200
+@@ -92,7 +92,7 @@
+ 
+ int getchar_timeout(void)
+ {
+-	int cnt = 30;
++	int cnt = 3;
+ 	int t0, t1;
+ 
+ 	t0 = gettime();
+diff -Naur linux-2.6.23-rc9.orig/arch/i386/boot/video.c linux-2.6.23-rc9/arch/i386/boot/video.c
+--- linux-2.6.23-rc9.orig/arch/x86/boot/video.c	2007-10-06 12:26:14.000000000 +0200
++++ linux-2.6.23-rc9/arch/x86/boot/video.c	2007-10-06 12:36:05.000000000 +0200
+@@ -329,7 +329,7 @@
+ 	unsigned int sel;
+ 
+ 	puts("Press <ENTER> to see video modes available, "
+-	     "<SPACE> to continue, or wait 30 sec\n");
++	     "<SPACE> to continue, or wait 3 sec\n");
+ 
+ 	kbd_flush();
+ 	while (1) {

packages/linux/patches/linux-2.6.39-rc1-005_kconfig_no_timestamp.patch

@@ -0,0 +1,13 @@
+Index: linux-2.6.16/scripts/kconfig/confdata.c
+===================================================================
+--- linux-2.6.16.orig/scripts/kconfig/confdata.c	2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16/scripts/kconfig/confdata.c	2006-03-20 18:47:06.000000000 +0100
+@@ -340,7 +340,7 @@
+ 	int type, l;
+ 	const char *str;
+ 	time_t now;
+-	int use_timestamp = 1;
++	int use_timestamp = 0;
+ 	char *env;
+ 
+ 	dirname[0] = 0;

packages/linux/patches/linux-2.6.39-rc1-006_enable_utf8.patch

@@ -0,0 +1,25 @@
+diff -Naur linux-2.6.31-rc4.orig/fs/fat/inode.c linux-2.6.31-rc4/fs/fat/inode.c
+--- linux-2.6.31-rc4.orig/fs/fat/inode.c	2009-07-25 12:47:41.000000000 +0200
++++ linux-2.6.31-rc4/fs/fat/inode.c	2009-07-25 13:38:18.000000000 +0200
+@@ -979,7 +979,8 @@
+ 	}
+ 	opts->name_check = 'n';
+ 	opts->quiet = opts->showexec = opts->sys_immutable = opts->dotsOK =  0;
+-	opts->utf8 = opts->unicode_xlate = 0;
++	opts->utf8 = 1;
++	opts->unicode_xlate = 0;
+ 	opts->numtail = 1;
+ 	opts->usefree = opts->nocase = 0;
+ 	opts->tz_utc = 0;
+diff -Naur linux-2.6.31-rc4.orig/fs/isofs/inode.c linux-2.6.31-rc4/fs/isofs/inode.c
+--- linux-2.6.31-rc4.orig/fs/isofs/inode.c	2009-07-25 12:47:41.000000000 +0200
++++ linux-2.6.31-rc4/fs/isofs/inode.c	2009-07-25 13:38:49.000000000 +0200
+@@ -377,7 +377,7 @@
+ 	popt->gid = 0;
+ 	popt->uid = 0;
+ 	popt->iocharset = NULL;
+-	popt->utf8 = 0;
++	popt->utf8 = 1;
+ 	popt->overriderockperm = 0;
+ 	popt->session=-1;
+ 	popt->sbsector=-1;

packages/linux/patches/linux-2.6.39-rc1-007_die_floppy_die.patch

@@ -0,0 +1,30 @@
+From 4ff58b642f80dedb20533978123d89b5ac9b1ed5 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle@phobos.i.jkkm.org>
+Date: Tue, 30 Mar 2010 00:04:29 -0400
+Subject: die-floppy-die
+
+Kill the floppy.ko pnp modalias. We were surviving just fine without
+autoloading floppy drivers, tyvm.
+
+Please feel free to register all complaints in the wastepaper bin.
+---
+ drivers/block/floppy.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
+index 90c4038..f4a0b90 100644
+--- a/drivers/block/floppy.c
++++ b/drivers/block/floppy.c
+@@ -4619,8 +4619,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
+ 	{"PNP0700", 0},
+ 	{}
+ };
+-
+-MODULE_DEVICE_TABLE(pnp, floppy_pnpids);
++/* MODULE_DEVICE_TABLE(pnp, floppy_pnpids); */
+ 
+ #else
+ 
+-- 
+1.7.0.1
+

packages/linux/patches/linux-2.6.39-rc1-009_disable_i8042_check_on_apple_mac.patch

@@ -0,0 +1,59 @@
+From 2a79554c864ac58fa2ad982f0fcee2cc2aa33eb5 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 20 May 2010 10:30:31 -0400
+Subject: Disable i8042 checks on Intel Apple Macs
+
+As those computers never had any i8042 controllers, and the
+current lookup code could potentially lock up/hang/wait for
+timeout for long periods of time.
+
+Fixes intermittent hangs on boot on a MacbookAir1,1
+
+Signed-off-by: Bastien Nocera <hadess@hadess.net>
+---
+ drivers/input/serio/i8042.c |   22 ++++++++++++++++++++++
+ 1 files changed, 22 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
+index 6440a8f..4d7cf98 100644
+--- a/drivers/input/serio/i8042.c
++++ b/drivers/input/serio/i8042.c
+@@ -1451,6 +1451,22 @@ static struct platform_driver i8042_driver = {
+ 	.shutdown	= i8042_shutdown,
+ };
+ 
++#ifdef CONFIG_DMI
++static struct dmi_system_id __initdata dmi_system_table[] = {
++	{
++		.matches = {
++			DMI_MATCH(DMI_BIOS_VENDOR, "Apple Computer, Inc.")
++		},
++	},
++	{
++		.matches = {
++			DMI_MATCH(DMI_BIOS_VENDOR, "Apple Inc.")
++		},
++	},
++	{}
++};
++#endif /*CONFIG_DMI*/
++
+ static int __init i8042_init(void)
+ {
+ 	struct platform_device *pdev;
+@@ -1458,6 +1474,12 @@ static int __init i8042_init(void)
+ 
+ 	dbg_init();
+ 
++#ifdef CONFIG_DMI
++	/* Intel Apple Macs never have an i8042 controller */
++	if (dmi_check_system(dmi_system_table) > 0)
++		return -ENODEV;
++#endif /*CONFIG_DMI*/
++
+ 	err = i8042_platform_init();
+ 	if (err)
+ 		return err;
+-- 
+1.7.0.1
+

packages/linux/patches/linux-2.6.39-rc1-050_add_appleir_usb_driver.patch

@@ -0,0 +1,702 @@
+From e11e9e78799a7641fe0dc5289f35f2604a4b71a3 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sun, 17 Jan 2010 00:40:15 +0000
+Subject: [PATCH] Input: add appleir USB driver
+
+This driver was originally written by James McKenzie, updated by
+Greg Kroah-Hartman, further updated by myself, with suspend support
+added.
+
+More recent versions of the IR receiver are also supported through
+a patch by Alex Karpenko. The patch also adds support for the 2nd
+and 5th generation of the controller, and the menu key on newer
+brushed metal remotes.
+
+Tested on a MacbookAir1,1
+
+Signed-off-by: Bastien Nocera <hadess@hadess.net>
+---
+ Documentation/input/appleir.txt |   46 ++++
+ drivers/hid/hid-apple.c         |    4 -
+ drivers/hid/hid-core.c          |    7 +-
+ drivers/hid/hid-ids.h           |    5 +-
+ drivers/input/misc/Kconfig      |   13 +
+ drivers/input/misc/Makefile     |    1 +
+ drivers/input/misc/appleir.c    |  519 +++++++++++++++++++++++++++++++++++++++
+ 7 files changed, 588 insertions(+), 7 deletions(-)
+ create mode 100644 Documentation/input/appleir.txt
+ create mode 100644 drivers/input/misc/appleir.c
+
+diff --git a/Documentation/input/appleir.txt b/Documentation/input/appleir.txt
+new file mode 100644
+index 0000000..db637fb
+--- /dev/null
++++ b/Documentation/input/appleir.txt
+@@ -0,0 +1,46 @@
++Apple IR receiver Driver (appleir)
++----------------------------------
++	Copyright (C) 2009 Bastien Nocera <hadess@hadess.net>
++
++The appleir driver is a kernel input driver to handle Apple's IR
++receivers (and associated remotes) in the kernel.
++
++The driver is an input driver which only handles "official" remotes
++as built and sold by Apple.
++
++Authors
++-------
++
++James McKenzie (original driver)
++Alex Karpenko (05ac:8242 support)
++Greg Kroah-Hartman (cleanups and original submission)
++Bastien Nocera (further cleanups, brushed metal "enter"
++button support and suspend support)
++
++Supported hardware
++------------------
++
++- All Apple laptops and desktops from 2005 onwards, except:
++  - the unibody Macbook (2009)
++  - Mac Pro (all versions)
++- Apple TV (all revisions prior to September 2010)
++
++The remote will only support the 6 (old white) or 7 (brushed metal) buttons
++of the remotes as sold by Apple. See the next section if you want to use
++other remotes or want to use lirc with the device instead of the kernel driver.
++
++Using lirc (native) instead of the kernel driver
++------------------------------------------------
++
++First, you will need to disable the kernel driver for the receiver.
++
++This can be achieved by passing quirks to the usbhid driver.
++The quirk line would be:
++usbhid.quirks=0x05ac:0x8242:0x40000010
++
++With 0x05ac being the vendor ID (Apple, you shouldn't need to change this)
++With 0x8242 being the product ID (check the output of lsusb for your hardware)
++And 0x10 being "HID_QUIRK_HIDDEV_FORCE" and 0x40000000 being "HID_QUIRK_NO_IGNORE"
++
++This should force the creation of a hiddev device for the receiver, and
++make it usable under lirc.
+diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
+index bba05d0..0059d5a 100644
+--- a/drivers/hid/hid-apple.c
++++ b/drivers/hid/hid-apple.c
+@@ -361,10 +361,6 @@ static void apple_remove(struct hid_device *hdev)
+ }
+ 
+ static const struct hid_device_id apple_devices[] = {
+-	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL),
+-		.driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },
+-	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4),
+-		.driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE),
+ 		.driver_data = APPLE_MIGHTYMOUSE | APPLE_INVERT_HWHEEL },
+ 
+diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
+index baa25ad..abc5bd7 100644
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1244,8 +1244,6 @@ static const struct hid_device_id hid_blacklist[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
+-	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },
+-	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
+ 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI) },
+@@ -1577,6 +1575,11 @@ static const struct hid_device_id hid_ignore_list[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_24) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL2) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL3) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL5) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM)},
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM2)},
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index 11af537..360a5ca 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -100,8 +100,11 @@
+ #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b
+ #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a
+ #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b
+-#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL	0x8241
++#define USB_DEVICE_ID_APPLE_IRCONTROL	0x8240
++#define USB_DEVICE_ID_APPLE_IRCONTROL2	0x1440
++#define USB_DEVICE_ID_APPLE_IRCONTROL3	0x8241
+ #define USB_DEVICE_ID_APPLE_IRCONTROL4	0x8242
++#define USB_DEVICE_ID_APPLE_IRCONTROL5	0x8243
+ 
+ #define USB_VENDOR_ID_ASUS		0x0486
+ #define USB_DEVICE_ID_ASUS_T91MT	0x0185
+diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
+index 60de906..2f2f2e7 100644
+--- a/drivers/input/misc/Kconfig
++++ b/drivers/input/misc/Kconfig
+@@ -209,6 +209,19 @@ config INPUT_KEYSPAN_REMOTE
+ 	  To compile this driver as a module, choose M here: the module will
+ 	  be called keyspan_remote.
+ 
++config INPUT_APPLEIR
++	tristate "Apple infrared receiver (built in)"
++	depends on USB_ARCH_HAS_HCD
++	select USB
++	help
++	  Say Y here if you want to use a Apple infrared remote control. All
++	  the Apple computers from 2005 onwards include such a port, except
++	  the unibody Macbook (2009), and Mac Pros. This receiver is also
++	  used in the Apple TV set-top box prior to the 2010 model.
++
++	  To compile this driver as a module, choose M here: the module will
++	  be called appleir.
++
+ config INPUT_POWERMATE
+ 	tristate "Griffin PowerMate and Contour Jog support"
+ 	depends on USB_ARCH_HAS_HCD
+diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
+index 1fe1f6c..d5ef2b9 100644
+--- a/drivers/input/misc/Makefile
++++ b/drivers/input/misc/Makefile
+@@ -13,6 +13,7 @@ obj-$(CONFIG_INPUT_ADXL34X)		+= adxl34x.o
+ obj-$(CONFIG_INPUT_ADXL34X_I2C)		+= adxl34x-i2c.o
+ obj-$(CONFIG_INPUT_ADXL34X_SPI)		+= adxl34x-spi.o
+ obj-$(CONFIG_INPUT_APANEL)		+= apanel.o
++obj-$(CONFIG_INPUT_APPLEIR)		+= appleir.o
+ obj-$(CONFIG_INPUT_ATI_REMOTE)		+= ati_remote.o
+ obj-$(CONFIG_INPUT_ATI_REMOTE2)		+= ati_remote2.o
+ obj-$(CONFIG_INPUT_ATLAS_BTNS)		+= atlas_btns.o
+diff --git a/drivers/input/misc/appleir.c b/drivers/input/misc/appleir.c
+new file mode 100644
+index 0000000..3817a3c
+--- /dev/null
++++ b/drivers/input/misc/appleir.c
+@@ -0,0 +1,519 @@
++/*
++ * appleir: USB driver for the apple ir device
++ *
++ * Original driver written by James McKenzie
++ * Ported to recent 2.6 kernel versions by Greg Kroah-Hartman <gregkh@suse.de>
++ *
++ * Copyright (C) 2006 James McKenzie
++ * Copyright (C) 2008 Greg Kroah-Hartman <greg@kroah.com>
++ * Copyright (C) 2008 Novell Inc.
++ *
++ * 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, version 2.
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/input.h>
++#include <linux/usb/input.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/usb.h>
++#include <linux/usb/input.h>
++#include <asm/unaligned.h>
++#include <asm/byteorder.h>
++
++#define DRIVER_VERSION "v1.2"
++#define DRIVER_AUTHOR "James McKenzie"
++#define DRIVER_DESC "Apple infrared receiver driver"
++#define DRIVER_LICENSE "GPL"
++
++MODULE_AUTHOR(DRIVER_AUTHOR);
++MODULE_DESCRIPTION(DRIVER_DESC);
++MODULE_LICENSE(DRIVER_LICENSE);
++
++#define USB_VENDOR_ID_APPLE			0x05ac
++#define USB_DEVICE_ID_APPLE_IRCONTROL		0x8240
++#define USB_DEVICE_ID_APPLE_IRCONTROL2		0x1440
++#define USB_DEVICE_ID_APPLE_IRCONTROL3		0x8241
++#define USB_DEVICE_ID_APPLE_IRCONTROL4		0x8242
++#define USB_DEVICE_ID_APPLE_IRCONTROL5		0x8243
++
++#define URB_SIZE	32
++
++#define MAX_KEYS	9
++#define MAX_KEYS_MASK	(MAX_KEYS - 1)
++
++#define dbginfo(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0)
++
++static int debug;
++module_param(debug, int, 0644);
++MODULE_PARM_DESC(debug, "Enable extra debug messages and information");
++
++/* I have two devices both of which report the following */
++/* 25 87 ee 83 0a  	+  */
++/* 25 87 ee 83 0c  	-  */
++/* 25 87 ee 83 09	<< */
++/* 25 87 ee 83 06	>> */
++/* 25 87 ee 83 05	>" */
++/* 25 87 ee 83 03	menu */
++/* 26 00 00 00 00	for key repeat*/
++
++/* Thomas Glanzmann reports the following responses */
++/* 25 87 ee ca 0b	+  */
++/* 25 87 ee ca 0d	-  */
++/* 25 87 ee ca 08	<< */
++/* 25 87 ee ca 07	>> */
++/* 25 87 ee ca 04	>" */
++/* 25 87 ee ca 02 	menu */
++/* 26 00 00 00 00       for key repeat*/
++/* He also observes the following event sometimes */
++/* sent after a key is release, which I interpret */
++/* as a flat battery message */
++/* 25 87 e0 ca 06	flat battery */
++
++/* Alexandre Karpenko reports the following responses for Device ID 0x8242 */
++/* 25 87 ee 47 0b	+  */
++/* 25 87 ee 47 0d	-  */
++/* 25 87 ee 47 08	<< */
++/* 25 87 ee 47 07	>> */
++/* 25 87 ee 47 04	>" */
++/* 25 87 ee 47 02 	menu */
++/* 26 87 ee 47 ** 	for key repeat (** is the code of the key being held) */
++
++/* Bastien Nocera's "new" remote */
++/* 25 87 ee 91 5f	followed by
++ * 25 87 ee 91 05	gives you >"
++ *
++ * 25 87 ee 91 5c	followed by
++ * 25 87 ee 91 05	gives you the middle button */
++
++static const unsigned short appleir_key_table[] = {
++	KEY_RESERVED,
++	KEY_MENU,
++	KEY_PLAYPAUSE,
++	KEY_FORWARD,
++	KEY_BACK,
++	KEY_VOLUMEUP,
++	KEY_VOLUMEDOWN,
++	KEY_ENTER,
++	KEY_RESERVED,
++};
++
++struct appleir {
++	struct input_dev *input_dev;
++	unsigned short keymap[ARRAY_SIZE(appleir_key_table)];
++	u8 *data;
++	dma_addr_t dma_buf;
++	struct usb_device *usbdev;
++	unsigned int flags;
++	struct urb *urb;
++	struct timer_list key_up_timer;
++	int current_key;
++	int prev_key_idx;
++	char phys[32];
++};
++
++static DEFINE_MUTEX(appleir_mutex);
++
++enum {
++	APPLEIR_OPENED = 0x1,
++	APPLEIR_SUSPENDED = 0x2,
++};
++
++static struct usb_device_id appleir_ids[] = {
++	{ USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) },
++	{ USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL2) },
++	{ USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL3) },
++	{ USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
++	{ USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL5) },
++	{}
++};
++MODULE_DEVICE_TABLE(usb, appleir_ids);
++
++static void dump_packet(struct appleir *appleir, char *msg, u8 *data, int len)
++{
++	int i;
++
++	printk(KERN_ERR "appleir: %s (%d bytes)", msg, len);
++
++	for (i = 0; i < len; ++i)
++		printk(" %02x", data[i]);
++	printk(" (should be command %d)\n", (data[4] >> 1) & MAX_KEYS_MASK);
++}
++
++static int get_key(int data)
++{
++	switch (data) {
++	case 0x02:
++	case 0x03:
++		/* menu */
++		return 1;
++	case 0x04:
++	case 0x05:
++		/* >" */
++		return 2;
++	case 0x06:
++	case 0x07:
++		/* >> */
++		return 3;
++	case 0x08:
++	case 0x09:
++		/* << */
++		return 4;
++	case 0x0a:
++	case 0x0b:
++		/* + */
++		return 5;
++	case 0x0c:
++	case 0x0d:
++		/* - */
++		return 6;
++	case 0x5c:
++		/* Middle button, on newer remotes,
++		 * part of a 2 packet-command */
++		return -7;
++	default:
++		return -1;
++	}
++}
++
++static void key_up(struct appleir *appleir, int key)
++{
++	dbginfo(&appleir->input_dev->dev, "key %d up\n", key);
++	input_report_key(appleir->input_dev, key, 0);
++	input_sync(appleir->input_dev);
++}
++
++static void key_down(struct appleir *appleir, int key)
++{
++	dbginfo(&appleir->input_dev->dev, "key %d down\n", key);
++	input_report_key(appleir->input_dev, key, 1);
++	input_sync(appleir->input_dev);
++}
++
++static void battery_flat(struct appleir *appleir)
++{
++	dev_err(&appleir->input_dev->dev, "possible flat battery?\n");
++}
++
++static void key_up_tick(unsigned long data)
++{
++	struct appleir *appleir = (struct appleir *)data;
++
++	if (appleir->current_key) {
++		key_up(appleir, appleir->current_key);
++		appleir->current_key = 0;
++	}
++}
++
++static void new_data(struct appleir *appleir, u8 *data, int len)
++{
++	static const u8 keydown[] = { 0x25, 0x87, 0xee };
++	static const u8 keyrepeat[] = { 0x26, };
++	static const u8 flatbattery[] = { 0x25, 0x87, 0xe0 };
++
++	if (debug)
++		dump_packet(appleir, "received", data, len);
++
++	if (len != 5)
++		return;
++
++	if (!memcmp(data, keydown, sizeof(keydown))) {
++		int index;
++
++		/* If we already have a key down, take it up before marking
++		   this one down */
++		if (appleir->current_key)
++			key_up(appleir, appleir->current_key);
++
++		/* Handle dual packet commands */
++		if (appleir->prev_key_idx > 0)
++			index = appleir->prev_key_idx;
++		else
++			index = get_key(data[4]);
++
++		if (index > 0) {
++			appleir->current_key = appleir->keymap[index];
++
++			key_down(appleir, appleir->current_key);
++			/* Remote doesn't do key up, either pull them up, in the test
++			   above, or here set a timer which pulls them up after 1/8 s */
++			mod_timer(&appleir->key_up_timer, jiffies + HZ / 8);
++			appleir->prev_key_idx = 0;
++			return;
++		} else if (index == -7) {
++			/* Remember key for next packet */
++			appleir->prev_key_idx = 0 - index;
++			return;
++		}
++	}
++
++	appleir->prev_key_idx = 0;
++
++	if (!memcmp(data, keyrepeat, sizeof(keyrepeat))) {
++		key_down(appleir, appleir->current_key);
++		/* Remote doesn't do key up, either pull them up, in the test
++		   above, or here set a timer which pulls them up after 1/8 s */
++		mod_timer(&appleir->key_up_timer, jiffies + HZ / 8);
++		return;
++	}
++
++	if (!memcmp(data, flatbattery, sizeof(flatbattery))) {
++		battery_flat(appleir);
++		/* Fall through */
++	}
++
++	dump_packet(appleir, "unknown packet", data, len);
++}
++
++static void appleir_urb(struct urb *urb)
++{
++	struct appleir *appleir = urb->context;
++	int status = urb->status;
++	int retval;
++
++	switch (status) {
++	case 0:
++		new_data(appleir, urb->transfer_buffer, urb->actual_length);
++		break;
++	case -ECONNRESET:
++	case -ENOENT:
++	case -ESHUTDOWN:
++		/* This urb is terminated, clean up */
++		dbginfo(&appleir->input_dev->dev, "%s - urb shutting down with status: %d", __func__,
++			urb->status);
++		return;
++	default:
++		dbginfo(&appleir->input_dev->dev, "%s - nonzero urb status received: %d", __func__,
++			urb->status);
++	}
++
++	retval = usb_submit_urb(urb, GFP_ATOMIC);
++	if (retval)
++		err("%s - usb_submit_urb failed with result %d", __func__,
++		    retval);
++}
++
++static int appleir_open(struct input_dev *dev)
++{
++	struct appleir *appleir = input_get_drvdata(dev);
++	struct usb_interface *intf = usb_ifnum_to_if(appleir->usbdev, 0);
++	int r;
++
++	r = usb_autopm_get_interface(intf);
++	if (r) {
++		dev_err(&intf->dev,
++			"%s(): usb_autopm_get_interface() = %d\n", __func__, r);
++		return r;
++	}
++
++	mutex_lock(&appleir_mutex);
++
++	if (usb_submit_urb(appleir->urb, GFP_ATOMIC)) {
++		r = -EIO;
++		goto fail;
++	}
++
++	appleir->flags |= APPLEIR_OPENED;
++
++	mutex_unlock(&appleir_mutex);
++
++	usb_autopm_put_interface(intf);
++
++	return 0;
++fail:
++	mutex_unlock(&appleir_mutex);
++	usb_autopm_put_interface(intf);
++	return r;
++}
++
++static void appleir_close(struct input_dev *dev)
++{
++	struct appleir *appleir = input_get_drvdata(dev);
++
++	mutex_lock(&appleir_mutex);
++
++	if (!(appleir->flags & APPLEIR_SUSPENDED)) {
++		usb_kill_urb(appleir->urb);
++		del_timer_sync(&appleir->key_up_timer);
++	}
++
++	appleir->flags &= ~APPLEIR_OPENED;
++
++	mutex_unlock(&appleir_mutex);
++}
++
++static int appleir_probe(struct usb_interface *intf,
++			 const struct usb_device_id *id)
++{
++	struct usb_device *dev = interface_to_usbdev(intf);
++	struct usb_endpoint_descriptor *endpoint;
++	struct appleir *appleir = NULL;
++	struct input_dev *input_dev;
++	int retval = -ENOMEM;
++	int i;
++
++	appleir = kzalloc(sizeof(struct appleir), GFP_KERNEL);
++	if (!appleir)
++		goto allocfail;
++
++	appleir->data = usb_alloc_coherent(dev, URB_SIZE, GFP_KERNEL,
++					 &appleir->dma_buf);
++	if (!appleir->data)
++		goto usbfail;
++
++	appleir->urb = usb_alloc_urb(0, GFP_KERNEL);
++	if (!appleir->urb)
++		goto urbfail;
++
++	appleir->usbdev = dev;
++
++	input_dev = input_allocate_device();
++	if (!input_dev)
++		goto inputfail;
++
++	appleir->input_dev = input_dev;
++
++	usb_make_path(dev, appleir->phys, sizeof(appleir->phys));
++	strlcpy(appleir->phys, "/input0", sizeof(appleir->phys));
++
++	input_dev->name = "Apple Infrared Remote Controller";
++	input_dev->phys = appleir->phys;
++	usb_to_input_id(dev, &input_dev->id);
++	input_dev->dev.parent = &intf->dev;
++	input_dev->keycode = appleir->keymap;
++	input_dev->keycodesize = sizeof(unsigned short);
++	input_dev->keycodemax = ARRAY_SIZE(appleir->keymap);
++
++	input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
++
++	memcpy(appleir->keymap, appleir_key_table, sizeof(appleir->keymap));
++	for (i = 0; i < ARRAY_SIZE(appleir_key_table); i++)
++		set_bit(appleir->keymap[i], input_dev->keybit);
++	clear_bit(KEY_RESERVED, input_dev->keybit);
++
++	input_set_drvdata(input_dev, appleir);
++	input_dev->open = appleir_open;
++	input_dev->close = appleir_close;
++
++	endpoint = &intf->cur_altsetting->endpoint[0].desc;
++
++	usb_fill_int_urb(appleir->urb, dev,
++			 usb_rcvintpipe(dev, endpoint->bEndpointAddress),
++			 appleir->data, 8,
++			 appleir_urb, appleir, endpoint->bInterval);
++
++	appleir->urb->transfer_dma = appleir->dma_buf;
++	appleir->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
++
++	setup_timer(&appleir->key_up_timer,
++		    key_up_tick, (unsigned long) appleir);
++
++	retval = input_register_device(appleir->input_dev);
++	if (retval)
++		goto inputfail;
++
++	usb_set_intfdata(intf, appleir);
++
++	return 0;
++
++inputfail:
++	input_free_device(appleir->input_dev);
++
++urbfail:
++	usb_free_urb(appleir->urb);
++
++usbfail:
++	usb_free_coherent(dev, URB_SIZE, appleir->data,
++			appleir->dma_buf);
++
++allocfail:
++	kfree(appleir);
++
++	return retval;
++}
++
++static void appleir_disconnect(struct usb_interface *intf)
++{
++	struct appleir *appleir = usb_get_intfdata(intf);
++
++	usb_set_intfdata(intf, NULL);
++	input_unregister_device(appleir->input_dev);
++	usb_free_urb(appleir->urb);
++	usb_free_coherent(interface_to_usbdev(intf), URB_SIZE,
++			appleir->data, appleir->dma_buf);
++	kfree(appleir);
++}
++
++static int appleir_suspend(struct usb_interface *interface,
++			   pm_message_t message)
++{
++	struct appleir *appleir = usb_get_intfdata(interface);
++
++	mutex_lock(&appleir_mutex);
++	if (appleir->flags & APPLEIR_OPENED)
++		usb_kill_urb(appleir->urb);
++
++	appleir->flags |= APPLEIR_SUSPENDED;
++
++	mutex_unlock(&appleir_mutex);
++
++	return 0;
++}
++
++static int appleir_resume(struct usb_interface *interface)
++{
++	struct appleir *appleir;
++	int r = 0;
++
++	appleir = usb_get_intfdata(interface);
++
++	mutex_lock(&appleir_mutex);
++	if (appleir->flags & APPLEIR_OPENED) {
++		struct usb_endpoint_descriptor *endpoint;
++
++		endpoint = &interface->cur_altsetting->endpoint[0].desc;
++		usb_fill_int_urb(appleir->urb, appleir->usbdev,
++				 usb_rcvintpipe(appleir->usbdev, endpoint->bEndpointAddress),
++				 appleir->data, 8,
++				 appleir_urb, appleir, endpoint->bInterval);
++		appleir->urb->transfer_dma = appleir->dma_buf;
++		appleir->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
++
++		/* And reset the USB device */
++		if (usb_submit_urb(appleir->urb, GFP_ATOMIC))
++			r = -EIO;
++	}
++
++	appleir->flags &= ~APPLEIR_SUSPENDED;
++
++	mutex_unlock(&appleir_mutex);
++
++	return r;
++}
++
++static struct usb_driver appleir_driver = {
++	.name                 = "appleir",
++	.probe                = appleir_probe,
++	.disconnect           = appleir_disconnect,
++	.suspend              = appleir_suspend,
++	.resume               = appleir_resume,
++	.reset_resume         = appleir_resume,
++	.id_table             = appleir_ids,
++};
++
++static int __init appleir_init(void)
++{
++	return usb_register(&appleir_driver);
++}
++
++static void __exit appleir_exit(void)
++{
++	usb_deregister(&appleir_driver);
++}
++
++module_init(appleir_init);
++module_exit(appleir_exit);
+-- 
+1.7.2.2
+

packages/linux/patches/linux-2.6.39-rc1-052-aureal_remote_quirk-0.1.patch

@@ -0,0 +1,113 @@
+diff -Naur linux-2.6.37/drivers/hid/hid-aureal.c linux-2.6.37.patch/drivers/hid/hid-aureal.c
+--- linux-2.6.37/drivers/hid/hid-aureal.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.37.patch/drivers/hid/hid-aureal.c	2011-01-07 22:35:31.413389936 +0100
+@@ -0,0 +1,60 @@
++/*
++ *  HID driver for some sunplus "special" devices
++ *
++ *  Copyright (c) 1999 Andreas Gal
++ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
++ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
++ *  Copyright (c) 2006-2007 Jiri Kosina
++ *  Copyright (c) 2007 Paul Walmsley
++ *  Copyright (c) 2008 Jiri Slaby
++ *  Copyright (c) 2010 Franco Catrin <fcatrin@gmail.com>
++ */
++
++/*
++ * 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 of the License, or (at your option)
++ * any later version.
++ */
++
++#include <linux/device.h>
++#include <linux/hid.h>
++#include <linux/module.h>
++
++#include "hid-ids.h"
++
++static __u8 *aureal_report_fixup(struct hid_device *hdev, __u8 *rdesc,
++		unsigned int *rsize)
++{
++	if (*rsize >= 54 && rdesc[52] == 0x25 && rdesc[53] == 0x01) {
++		dev_info(&hdev->dev, "fixing Aureal Cy se W-01RN USB_V3.1 "
++				"report descriptor. Keyboard Logical Maximum = 101\n");
++		rdesc[53] = 0x65;
++	} return rdesc;
++}
++
++static const struct hid_device_id aureal_devices[] = {
++	{ HID_USB_DEVICE(USB_VENDOR_ID_AUREAL, USB_DEVICE_ID_AUREAL_W01RN) },
++	{ }
++};
++MODULE_DEVICE_TABLE(hid, aureal_devices);
++
++static struct hid_driver aureal_driver = {
++	.name = "aureal",
++	.id_table = aureal_devices,
++	.report_fixup = aureal_report_fixup,
++};
++
++static int __init aureal_init(void)
++{
++	return hid_register_driver(&aureal_driver);
++}
++
++static void __exit aureal_exit(void)
++{
++	hid_unregister_driver(&aureal_driver);
++}
++
++module_init(aureal_init);
++module_exit(aureal_exit);
++MODULE_LICENSE("GPL");
+diff -Naur linux-2.6.37/drivers/hid/hid-ids.h linux-2.6.37.patch/drivers/hid/hid-ids.h
+--- linux-2.6.37/drivers/hid/hid-ids.h	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37.patch/drivers/hid/hid-ids.h	2011-01-07 22:35:31.414389949 +0100
+@@ -6,6 +6,7 @@
+  *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+  *  Copyright (c) 2006-2007 Jiri Kosina
+  *  Copyright (c) 2007 Paul Walmsley
++ *  Copyright (c) 2010 Franco Catrin <fcatrin@gmail.com>
+  */
+ 
+ /*
+@@ -327,6 +328,9 @@
+ #define USB_DEVICE_ID_KYE_ERGO_525V	0x0087
+ #define USB_DEVICE_ID_KYE_GPEN_560	0x5003
+ 
++#define USB_VENDOR_ID_AUREAL		0x0755
++#define USB_DEVICE_ID_AUREAL_W01RN	0x2626
++
+ #define USB_VENDOR_ID_LABTEC		0x1020
+ #define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD	0x0006
+ 
+diff -Naur linux-2.6.37/drivers/hid/Kconfig linux-2.6.37.patch/drivers/hid/Kconfig
+--- linux-2.6.37/drivers/hid/Kconfig	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37.patch/drivers/hid/Kconfig	2011-01-07 22:35:31.467390603 +0100
+@@ -87,6 +87,13 @@
+ 	Say Y here if you want support for keyboards of	Apple iBooks, PowerBooks,
+ 	MacBooks, MacBook Pros and Apple Aluminum.
+ 
++config HID_AUREAL
++	tristate "Aureal" if EMBEDDED
++	depends on USB_HID
++	default !EMBEDDED
++	---help---
++	Support for Aureal Cy se W-01RN Remote Controller
++
+ config HID_BELKIN
+ 	tristate "Belkin Flip KVM and Wireless keyboard" if EMBEDDED
+ 	depends on USB_HID
+diff -Naur linux-2.6.37/drivers/hid/Makefile linux-2.6.37.patch/drivers/hid/Makefile
+--- linux-2.6.37/drivers/hid/Makefile	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37.patch/drivers/hid/Makefile	2011-01-07 22:35:31.547391590 +0100
+@@ -29,6 +29,7 @@
+ obj-$(CONFIG_HID_A4TECH)	+= hid-a4tech.o
+ obj-$(CONFIG_HID_ACRUX_FF)	+= hid-axff.o
+ obj-$(CONFIG_HID_APPLE)		+= hid-apple.o
++obj-$(CONFIG_HID_AUREAL)	+= hid-aureal.o
+ obj-$(CONFIG_HID_BELKIN)	+= hid-belkin.o
+ obj-$(CONFIG_HID_CANDO)		+= hid-cando.o
+ obj-$(CONFIG_HID_CHERRY)	+= hid-cherry.o

packages/linux/patches/linux-2.6.39-rc1-053_ati-remote_all_keys_and_keychange-0.1.patch

@@ -0,0 +1,65 @@
+diff -Naur linux-2.6.37-rc6/drivers/input/misc/ati_remote.c linux-2.6.37-rc6.patch/drivers/input/misc/ati_remote.c
+--- linux-2.6.37-rc6/drivers/input/misc/ati_remote.c	2010-12-16 02:24:48.000000000 +0100
++++ linux-2.6.37-rc6.patch/drivers/input/misc/ati_remote.c	2010-12-16 12:35:04.454620549 +0100
+@@ -90,6 +90,7 @@
+ #include <linux/init.h>
+ #include <linux/slab.h>
+ #include <linux/module.h>
++#include <linux/moduleparam.h>
+ #include <linux/usb/input.h>
+ #include <linux/wait.h>
+ #include <linux/jiffies.h>
+@@ -131,6 +132,10 @@
+ module_param(debug, int, 0644);
+ MODULE_PARM_DESC(debug, "Enable extra debug messages and information");
+ 
++static int keychange;
++module_param(keychange, int, 0644);
++MODULE_PARM_DESC(keychange, "Enable support for Keychange remotes");
++
+ static int repeat_filter = FILTER_TIME;
+ module_param(repeat_filter, int, 0644);
+ MODULE_PARM_DESC(repeat_filter, "Repeat filter time, default = 60 msec");
+@@ -285,6 +290,25 @@
+ 	{KIND_FILTERED, 0xf4, 0x2F, EV_KEY, KEY_END, 1},        /* END */
+ 	{KIND_FILTERED, 0xf5, 0x30, EV_KEY, KEY_SELECT, 1},     /* SELECT */
+ 
++	/* Coloured keys  */
++	{KIND_FILTERED, 0xf7, 0x32, EV_KEY, KEY_PLAYCD, 1}, 	/* TXT Rot */
++	{KIND_FILTERED, 0xf8, 0x33, EV_KEY, KEY_PAUSECD, 1}, 	/* TXT Gr */
++	{KIND_FILTERED, 0xf9, 0x34, EV_KEY, KEY_PROG3, 1}, 	/* TXT Gelb */
++	{KIND_FILTERED, 0xfa, 0x35, EV_KEY, KEY_PROG4, 1}, 	/* TXT Blau */
++
++	/* More Keys */
++	{KIND_FILTERED, 0xac, 0x37, EV_KEY, KEY_G, 1}, /* Acquire Image */
++	{KIND_FILTERED, 0xfe, 0x39, EV_KEY, KEY_H, 1}, /* FULL SCREEN _| */
++	{KIND_FILTERED, 0xfb, 0x36, EV_KEY, KEY_I, 1}, /* Rename */
++	{KIND_FILTERED, 0xf1, 0x2c, EV_KEY, KEY_J, 1}, /* TV */
++	{KIND_FILTERED, 0xf6, 0x31, EV_KEY, KEY_K, 1}, /* Video Desktop */
++	{KIND_FILTERED, 0xa1, 0x00, EV_KEY, KEY_L, 1},
++
++	/* Keys added by torsten at archesoft.de */
++	{KIND_FILTERED, 0xff, 0x3a, EV_KEY, KEY_M, 1}, /* dvd audio */
++	{KIND_FILTERED, 0xfc, 0x37, EV_KEY, KEY_N, 1}, /* aquire image */
++	{KIND_FILTERED, 0xfd, 0x38, EV_KEY, KEY_O, 1}, /* edit image */
++
+ 	{KIND_END, 0x00, 0x00, EV_MAX + 1, 0, 0}
+ };
+ 
+@@ -409,6 +433,16 @@
+ {
+ 	int i;
+ 
++	/* If keychange is enabled we undo the keychanges of the remote here */
++
++	if (keychange){
++	    if (d2 & 0x80) {
++		d1 += 0x80;
++		d2 -= 0x80;
++	    }
++	}
++
++
+ 	for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++) {
+ 		/*
+ 		 * Decide if the table entry matches the remote input.

packages/linux/patches/linux-2.6.39-rc1-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch

@@ -0,0 +1,11 @@
+diff -Naur linux-2.6.38-rc5/drivers/ata/libata-core.c linux-2.6.38-rc5.patch/drivers/ata/libata-core.c
+--- linux-2.6.38-rc5/drivers/ata/libata-core.c	2011-02-16 04:23:45.000000000 +0100
++++ linux-2.6.38-rc5.patch/drivers/ata/libata-core.c	2011-02-22 00:57:25.789636966 +0100
+@@ -4139,6 +4139,7 @@
+ 	 */
+ 	{ "PIONEER DVD-RW  DVRTD08",	"1.00",	ATA_HORKAGE_NOSETXFER },
+ 	{ "PIONEER DVD-RW  DVR-212D",	"1.28", ATA_HORKAGE_NOSETXFER },
++	{ "PIONEER DVD-RW  DVR-216D",	"1.07",	ATA_HORKAGE_NOSETXFER },
+ 
+ 	/* End Marker */
+ 	{ }

packages/linux/patches/linux-2.6.39-rc1-716_mm-zero_swappiness.patch

@@ -0,0 +1,17 @@
+---
+ mm/vmscan.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: linux-2.6.37-ck2/mm/vmscan.c
+===================================================================
+--- linux-2.6.37-ck2.orig/mm/vmscan.c	2011-01-06 14:04:10.000000000 +1100
++++ linux-2.6.37-ck2/mm/vmscan.c	2011-02-14 10:11:00.536252000 +1100
+@@ -133,7 +133,7 @@
+ /*
+  * From 0 .. 100.  Higher means more swappy.
+  */
+-int vm_swappiness = 60;
++int vm_swappiness;
+ long vm_total_pages;	/* The total number of pages which the VM controls */
+ 
+ static LIST_HEAD(shrinker_list);

packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-10.1-Dharma-001-fix_bookmarks_filenames-0.1.patch

@@ -0,0 +1,14 @@
+diff -Naur xbmc-theme-Confluence-10.1-Dharma/720p/VideoOSD.xml xbmc-theme-Confluence-10.1-Dharma.patch/720p/VideoOSD.xml
+--- xbmc-theme-Confluence-10.1-Dharma/720p/VideoOSD.xml	2011-03-08 02:49:22.000000000 +0100
++++ xbmc-theme-Confluence-10.1-Dharma.patch/720p/VideoOSD.xml	2011-03-30 18:18:57.291644805 +0200
+@@ -23,8 +23,8 @@
+ 					<height>45</height>
+ 					<label>298</label>
+ 					<font>-</font>
+-					<texturefocus>OSDBookMarksFO.png</texturefocus>
+-					<texturenofocus>OSDBookMarksNF.png</texturenofocus>
++					<texturefocus>OSDBookmarksFO.png</texturefocus>
++					<texturenofocus>OSDBookmarksNF.png</texturenofocus>
+ 					<onleft>705</onleft>
+ 					<onright>701</onright>
+ 					<onup>600</onup>

packages/mediacenter/xbmc/build

@@ -137,6 +137,7 @@ do_autoreconf xbmc/lib/libid3tag/libid3tag
             $XBMC_PULSEAUDIO \
             --enable-ffmpeg-libvorbis \
             --disable-faac \
+            --enable-lame \
             $XBMC_DVDCSS \
             --disable-mid \
             $XBMC_AVAHI \

packages/mediacenter/xbmc/meta

@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
 PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc xbmc-addon-settings"
-PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc xbmc-addon-settings"
+PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
 PKG_SHORTDESC="xbmc: XBMC Mediacenter"

packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-404-add_lame_check-0.6.patch

@@ -0,0 +1,124 @@
+diff -Naur xbmc-10.1-Dharma/configure.in xbmc-10.1-Dharma.patch/configure.in
+--- xbmc-10.1-Dharma/configure.in	2011-03-08 02:49:24.000000000 +0100
++++ xbmc-10.1-Dharma.patch/configure.in	2011-03-26 05:56:44.077454237 +0100
+@@ -69,6 +69,8 @@
+ pulse_disabled="== PulseAudio support manually disabled. =="
+ faac_not_found="== Could not find libfaac. FAAC support disabled. =="
+ faac_disabled="== FAAC support manually disabled. =="
++lame_not_found="== Could not find libmp3lame. LAME support disabled. =="
++lame_disabled="== LAME support manually disabled. =="
+ dvdcss_enabled="== DVDCSS support enabled. =="
+ dvdcss_disabled="== DVDCSS support disabled. =="
+ hal_not_found="== Could not find hal. HAL support disabled. =="
+@@ -234,6 +236,12 @@
+   [use_faac=$enableval],
+   [use_faac=yes])
+ 
++AC_ARG_ENABLE([lame],
++  [AS_HELP_STRING([--enable-lame],
++  [enable lame support (default is yes)])],
++  [use_lame=$enableval],
++  [use_lame=yes])
++
+ AC_ARG_ENABLE([dvdcss],
+   [AS_HELP_STRING([--enable-dvdcss],
+   [enable DVDCSS support (default is yes)])],
+@@ -747,6 +755,20 @@
+   fi
+ fi
+ 
++# LAME
++if test "$use_lame" = "yes"; then
++  AC_CHECK_LIB([mp3lame], [main],
++    AC_DEFINE([HAVE_LIBMP3LAME], [1], [Define to 1 if you have the 'libmp3lame' library (-lmp3lame).]),
++    use_lame=no;AC_MSG_RESULT($lame_not_found))
++else
++  AC_MSG_RESULT($lame_disabled)
++fi
++if test "$use_lame" = "yes"; then
++  AC_SUBST([HAVE_LIBMP3LAME], 1)
++else
++  AC_SUBST([HAVE_LIBMP3LAME], 0)
++fi
++
+ # HAL
+ if test "$host_vendor" = "apple" ; then
+   use_hal="no"
+@@ -1262,6 +1284,12 @@
+   final_message="$final_message\n  FAAC:\t\tNo"
+ fi
+ 
++if test "$use_lame" = "yes"; then
++  final_message="$final_message\n  LAME:\t\tYes"
++else
++  final_message="$final_message\n  LAME:\t\tNo"
++fi
++
+ # DVDCSS
+ if test "$use_dvdcss" = "yes"; then
+   AC_MSG_NOTICE($dvdcss_enabled)
+diff -Naur xbmc-10.1-Dharma/xbmc/cdrip/CDDARipper.cpp xbmc-10.1-Dharma.patch/xbmc/cdrip/CDDARipper.cpp
+--- xbmc-10.1-Dharma/xbmc/cdrip/CDDARipper.cpp	2011-03-08 02:49:14.000000000 +0100
++++ xbmc-10.1-Dharma.patch/xbmc/cdrip/CDDARipper.cpp	2011-03-26 04:56:03.594891023 +0100
+@@ -27,7 +27,11 @@
+ #include "CDDAReader.h"
+ #include "StringUtils.h"
+ #include "Util.h"
++
++#ifdef HAVE_LIBMP3LAME
+ #include "EncoderLame.h"
++#endif
++
+ #include "EncoderWav.h"
+ #include "EncoderVorbis.h"
+ #include "EncoderFFmpeg.h"
+@@ -77,9 +81,16 @@
+   case CDDARIP_ENCODER_FLAC:
+     m_pEncoder = new CEncoderFlac();
+     break;
+-  default:
++#ifdef HAVE_LIBMP3LAME
++  case CDDARIP_ENCODER_LAME:
+     m_pEncoder = new CEncoderLame();
+     break;
++#else
++  default:
++    CLog::Log(LOGERROR,"invalid encoder selected");
++    return false;
++    break;
++#endif
+   }
+ 
+   // we have to set the tags before we init the Encoder
+diff -Naur xbmc-10.1-Dharma/xbmc/cdrip/Makefile.in xbmc-10.1-Dharma.patch/xbmc/cdrip/Makefile.in
+--- xbmc-10.1-Dharma/xbmc/cdrip/Makefile.in	2011-03-08 02:49:14.000000000 +0100
++++ xbmc-10.1-Dharma.patch/xbmc/cdrip/Makefile.in	2011-03-26 04:55:12.286896848 +0100
+@@ -6,11 +6,14 @@
+      CDDAReader.cpp \
+      Encoder.cpp \
+      EncoderFFmpeg.cpp \
+-     EncoderLame.cpp \
+      EncoderVorbis.cpp \
+      EncoderWav.cpp \
+      EncoderFlac.cpp \
+ 
++ifeq (@HAVE_LIBMP3LAME@,1)
++  SRCS+=EncoderLame.cpp
++endif
++
+ LIB=cdrip.a
+ 
+ include ../../Makefile.include
+diff -Naur xbmc-10.1-Dharma/xbmc/GUISettings.cpp xbmc-10.1-Dharma.patch/xbmc/GUISettings.cpp
+--- xbmc-10.1-Dharma/xbmc/GUISettings.cpp	2011-03-08 02:49:14.000000000 +0100
++++ xbmc-10.1-Dharma.patch/xbmc/GUISettings.cpp	2011-03-26 04:55:12.288896808 +0100
+@@ -325,7 +325,9 @@
+   AddPath(acd,"audiocds.recordingpath",20000,"select writable folder",BUTTON_CONTROL_PATH_INPUT,false,657);
+   AddString(acd, "audiocds.trackpathformat", 13307, "%A - %B/[%N. ][%A - ]%T", EDIT_CONTROL_INPUT, false, 16016);
+   map<int,int> encoders;
++#ifdef HAVE_LIBMP3LAME
+   encoders.insert(make_pair(34000,CDDARIP_ENCODER_LAME));
++#endif
+   encoders.insert(make_pair(34001,CDDARIP_ENCODER_VORBIS));
+   encoders.insert(make_pair(34002,CDDARIP_ENCODER_WAV));
+   encoders.insert(make_pair(34005,CDDARIP_ENCODER_FLAC));

packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-405-fix_vorbis_cdrip-0.1.patch

@@ -0,0 +1,12 @@
+diff -Naur xbmc-10.1-Dharma/xbmc/cdrip/DllVorbis.h xbmc-10.1-Dharma.patch/xbmc/cdrip/DllVorbis.h
+--- xbmc-10.1-Dharma/xbmc/cdrip/DllVorbis.h	2011-03-08 02:49:14.000000000 +0100
++++ xbmc-10.1-Dharma.patch/xbmc/cdrip/DllVorbis.h	2011-03-29 16:37:38.432826576 +0200
+@@ -61,7 +61,7 @@
+ public:
+     virtual ~DllVorbis() {};
+     virtual void vorbis_info_init(vorbis_info *vi)
+-        { vorbis_info_init(vi); }
++        { ::vorbis_info_init(vi); }
+     virtual int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd, ogg_packet *op)
+         { return ::vorbis_bitrate_flushpacket(vd, op); }
+     virtual int vorbis_bitrate_addblock(vorbis_block *vb)

packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-406-gcc-4.6-fixes-0.1.patch

@@ -0,0 +1,97 @@
+From c66099c4d8e6b2d748ca3ddc31ee90b731d0f620 Mon Sep 17 00:00:00 2001
+From: Stephan Raue <stephan@openelec.tv>
+Date: Wed, 30 Mar 2011 14:57:28 +0200
+Subject: [PATCH] dvdplayer: fix build with gcc-4.6. Flags to the Linker must be passed via -Wl,. This fixes ticket #11383
+
+Signed-off-by: Stephan Raue <stephan@openelec.tv>
+---
+ xbmc/cores/dvdplayer/Codecs/Makefile.in        |   18 +++++++++---------
+ xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in |    4 ++--
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/xbmc/cores/dvdplayer/Codecs/Makefile.in b/xbmc/cores/dvdplayer/Codecs/Makefile.in
+index a7ef1a0..308664a 100644
+--- a/xbmc/cores/dvdplayer/Codecs/Makefile.in
++++ b/xbmc/cores/dvdplayer/Codecs/Makefile.in
+@@ -148,32 +148,32 @@ liba52:
+ else
+ 
+ $(SYSDIR)/avutil-50-$(ARCH).so: ffmpeg/libavutil/libavutil.so
+-	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
++	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
+ 		ffmpeg/libavutil/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
+ 
+ $(SYSDIR)/avcodec-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavcodec/libavcodec.so
+-	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
++	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
+ 		ffmpeg/libavcodec/*.o ffmpeg/libavcodec/$(ARCH_DIR)/*.o \
+ 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
+ 
+ $(SYSDIR)/avformat-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavformat/libavformat.so
+-	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
++	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
+ 		ffmpeg/libavformat/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
+ 
+ ifneq ($(ARCH), arm)
+ $(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so
+-	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
++	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
+ 		ffmpeg/libswscale/*.o ffmpeg/libswscale/$(ARCH_DIR)/*.o \
+ 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
+ else # No ARM version of swscale available yet.
+ $(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so
+-	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
++	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
+ 		ffmpeg/libswscale/*.o \
+ 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
+ endif
+ 
+ $(SYSDIR)/postproc-51-$(ARCH).so: $(WRAPPER) ffmpeg/libpostproc/libpostproc.so
+-	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
++	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
+ 		ffmpeg/libpostproc/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
+ 
+ ffmpeg/libavutil/libavutil.so     : ffmpeg;
+@@ -185,17 +185,17 @@ ffmpeg:
+ 	$(MAKE) -C $@
+ 
+ $(SYSDIR)/libdts-$(ARCH).so: $(WRAPPER) libdts/libdts/libdts.a
+-	$(CC) -o $@ $(LDFLAGS) --soname,$@ \
++	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
+ 		libdts/libdts/bitstream.o \
+ 		libdts/libdts/downmix.o libdts/libdts/parse.o \
+ 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
+ 
+ $(SYSDIR)/liba52-$(ARCH).so: $(WRAPPER) liba52/liba52/liba52.la
+-	$(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/liba52/.libs/*.o \
++	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/liba52/.libs/*.o \
+ 		-Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
+ 
+ $(SYSDIR)/libao-$(ARCH).so: $(WRAPPER) liba52/libao/libao.a
+-	$(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/libao/libao.a \
++	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/libao/libao.a \
+ 		-Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
+ 
+ libdts/libdts/libdts.a : libdts;
+diff --git a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
+index 3c487e9..6d4abd4 100644
+--- a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
++++ b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
+@@ -49,12 +49,12 @@ $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER_OSX) $(DVDCSS_A) libdvdread/obj/libdvd
+ else
+ 
+ $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
+-	$(CC) -o $@ $(LDFLAGS) --soname,$@ \
++	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
+ 		libdvdcss/src/*.o \
+ 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
+ 
+ $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
+-	$(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
++	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
+ 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
+ 
+ endif
+-- 
+1.7.0.2
+

packages/mediacenter/xbmc/scripts/cputemp

@@ -22,9 +22,7 @@
 
 TEMP="0"
 
-if [ -f /sys/class/thermal/thermal_zone0/temp ]; then
-  TEMP=`echo "$(cat /sys/class/thermal/thermal_zone0/temp)/1000" |bc`
-elif [ -f /usr/bin/sensors ]; then
+if [ -f /usr/bin/sensors ]; then
   TEMP=`/usr/bin/sensors -u | tail -n6 | grep temp1_input | awk '{print $2 }' |awk '{printf("%d\n",$1 + 0.5);}'`
 fi
 

packages/network/SABnzbd/config/sabnzbd.config

@@ -9,9 +9,9 @@ __version__ = 18
     cleanup_list = ,
     cache_limit = 128M
     par_option = ""
-    web_color = white
+    web_color = gold
     replace_spaces = 0
-    web_color2 = ""
+    web_color2 = "gold"
     dirscan_speed = 5
     enable_filejoin = 1
     create_group_folders = 0

packages/network/SABnzbd/meta

@@ -19,12 +19,13 @@
 ################################################################################
 
 PKG_NAME="SABnzbd"
-PKG_VERSION="0.5.6"
+PKG_VERSION="0.6.0Beta4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://sabnzbd.org/"
-PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
+#PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
+PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus-beta/sabnzbd-0.6.0Beta4/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
 PKG_DEPENDS="Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/network/bluez/build

@@ -48,6 +48,7 @@ cd $PKG_BUILD
             --enable-fortify \
             --disable-pie \
             --disable-network \
+            --disable-sap \
             --disable-serial \
             --enable-usb \
             --enable-input \
@@ -68,6 +69,7 @@ cd $PKG_BUILD
             --enable-udevrules \
             --enable-configfiles \
             --disable-maemo6 \
+            --disable-dbusoob \
             --disable-hal \
             --disable-capng \
             --with-gnu-ld \

packages/network/bluez/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bluez"
-PKG_VERSION="4.89"
+PKG_VERSION="4.91"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/network/cifs-utils/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
+
+cd $PKG_BUILD
+ac_cv_func_malloc_0_nonnull=yes \
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib \
+            --localstatedir=/var \
+            --disable-cifsupcall \
+            --disable-cifscreds \
+            --with-libcap \
+
+make

packages/network/cifs-utils/install

@@ -0,0 +1,26 @@
+#!/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
+
+mkdir -p $INSTALL/sbin
+  cp $PKG_BUILD/mount.cifs $INSTALL/sbin

packages/network/cifs-utils/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="cifs-utils"
+PKG_VERSION="4.8.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.samba.org"
+PKG_URL="ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libcap"
+PKG_BUILD_DEPENDS="toolchain libcap"
+PKG_PRIORITY="optional"
+PKG_SECTION="network"
+PKG_SHORTDESC="cifs-utils: a set of user-space tools to mount/umount CIFS filesystems"
+PKG_LONGDESC="The in-kernel CIFS filesystem relies on a set of user-space tools. That package of tools is called cifs-utils. Although not really part of Samba proper, these tools were originally part of the Samba package. For several reasons, shipping these tools as part of Samba was problematic and it was deemed better to split them off into their own package."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

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

@@ -50,7 +50,7 @@ fi
 
   # NETWORK: ( LAN / WLAN )
 
-    for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do
+    for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do
       if [ ! -f /sys/class/net/$NET_IFACE/address ]; then
         logger -t Connman "### [$i] cannot find /sys/class/net/$NET_IFACE/address ###"
       else

packages/network/connman/meta

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

packages/network/libnfsidmap/build

@@ -23,14 +23,10 @@
 . config/options $1
 
 cd $PKG_BUILD
-ac_cv_func_malloc_0_nonnull=yes \
-ac_cv_func_realloc_0_nonnull=yes \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --datadir=/usr/share \
-            --localstatedir=/var \
             --disable-static \
             --enable-shared \
 

packages/network/libnfsidmap/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
+
+mkdir -p $INSTALL/usr/lib
+  cp -P $PKG_BUILD/.libs/libnfsidmap.so* $INSTALL/usr/lib/
+
+mkdir -p $INSTALL/usr/lib/libnfsidmap
+  cp -P $PKG_BUILD/.libs/nsswitch.so $INSTALL/usr/lib/libnfsidmap/
+  cp -P $PKG_BUILD/.libs/static.so $INSTALL/usr/lib/libnfsidmap/

packages/network/libnfsidmap/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="libnfsidmap"
+PKG_VERSION="0.24"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.citi.umich.edu/projects/nfsv4/linux/"
+PKG_URL="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="network"
+PKG_SHORTDESC="libnfsidmap: Library to help mapping id's, mainly for NFSv4"
+PKG_LONGDESC="Library to help mapping id's, mainly for NFSv4."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

packages/network/netmount/config/netmount.conf.sample

@@ -30,12 +30,12 @@
 #
 # - "service" can be "nfs" for NFS mounts or "cifs" for CIFS (Samba) mounts
 # - Please use an "|" as delimiter
-# - Please use an "," as delimiter for mountoptions
 # - Don't use spaces in usernames, passwords and options
+# - for NFS mounts there is no support for options
 # - be aware of the different syntax for NFS shares
 # - Local mountpoints should only be on /storage
 #
 # Examples:
 # cifs | //192.168.1.44/videos | /storage/mount/videos | username=user,pass=secret
 # cifs | //192.168.1.44/tv shows | /storage/mount/tvshows | username=user,pass=secret
-# nfs | 192.168.1.44:/videos | /storage/mount/videos | rw
+# nfs | 192.168.1.44:/videos | /storage/mount/videos

packages/network/netmount/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="sshfs-fuse connman"
+PKG_DEPENDS="cifs-utils nfs-utils sshfs-fuse connman"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="tools"

packages/network/netmount/scripts/netmount

@@ -39,10 +39,10 @@ IFS="
     mkdir -p $MOUNTPOINT
     case "$SERVICE" in
       cifs)
-        mount "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1 &
+        mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1 &
         ;;
       nfs)
-        mount "$SHARE" "$MOUNTPOINT" -o nolock,"$OPTIONS" > /dev/null 2>&1 &
+        mount.nfs "$SHARE" "$MOUNTPOINT" > /dev/null 2>&1 &
         ;;
     esac
   done

packages/network/nfs-utils/build

@@ -0,0 +1,58 @@
+#!/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
+
+CFLAGS_FOR_BUILD="$HOST_CFLAGS"
+CXXFLAGS_FOR_BUILD="$HOST_CXXFLAGS"
+CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS"
+LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"
+
+cd $PKG_BUILD
+libblkid_is_recent="yes" \
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-static \
+            --enable-shared \
+            --with-sysroot="$SYSROOT_PREFIX/usr" \
+            --enable-nfsv3 \
+            --enable-nfsv4 \
+            --disable-nfsv41 \
+            --disable-gss \
+            --disable-kprefix \
+            --enable-uuid \
+            --enable-mount \
+            --disable-tirpc \
+            --disable-ipv6 \
+            --enable-mountconfig \
+            --without-tcp-wrappers \
+            --without-krb5 \
+            --disable-caps \
+            --enable-largefile \
+            --with-mountfile=/etc/nfsmounts.conf \
+            --with-gnu-ld
+
+make
+
+sed -e "s,#!/bin/sh -p,#!/bin/sh,g" -i utils/statd/start-statd

packages/network/nfs-utils/config/protocols

@@ -0,0 +1,154 @@
+# /etc/protocols:
+# $Id: protocols,v 1.5 2006/10/11 15:39:11 pknirsch Exp $
+#
+# Internet (IP) protocols
+#
+#	from: @(#)protocols	5.1 (Berkeley) 4/17/89
+#
+# Updated for NetBSD based on RFC 1340, Assigned Numbers (July 1992).
+#
+# See also http://www.iana.org/assignments/protocol-numbers
+
+ip	0	IP		# internet protocol, pseudo protocol number
+hopopt	0	HOPOPT		# hop-by-hop options for ipv6
+icmp	1	ICMP		# internet control message protocol
+igmp	2	IGMP		# internet group management protocol
+ggp	3	GGP		# gateway-gateway protocol
+ipencap	4	IP-ENCAP	# IP encapsulated in IP (officially ``IP'')
+st	5	ST		# ST datagram mode
+tcp	6	TCP		# transmission control protocol
+cbt	7	CBT		# CBT, Tony Ballardie <A.Ballardie@cs.ucl.ac.uk>
+egp	8	EGP		# exterior gateway protocol
+igp	9	IGP		# any private interior gateway (Cisco: for IGRP)
+bbn-rcc	10	BBN-RCC-MON	# BBN RCC Monitoring
+nvp	11	NVP-II		# Network Voice Protocol
+pup	12	PUP		# PARC universal packet protocol
+argus	13	ARGUS		# ARGUS
+emcon	14	EMCON		# EMCON
+xnet	15	XNET		# Cross Net Debugger
+chaos	16	CHAOS		# Chaos
+udp	17	UDP		# user datagram protocol
+mux	18	MUX		# Multiplexing protocol
+dcn	19	DCN-MEAS	# DCN Measurement Subsystems
+hmp	20	HMP		# host monitoring protocol
+prm	21	PRM		# packet radio measurement protocol
+xns-idp	22	XNS-IDP		# Xerox NS IDP
+trunk-1	23	TRUNK-1		# Trunk-1
+trunk-2	24	TRUNK-2		# Trunk-2
+leaf-1	25	LEAF-1		# Leaf-1
+leaf-2	26	LEAF-2		# Leaf-2
+rdp	27	RDP		# "reliable datagram" protocol
+irtp	28	IRTP		# Internet Reliable Transaction Protocol
+iso-tp4	29	ISO-TP4		# ISO Transport Protocol Class 4
+netblt	30	NETBLT		# Bulk Data Transfer Protocol
+mfe-nsp	31	MFE-NSP		# MFE Network Services Protocol
+merit-inp	32	MERIT-INP	# MERIT Internodal Protocol
+dccp	33	DCCP		# Datagram Congestion Control Protocol  
+3pc	34	3PC		# Third Party Connect Protocol
+idpr	35	IDPR		# Inter-Domain Policy Routing Protocol
+xtp	36	XTP		# Xpress Tranfer Protocol
+ddp	37	DDP		# Datagram Delivery Protocol
+idpr-cmtp	38	IDPR-CMTP	# IDPR Control Message Transport Proto
+tp++	39	TP++		# TP++ Transport Protocol
+il	40	IL		# IL Transport Protocol
+ipv6	41	IPv6		# IPv6
+sdrp	42	SDRP		# Source Demand Routing Protocol
+ipv6-route	43	IPv6-Route 	# Routing Header for IPv6
+ipv6-frag	44	IPv6-Frag	# Fragment Header for IPv6
+idrp	45	IDRP		# Inter-Domain Routing Protocol
+rsvp	46	RSVP		# Resource ReSerVation Protocol
+gre	47	GRE		# Generic Routing Encapsulation
+dsr	48	DSR		# Dynamic Source Routing Protocol
+bna	49	BNA		# BNA
+esp	50	ESP		# Encap Security Payload
+ah	51	AH		# Authentication Header
+i-nlsp	52	I-NLSP		# Integrated Net Layer Security TUBA
+swipe	53	SWIPE		# IP with Encryption
+narp	54	NARP		# NBMA Address Resolution Protocol
+mobile	55	MOBILE		# IP Mobility
+tlsp	56	TLSP		# Transport Layer Security Protocol
+skip	57	SKIP		# SKIP
+ipv6-icmp	58	IPv6-ICMP	# ICMP for IPv6
+ipv6-nonxt	59	IPv6-NoNxt	# No Next Header for IPv6
+ipv6-opts	60	IPv6-Opts	# Destination Options for IPv6
+#	61			# any host internal protocol
+cftp	62	CFTP		# CFTP
+#	63			# any local network
+sat-expak	64	SAT-EXPAK	# SATNET and Backroom EXPAK
+kryptolan	65	KRYPTOLAN	# Kryptolan
+rvd	66	RVD		# MIT Remote Virtual Disk Protocol
+ippc	67	IPPC		# Internet Pluribus Packet Core
+#	68			# any distributed file system
+sat-mon	69	SAT-MON		# SATNET Monitoring
+visa	70	VISA		# VISA Protocol
+ipcv	71	IPCV		# Internet Packet Core Utility
+cpnx	72	CPNX		# Computer Protocol Network Executive
+cphb	73	CPHB		# Computer Protocol Heart Beat
+wsn	74	WSN		# Wang Span Network
+pvp	75	PVP		# Packet Video Protocol
+br-sat-mon	76	BR-SAT-MON	# Backroom SATNET Monitoring
+sun-nd	77	SUN-ND		# SUN ND PROTOCOL-Temporary
+wb-mon	78	WB-MON		# WIDEBAND Monitoring
+wb-expak	79	WB-EXPAK	# WIDEBAND EXPAK
+iso-ip	80	ISO-IP		# ISO Internet Protocol
+vmtp	81	VMTP		# Versatile Message Transport
+secure-vmtp	82	SECURE-VMTP	# SECURE-VMTP
+vines	83	VINES		# VINES
+ttp	84	TTP		# TTP
+nsfnet-igp	85	NSFNET-IGP	# NSFNET-IGP
+dgp	86	DGP		# Dissimilar Gateway Protocol
+tcf	87	TCF		# TCF
+eigrp	88	EIGRP		# Enhanced Interior Routing Protocol (Cisco)
+ospf	89	OSPFIGP		# Open Shortest Path First IGP
+sprite-rpc	90	Sprite-RPC	# Sprite RPC Protocol
+larp	91	LARP		# Locus Address Resolution Protocol
+mtp	92	MTP		# Multicast Transport Protocol
+ax.25	93	AX.25		# AX.25 Frames
+ipip	94	IPIP		# Yet Another IP encapsulation
+micp	95	MICP		# Mobile Internetworking Control Pro.
+scc-sp	96	SCC-SP		# Semaphore Communications Sec. Pro.
+etherip	97	ETHERIP		# Ethernet-within-IP Encapsulation
+encap	98	ENCAP		# Yet Another IP encapsulation
+#	99			# any private encryption scheme
+gmtp	100	GMTP		# GMTP
+ifmp	101	IFMP		# Ipsilon Flow Management Protocol
+pnni	102	PNNI		# PNNI over IP
+pim	103	PIM		# Protocol Independent Multicast
+aris	104	ARIS		# ARIS
+scps	105	SCPS		# SCPS
+qnx	106	QNX		# QNX
+a/n	107	A/N		# Active Networks
+ipcomp	108	IPComp		# IP Payload Compression Protocol
+snp	109	SNP		# Sitara Networks Protocol
+compaq-peer	110	Compaq-Peer	# Compaq Peer Protocol
+ipx-in-ip	111	IPX-in-IP	# IPX in IP
+vrrp	112	VRRP		# Virtual Router Redundancy Protocol
+pgm	113	PGM		# PGM Reliable Transport Protocol
+#	114			# any 0-hop protocol
+l2tp	115	L2TP		# Layer Two Tunneling Protocol
+ddx	116	DDX		# D-II Data Exchange
+iatp	117	IATP		# Interactive Agent Transfer Protocol
+stp	118	STP		# Schedule Transfer
+srp	119	SRP		# SpectraLink Radio Protocol
+uti	120	UTI		# UTI
+smp	121	SMP		# Simple Message Protocol
+sm	122	SM		# SM
+ptp	123	PTP		# Performance Transparency Protocol
+isis	124	ISIS		# ISIS over IPv4
+fire	125	FIRE
+crtp	126	CRTP		# Combat Radio Transport Protocol
+crdup	127	CRUDP		# Combat Radio User Datagram
+sscopmce	128	SSCOPMCE
+iplt	129	IPLT
+sps	130	SPS		# Secure Packet Shield
+pipe	131	PIPE		# Private IP Encapsulation within IP
+sctp	132	SCTP		# Stream Control Transmission Protocol
+fc	133	FC		# Fibre Channel
+rsvp-e2e-ignore	134	RSVP-E2E-IGNORE
+#	135			# Mobility Header
+udplite	136	UDPLite
+mpls-in-ip	137	MPLS-in-IP
+#   138-252 Unassigned                                       [IANA]
+#   253     Use for experimentation and testing           [RFC3692]
+#   254     Use for experimentation and testing           [RFC3692]
+#   255                 Reserved                             [IANA]

packages/network/nfs-utils/init.d/05_nfsutils

@@ -0,0 +1,35 @@
+################################################################################
+#      Copyright (C) 2009-2010 OpenELEC.tv
+#      http://www.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
+################################################################################
+
+# create directories needed for nfs-utils
+#
+# runlevels: openelec, textmode
+
+(
+  progress "create directories needed for nfs-utils"
+
+    install -m 755 -o rpcuser -g rpcuser -d /var/lib/nfs
+    install -m 755 -o rpcuser -g rpcuser -d /var/lib/nfs/sm
+    install -m 755 -o rpcuser -g rpcuser -d /var/lib/nfs/sm.bak
+    touch /var/lib/nfs/etab && chown rpcuser:rpcuser /var/lib/nfs/etab
+    touch /var/lib/nfs/rmtab && chown rpcuser:rpcuser /var/lib/nfs/rmtab
+    touch /var/lib/nfs/state && chown rpcuser:rpcuser /var/lib/nfs/state
+    touch /var/lib/nfs/xtab && chown rpcuser:rpcuser /var/lib/nfs/xtab
+)&

packages/network/nfs-utils/install

@@ -0,0 +1,40 @@
+#!/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
+
+add_user rpcuser x 29 29 "RPC Service User" "/var/lib/nfs" "/bin/sh"
+add_group rpcuser 29
+
+mkdir -p $INSTALL/sbin
+  cp $PKG_BUILD/utils/mount/mount.nfs $INSTALL/sbin/
+    ln -sf mount.nfs $INSTALL/sbin/mount.nfs4
+    ln -sf mount.nfs $INSTALL/sbin/umount.nfs
+    ln -sf mount.nfs $INSTALL/sbin/umount.nfs4
+
+mkdir -p $INSTALL/usr/sbin
+  cp $PKG_BUILD/utils/statd/statd $INSTALL/usr/sbin/rpc.statd
+  cp $PKG_BUILD/utils/statd/start-statd $INSTALL/usr/sbin/
+    chmod +x $INSTALL/usr/sbin/start-statd
+
+mkdir -p $INSTALL/etc
+  cp $PKG_DIR/config/protocols $INSTALL/etc