config/version: set version to 4.1.6

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

config/functions

@@ -165,14 +165,13 @@ do_autoreconf() {
 
 strip_lto() {
   # strip out LTO optimization from *FLAGS
-  CFLAGS=`echo $CFLAGS | sed -e "s|-flto||g"`
-  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-flto||g"`
-  LDFLAGS=`echo $LDFLAGS | sed -e "s|-flto||g"`
-}
-
-strip_linker_plugin() {
-  # strip out usage from linker plugin
-  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||g"`
+  if [ -n "$GCC_OPTIM_LTO" ] ; then
+    CFLAGS=`echo $CFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
+    CXXFLAGS=`echo $CXXFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
+  fi
+  if [ -n "$LD_OPTIM_LTO" ] ; then
+    LDFLAGS=`echo $LDFLAGS | sed -e "s|$LD_OPTIM_LTO||g"`
+  fi
 }
 
 strip_gold() {

config/optimize

@@ -30,7 +30,7 @@ fi
 TARGET_CPPFLAGS=
 TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $GCC_OPTIM_LTO $PROJECT_CFLAGS"
 TARGET_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO $GCC_OPTIM"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO"
 TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
 TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
 

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="4.1.4"
+  OPENELEC_VERSION="4.1.6"
 
 # 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/libcdio/package.mk

@@ -44,11 +44,11 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-cxx \
                            --disable-vcd-info \
                            --without-cd-drive \
                            --without-cd-info \
-                           --with-cd-paranoia \
                            --without-cdda-player \
                            --without-cd-read \
                            --without-iso-info \
                            --without-iso-read \
+                           --without-libiconv-prefix \
                            --with-gnu-ld"
 
 pre_configure_target() {

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/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/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/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/libpcap/package.mk

@@ -17,13 +17,13 @@
 ################################################################################
 
 PKG_NAME="libpcap"
-PKG_VERSION="1.3.0"
+PKG_VERSION="1.6.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tcpdump.org/"
 PKG_URL="http://www.tcpdump.org/release/libpcap-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain libusb"
+PKG_DEPENDS_TARGET="toolchain libusb libnl"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="system interface for user-level packet capture"
@@ -44,6 +44,8 @@ pre_configure_target() {
 # When cross-compiling, configure can't set linux version
 # forcing it
   sed -i -e 's/ac_cv_linux_vers=unknown/ac_cv_linux_vers=2/' ../configure
+
+  export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/libnl3"
 }
 
 post_makeinstall_target() {

packages/devel/libpcap/patches/libpcap-crosscompiling.patch

@@ -0,0 +1,11 @@
+diff -Naur libpcap-1.6.2/configure.in libpcap-1.6.2.patch/configure.in
+--- libpcap-1.6.2/configure.in	2014-07-19 15:21:09.000000000 +0200
++++ libpcap-1.6.2.patch/configure.in	2014-09-06 05:58:33.918837813 +0200
+@@ -459,7 +459,6 @@
+ 			AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
+ 			AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
+ 			AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
+-			V_INCLS="$V_INCLS -I/usr/include/libnl3"
+ 			have_any_nl="yes"
+ 		])
+ 

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

@@ -17,14 +17,13 @@
 ################################################################################
 
 PKG_NAME="ncurses"
-PKG_VERSION="5.7"
+PKG_VERSION="5.9"
 PKG_REV="1"
 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 \
@@ -74,18 +73,7 @@ PKG_CONFIGURE_OPTS_TARGET="--without-cxx \
 
 pre_configure_target() {
   # causes some segmentation fault's (dialog) when compiled with gcc's link time optimization.
-  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
+  strip_lto
 }
 
 make_target() {
@@ -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-rc3"
 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="43c5b2f"
+PKG_VERSION="9bf9da2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
@@ -48,6 +48,10 @@ make_target() {
     cp -PRv $FLOAT/opt/vc/lib/libbcm_host.so $SYSROOT_PREFIX/usr/lib
     cp -PRv $FLOAT/opt/vc/lib/libvchiq_arm.so $SYSROOT_PREFIX/usr/lib
     cp -PRv $FLOAT/opt/vc/lib/libvcos.so $SYSROOT_PREFIX/usr/lib
+    cp -PRv $FLOAT/opt/vc/lib/libmmal.so $SYSROOT_PREFIX/usr/lib
+    cp -PRv $FLOAT/opt/vc/lib/libmmal_core.so $SYSROOT_PREFIX/usr/lib
+    cp -PRv $FLOAT/opt/vc/lib/libmmal_util.so $SYSROOT_PREFIX/usr/lib
+    cp -PRv $FLOAT/opt/vc/lib/libmmal_vc_client.so $SYSROOT_PREFIX/usr/lib
 }
 
 makeinstall_target() {
@@ -61,6 +65,10 @@ makeinstall_target() {
     cp -PRv $FLOAT/opt/vc/lib/libopenmaxil.so $INSTALL/usr/lib
     cp -PRv $FLOAT/opt/vc/lib/libvchiq_arm.so $INSTALL/usr/lib
     cp -PRv $FLOAT/opt/vc/lib/libvcos.so $INSTALL/usr/lib
+    cp -PRv $FLOAT/opt/vc/lib/libmmal.so $INSTALL/usr/lib
+    cp -PRv $FLOAT/opt/vc/lib/libmmal_core.so $INSTALL/usr/lib
+    cp -PRv $FLOAT/opt/vc/lib/libmmal_util.so $INSTALL/usr/lib
+    cp -PRv $FLOAT/opt/vc/lib/libmmal_vc_client.so $INSTALL/usr/lib
 
 # some usefull debug tools
   mkdir -p $INSTALL/usr/bin

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/llvm/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="llvm"
-PKG_VERSION="3.4.2"
+PKG_VERSION="3.5.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://llvm.org/"
-PKG_URL="http://llvm.org/releases/$PKG_VERSION/${PKG_NAME}-${PKG_VERSION}.src.tar.gz"
+PKG_URL="http://llvm.org/releases/$PKG_VERSION/${PKG_NAME}-${PKG_VERSION}.src.tar.xz"
 PKG_SOURCE_DIR="${PKG_NAME}-${PKG_VERSION}.src"
 PKG_DEPENDS_HOST=""
 PKG_DEPENDS_TARGET="toolchain llvm:host"
@@ -98,11 +98,6 @@ pre_configure_host() {
     autoconf --force --verbose -I m4 -o ../configure
   )
 
-  ( cd ../projects/sample/autoconf
-    aclocal  --force --verbose -I m4
-    autoconf --force --verbose -I m4 -o ../configure
-  )
-
   # we are building hosttools inside the target builddir
     mkdir -p ../.$TARGET_NAME && cd ../.$TARGET_NAME/
     rm -rf ../.$HOST_NAME

packages/lang/llvm/patches/llvm-3.3-cross.patch

@@ -1,114 +0,0 @@
-diff -Naur llvm-3.3.src/autoconf/configure.ac llvm-3.3.src.patch/autoconf/configure.ac
---- llvm-3.3.src/autoconf/configure.ac	2013-05-20 22:18:23.000000000 +0200
-+++ llvm-3.3.src.patch/autoconf/configure.ac	2013-09-24 07:20:25.485443916 +0200
-@@ -461,6 +461,10 @@
-        AC_CHECK_PROG(BUILD_CXX, c++, c++, , , /usr/ucb/c++)
-      fi
-   fi
-+  AC_SUBST(BUILD_CPPFLAGS)
-+  AC_SUBST(BUILD_CFLAGS)
-+  AC_SUBST(BUILD_CXXFLAGS)
-+  AC_SUBST(BUILD_LDFLAGS)
- else
-   AC_SUBST(LLVM_CROSS_COMPILING, [0])
- fi
-diff -Naur llvm-3.3.src/autoconf/m4/build_exeext.m4 llvm-3.3.src.patch/autoconf/m4/build_exeext.m4
---- llvm-3.3.src/autoconf/m4/build_exeext.m4	2008-09-26 19:27:58.000000000 +0200
-+++ llvm-3.3.src.patch/autoconf/m4/build_exeext.m4	2013-09-24 07:20:25.485443916 +0200
-@@ -18,7 +18,7 @@
-      fi
-   fi
-   test -z "$BUILD_CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
--  ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
-+  ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
-   rm -f conftest*
-   echo 'int main () { return 0; }' > conftest.$ac_ext
-   ac_cv_build_exeext=
-diff -Naur llvm-3.3.src/Makefile llvm-3.3.src.patch/Makefile
---- llvm-3.3.src/Makefile	2013-01-28 04:19:57.000000000 +0100
-+++ llvm-3.3.src.patch/Makefile	2013-09-24 07:21:27.489493235 +0200
-@@ -99,44 +99,6 @@
-   DIRS := $(filter-out unittests, $(DIRS))
- endif
- 
--# If we're cross-compiling, build the build-hosted tools first
--ifeq ($(LLVM_CROSS_COMPILING),1)
--all:: cross-compile-build-tools
--
--clean::
--	$(Verb) rm -rf BuildTools
--
--cross-compile-build-tools:
--	$(Verb) if [ ! -f BuildTools/Makefile ]; then \
--          $(MKDIR) BuildTools; \
--	  cd BuildTools ; \
--	  unset CFLAGS ; \
--	  unset CXXFLAGS ; \
--	  unset SDKROOT ; \
--	  unset UNIVERSAL_SDK_PATH ; \
--	  $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
--		--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \
--	        --disable-polly ; \
--	  cd .. ; \
--	fi; \
--	($(MAKE) -C BuildTools \
--	  BUILD_DIRS_ONLY=1 \
--	  UNIVERSAL= \
--	  UNIVERSAL_SDK_PATH= \
--	  SDKROOT= \
--	  TARGET_NATIVE_ARCH="$(TARGET_NATIVE_ARCH)" \
--	  TARGETS_TO_BUILD="$(TARGETS_TO_BUILD)" \
--	  ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \
--	  ENABLE_PROFILING=$(ENABLE_PROFILING) \
--	  ENABLE_COVERAGE=$(ENABLE_COVERAGE) \
--	  DISABLE_ASSERTIONS=$(DISABLE_ASSERTIONS) \
--	  ENABLE_EXPENSIVE_CHECKS=$(ENABLE_EXPENSIVE_CHECKS) \
--	  ENABLE_LIBCPP=$(ENABLE_LIBCPP) \
--	  CFLAGS= \
--	  CXXFLAGS= \
--	) || exit 1;
--endif
--
- # Include the main makefile machinery.
- include $(LLVM_SRC_ROOT)/Makefile.rules
- 
-diff -Naur llvm-3.3.src/Makefile.config.in llvm-3.3.src.patch/Makefile.config.in
---- llvm-3.3.src/Makefile.config.in	2013-04-23 10:28:39.000000000 +0200
-+++ llvm-3.3.src.patch/Makefile.config.in	2013-09-24 07:20:25.487443917 +0200
-@@ -130,6 +130,10 @@
- # call if we're cross-compiling).
- BUILD_CC=@BUILD_CC@
- BUILD_CXX=@BUILD_CXX@
-+BUILD_CPPFLAGS=@BUILD_CPPFLAGS@
-+BUILD_CFLAGS=@BUILD_CFLAGS@
-+BUILD_CXXFLAGS=@BUILD_CXXFLAGS@
-+BUILD_LDFLAGS=@BUILD_LDFLAGS@
- 
- # Triple for configuring build tools when cross-compiling
- BUILD_TRIPLE=@build@
-diff -Naur llvm-3.3.src/projects/sample/autoconf/configure.ac llvm-3.3.src.patch/projects/sample/autoconf/configure.ac
---- llvm-3.3.src/projects/sample/autoconf/configure.ac	2013-05-06 18:23:07.000000000 +0200
-+++ llvm-3.3.src.patch/projects/sample/autoconf/configure.ac	2013-09-24 07:33:47.746272015 +0200
-@@ -345,6 +345,10 @@
-        AC_CHECK_PROG(BUILD_CXX, c++, c++, , , /usr/ucb/c++)
-      fi
-   fi
-+  AC_SUBST(BUILD_CPPFLAGS)
-+  AC_SUBST(BUILD_CFLAGS)
-+  AC_SUBST(BUILD_CXXFLAGS)
-+  AC_SUBST(BUILD_LDFLAGS)
- else
-   AC_SUBST(LLVM_CROSS_COMPILING, [0])
- fi
-diff -Naur llvm-3.3.src/projects/sample/autoconf/m4/build_exeext.m4 llvm-3.3.src.patch/projects/sample/autoconf/m4/build_exeext.m4
---- llvm-3.3.src/projects/sample/autoconf/m4/build_exeext.m4	2011-10-19 01:10:47.000000000 +0200
-+++ llvm-3.3.src.patch/projects/sample/autoconf/m4/build_exeext.m4	2013-09-24 07:32:18.332178706 +0200
-@@ -18,7 +18,7 @@
-      fi
-   fi
-   test -z "$BUILD_CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
--  ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
-+  ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
-   rm -f conftest*
-   echo 'int main () { return 0; }' > conftest.$ac_ext
-   ac_cv_build_exeext=

packages/lang/llvm/patches/llvm-3.5-cross.patch

@@ -0,0 +1,98 @@
+diff -Naur llvm-3.5.0.src/autoconf/configure.ac llvm-3.5.0.src.patch/autoconf/configure.ac
+--- llvm-3.5.0.src/autoconf/configure.ac	2014-07-25 19:47:30.000000000 +0200
++++ llvm-3.5.0.src.patch/autoconf/configure.ac	2014-09-05 10:42:58.947215468 +0200
+@@ -485,6 +485,10 @@
+        AC_CHECK_PROG(BUILD_CXX, c++, c++, , , /usr/ucb/c++)
+      fi
+   fi
++  AC_SUBST(BUILD_CPPFLAGS)
++  AC_SUBST(BUILD_CFLAGS)
++  AC_SUBST(BUILD_CXXFLAGS)
++  AC_SUBST(BUILD_LDFLAGS)
+ else
+   AC_SUBST(LLVM_CROSS_COMPILING, [0])
+ fi
+diff -Naur llvm-3.5.0.src/autoconf/m4/build_exeext.m4 llvm-3.5.0.src.patch/autoconf/m4/build_exeext.m4
+--- llvm-3.5.0.src/autoconf/m4/build_exeext.m4	2008-09-26 19:27:58.000000000 +0200
++++ llvm-3.5.0.src.patch/autoconf/m4/build_exeext.m4	2014-09-05 10:42:58.948215478 +0200
+@@ -18,7 +18,7 @@
+      fi
+   fi
+   test -z "$BUILD_CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
+-  ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
++  ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
+   rm -f conftest*
+   echo 'int main () { return 0; }' > conftest.$ac_ext
+   ac_cv_build_exeext=
+diff -Naur llvm-3.5.0.src/Makefile llvm-3.5.0.src.patch/Makefile
+--- llvm-3.5.0.src/Makefile	2014-03-25 22:45:41.000000000 +0100
++++ llvm-3.5.0.src.patch/Makefile	2014-09-05 10:45:20.542528330 +0200
+@@ -99,54 +99,6 @@
+   DIRS := $(filter-out unittests, $(DIRS))
+ endif
+ 
+-# If we're cross-compiling, build the build-hosted tools first
+-ifeq ($(LLVM_CROSS_COMPILING),1)
+-all:: cross-compile-build-tools
+-
+-clean::
+-	$(Verb) rm -rf BuildTools
+-
+-cross-compile-build-tools:
+-	$(Verb) if [ ! -f BuildTools/Makefile ]; then \
+-          $(MKDIR) BuildTools; \
+-	  cd BuildTools ; \
+-	  unset CFLAGS ; \
+-	  unset CXXFLAGS ; \
+-	  AR=$(BUILD_AR) ; \
+-	  AS=$(BUILD_AS) ; \
+-	  LD=$(BUILD_LD) ; \
+-	  CC=$(BUILD_CC) ; \
+-	  CXX=$(BUILD_CXX) ; \
+-	  unset SDKROOT ; \
+-	  unset UNIVERSAL_SDK_PATH ; \
+-	  configure_opts= ; \
+-	  if test "$(ENABLE_LIBCPP)" -ne 0 ; then \
+-	    configure_opts="$$configure_opts --enable-libcpp"; \
+-	  fi; \
+-	  $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
+-		--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \
+-	        --disable-polly $$configure_opts; \
+-	  cd .. ; \
+-	fi; \
+-	($(MAKE) -C BuildTools \
+-	  BUILD_DIRS_ONLY=1 \
+-	  UNIVERSAL= \
+-	  UNIVERSAL_SDK_PATH= \
+-	  SDKROOT= \
+-	  TARGET_NATIVE_ARCH="$(TARGET_NATIVE_ARCH)" \
+-	  TARGETS_TO_BUILD="$(TARGETS_TO_BUILD)" \
+-	  TARGET_LIBS="$(LIBS)" \
+-	  ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \
+-	  ENABLE_PROFILING=$(ENABLE_PROFILING) \
+-	  ENABLE_COVERAGE=$(ENABLE_COVERAGE) \
+-	  DISABLE_ASSERTIONS=$(DISABLE_ASSERTIONS) \
+-	  ENABLE_EXPENSIVE_CHECKS=$(ENABLE_EXPENSIVE_CHECKS) \
+-	  ENABLE_LIBCPP=$(ENABLE_LIBCPP) \
+-	  CFLAGS= \
+-	  CXXFLAGS= \
+-	) || exit 1;
+-endif
+-
+ # Include the main makefile machinery.
+ include $(LLVM_SRC_ROOT)/Makefile.rules
+ 
+diff -Naur llvm-3.5.0.src/Makefile.config.in llvm-3.5.0.src.patch/Makefile.config.in
+--- llvm-3.5.0.src/Makefile.config.in	2014-07-16 18:50:34.000000000 +0200
++++ llvm-3.5.0.src.patch/Makefile.config.in	2014-09-05 10:42:58.954215572 +0200
+@@ -135,6 +135,10 @@
+ # call if we're cross-compiling).
+ BUILD_CC=@BUILD_CC@
+ BUILD_CXX=@BUILD_CXX@
++BUILD_CPPFLAGS=@BUILD_CPPFLAGS@
++BUILD_CFLAGS=@BUILD_CFLAGS@
++BUILD_CXXFLAGS=@BUILD_CXXFLAGS@
++BUILD_LDFLAGS=@BUILD_LDFLAGS@
+ 
+ # Triple for configuring build tools when cross-compiling
+ BUILD_TRIPLE=@build@

packages/lang/llvm/patches/llvm-3.5-fix-rpath.patch

@@ -1,7 +1,7 @@
-diff -Naur llvm.src/Makefile.rules llvm.src.patch/Makefile.rules
---- llvm.src/Makefile.rules	2013-11-15 00:51:29.000000000 +0100
-+++ llvm.src.patch/Makefile.rules	2014-01-04 16:33:49.254066226 +0100
-@@ -577,14 +577,6 @@
+diff -Naur llvm-3.5.0.src/Makefile.rules llvm-3.5.0.src.patch/Makefile.rules
+--- llvm-3.5.0.src/Makefile.rules	2014-06-20 21:00:41.000000000 +0200
++++ llvm-3.5.0.src.patch/Makefile.rules	2014-09-05 11:04:20.267554714 +0200
+@@ -594,16 +594,6 @@
    endif
  endif
  
@@ -9,6 +9,8 @@ diff -Naur llvm.src/Makefile.rules llvm.src.patch/Makefile.rules
 -ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
 -ifneq ($(HOST_OS),Darwin)
 -  LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
+-else
+-  LD.Flags += -Wl,-install_name  -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
 -endif
 -endif
 -endif
@@ -16,7 +18,7 @@ diff -Naur llvm.src/Makefile.rules llvm.src.patch/Makefile.rules
  ifdef TOOL_VERBOSE
    C.Flags += -v
    CXX.Flags += -v
-@@ -613,14 +605,7 @@
+@@ -650,14 +640,7 @@
    ifndef TOOL_NO_EXPORTS
      LD.Flags += $(RDYNAMIC)
    endif

packages/lang/llvm/patches/llvm-3.5-gcc-4.9.patch

@@ -0,0 +1,49 @@
+The shared-object build for llvm (i.e. libLLVM-3.5svn.so + tools)
+currently breaks on linux when linking opt.  This patch is an attempt
+to fix that.
+
+-- Sanjoy
+-------------- next part --------------
+commit 080fb498017d17af2e4d7563608c7d8a848f20da
+Author: Sanjoy Das <sanjoy at azulsystems.com>
+Date:   Thu Jun 19 15:38:02 2014 -0700
+
+    Fix the --enable-shared build.
+    
+    Currently a build configured with ./configure --enable-shared breaks
+    with an undefined "llvm::cl::parser<llvm::PassInfo
+    const*>::getOption(unsigned int) const" symbol when linking opt.  This
+    body for this symbol gets emitted into Pass.o (along with the destructor
+    for PassNameParser), but gets linked into libLLVM-3.5svn.so with local
+    visibility, causing the link error.
+    
+    This fix uses the existing EXTERN_TEMPLATE machinery to force a globally
+    visible definition for the functions in parser<const PassInfo *> into
+    Pass.o.
+
+diff --git a/include/llvm/IR/LegacyPassNameParser.h b/include/llvm/IR/LegacyPassNameParser.h
+index e2e4912..a07e3fd 100644
+--- a/include/llvm/IR/LegacyPassNameParser.h
++++ b/include/llvm/IR/LegacyPassNameParser.h
+@@ -95,6 +95,8 @@ private:
+   }
+ };
+ 
++EXTERN_TEMPLATE_INSTANTIATION(class cl::parser<const PassInfo *>);
++
+ ///===----------------------------------------------------------------------===//
+ /// FilteredPassNameParser class - Make use of the pass registration
+ /// mechanism to automatically add a command line argument to opt for
+diff --git a/lib/IR/Pass.cpp b/lib/IR/Pass.cpp
+index 91d86ae..00ce223 100644
+--- a/lib/IR/Pass.cpp
++++ b/lib/IR/Pass.cpp
+@@ -234,6 +234,8 @@ PassNameParser::~PassNameParser() {
+   // attempting to remove the registration listener is an error.
+ }
+ 
++TEMPLATE_INSTANTIATION(class cl::parser<const PassInfo *>);
++
+ //===----------------------------------------------------------------------===//
+ //   AnalysisUsage Class Implementation
+ //

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.1"
+PKG_VERSION="3.16.2"
 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-704-Support-for-Ubiquiti-WifiStation.patch

@@ -1,28 +0,0 @@
-From 62330f8f9b6105bfe201f52b7ed86ea6ce3d5901 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Sun, 8 Sep 2013 10:33:51 +0100
-Subject: [PATCH] Add Ubiquiti WifiStation USB id to ath9k wifi driver
-
----
- drivers/net/wireless/ath/ath9k/hif_usb.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
-index 75a6376..8cb8d8d 100644
---- a/drivers/net/wireless/ath/ath9k/hif_usb.c
-+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
-@@ -37,9 +37,11 @@
- 	{ USB_DEVICE(0x13D3, 0x3350) }, /* Azurewave */
- 	{ USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */
- 	{ USB_DEVICE(0x040D, 0x3801) }, /* VIA */
-+	{ USB_DEVICE(0x0cf3, 0xb002) }, /* Ubiquiti WifiStation */
- 	{ USB_DEVICE(0x0cf3, 0xb003) }, /* Ubiquiti WifiStation Ext */
- 	{ USB_DEVICE(0x0cf3, 0xb002) }, /* Ubiquiti WifiStation */
- 	{ USB_DEVICE(0x057c, 0x8403) }, /* AVM FRITZ!WLAN 11N v2 USB */
-+	{ USB_DEVICE(0x057c, 0x8403) }, /* AVM FRITZ!WLAN 11N v2 USB */
- 
- 	{ USB_DEVICE(0x0cf3, 0x7015),
- 	  .driver_info = AR9287_USB },  /* Atheros */
--- 
-1.8.4
-

packages/linux/patches/3.16.2/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch

@@ -3,7 +3,7 @@ From: Stefan Saraev <stefan@saraev.ca>
 Date: Tue, 22 Apr 2014 16:05:14 +0300
 Subject: [PATCH] [RFC] hid/sony: add autorepeat for PS3 remotes
 
-adapted to 3.15
+adapted to 3.16
 
 Betreff: [RFC] hid/sony: add autorepeat for PS3 remotes
 Von: David Dillow <dave@thedillows.org>
@@ -24,21 +24,20 @@ This compiled against the hid-sony driver with the PS3 remote changes
 merged, but I have done no testing of it. If the approach seems
 reasonable, I'll try to test it when the MythTV is idle.
 ---
- drivers/hid/hid-sony.c |   21 +++++++++++++++++++++
- 1 files changed, 21 insertions(+), 0 deletions(-)
+ drivers/hid/hid-sony.c |   20 ++++++++++++++++++++
+ 1 files changed, 20 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
-index 6647dc0..02ff292 100644
 --- a/drivers/hid/hid-sony.c
 +++ b/drivers/hid/hid-sony.c
-@@ -785,6 +785,25 @@ static int ps3remote_mapping(struct hid_device *hdev, struct hid_input *hi,
+@@ -819,6 +819,24 @@ static int ps3remote_mapping(struct hid_
+ 	return 1;
  }
  
- 
 +static int ps3remote_setup_repeat(struct hid_device *hdev)
 +{
 +	struct hid_input *hidinput = list_first_entry(&hdev->inputs,
-+                                                     struct hid_input, list);
++						 struct hid_input, list);
 +	struct input_dev *input = hidinput->input;
 +
 +	/*
@@ -53,19 +52,18 @@ index 6647dc0..02ff292 100644
 +
 +	return 0;
 +}
-+
+ 
  /* Sony Vaio VGX has wrongly mouse pointer declared as constant */
  static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
- 		unsigned int *rsize)
-@@ -1608,6 +1627,8 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
- 		connect_mask |= HID_CONNECT_HIDDEV_FORCE;
- 	else if (sc->quirks & SIXAXIS_CONTROLLER_BT)
- 		connect_mask |= HID_CONNECT_HIDDEV_FORCE;
-+	else if (sc->quirks & PS3REMOTE)
-+		ret = ps3remote_setup_repeat(hdev);
+@@ -1892,6 +1910,8 @@ static int sony_probe(struct hid_device
+ 			goto err_stop;
  
- 	ret = hid_hw_start(hdev, connect_mask);
- 	if (ret) {
+ 		sony_init_work(sc, dualshock4_state_worker);
++	} else if (sc->quirks & PS3REMOTE) {
++		ret = ps3remote_setup_repeat(hdev);
+ 	} else {
+ 		ret = 0;
+ 	}
 -- 
 1.7.2.5
 

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

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="13-f2ddaae"
+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-f2ddaae"
+PKG_VERSION="13-0f3db05"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

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/patches/xbmc-999.93-pstate_support.patch

@@ -0,0 +1,13 @@
+diff -Naur xbmc-14-a29b21a/xbmc/utils/CPUInfo.cpp xbmc-14-a29b21a.patch/xbmc/utils/CPUInfo.cpp
+--- xbmc-14-a29b21a/xbmc/utils/CPUInfo.cpp	2014-08-24 17:41:38.000000000 +0200
++++ xbmc-14-a29b21a.patch/xbmc/utils/CPUInfo.cpp	2014-08-29 23:32:55.958602554 +0200
+@@ -266,7 +266,8 @@
+     m_fProcTemperature = fopen("/sys/class/thermal/thermal_zone0/temp", "r");  // On Raspberry PIs
+ 
+   m_fCPUFreq = fopen ("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", "r");
+-
++  if (m_fCPUFreq == NULL)
++    m_fCPUFreq = fopen ("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq", "r");
+ 
+   FILE* fCPUInfo = fopen("/proc/cpuinfo", "r");
+   m_cpuCount = 0;

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/multimedia/ffmpeg/package.mk

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

packages/multimedia/libbdplus/package.mk

@@ -16,21 +16,30 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="scrnsaverproto"
-PKG_VERSION="1.2.2"
+PKG_NAME="libbdplus"
+PKG_VERSION="0.1.1"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.X.org"
-PKG_URL="http://xorg.freedesktop.org/archive/individual/proto/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain util-macros"
+PKG_LICENSE="GPL"
+PKG_SITE="https://www.videolan.org/developers/libbdplus.html"
+PKG_URL="ftp://ftp.videolan.org/pub/videolan/libbdplus/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain libgcrypt libgpg-error"
 PKG_PRIORITY="optional"
-PKG_SECTION="x11/proto"
-PKG_SHORTDESC="scrnsaverproto: ScrnSaver extension headers"
-PKG_LONGDESC="ScrnSaver extension headers"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="libbdplus: A project to implement the BD+ System Specifications"
+PKG_LONGDESC="libbdplus is a research project to implement the BD+ System Specifications."
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-# package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--without-xmlto"
+PKG_CONFIGURE_OPTS_TARGET="--disable-werror \
+                           --disable-extra-warnings \
+                           --disable-optimizations \
+                           --with-gnu-ld"
+
+if [ "$AACS_SUPPORT" = "yes" ]; then
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libaacs"
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --with-libaacs"
+else
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --without-libaacs"
+fi

packages/multimedia/libbluray/package.mk

@@ -32,10 +32,14 @@ PKG_LONGDESC="libbluray is an open-source library designed for Blu-Ray Discs pla
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-if [ "$NONFREE_SUPPORT" = "yes" ]; then
+if [ "$AACS_SUPPORT" = "yes" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libaacs"
 fi
 
+if [ "$BDPLUS_SUPPORT" = "yes" ]; then
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libbdplus"
+fi
+
 PKG_CONFIGURE_OPTS_TARGET="--disable-werror \
                            --disable-extra-warnings \
                            --disable-optimizations \

packages/network/bluez/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bluez"
-PKG_VERSION="5.21"
+PKG_VERSION="5.22"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/network/connman/config/settings

@@ -1,18 +0,0 @@
-[global]
-OfflineMode=false
-Timeservers=0.pool.ntp.org;1.pool.ntp.org;2.pool.ntp.org;3.pool.ntp.org
-
-[Wired]
-Enable=true
-
-[WiFi]
-Enable=true
-
-[Bluetooth]
-Enable=false
-
-[3G]
-Enable=false
-
-[WiMAX]
-Enable=false

packages/network/connman/package.mk

@@ -17,13 +17,13 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="1.24"
+PKG_VERSION="1.25"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.connman.net"
 PKG_URL="https://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain glib readline dbus iptables wpa_supplicant ntp"
+PKG_DEPENDS_TARGET="toolchain glib readline dbus iptables wpa_supplicant"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="connman: Network manager daemon"
@@ -64,6 +64,7 @@ PKG_CONFIGURE_OPTS_TARGET="WPASUPPLICANT=/usr/bin/wpa_supplicant \
                            --disable-selinux \
                            --enable-loopback \
                            --enable-ethernet \
+                           --disable-gadget \
                            --enable-wifi \
                            --disable-bluetooth \
                            --disable-ofono \
@@ -99,6 +100,7 @@ post_makeinstall_target() {
     sed -i $INSTALL/etc/connman/main.conf \
         -e "s|^# BackgroundScanning.*|BackgroundScanning = true|g" \
         -e "s|^# FallbackNameservers.*|FallbackNameservers = 8.8.8.8,8.8.4.4|g" \
+        -e "s|^# FallbackTimeservers.*|FallbackTimeservers = 0.pool.ntp.org,1.pool.ntp.org,2.pool.ntp.org,3.pool.ntp.org|g" \
         -e "s|^# PreferredTechnologies.*|PreferredTechnologies = ethernet,wifi,cellular|g" \
         -e "s|^# TetheringTechnologies.*|TetheringTechnologies = wifi|g" \
         -e "s|^# AllowHostnameUpdates.*|AllowHostnameUpdates = false|g" \
@@ -106,9 +108,6 @@ post_makeinstall_target() {
 
   mkdir -p $INSTALL/usr/config
     cp $PKG_DIR/config/hosts.conf $INSTALL/usr/config
-
-  mkdir -p $INSTALL/usr/share/connman/
-    cp $PKG_DIR/config/settings $INSTALL/usr/share/connman/
 }
 
 post_install() {

packages/network/connman/scripts/connman-setup

@@ -17,12 +17,6 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-# creating initial settings file
-  if [ ! -f /storage/.cache/connman/settings ]; then
-    mkdir -p /storage/.cache/connman
-      cp /usr/share/connman/settings /storage/.cache/connman
-  fi
-
 # set variable for connman main.conf location
   if [ -f /storage/.config/connman_main.conf ]; then
     export CONNMAN_MAIN="--config=/storage/.config/connman_main.conf"

packages/network/connman/system.d/connman.service

@@ -11,7 +11,7 @@ Type=dbus
 BusName=net.connman
 Restart=on-failure
 EnvironmentFile=-/run/openelec/debug/connman.conf
-ExecStartPre=-/bin/sh -c "cat /storage/.cache/hostname > /proc/sys/kernel/hostname &>/dev/null"
+ExecStartPre=-/bin/sh -c "cat /storage/.cache/hostname > /proc/sys/kernel/hostname"
 ExecStartPre=/sbin/ifconfig lo 127.0.0.1 netmask 255.0.0.0 up
 ExecStart=/bin/sh -c ". /usr/lib/connman/connman-setup; exec /usr/sbin/connmand -nr $CONNMAN_MAIN $CONNMAN_DEBUG"
 # send SIGKILL on stop to keep ip configuration

packages/network/connman/system.d/network-online.service

@@ -5,7 +5,7 @@ After=connman.service
 
 [Service]
 Type=oneshot
-ExecStartPre=/bin/sh -c 'echo "waiting on Network to come online ..."
+ExecStartPre=/bin/sh -c 'echo "waiting on Network to come online ..."'
 ExecStart=/usr/bin/cm-online 30
 StandardOutput=tty
 

packages/network/ntp/package.mk

@@ -1,48 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-PKG_NAME="ntp"
-PKG_VERSION="4.2.6p5"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.ntp.org/"
-PKG_URL="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="network"
-PKG_SHORTDESC="ntp: Network Time Protocol utilities"
-PKG_LONGDESC="The Network Time Protocol (NTP) is used to synchronize the time of a computer client or server to another server or reference time source, such as a radio or satellite receiver or modem. It provides client accuracies typically within a millisecond on LANs and up to a few tens of milliseconds on WANs relative to a primary server synchronized to Coordinated Universal Time (UTC) via a Global Positioning Service (GPS) receiver, for example."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
-
-PKG_CONFIGURE_OPTS_TARGET="--disable-all-clocks \
-                           --enable-ipv6 \
-                           --without-rpath \
-                           --with-gnu-ld \
-                           --disable-linuxcaps \
-                           --without-ntpsnmpd \
-                           --enable-local-libopts \
-                           --without-crypto"
-
-makeinstall_target() {
-  mkdir -p $INSTALL/usr/sbin
-    cp ntpd/ntpd $INSTALL/usr/sbin/
-    cp ntpdate/ntpdate $INSTALL/usr/sbin/
-}

packages/network/ntp/patches/ntp-4.2.6p5-automake_1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur ntp-4.2.6p5-old/configure.ac ntp-4.2.6p5-new/configure.ac
---- ntp-4.2.6p5-old/configure.ac	2011-09-22 20:17:25.000000000 -0700
-+++ ntp-4.2.6p5-new/configure.ac	2013-01-03 19:05:39.000000000 -0800
-@@ -40,7 +40,7 @@
- dnl the 'host' machine is where the resulting stuff runs.
- AC_DEFINE_UNQUOTED([STR_SYSTEM], ["$host"],
-     [canonical system (cpu-vendor-os) of where we should run])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- dnl AC_ARG_PROGRAM
- 
- ntp_atom_ok=${ntp_atom_ok=no}

packages/network/samba/package.mk

@@ -68,7 +68,6 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__proc_sys_kernel_core_pattern=yes \
                            --disable-krb5developer \
                            --disable-picky-developer \
                            --enable-largefile \
-                           --with-pthreads \
                            --disable-socket-wrapper \
                            --disable-nss-wrapper \
                            --disable-swat \
@@ -80,7 +79,6 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__proc_sys_kernel_core_pattern=yes \
                            --disable-dnssd \
                            $SMB_AVAHI \
                            --disable-pthreadpool \
-                           --disable-netapi \
                            --disable-dmalloc \
                            --with-fhs \
                            --without-libtalloc \
@@ -94,14 +92,10 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__proc_sys_kernel_core_pattern=yes \
                            --without-afs \
                            --without-fake-kaserver \
                            --without-vfs-afsacl \
-                           --without-dce-dfs \
                            --without-ldap \
                            --without-ads \
                            --without-dnsupdate \
                            --without-automount \
-                           --without-cifsmount \
-                           --without-cifsumount \
-                           --without-cifsupcall \
                            --without-krb5 \
                            --without-pam \
                            --without-pam_smbpass \
@@ -118,9 +112,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__proc_sys_kernel_core_pattern=yes \
                            --without-wbclient \
                            --without-winbind \
                            --with-included-popt \
-                           --with-included-iniparser \
-                           --without-sqlite3 \
-                           --without-setproctitle"
+                           --with-included-iniparser"
 
 pre_configure_target() {
   ( cd ../source3
@@ -128,6 +120,7 @@ pre_configure_target() {
   )
 
   CFLAGS="$CFLAGS -fPIC -DPIC"
+  LDFLAGS="$LDFLAGS -fwhole-program"
 }
 
 make_target() {

packages/network/samba/system.d.opt/samba-defaults.service

@@ -7,5 +7,5 @@ ConditionPathExists=!/storage/.cache/services/samba.disabled
 
 [Service]
 Type=oneshot
-ExecStart=/bin/sh -c 'cp /usr/share/services/samba.conf /storage/.cache/services/'
+ExecStart=/bin/cp /usr/share/services/samba.conf /storage/.cache/services/
 RemainAfterExit=yes

packages/print/freetype/patches/freetype-01-fix-pkgconf.patch

@@ -0,0 +1,27 @@
+From 7688dae788f3a3f8f5f0478f096904cc885a1a90 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sat, 16 Aug 2014 14:57:02 +0300
+Subject: [PATCH] fix pkgconf
+
+---
+ builds/unix/freetype2.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in
+index 6e7fb10..653732d 100644
+--- a/builds/unix/freetype2.in
++++ b/builds/unix/freetype2.in
+@@ -1,7 +1,7 @@
+ prefix="%prefix%"
+-exec_prefix="%exec_prefix%"
+-libdir="%libdir%"
+-includedir="%includedir%/freetype2"
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include/freetype2
+ 
+ Name: FreeType 2
+ URL: http://freetype.org
+-- 
+1.7.2.5
+

packages/security/libgcrypt/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libgcrypt"
-PKG_VERSION="1.6.1"
+PKG_VERSION="1.6.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"