config/version: set version to 4.1.5

Signed-off-by: Stephan Raue <stephan@openelec.tv>

config/addon/addon.xml

@@ -12,6 +12,7 @@
              library="default.py">
         <provides>executable</provides>
   </extension>
+@EXTENSIONS@
   <extension point="xbmc.addon.metadata">
     <summary>@PKG_SHORTDESC@</summary>
     <description>

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="4.1.3"
+  OPENELEC_VERSION="4.1.5"
 
 # OS_VERSION: OS Version
   OS_VERSION="4.2"

packages/addons/repository/repository.unofficial.addon.pro/package.mk

@@ -41,7 +41,7 @@ PKG_MAINTAINER="unofficial.addon.pro"
 make_target() {
   $SED -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
      -e "s|@PROJECT@|$PROJECT|g" \
-     -e "s|@ARCH@|$ARCH|g" \
+     -e "s|@ARCH@|$TARGET_ARCH|g" \
   -i addon.xml
 }
 

packages/audio/taglib/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="taglib"
-PKG_VERSION="1.9.1"
+PKG_VERSION="1.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://taglib.github.com/"
-PKG_URL="https://github.com/taglib/taglib/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://taglib.github.io/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain cmake:host zlib"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
@@ -39,5 +39,10 @@ configure_target() {
 
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
+  # pkgconf hack
   $SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/taglib-config
+  $SED "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc
+  $SED "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc
+  $SED "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc
+  $SED "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc
 }

packages/compress/lzo/package.mk

@@ -33,4 +33,5 @@ PKG_LONGDESC="LZO is a data compression library which is suitable for data de-/c
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
+PKG_CONFIGURE_OPTS_HOST="--disable-shared --enable-static"
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"

packages/databases/sqlite/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3080500"
+PKG_VERSION="autoconf-3080600"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"

packages/devel/automake/patches/automake-01-fix-help2man.patch

@@ -0,0 +1,25 @@
+From fc19cd1da6161ec5602e692488dfc8e670797afe Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Fri, 15 Aug 2014 22:10:03 +0300
+Subject: [PATCH] meh help2man
+
+---
+ Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5a336df..2d2029b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -701,7 +701,7 @@ update_mans = \
+   $(AM_V_GEN): \
+     && $(MKDIR_P) doc \
+     && $(extend_PATH) \
+-    && $(PERL) $(srcdir)/doc/help2man --output=$@
++    && $(PERL) $(srcdir)/doc/help2man --output=$@ --no-discard-stderr
+ 
+ amhello_sources = \
+   doc/amhello/configure.ac \
+-- 
+1.7.2.5
+

packages/devel/binutils/package.mk

@@ -28,7 +28,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/binutils/binutils.html"
 PKG_URL="http://ftp.gnu.org/gnu/binutils/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="ccache:host bison:host flex:host linux:host gmp:host mpfr:host"
+PKG_DEPENDS_HOST="ccache:host bison:host flex:host linux:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="binutils: A GNU collection of binary utilities"
@@ -40,8 +40,6 @@ PKG_AUTORECONF="no"
 PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
                          --with-sysroot=$SYSROOT_PREFIX \
                          --with-lib-path=$SYSROOT_PREFIX/lib:$SYSROOT_PREFIX/usr/lib \
-                         --with-gmp=$ROOT/$TOOLCHAIN \
-                         --with-mpfr=$ROOT/$TOOLCHAIN \
                          --without-ppl \
                          --without-cloog \
                          --disable-werror \
@@ -55,10 +53,6 @@ PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
                          --enable-lto \
                          --disable-nls"
 
-if [ "$TARGET_ARCH" = "x86_64" ]; then
-  PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_HOST --enable-64-bit-bfd"
-fi
-
 pre_configure_host() {
   unset CPPFLAGS
   unset CFLAGS

packages/devel/binutils/patches/binutils-2.23.1-cloog-0.17.patch

@@ -1,25 +0,0 @@
-diff -Naur binutils-2.22/configure binutils-2.22.patch/configure
---- binutils-2.22/configure	2011-08-14 14:28:15.000000000 +0200
-+++ binutils-2.22.patch/configure	2012-05-08 05:57:26.093455382 +0200
-@@ -5946,8 +5946,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
--    || CLOOG_VERSION_MINOR != 16 \
--    || CLOOG_VERSION_REVISION < 1
-+    || CLOOG_VERSION_MINOR != 18
-     choke me
-    #endif
-   ;
-diff -Naur binutils-2.22/configure.ac binutils-2.22.patch/configure.ac
---- binutils-2.22/configure.ac	2011-11-21 12:58:27.000000000 +0100
-+++ binutils-2.22.patch/configure.ac	2012-05-08 05:54:27.974921129 +0200
-@@ -1589,7 +1589,7 @@
-   dnl
-   dnl If we use CLooG-Legacy, the provided version information is
-   dnl ignored.
--  CLOOG_CHECK_VERSION(0,16,1)
-+  CLOOG_CHECK_VERSION(0,18,0)
- 
-   dnl Only execute fail-action, if CLooG has been requested.
-   CLOOG_IF_FAILED([

packages/devel/boost/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="boost"
-PKG_VERSION="1_55_0"
+PKG_VERSION="1_56_0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.boost.org/"
-PKG_URL="$SOURCEFORGE_SRC/boost/boost/1.55.0/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
+PKG_URL="$SOURCEFORGE_SRC/boost/boost/1.56.0/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
 PKG_SOURCE_DIR="${PKG_NAME}_${PKG_VERSION}"
 PKG_DEPENDS_HOST=""
 PKG_DEPENDS_TARGET="toolchain boost:host Python:host zlib bzip2"
@@ -35,7 +35,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 make_host() {
-  cd tools/build/v2/engine
+  cd tools/build/src/engine
     sh build.sh
 }
 
@@ -59,7 +59,7 @@ configure_target() {
                   --with-python=$ROOT/$TOOLCHAIN/bin/python \
 
   echo "using gcc : `$TARGET_CC -v 2>&1  | tail -n 1 |awk '{print $3}'` : $TARGET_CC  : <compileflags>\"$CFLAGS\" <linkflags>\"$LDFLAGS\" ;" \
-    > tools/build/v2/user-config.jam
+    > tools/build/src/user-config.jam
 }
 
 make_target() {
@@ -69,6 +69,7 @@ make_target() {
 makeinstall_target() {
   $ROOT/$TOOLCHAIN/bin/bjam -d2 --toolset=gcc link=static \
                                 --prefix=$SYSROOT_PREFIX/usr \
+				--ignore-site-config \
                                   --layout=system \
                                   --with-thread \
                                   --with-iostreams \

packages/devel/cmake/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="cmake"
-PKG_VERSION="3.0.0"
+PKG_VERSION="3.0.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/devel/dbus-glib/package.mk

@@ -23,8 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freedesktop.org/wiki/Software/dbus"
 PKG_URL="http://dbus.freedesktop.org/releases/dbus-glib/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="glib:host dbus:host"
-PKG_DEPENDS_TARGET="toolchain dbus glib expat dbus-glib:host"
+PKG_DEPENDS_TARGET="toolchain dbus glib expat"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="dbus-glib: A message bus system"
@@ -40,13 +39,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_have_abstract_sockets=yes \
                            --disable-shared \
                            --disable-tests \
                            --disable-bash-completion \
-                           --enable-asserts=no \
-                           --with-introspect-xml=$PKG_BUILD/.$HOST_NAME/introspect.xml \
-                           --with-dbus-binding-tool=$ROOT/$TOOLCHAIN/bin/dbus-binding-tool"
-
-PKG_CONFIGURE_OPTS_HOST="--disable-tests \
-                         --disable-bash-completion \
-                         --enable-asserts=yes"
+                           --enable-asserts=no"
 
 pre_configure_target() {
   CFLAGS="$CFLAGS -fPIC -DPIC"

packages/devel/dbus-glib/patches/dbus-glib-01-dont-build-tools-examples.patch

@@ -0,0 +1,38 @@
+From a45f914870e923741f3123799bd9e126b5da4aa0 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Wed, 20 Aug 2014 22:43:28 +0300
+Subject: [PATCH] dont build tools / examples
+
+---
+ Makefile.am      |    4 ++--
+ dbus/Makefile.am |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index dd76c7e..78cb56f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,8 +1,8 @@
+ ACLOCAL_AMFLAGS = -I m4
+ GLIB_PC=dbus-glib-1.pc
+ 
+-SUBDIRS=dbus tools test doc
+-DIST_SUBDIRS=dbus tools test doc m4
++SUBDIRS=dbus test doc
++DIST_SUBDIRS=dbus test doc m4
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = $(GLIB_PC)
+diff --git a/dbus/Makefile.am b/dbus/Makefile.am
+index 6d885f9..8bc102d 100644
+--- a/dbus/Makefile.am
++++ b/dbus/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = . examples
++SUBDIRS = .
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir)						\
+-- 
+1.7.2.5
+

packages/devel/elfutils/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="elfutils"
-PKG_VERSION="0.158"
+PKG_VERSION="0.159"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -35,6 +35,7 @@ PKG_AUTORECONF="yes"
 PKG_CONFIGURE_OPTS_TARGET="utrace_cv_cc_biarch=false \
                            --disable-werror \
                            --disable-progs \
+                           --disable-nls \
                            --with-zlib \
                            --without-bzlib \
                            --without-lzma"

packages/devel/elfutils/patches/elfutils-0.158-CVE-2014-0172.patch

@@ -1,28 +0,0 @@
-commit 7f1eec317db79627b473c5b149a22a1b20d1f68f
-Author: Mark Wielaard <mjw@redhat.com>
-Date:   Wed Apr 9 11:33:23 2014 +0200
-
-    CVE-2014-0172 Check for overflow before calling malloc to uncompress data.
-    
-    https://bugzilla.redhat.com/show_bug.cgi?id=1085663
-    
-    Reported-by: Florian Weimer <fweimer@redhat.com>
-    Signed-off-by: Mark Wielaard <mjw@redhat.com>
-
-diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c
-index 79daeac..34ea373 100644
---- a/libdw/dwarf_begin_elf.c
-+++ b/libdw/dwarf_begin_elf.c
-@@ -282,6 +282,12 @@ check_section (Dwarf *result, GElf_Ehdr *ehdr, Elf_Scn *scn, bool inscngrp)
- 	    memcpy (&size, data->d_buf + 4, sizeof size);
- 	    size = be64toh (size);
- 
-+	    /* Check for unsigned overflow so malloc always allocated
-+	       enough memory for both the Elf_Data header and the
-+	       uncompressed section data.  */
-+	    if (unlikely (sizeof (Elf_Data) + size < size))
-+	      break;
-+
- 	    Elf_Data *zdata = malloc (sizeof (Elf_Data) + size);
- 	    if (unlikely (zdata == NULL))
- 	      break;

packages/devel/elfutils/patches/elfutils-0.158-mod-e_type.patch

@@ -1,62 +0,0 @@
-commit 65cefbd0793c0f9e90a326d7bebf0a47c93294ad
-Author: Josh Stone <jistone@redhat.com>
-Date:   Tue Mar 11 10:19:28 2014 -0700
-
-    libdwfl: dwfl_module_getdwarf.c (open_elf) only (re)set mod->e_type once.
-    
-    As noted in https://sourceware.org/bugzilla/show_bug.cgi?id=16676#c2 for
-    systemtap, the heuristic used by open_elf to set the kernel Dwfl_Module
-    type to ET_DYN, even if the underlying ELF file e_type was set to
-    ET_EXEC, could trigger erroneously for non-kernel/non-main (debug or
-    aux) files.  Make sure we only set the e_type of the module once when
-    processing the main file (when the phdrs can be trusted).
-
-diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
-index c4bd739..f8de80b 100644
---- a/libdwfl/dwfl_module_getdwarf.c
-+++ b/libdwfl/dwfl_module_getdwarf.c
-@@ -1,5 +1,5 @@
- /* Find debugging and symbol information for a module in libdwfl.
--   Copyright (C) 2005-2012 Red Hat, Inc.
-+   Copyright (C) 2005-2012, 2014 Red Hat, Inc.
-    This file is part of elfutils.
- 
-    This file is free software; you can redistribute it and/or modify
-@@ -77,7 +77,7 @@ open_elf (Dwfl_Module *mod, struct dwfl_file *file)
-       return DWFL_E (LIBELF, elf_errno ());
-     }
- 
--  if (mod->e_type != ET_REL)
-+  if (ehdr->e_type != ET_REL)
-     {
-       /* In any non-ET_REL file, we compute the "synchronization address".
- 
-@@ -131,11 +131,24 @@ open_elf (Dwfl_Module *mod, struct dwfl_file *file)
- 	}
-     }
- 
--  mod->e_type = ehdr->e_type;
-+  /* We only want to set the module e_type explictly once, derived from
-+     the main ELF file.  (It might be changed for the kernel, because
-+     that is special - see below.)  open_elf is always called first for
-+     the main ELF file, because both find_dw and find_symtab call
-+     __libdwfl_getelf first to open the main file.  So don't let debug
-+     or aux files override the module e_type.  The kernel heuristic
-+     below could otherwise trigger for non-kernel/non-main files, since
-+     their phdrs might not match the actual load addresses.  */
-+  if (file == &mod->main)
-+    {
-+      mod->e_type = ehdr->e_type;
- 
--  /* Relocatable Linux kernels are ET_EXEC but act like ET_DYN.  */
--  if (mod->e_type == ET_EXEC && file->vaddr != mod->low_addr)
--    mod->e_type = ET_DYN;
-+      /* Relocatable Linux kernels are ET_EXEC but act like ET_DYN.  */
-+      if (mod->e_type == ET_EXEC && file->vaddr != mod->low_addr)
-+	mod->e_type = ET_DYN;
-+    }
-+  else
-+    assert (mod->main.elf != NULL);
- 
-   return DWFL_E_NOERROR;
- }

packages/devel/flex/package.mk

@@ -32,7 +32,7 @@ PKG_LONGDESC="flex is a tool for generating programs that perform pattern-matchi
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-PKG_CONFIGURE_OPTS_HOST="--disable-rpath --with-gnu-ld"
+PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared --disable-rpath --with-gnu-ld"
 
 post_makeinstall_host() {
   cat > $ROOT/$TOOLCHAIN/bin/lex << "EOF"

packages/devel/gettext/package.mk

@@ -38,6 +38,8 @@ PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared \
                          --disable-rpath \
                          --with-gnu-ld \
                          --disable-java \
+                         --disable-curses \
+                         --with-included-libxml \
                          --disable-native-java \
                          --disable-csharp \
                          --without-emacs"

packages/devel/glib/package.mk

@@ -23,8 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
 PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.40/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_HOST="ccache:host libffi:host libxml2:host zlib:host Python:host"
-PKG_DEPENDS_TARGET="toolchain zlib libffi pcre glib:host Python:host"
+PKG_DEPENDS_TARGET="toolchain zlib libffi pcre Python:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="glib: C support library"
@@ -33,15 +32,6 @@ PKG_LONGDESC="GLib is a library which includes support routines for C such as li
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_HOST="--with-gnu-ld \
-                         --with-libiconv=no \
-                         --enable-debug=no \
-                         --disable-man \
-                         --disable-dtrace \
-                         --disable-systemtap \
-                         --disable-rebuilds \
-                         --disable-gtk-doc"
-
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_mmap_fixed_mapped=yes \
                            ac_cv_func_posix_getpwuid_r=yes \
                            ac_cv_func_posix_getgrgid_r=yes \
@@ -64,25 +54,6 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_mmap_fixed_mapped=yes \
                            --with-threads=posix \
                            --with-pcre=system"
 
-pre_build_host() {
-  # hack: we need pkg.m4 for autoreconf, but pkgconfig depends on glib so install
-  # pkg.m4 first
-  $SCRIPTS/unpack pkg-config
-  cp $BUILD/pkg-config-*/pkg.m4 $TOOLCHAIN/share/aclocal
-}
-
-pre_configure_host() {
-  export ZLIB_CFLAGS=""
-  export ZLIB_LIBS=""
-  export LIBFFI_CFLAGS="-I$ROOT/$TOOLCHAIN/include/libffi"
-  export LIBFFI_LIBS="-L$ROOT/$TOOLCHAIN/lib -lffi"
-}
-
-post_makeinstall_host() {
-  cp -f gobject/.libs/glib-genmarshal $ROOT/$TOOLCHAIN/bin
-  cp -f gobject/glib-mkenums $ROOT/$TOOLCHAIN/bin
-}
-
 post_makeinstall_target() {
   mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
     cp g*-2.0.pc $SYSROOT_PREFIX/usr/lib/pkgconfig

packages/devel/glib/patches/glib-01-dont-build-tests.patch

@@ -0,0 +1,54 @@
+From 68cbd635036fe04cd07bbb1a4829eebab2d7dc03 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Wed, 20 Aug 2014 22:46:35 +0300
+Subject: [PATCH] dont build tests
+
+---
+ Makefile.am  |    2 +-
+ configure.ac |   17 -----------------
+ 2 files changed, 1 insertions(+), 18 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 40e5cd5..db7bfc8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,7 +6,7 @@ include $(top_srcdir)/glib.mk
+ 
+ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
+ 
+-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
++SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
+ DIST_SUBDIRS = $(SUBDIRS) build
+ 
+ bin_SCRIPTS = glib-gettextize
+diff --git a/configure.ac b/configure.ac
+index a01e58d..f310615 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2559,23 +2559,6 @@ dnl ******************************************************************
+ 
+ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+ 
+-AS_IF([ test $cross_compiling = yes ], [
+-  AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
+-  if test x$GLIB_GENMARSHAL = xno; then
+-    AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)
+-  fi
+-
+-  AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas, no)
+-  if test x$GLIB_COMPILE_SCHEMAS = xno; then
+-    AC_MSG_ERROR(Could not find a glib-compile-schemas in your PATH)
+-  fi
+-
+-  AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources, no)
+-  if test x$GLIB_COMPILE_RESOURCES = xno; then
+-    AC_MSG_ERROR(Could not find a glib-compile-resources in your PATH)
+-  fi
+-])
+-
+ dnl **************************
+ dnl *** Checks for gtk-doc ***
+ dnl **************************
+-- 
+1.7.2.5
+

packages/devel/gmp/package.mk

@@ -33,7 +33,7 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_HOST="--enable-cxx"
+PKG_CONFIGURE_OPTS_HOST="--enable-cxx --enable-static --disable-shared"
 
 pre_configure_host() {
   export CFLAGS="$CFLAGS -fPIC -DPIC"

packages/devel/gmp/patches/gmp-__thumb__-fix-1.patch

@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1396035313 -3600
-# Node ID c56ea318eb6435bdd28dbfef657b2fe372134f1f
-# Parent  c6fe20ab62acc266ff5ad3629bef447bc43dcd1b
-Conditionalise ARM asm on !__thumb__.
-
-diff -r c6fe20ab62ac -r c56ea318eb64 mpn/generic/mod_1_1.c
---- a/mpn/generic/mod_1_1.c	Wed Mar 26 12:58:33 2014 +0100
-+++ b/mpn/generic/mod_1_1.c	Fri Mar 28 20:35:13 2014 +0100
-@@ -129,7 +129,7 @@
- 	     "%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC)
- #endif
- 
--#if defined (__arm__) && W_TYPE_SIZE == 32
-+#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32
- #define add_mssaaaa(m, sh, sl, ah, al, bh, bl)				\
-   __asm__ (  "adds	%2, %5, %6\n\t"					\
- 	     "adcs	%1, %3, %4\n\t"					\
-

packages/devel/gmp/patches/gmp-__thumb__-fix-2.patch

@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1396602422 -7200
-# Node ID 676e2d0f0e4dd301a7066079d2c9326c25c34a40
-# Parent  0194a75b56b21a9196626430af86c5bd9110c42d
-Conditionalise ARM asm on !__thumb__.
-
-diff -r 0194a75b56b2 -r 676e2d0f0e4d mpn/generic/div_qr_1n_pi1.c
---- a/mpn/generic/div_qr_1n_pi1.c	Thu Apr 03 23:58:51 2014 +0200
-+++ b/mpn/generic/div_qr_1n_pi1.c	Fri Apr 04 11:07:02 2014 +0200
-@@ -130,7 +130,7 @@
- 	     "%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC)
- #endif
- 
--#if defined (__arm__) && W_TYPE_SIZE == 32
-+#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32
- #define add_mssaaaa(m, sh, sl, ah, al, bh, bl)				\
-   __asm__ (  "adds	%2, %5, %6\n\t"					\
- 	     "adcs	%1, %3, %4\n\t"					\
-

packages/devel/libffi/package.mk

@@ -23,7 +23,6 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sourceware.org/$PKG_NAME/"
 PKG_URL="ftp://sourceware.org/pub/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host libtool:host intltool:host autoconf-archive:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
@@ -33,14 +32,10 @@ PKG_LONGDESC="The libffi library provides a portable, high level programming int
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_HOST="--disable-debug \
-             --enable-structs \
-             --enable-raw-api \
-             --disable-purify-safety \
-             --with-gnu-ld"
-
 PKG_CONFIGURE_OPTS_TARGET="--disable-debug \
-             --enable-structs \
-             --enable-raw-api \
-             --disable-purify-safety \
-             --with-gnu-ld"
+                           --enable-static --disable-shared \
+                           --with-pic \
+                           --enable-structs \
+                           --enable-raw-api \
+                           --disable-purify-safety \
+                           --with-gnu-ld"

packages/devel/libffi/patches/libffi-fix-pkgconf.patch

@@ -0,0 +1,23 @@
+From a2d10693e352db0cdfc22550f23f8294564ce939 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sat, 16 Aug 2014 12:26:53 +0300
+Subject: [PATCH] fix pkgconf
+
+---
+ libffi.pc.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libffi.pc.in b/libffi.pc.in
+index 1477a66..1dd4ebd 100644
+--- a/libffi.pc.in
++++ b/libffi.pc.in
+@@ -7,5 +7,5 @@ includedir=@includedir@/@PACKAGE_NAME@
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces
+ Version: @PACKAGE_VERSION@
+-Libs: -L${toolexeclibdir} -lffi
++Libs: -L${libdir} -lffi
+ Cflags: -I${includedir}
+-- 
+1.7.2.5
+

packages/devel/libtool/package.mk

@@ -33,4 +33,4 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-ltdl-install"
+PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared"

packages/devel/mpc/package.mk

@@ -33,7 +33,6 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
-                         --enable-shared \
-                         --disable-static \
+                         --enable-static --disable-shared \
                          --with-gmp=$ROOT/$TOOLCHAIN \
                          --with-mpfr=$ROOT/$TOOLCHAIN"

packages/devel/mpfr/package.mk

@@ -30,17 +30,10 @@ PKG_SHORTDESC="mpfr: A C library for multiple-precision floating-point computati
 PKG_LONGDESC="The MPFR library is a C library for multiple-precision floating-point computations with exact rounding (also called correct rounding). It is based on the GMP multiple-precision library. The main goal of MPFR is to provide a library for multiple-precision floating-point computation which is both efficient and has well-defined semantics. It copies the good ideas from the ANSI/IEEE-754 standard for double-precision floating-point arithmetic (53-bit mantissa)."
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
+PKG_AUTORECONF="yes"
 
 PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
+                         --enable-static --disable-shared \
                          --prefix=$ROOT/$TOOLCHAIN \
-                         --enable-shared \
                          --with-gmp-lib=$ROOT/$TOOLCHAIN/lib \
                          --with-gmp-include=$ROOT/$TOOLCHAIN/include"
-
-pre_build_host() {
-  ( cd $PKG_BUILD
-    libtoolize
-    autoreconf -vif
-  )
-}

packages/devel/ncurses/package.mk

@@ -23,8 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://www.gnu.org/software/ncurses/"
 PKG_URL="http://ftp.gnu.org/pub/gnu/ncurses/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST=""
-PKG_DEPENDS_TARGET="toolchain ncurses:host"
+PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="ncurses: The ncurses (new curses) library"
@@ -33,7 +32,6 @@ PKG_LONGDESC="The ncurses (new curses) library is a free software emulation of c
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-PKG_CONFIGURE_OPTS_HOST="--with-shared"
 PKG_CONFIGURE_OPTS_TARGET="--without-cxx \
                            --without-cxx-binding \
                            --without-ada \
@@ -48,7 +46,8 @@ PKG_CONFIGURE_OPTS_TARGET="--without-cxx \
                            --without-gpm \
                            --disable-rpath \
                            --disable-overwrite \
-                           --enable-database \
+                           --disable-database \
+                           --with-fallbacks=linux,screen,xterm,xterm-color \
                            --disable-big-core \
                            --enable-termcap \
                            --enable-getcap \
@@ -77,17 +76,6 @@ pre_configure_target() {
   strip_linker_plugin
 }
 
-make_host() {
-  make -C include
-  make -C progs tic
-}
-
-makeinstall_host() {
-  cp progs/tic $ROOT/$TOOLCHAIN/bin
-  cp lib/*.so* $ROOT/$TOOLCHAIN/lib
-  make -C include install
-}
-
 make_target() {
   make -C include
   make -C ncurses
@@ -103,19 +91,3 @@ makeinstall_target() {
 
   make DESTDIR=$INSTALL -C ncurses install
 }
-
-post_makeinstall_target() {
-  mkdir -p $INSTALL/usr/share/terminfo/l
-    TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe linux \
-      $ROOT/$PKG_BUILD/misc/terminfo.src
-
-  mkdir -p $INSTALL/usr/share/terminfo/s
-    TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe screen \
-      $ROOT/$PKG_BUILD/misc/terminfo.src
-
-  mkdir -p $INSTALL/usr/share/terminfo/x
-    TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe xterm \
-      $ROOT/$PKG_BUILD/misc/terminfo.src
-    TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe xterm-color \
-      $ROOT/$PKG_BUILD/misc/terminfo.src
-}

packages/graphics/Mesa/package.mk

@@ -17,13 +17,14 @@
 ################################################################################
 
 PKG_NAME="Mesa"
-PKG_VERSION="10.2.5"
+PKG_VERSION="10.3.0-rc1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain Python:host libxml2:host expat glproto dri2proto presentproto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 systemd dri3proto libxshmfence"
+PKG_URL="ftp://freedesktop.org/pub/mesa/10.3/MesaLib-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain Python:host expat glproto dri2proto presentproto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 systemd dri3proto libxshmfence"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"
 PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API"
@@ -92,7 +93,7 @@ PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \
                            --with-osmesa-lib-name=OSMesa \
                            --with-gallium-drivers=$GALLIUM_DRIVERS \
                            --with-dri-drivers=$DRI_DRIVERS \
-                           --with-expat=$SYSROOT_PREFIX/usr"
+                           --with-sysroot=$SYSROOT_PREFIX"
 
 
 pre_configure_target() {

packages/graphics/bcm2835-driver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="a6fe297"
+PKG_VERSION="fb3e439"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/graphics/glew/patches/glew-01-fix-pkgconf.patch

@@ -0,0 +1,26 @@
+From ba254faae130080d5045d8fd97dc1f232b391d2f Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sat, 16 Aug 2014 17:03:32 +0300
+Subject: [PATCH] fix pkgconf
+
+---
+ glew.pc.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glew.pc.in b/glew.pc.in
+index 4c934af..35ef2ac 100644
+--- a/glew.pc.in
++++ b/glew.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++includedir=${prefix}/include
++libdir=${exec_prefix}/lib
+ 
+ Name: glew
+ Description: The OpenGL Extension Wrangler library
+-- 
+1.7.2.5
+

packages/graphics/libpng/package.mk

@@ -37,7 +37,10 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_lib_z_zlibVersion=yes \
                            --enable-static \
                            --disable-shared"
 
+PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared"
+
 pre_configure_host() {
+  export CFLAGS="$CFLAGS -fPIC -DPIC"
   export CPPFLAGS="$CPPFLAGS -I$ROOT/$TOOLCHAIN/include"
 }
 

packages/lang/Python/package.mk

@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.python.org/"
 PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_HOST="zlib:host expat:host"
+PKG_DEPENDS_HOST="zlib:host"
 PKG_DEPENDS_TARGET="toolchain Python:host sqlite expat zlib bzip2 openssl libffi file"
 PKG_PRIORITY="optional"
 PKG_SECTION="lang"
@@ -38,8 +38,7 @@ PY_DISABLED_MODULES="readline _curses _curses_panel _tkinter nis gdbm bsddb"
 PKG_CONFIGURE_OPTS_HOST="--cache-file=config.cache \
                          --without-cxx-main \
                          --with-threads \
-                         --enable-unicode=ucs4 \
-                         --with-system-expat"
+                         --enable-unicode=ucs4"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_file_dev_ptc=no \
                            ac_cv_file_dev_ptmx=yes \
@@ -65,7 +64,6 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_file_dev_ptc=no \
 
 pre_configure_host() {
   export OPT="$HOST_CFLAGS"
-  export LDFLAGS="$LDFLAGS -lexpat"
 }
 
 make_host() {

packages/lang/gcc/package.mk

@@ -88,11 +88,13 @@ PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
                          --disable-libssp \
                          --disable-multilib \
                          --disable-libatomic \
+                         --disable-libitm \
                          --enable-gold \
                          --enable-ld=default \
                          --enable-plugin \
                          --enable-lto \
                          --disable-libquadmath \
+                         --disable-libgomp \
                          --enable-tls \
                          --enable-shared \
                          --disable-static \
@@ -121,8 +123,6 @@ post_make_host() {
 
   if [ ! "$DEBUG" = yes ]; then
     $TARGET_STRIP $TARGET_NAME/libgcc/libgcc_s.so*
-    $TARGET_STRIP $TARGET_NAME/libgomp/.libs/libgomp.so*
-    $TARGET_STRIP $TARGET_NAME/libitm/.libs/libitm.so*
     $TARGET_STRIP $TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so*
   fi
 }
@@ -171,7 +171,6 @@ make_target() {
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib
     cp -P $ROOT/$PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libgcc/libgcc_s.so* $INSTALL/usr/lib
-    cp -P $ROOT/$PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libgomp/.libs/libgomp.so* $INSTALL/usr/lib
     cp -P $ROOT/$PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* $INSTALL/usr/lib
 }
 

packages/lang/nasm/package.mk

@@ -16,27 +16,24 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="speedcontrol"
-PKG_VERSION="1"
+PKG_NAME="nasm"
+PKG_VERSION="2.11.02"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://noto.de"
-PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain"
+PKG_SITE="http://nasm.sourceforge.net/"
+PKG_URL="http://www.nasm.us/pub/nasm/releasebuilds/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_HOST=""
 PKG_PRIORITY="optional"
-PKG_SECTION="system"
-PKG_SHORTDESC="speedcontrol: a tool to setup cdrom drive speed"
-PKG_LONGDESC="speedcontrol is a tool to setup cdrom drive speed"
+PKG_SECTION="lang"
+PKG_SHORTDESC="nasm: A 80x86 assembler which can create a wide rande of object formats"
+PKG_LONGDESC="The Netwide Assembler, NASM, is an 80x86 assembler designed for portability and modularity. It supports a range of object file formats, including Linux, Microsoft 16-bit OBJ and Win32. It will also output plain binary files. Its syntax is designed to be sim- ple and easy to understand, similar to Intel's but less complex. It supports Pentium, P6 and MMX opcodes, and has macro capability. It includes a disassembler as well."
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-make_target() {
-  $CC $CFLAGS $LDFLAGS -o $PKG_NAME $PKG_NAME.c
-}
-
-makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-    cp $PKG_NAME $INSTALL/usr/bin
+pre_configure_host() {
+# nasm fails to build in subdirs
+  cd $ROOT/$PKG_BUILD
+    rm -rf .$HOST_NAME
 }

packages/linux-drivers/tbs-linux-drivers/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="tbs-linux-drivers"
-PKG_VERSION="140707"
+PKG_VERSION="140819"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"

packages/linux/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="linux"
-PKG_VERSION="3.16"
+PKG_VERSION="3.16.1"
 PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_REV="1"
 PKG_ARCH="any"

packages/linux/patches/3.16.1/linux-061-valve-xpad-rework.patch

@@ -0,0 +1,469 @@
+diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/input/joystick/xpad.c
+--- linux-3.15.6.orig/drivers/input/joystick/xpad.c	2014-08-01 20:37:09.039708016 -0700
++++ linux-3.15.6/drivers/input/joystick/xpad.c	2014-08-01 19:44:20.521111000 -0700
+@@ -281,17 +281,21 @@
+ 	struct urb *irq_out;		/* urb for interrupt out report */
+ 	unsigned char *odata;		/* output data */
+ 	dma_addr_t odata_dma;
+-	struct mutex odata_mutex;
++	spinlock_t odata_lock;
+ #endif
+ 
+ #if defined(CONFIG_JOYSTICK_XPAD_LEDS)
+ 	struct xpad_led *led;
+ #endif
++	
++	int joydev_id;
+ 
+ 	char phys[64];			/* physical device path */
+ 
+ 	int mapping;			/* map d-pad to buttons or to axes */
+ 	int xtype;			/* type of xbox device */
++	
++	const char *name;
+ };
+ 
+ /*
+@@ -435,6 +439,109 @@
+ 
+ 	input_sync(dev);
+ }
++static void xpad_send_led_command(struct usb_xpad *xpad, int command);
++static int xpad_open(struct input_dev *dev);
++static void xpad_close(struct input_dev *dev);
++static void xpad_set_up_abs(struct input_dev *input_dev, signed short abs);
++static int xpad_init_ff(struct usb_xpad *xpad);
++static int xpad_find_joydev(struct device *dev, void *data)
++{
++	if (strstr(dev_name(dev), "js"))
++		return 1;
++	
++	return 0;
++}
++
++static struct workqueue_struct *my_wq;
++
++typedef struct {
++	struct work_struct my_work;
++	struct usb_xpad *xpad;
++} my_work_t;
++
++static void my_wq_function( struct work_struct *work)
++{
++	my_work_t *my_work = (my_work_t *)work;
++	
++	struct usb_xpad *xpad = my_work->xpad;
++	
++	if (xpad->pad_present) {
++		
++		struct input_dev *input_dev;
++		int i;
++		
++		input_dev = input_allocate_device();
++
++		xpad->dev = input_dev;
++		input_dev->name = xpad->name;
++		input_dev->phys = xpad->phys;
++		usb_to_input_id(xpad->udev, &input_dev->id);
++		input_dev->dev.parent = &xpad->intf->dev;
++		
++		input_set_drvdata(input_dev, xpad);
++		
++		input_dev->open = xpad_open;
++		input_dev->close = xpad_close;
++		
++		input_dev->evbit[0] = BIT_MASK(EV_KEY);
++		
++		if (!(xpad->mapping & MAP_STICKS_TO_NULL)) {
++			input_dev->evbit[0] |= BIT_MASK(EV_ABS);
++			/* set up axes */
++			for (i = 0; xpad_abs[i] >= 0; i++)
++				xpad_set_up_abs(input_dev, xpad_abs[i]);
++		}
++		
++		/* set up standard buttons */
++		for (i = 0; xpad_common_btn[i] >= 0; i++)
++			__set_bit(xpad_common_btn[i], input_dev->keybit);
++		
++		/* set up model-specific ones */
++		if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX360W) {
++			for (i = 0; xpad360_btn[i] >= 0; i++)
++				__set_bit(xpad360_btn[i], input_dev->keybit);
++		} else {
++			for (i = 0; xpad_btn[i] >= 0; i++)
++				__set_bit(xpad_btn[i], input_dev->keybit);
++		}
++		
++		if (xpad->mapping & MAP_DPAD_TO_BUTTONS) {
++			for (i = 0; xpad_btn_pad[i] >= 0; i++)
++				__set_bit(xpad_btn_pad[i], input_dev->keybit);
++		} else {
++			for (i = 0; xpad_abs_pad[i] >= 0; i++)
++				xpad_set_up_abs(input_dev, xpad_abs_pad[i]);
++		}
++		
++		if (xpad->mapping & MAP_TRIGGERS_TO_BUTTONS) {
++			for (i = 0; xpad_btn_triggers[i] >= 0; i++)
++				__set_bit(xpad_btn_triggers[i], input_dev->keybit);
++		} else {
++			for (i = 0; xpad_abs_triggers[i] >= 0; i++)
++				xpad_set_up_abs(input_dev, xpad_abs_triggers[i]);
++		}
++		
++		input_register_device(xpad->dev);
++		
++		{
++			struct device* joydev_dev = device_find_child(&xpad->dev->dev, NULL, xpad_find_joydev);
++			
++			if (joydev_dev) {
++// 				printk("found joydev child with minor %i\n", MINOR(joydev_dev->devt));
++				xpad->joydev_id = MINOR(joydev_dev->devt);
++				xpad_send_led_command(xpad, (xpad->joydev_id % 4) + 2);
++			}
++		}
++		
++		xpad_init_ff(xpad);
++	} else {
++		input_unregister_device(xpad->dev);
++	}
++	
++	kfree( (void *)work );
++	
++	return;
++}
+ 
+ /*
+  * xpad360w_process_packet
+@@ -456,11 +563,35 @@
+ 	/* Presence change */
+ 	if (data[0] & 0x08) {
+ 		if (data[1] & 0x80) {
+-			xpad->pad_present = 1;
+-			usb_submit_urb(xpad->bulk_out, GFP_ATOMIC);
+-		} else
+-			xpad->pad_present = 0;
++			
++			if (!xpad->pad_present)
++			{
++				my_work_t * work;
++				xpad->pad_present = 1;
++				usb_submit_urb(xpad->bulk_out, GFP_ATOMIC);
++				
++				work = (my_work_t *)kmalloc(sizeof(my_work_t), GFP_KERNEL);
++				INIT_WORK( (struct work_struct *)work, my_wq_function );
++				work->xpad = xpad;
++				queue_work( my_wq, (struct work_struct *)work );
++			}
++			
++		} else {
++			if (xpad->pad_present)
++			{
++				my_work_t * work;
++				xpad->pad_present = 0;
++
++				work = (my_work_t *)kmalloc(sizeof(my_work_t), GFP_KERNEL);
++				INIT_WORK( (struct work_struct *)work, my_wq_function );
++				work->xpad = xpad;
++				queue_work( my_wq, (struct work_struct *)work );
++			}
++// 			printk("got kill packet for id %i\n", xpad->joydev_id);
++		}
+ 	}
++	
++// 	printk("xpad packet %hhX %hhX %hhX %hhX %hhX %hhX\n", data[0], data[1], data[2], data[3], data[4], data[5]);
+ 
+ 	/* Valid pad data */
+ 	if (!(data[1] & 0x1))
+@@ -476,6 +607,8 @@
+ 	int retval, status;
+ 
+ 	status = urb->status;
++	
++// 	printk("xpad_irq_in %i\n", status);
+ 
+ 	switch (status) {
+ 	case 0:
+@@ -584,8 +717,6 @@
+ 		goto fail1;
+ 	}
+ 
+-	mutex_init(&xpad->odata_mutex);
+-
+ 	xpad->irq_out = usb_alloc_urb(0, GFP_KERNEL);
+ 	if (!xpad->irq_out) {
+ 		error = -ENOMEM;
+@@ -714,15 +845,38 @@
+ 
+ static void xpad_send_led_command(struct usb_xpad *xpad, int command)
+ {
+-	if (command >= 0 && command < 14) {
+-		mutex_lock(&xpad->odata_mutex);
+-		xpad->odata[0] = 0x01;
+-		xpad->odata[1] = 0x03;
+-		xpad->odata[2] = command;
+-		xpad->irq_out->transfer_buffer_length = 3;
+-		usb_submit_urb(xpad->irq_out, GFP_KERNEL);
+-		mutex_unlock(&xpad->odata_mutex);
++	if ((unsigned)command > 15)
++		return;
++
++	spin_lock(&xpad->odata_lock);
++
++	switch (xpad->xtype) {
++		
++		case XTYPE_XBOX360:
++			xpad->odata[0] = 0x01;
++			xpad->odata[1] = 0x03;
++			xpad->odata[2] = command;
++			xpad->irq_out->transfer_buffer_length = 3;
++			break;
++		case XTYPE_XBOX360W:
++			xpad->odata[0] = 0x00;
++			xpad->odata[1] = 0x00;
++			xpad->odata[2] = 0x08;
++			xpad->odata[3] = 0x40 + (command % 0x0e);
++			xpad->odata[4] = 0x00;
++			xpad->odata[5] = 0x00;
++			xpad->odata[6] = 0x00;
++			xpad->odata[7] = 0x00;
++			xpad->odata[8] = 0x00;
++			xpad->odata[9] = 0x00;
++			xpad->odata[10] = 0x00;
++			xpad->odata[11] = 0x00;
++			xpad->irq_out->transfer_buffer_length = 12;
++			break;
+ 	}
++
++	usb_submit_urb(xpad->irq_out, GFP_KERNEL);
++	spin_unlock(&xpad->odata_lock);
+ }
+ 
+ static void xpad_led_set(struct led_classdev *led_cdev,
+@@ -741,8 +895,10 @@
+ 	struct xpad_led *led;
+ 	struct led_classdev *led_cdev;
+ 	int error;
++	
++// 	printk("xpad_led_probe\n");
+ 
+-	if (xpad->xtype != XTYPE_XBOX360)
++	if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX360W)
+ 		return 0;
+ 
+ 	xpad->led = led = kzalloc(sizeof(struct xpad_led), GFP_KERNEL);
+@@ -765,11 +921,6 @@
+ 		return error;
+ 	}
+ 
+-	/*
+-	 * Light up the segment corresponding to controller number
+-	 */
+-	xpad_send_led_command(xpad, (led_no % 4) + 2);
+-
+ 	return 0;
+ }
+ 
+@@ -791,6 +942,7 @@
+ static int xpad_open(struct input_dev *dev)
+ {
+ 	struct usb_xpad *xpad = input_get_drvdata(dev);
++// 	printk("xpad open driver data %x\n", (unsigned int)xpad);
+ 
+ 	/* URB was submitted in probe */
+ 	if (xpad->xtype == XTYPE_XBOX360W)
+@@ -839,23 +991,24 @@
+ {
+ 	struct usb_device *udev = interface_to_usbdev(intf);
+ 	struct usb_xpad *xpad;
+-	struct input_dev *input_dev;
+ 	struct usb_endpoint_descriptor *ep_irq_in;
+ 	int i, error;
++	struct input_dev *input_dev;
++	
++	if (!my_wq) {
++		my_wq = create_workqueue("xpad_queue");
++	}
+ 
+ 	for (i = 0; xpad_device[i].idVendor; i++) {
+ 		if ((le16_to_cpu(udev->descriptor.idVendor) == xpad_device[i].idVendor) &&
+ 		    (le16_to_cpu(udev->descriptor.idProduct) == xpad_device[i].idProduct))
+ 			break;
+ 	}
+-
++	
+ 	xpad = kzalloc(sizeof(struct usb_xpad), GFP_KERNEL);
+-	input_dev = input_allocate_device();
+-	if (!xpad || !input_dev) {
+-		error = -ENOMEM;
+-		goto fail1;
+-	}
+ 
++	xpad->name = xpad_device[i].name;
++	
+ 	xpad->idata = usb_alloc_coherent(udev, XPAD_PKT_LEN,
+ 					 GFP_KERNEL, &xpad->idata_dma);
+ 	if (!xpad->idata) {
+@@ -891,65 +1044,12 @@
+ 			xpad->mapping |= MAP_STICKS_TO_NULL;
+ 	}
+ 
+-	xpad->dev = input_dev;
+-	usb_make_path(udev, xpad->phys, sizeof(xpad->phys));
+-	strlcat(xpad->phys, "/input0", sizeof(xpad->phys));
+-
+-	input_dev->name = xpad_device[i].name;
+-	input_dev->phys = xpad->phys;
+-	usb_to_input_id(udev, &input_dev->id);
+-	input_dev->dev.parent = &intf->dev;
+-
+-	input_set_drvdata(input_dev, xpad);
+-
+-	input_dev->open = xpad_open;
+-	input_dev->close = xpad_close;
+-
+-	input_dev->evbit[0] = BIT_MASK(EV_KEY);
+-
+-	if (!(xpad->mapping & MAP_STICKS_TO_NULL)) {
+-		input_dev->evbit[0] |= BIT_MASK(EV_ABS);
+-		/* set up axes */
+-		for (i = 0; xpad_abs[i] >= 0; i++)
+-			xpad_set_up_abs(input_dev, xpad_abs[i]);
+-	}
+-
+-	/* set up standard buttons */
+-	for (i = 0; xpad_common_btn[i] >= 0; i++)
+-		__set_bit(xpad_common_btn[i], input_dev->keybit);
+-
+-	/* set up model-specific ones */
+-	if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX360W) {
+-		for (i = 0; xpad360_btn[i] >= 0; i++)
+-			__set_bit(xpad360_btn[i], input_dev->keybit);
+-	} else {
+-		for (i = 0; xpad_btn[i] >= 0; i++)
+-			__set_bit(xpad_btn[i], input_dev->keybit);
+-	}
+-
+-	if (xpad->mapping & MAP_DPAD_TO_BUTTONS) {
+-		for (i = 0; xpad_btn_pad[i] >= 0; i++)
+-			__set_bit(xpad_btn_pad[i], input_dev->keybit);
+-	} else {
+-		for (i = 0; xpad_abs_pad[i] >= 0; i++)
+-		    xpad_set_up_abs(input_dev, xpad_abs_pad[i]);
+-	}
+-
+-	if (xpad->mapping & MAP_TRIGGERS_TO_BUTTONS) {
+-		for (i = 0; xpad_btn_triggers[i] >= 0; i++)
+-			__set_bit(xpad_btn_triggers[i], input_dev->keybit);
+-	} else {
+-		for (i = 0; xpad_abs_triggers[i] >= 0; i++)
+-			xpad_set_up_abs(input_dev, xpad_abs_triggers[i]);
+-	}
+-
+ 	error = xpad_init_output(intf, xpad);
+ 	if (error)
+ 		goto fail3;
+ 
+-	error = xpad_init_ff(xpad);
+-	if (error)
+-		goto fail4;
++	usb_make_path(xpad->udev, xpad->phys, sizeof(xpad->phys));
++	strlcat(xpad->phys, "/input0", sizeof(xpad->phys));
+ 
+ 	error = xpad_led_probe(xpad);
+ 	if (error)
+@@ -963,10 +1063,6 @@
+ 	xpad->irq_in->transfer_dma = xpad->idata_dma;
+ 	xpad->irq_in->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+ 
+-	error = input_register_device(xpad->dev);
+-	if (error)
+-		goto fail6;
+-
+ 	usb_set_intfdata(intf, xpad);
+ 
+ 	if (xpad->xtype == XTYPE_XBOX360W) {
+@@ -974,6 +1070,7 @@
+ 		 * Setup the message to set the LEDs on the
+ 		 * controller when it shows up
+ 		 */
++		spin_lock(&xpad->odata_lock);
+ 		xpad->bulk_out = usb_alloc_urb(0, GFP_KERNEL);
+ 		if (!xpad->bulk_out) {
+ 			error = -ENOMEM;
+@@ -1015,23 +1112,55 @@
+ 		 */
+ 		xpad->irq_in->dev = xpad->udev;
+ 		error = usb_submit_urb(xpad->irq_in, GFP_KERNEL);
++		
++		spin_unlock(&xpad->odata_lock);
+ 		if (error)
+ 			goto fail9;
++		
++		// I don't know how to check controller state on driver load so just slam them
++		// off so that people have to turn them on, triggering a state update
++		
++		// got the power off packet from an OSX reverse-engineered driver:
++		// http://tattiebogle.net/index.php/ProjectRoot/Xbox360Controller/OsxDriver#toc1
++		spin_lock(&xpad->odata_lock);
++		xpad->odata[0] = 0x00;
++		xpad->odata[1] = 0x00;
++		xpad->odata[2] = 0x08;
++		xpad->odata[3] = 0xC0;
++		xpad->odata[4] = 0x00;
++		xpad->odata[5] = 0x00;
++		xpad->odata[6] = 0x00;
++		xpad->odata[7] = 0x00;
++		xpad->odata[8] = 0x00;
++		xpad->odata[9] = 0x00;
++		xpad->odata[10] = 0x00;
++		xpad->odata[11] = 0x00;
++		xpad->irq_out->transfer_buffer_length = 12;
++		usb_submit_urb(xpad->irq_out, GFP_KERNEL);
++		spin_unlock(&xpad->odata_lock);
++	} else {
++		my_work_t *work;
++		xpad->pad_present = 1;
++		
++		work = (my_work_t *)kmalloc(sizeof(my_work_t), GFP_KERNEL);
++		INIT_WORK( (struct work_struct *)work, my_wq_function );
++		work->xpad = xpad;
++		queue_work( my_wq, (struct work_struct *)work );
+ 	}
+ 
+ 	return 0;
+ 
+  fail9:	kfree(xpad->bdata);
+  fail8:	usb_free_urb(xpad->bulk_out);
+- fail7:	input_unregister_device(input_dev);
+-	input_dev = NULL;
++ fail7:	//input_unregister_device(input_dev);
++	//input_dev = NULL;
+  fail6:	xpad_led_disconnect(xpad);
+- fail5:	if (input_dev)
+-		input_ff_destroy(input_dev);
++ fail5:	//if (input_dev)
++		//input_ff_destroy(input_dev);
+  fail4:	xpad_deinit_output(xpad);
+  fail3:	usb_free_urb(xpad->irq_in);
+  fail2:	usb_free_coherent(udev, XPAD_PKT_LEN, xpad->idata, xpad->idata_dma);
+- fail1:	input_free_device(input_dev);
++ fail1:	//input_free_device(input_dev);
+ 	kfree(xpad);
+ 	return error;
+ 
+@@ -1041,8 +1170,14 @@
+ {
+ 	struct usb_xpad *xpad = usb_get_intfdata (intf);
+ 
++// 	printk("xpad_disconnect\n");
+ 	xpad_led_disconnect(xpad);
+-	input_unregister_device(xpad->dev);
++	
++	if (xpad->pad_present)
++	{
++		xpad->pad_present = 0;
++		input_unregister_device(xpad->dev);
++	}
+ 	xpad_deinit_output(xpad);
+ 
+ 	if (xpad->xtype == XTYPE_XBOX360W) {

packages/linux/patches/3.16.1/linux-062-imon_pad_ignore_diagonal.patch

@@ -0,0 +1,21 @@
+diff -Naur linux-3.16.1/drivers/media/rc/imon.c linux-3.16.1.patch/drivers/media/rc/imon.c
+--- linux-3.16.1/drivers/media/rc/imon.c	2014-08-14 04:36:35.000000000 +0200
++++ linux-3.16.1.patch/drivers/media/rc/imon.c	2014-08-15 13:57:16.587620642 +0200
+@@ -1344,6 +1344,17 @@
+ 			}
+ 		} else {
+ 			/*
++			 * For users without stabilized, just ignore any value getting
++			 * to close to the diagonal.
++			 */
++			if ((abs(rel_y) < 2 && abs(rel_x) < 2) ||
++				abs(abs(rel_y) - abs(rel_x)) < 2 ) {
++				spin_lock_irqsave(&ictx->kc_lock, flags);
++				ictx->kc = KEY_UNKNOWN;
++				spin_unlock_irqrestore(&ictx->kc_lock, flags);
++				return;
++			}
++			/*
+ 			 * Hack alert: instead of using keycodes, we have
+ 			 * to use hard-coded scancodes here...
+ 			 */

packages/linux/patches/3.16/linux-991.01-ptrace_fix.patch

@@ -1,17 +0,0 @@
-diff -Naur linux-3.10.10/include/uapi/linux/ptrace.h linux-3.10.10.patch/include/uapi/linux/ptrace.h
---- linux-3.10.10/include/uapi/linux/ptrace.h	2013-08-29 18:47:51.000000000 +0200
-+++ linux-3.10.10.patch/include/uapi/linux/ptrace.h	2013-09-04 16:38:10.182685149 +0200
-@@ -55,11 +55,13 @@
- 
- #define PTRACE_PEEKSIGINFO	0x4209
- 
-+#ifdef __KERNEL__
- struct ptrace_peeksiginfo_args {
- 	__u64 off;	/* from which siginfo to start */
- 	__u32 flags;
- 	__s32 nr;	/* how may siginfos to take */
- };
-+#endif /* __KERNEL__ */
- 
- /* Read signals from a shared (process wide) queue */
- #define PTRACE_PEEKSIGINFO_SHARED	(1 << 0)

packages/mediacenter/xbmc-theme-Confluence/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="13-6066a54"
+PKG_VERSION="13-0f3db05"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="13-6066a54"
+PKG_VERSION="13-0f3db05"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -505,7 +505,6 @@ post_install() {
 
   enable_service xbmc-autostart.service
   enable_service xbmc-cleanlogs.service
-  enable_service xbmc-config.service
   enable_service xbmc-hacks.service
   enable_service xbmc-sources.service
   enable_service xbmc-halt.service

packages/mediacenter/xbmc/patches/xbmc-995.12-openelec-setup-timezone.patch

@@ -0,0 +1,42 @@
+From c2717b64788fd05098f1d1f5499def9fbc4af957 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Mon, 18 Aug 2014 17:46:54 +0300
+Subject: [PATCH] openelec: setup timezone
+
+---
+ xbmc/linux/LinuxTimezone.cpp |   12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/xbmc/linux/LinuxTimezone.cpp b/xbmc/linux/LinuxTimezone.cpp
+index b4ffd13..5bf41eb 100644
+--- a/xbmc/linux/LinuxTimezone.cpp
++++ b/xbmc/linux/LinuxTimezone.cpp
+@@ -39,6 +39,8 @@
+ #include "settings/lib/Setting.h"
+ #include "settings/Settings.h"
+ 
++#include <fstream>
++
+ using namespace std;
+ 
+ CLinuxTimezone::CLinuxTimezone() : m_IsDST(0)
+@@ -158,6 +160,16 @@ void CLinuxTimezone::OnSettingChanged(const CSetting *setting)
+   const std::string &settingId = setting->GetId();
+   if (settingId == "locale.timezone")
+   {
++    std::ofstream out("/storage/.cache/timezone");
++    if (out)
++    {
++      const std::string tz = std::string("TIMEZONE=") + ((CSettingString*)setting)->GetValue().c_str();
++      out << tz << std::endl;
++      out.flush();
++      out.close();
++      system("systemctl restart tz-data.service");
++    }
++
+     SetTimezone(((CSettingString*)setting)->GetValue());
+ 
+     CDateTime::ResetTimezoneBias();
+-- 
+1.7.2.5
+

packages/mediacenter/xbmc/patches/xbmc-995.12-run-tzdata-setup-on-timezone-change.patch

@@ -1,26 +0,0 @@
-From 25be1b385303a8114d7e227ffab52a22de42ccd1 Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Tue, 26 Nov 2013 20:53:08 +0200
-Subject: [PATCH] run tzdata-setup on timezone change
-
----
- xbmc/linux/LinuxTimezone.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/xbmc/linux/LinuxTimezone.cpp b/xbmc/linux/LinuxTimezone.cpp
-index be7bce6..4000181 100644
---- a/xbmc/linux/LinuxTimezone.cpp
-+++ b/xbmc/linux/LinuxTimezone.cpp
-@@ -158,6 +158,9 @@ void CLinuxTimezone::OnSettingChanged(const CSetting *setting)
-   const std::string &settingId = setting->GetId();
-   if (settingId == "locale.timezone")
-   {
-+    const std::string cmd = std::string("sh /usr/lib/openelec/tzdata-setup ") + ((CSettingString*)setting)->GetValue().c_str();
-+    system(cmd.c_str());
-+
-     SetTimezone(((CSettingString*)setting)->GetValue());
- 
-     CDateTime::ResetTimezoneBias();
--- 
-1.8.3.2
-

packages/mediacenter/xbmc/system.d/xbmc-config.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=XBMC configfile writer
-Before=xbmc.service
-
-[Service]
-Type=oneshot
-Environment=HOME=/storage
-ExecStart=/usr/lib/xbmc/xbmc-config
-RemainAfterExit=yes
-
-[Install]
-WantedBy=xbmc.service

packages/mediacenter/xbmc/system.d/xbmc-waitonnetwork.service

@@ -8,7 +8,7 @@ ConditionPathExists=/storage/.cache/openelec/network_wait
 [Service]
 Type=oneshot
 EnvironmentFile=/storage/.cache/openelec/network_wait
-ExecStartPre=/bin/sh -c 'echo "waiting on Network to come online ... (max. $WAIT_NETWORK_TIME sec.)"
+ExecStartPre=/bin/sh -c 'echo "waiting on Network to come online ... (max. $WAIT_NETWORK_TIME sec.)"'
 ExecStart=/usr/bin/cm-online ${WAIT_NETWORK_TIME}
 StandardOutput=tty
 RemainAfterExit=yes

packages/mediacenter/xbmc/system.d/xbmc.service

@@ -9,6 +9,7 @@ Environment=SDL_MOUSE_RELATIVE=0
 Environment=HOME=/storage
 EnvironmentFile=-/run/openelec/xbmc.conf
 EnvironmentFile=-/run/openelec/debug/xbmc.conf
+ExecStartPre=-/usr/lib/xbmc/xbmc-config
 ExecStart=/bin/sh -c ". /etc/profile; exec /usr/lib/xbmc/xbmc.bin --standalone -fs $XBMC_ARGS $XBMC_DEBUG"
 # keep KillMode=process unless there is no good reason to switch to cgroup
 KillMode=process

packages/multimedia/ffmpeg/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="ffmpeg"
-PKG_VERSION="2.3.1"
+PKG_VERSION="2.3.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/multimedia/libva-intel-driver/patches/libva-intel-driver-FD82466.patch

@@ -0,0 +1,34 @@
+From 976a1c2f3d6c2c2d4b0ef8a43a3ef128936b0dd6 Mon Sep 17 00:00:00 2001
+From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+Date: Wed, 18 Jun 2014 13:11:48 +0200
+Subject: [PATCH] decoder: h264: fix RefPicList0/1 without frame in DPB.
+
+---
+ src/i965_decoder_utils.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/i965_decoder_utils.c b/src/i965_decoder_utils.c
+index 0539e08..d79b2b3 100644
+--- a/src/i965_decoder_utils.c
++++ b/src/i965_decoder_utils.c
+@@ -526,6 +526,8 @@ intel_update_avc_frame_store_index(
+             continue;
+ 
+         GenAvcSurface * const avc_surface = obj_surface->private_data;
++        if (!avc_surface)
++            continue;
+         if (avc_surface->frame_store_id >= 0) {
+             GenFrameStore * const fs =
+                 &frame_store[avc_surface->frame_store_id];
+@@ -559,6 +561,8 @@ intel_update_avc_frame_store_index(
+             continue;
+ 
+         GenAvcSurface * const avc_surface = obj_surface->private_data;
++        if (!avc_surface)
++            continue;
+         if (n < num_free_refs) {
+             GenFrameStore * const fs = free_refs[n++];
+             fs->surface_id = obj_surface->base.id;
+-- 
+1.7.9.5
+