config/version: set version to 6.0.0

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

config/functions

@@ -343,6 +343,7 @@ show_config() {
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - ALSA support:\t\t\t $ALSA_SUPPORT"
+  config_message="$config_message\n - Pulseaudio support:\t\t\t $PULSEAUDIO_SUPPORT"
   config_message="$config_message\n - Bluetooth support:\t\t\t $BLUETOOTH_SUPPORT"
   config_message="$config_message\n - LCD drivers:\t\t\t\t $LCD_DRIVER"
 

config/noobs/partition_setup.sh

@@ -40,7 +40,7 @@ md5sumCheck() {
   )
 }
 
-if [ -z $part1 -o -z $part2 -o -z $id1 -o -z $id2]; then
+if [ -z $part1 -o -z $part2 -o -z $id1 -o -z $id2 ]; then
   echo "error: part1, part2, id1 or id2 not specified"
   echo "actual values:"
   echo "part1:" $part1

config/options

@@ -52,6 +52,11 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
 # If you have ccache installed, take care that LOCAL_CC don't point to it
   LOCAL_CC=`which gcc`
 
+if [ -z "$LOCAL_CC" ] ; then
+  echo "***** Please install gcc *****"
+  exit 127
+fi
+
 # Need to point to your actual g++
 # If you have ccache installed, take care that LOCAL_CXX don't point to it
   LOCAL_CXX=`which g++`
@@ -76,9 +81,6 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
 # the nearest multiple of 16 kilobytes.
   CCACHE_CACHE_SIZE="30G"
 
-# forcing install of all packages (yes/no)
-  FORCE_INSTALL="no"
-
 # install devtools on development builds
   if [ "$OPENELEC_VERSION" = "devel" ]; then
     DEVTOOLS=yes

config/path

@@ -20,6 +20,10 @@ HOST_NAME=`$LOCAL_CC -dumpmachine`
 TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI}
 
 BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION
+if [ "$OPENELEC_VERSION" = "devel" ] ; then
+  BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$OPENELEC_VERSION
+fi
+
 if [ -n "$BUILD_SUFFIX" ]; then
   BUILD=$BUILD-$BUILD_SUFFIX
 fi

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="5.95.1"
+  OPENELEC_VERSION="6.0.0"
 
 # OS_VERSION: OS Version
   OS_VERSION="6.0"

distributions/OpenELEC/options

@@ -2,7 +2,7 @@
   DISTRONAME="OpenELEC"
 
 # short project description
-  DESCRIPTION="OpenELEC is a fast and userfriendly Kodi Entertainment Center distribution."
+  DESCRIPTION="OpenELEC is a fast and user-friendly Kodi Entertainment Center distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
@@ -14,6 +14,9 @@
 # Root password to integrate in the target system
   ROOT_PASSWORD="openelec"
 
+# Install glibc locales to the build (yes / no)
+  GLIBC_LOCALES="yes"
+
 # Mediacenter to use (kodi / no)
   MEDIACENTER="kodi"
 
@@ -28,6 +31,9 @@
 # install extra subtitle Fonts for KODI (yes / no)
   KODI_EXTRA_FONTS="yes"
 
+# build and install PulseAudio support (yes / no)
+  PULSEAUDIO_SUPPORT="no"
+
 # build and install espeak support (yes / no)
   ESPEAK_SUPPORT="yes"
 
@@ -143,7 +149,7 @@
 
 # LCD driver to Use - Possible drivers are ( Comma seperated:
 # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,dm140,
-# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
+# ea65,EyeboxOne,g15,glcd,glcdlib,glk,hd44780,i2500vfd,
 # icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,
 # joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,
 # ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,

packages/addons/driver/sundtek-mediatv/changelog.txt

@@ -1,3 +1,5 @@
+6.0.1
+  update driver for new devices support
 6.0.0
   rebuild for OpenELEC-6.0
 4.3.4

packages/addons/driver/sundtek-mediatv/package.mk

@@ -18,7 +18,7 @@
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="6.0"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"

packages/addons/repository/repository.unofficial.addon.pro/changelog.txt

@@ -1,3 +1,6 @@
+6.0.1
+- update repo minversion for kodi 15
+
 6.0.0
 - rebuild for OpenELEC-6.0
 

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

@@ -20,7 +20,7 @@
 
 PKG_NAME="repository.unofficial.addon.pro"
 PKG_VERSION="6.0"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://unofficial.addon.pro"

packages/addons/repository/repository.unofficial.addon.pro/sources/addon.xml

@@ -10,7 +10,7 @@
                     <checksum>http://unofficial.addon.pro/addons/4.3/@PROJECT@/@ARCH@/addons.xml.md5</checksum>
                     <datadir zip="true">http://unofficial.addon.pro/addons/4.3/@PROJECT@/@ARCH@</datadir>
                 </dir>
-                <dir minversion="14.9.0">
+                <dir minversion="15.0.0">
                     <info>http://unofficial.addon.pro/addons/6.0/@PROJECT@/@ARCH@/addons.xml</info>
                     <checksum>http://unofficial.addon.pro/addons/6.0/@PROJECT@/@ARCH@/addons.xml.md5</checksum>
                     <datadir zip="true">http://unofficial.addon.pro/addons/6.0/@PROJECT@/@ARCH@</datadir>

packages/addons/script/script.config.vdr/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="script.config.vdr"
-PKG_VERSION="1.0.7"
+PKG_VERSION="1.0.8"
 PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/addons/service/multimedia/vdr-addon/changelog.txt

@@ -1,3 +1,9 @@
+6.0.1
+- update to vdr-plugin-dvbapi-0489e01
+- update to vdr-plugin-vnsiserver-a7b0670
+- update to vdr-satip-2.2.2
+- update to vdr-iptv-2.2.1
+
 6.0.0
 - rebuild for OpenELEC-6.0
 - remove plugin 'control'

packages/addons/service/multimedia/vdr-addon/package.mk

@@ -19,7 +19,7 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="6.0"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
@@ -33,7 +33,7 @@ PKG_AUTORECONF="no"
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.service"
 PKG_ADDON_PROVIDES=""
-PKG_ADDON_REQUIRES="pvr.vdr.vnsi:0.0.0"
+PKG_ADDON_REQUIRES="pvr.vdr.vnsi:0.0.0 script.config.vdr:0.0.0"
 PKG_ADDON_NAME="VDR PVR Backend"
 PKG_ADDON_REPOVERSION="6.0"
 

packages/audio/dcadec/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="dcadec"
-PKG_VERSION="7b3b44c"
+PKG_VERSION="37d8e68"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/audio/flac/package.mk

@@ -20,8 +20,8 @@ PKG_NAME="flac"
 PKG_VERSION="1.3.1"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="LGPL"
-PKG_SITE="http://flac.sourceforge.net/"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://xiph.org/flac/"
 PKG_URL="http://downloads.xiph.org/releases/flac/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libogg"
 PKG_PRIORITY="optional"

packages/audio/libcdio/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="libcdio"
-PKG_VERSION="0.92"
+PKG_VERSION="0.93"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.gnu.org/software/libcdio/"
-PKG_URL="http://ftp.gnu.org/gnu/libcdio/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_LICENSE="GPLv3"
+PKG_SITE="https://www.gnu.org/software/libcdio/"
+PKG_URL="https://ftp.gnu.org/gnu/libcdio/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"

packages/audio/libogg/package.mk

@@ -17,11 +17,11 @@
 ################################################################################
 
 PKG_NAME="libogg"
-PKG_VERSION="1.3.1"
+PKG_VERSION="1.3.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
-PKG_SITE="http://www.xiph.org/ogg/"
+PKG_SITE="https://www.xiph.org/ogg/"
 PKG_URL="http://downloads.xiph.org/releases/ogg/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"

packages/audio/libopenmpt/package.mk

@@ -20,7 +20,7 @@ PKG_NAME="libopenmpt"
 PKG_VERSION="0.2.4764"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="GPL"
+PKG_LICENSE="BSD"
 PKG_SITE="http://lib.openmpt.org/libopenmpt/"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"

packages/audio/libsndfile/package.mk

@@ -0,0 +1,50 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="libsndfile"
+PKG_VERSION="1.0.25"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="LGPL"
+PKG_SITE="http://www.mega-nerd.com/libsndfile/"
+PKG_URL="http://www.mega-nerd.com/$PKG_NAME/files/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain alsa-lib flac libvorbis libogg"
+PKG_PRIORITY="optional"
+PKG_SECTION="audio"
+PKG_SHORTDESC="libsndfile: A library for accessing various audio file formats"
+PKG_LONGDESC="libsndfile is a C library for reading and writing sound files such as AIFF, AU, WAV, and others through one standard interface. It can currently read/write 8, 16, 24 and 32-bit PCM files as well as 32 and 64-bit floating point WAV files and a number of compressed formats. It compiles and runs on *nix, MacOS, and Win32."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+# package specific configure options
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
+                           --disable-silent-rules \
+                           --disable-sqlite \
+                           --enable-alsa \
+                           --enable-external-libs \
+                           --disable-experimental \
+                           --disable-test-coverage \
+                           --enable-largefile \
+                           --with-gnu-ld"
+
+post_makeinstall_target() {
+  rm -rf $INSTALL/usr/bin
+}

packages/audio/libsndfile/patches/libsndfile-1.0.25-configure.patch

@@ -0,0 +1,25 @@
+diff -Naur libsndfile-1.0.25-old/configure.ac libsndfile-1.0.25-new/configure.ac
+--- libsndfile-1.0.25-old/configure.ac	2011-07-13 01:59:57.000000000 -0700
++++ libsndfile-1.0.25-new/configure.ac	2011-07-13 17:04:14.000000000 -0700
+@@ -18,9 +18,6 @@
+ AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
+ AM_SILENT_RULES([yes])
+ 
+-dnl Add parameters for aclocal
+-AC_SUBST(ACLOCAL_AMFLAGS, "-I M4")
+-
+ AC_LANG([C])
+ 
+ AC_PROG_CC
+diff -Naur libsndfile-1.0.25-old/Makefile.am libsndfile-1.0.25-new/Makefile.am
+--- libsndfile-1.0.25-old/Makefile.am	2011-07-07 02:47:24.000000000 -0700
++++ libsndfile-1.0.25-new/Makefile.am	2011-07-13 17:04:14.000000000 -0700
+@@ -2,6 +2,8 @@
+ 
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
+ 
++ACLOCAL_AMFLAGS = -I M4
++
+ if BUILD_OCTAVE_MOD
+ octave_dir = Octave
+ endif

packages/audio/pulseaudio/config/system.pa

@@ -0,0 +1,74 @@
+#!/usr/bin/pulseaudio -nF
+#
+# This file is part of PulseAudio.
+#
+# PulseAudio is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# PulseAudio 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 Lesser General Public License
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+
+# This startup script is used only if PulseAudio is started in system
+# mode.
+
+### Automatically load driver modules depending on the hardware available
+.ifexists module-udev-detect.so
+load-module module-udev-detect
+.else
+### Use the static hardware detection module (for systems that lack udev/hal support)
+load-module module-detect
+.endif
+
+### Load several protocols
+.ifexists module-esound-protocol-unix.so
+load-module module-esound-protocol-unix
+.endif
+load-module module-native-protocol-unix
+
+### Automatically restore the volume of streams and devices
+load-module module-stream-restore
+load-module module-device-restore
+
+### Automatically restore the default sink/source when changed by the user
+### during runtime
+### NOTE: This should be loaded as early as possible so that subsequent modules
+### that look up the default sink/source get the right value
+load-module module-default-device-restore
+
+### Automatically move streams to the default sink if the sink they are
+### connected to dies, similar for sources
+load-module module-rescue-streams
+
+### Make sure we always have a sink around, even if it is a null sink.
+load-module module-always-sink
+
+### Automatically suspend sinks/sources that become idle for too long
+load-module module-suspend-on-idle
+
+### Enable positioned event sounds
+load-module module-position-event-sounds
+
+### Automatically load modules for bluetooth
+.ifexists module-bluetooth-policy.so
+ load-module module-bluetooth-policy
+.endif
+
+.ifexists module-bluetooth-discover.so
+ load-module module-bluetooth-discover
+.endif
+
+.ifexists module-zeroconf-publish.so
+  load-module module-zeroconf-publish
+  load-module module-zeroconf-discover
+.endif
+
+load-module module-native-protocol-tcp auth-anonymous=1
+load-module module-switch-on-connect
+

packages/audio/pulseaudio/package.mk

@@ -0,0 +1,128 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="pulseaudio"
+PKG_VERSION="7.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://pulseaudio.org/"
+PKG_URL="http://www.freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain libtool json-c alsa-lib libsndfile soxr dbus systemd libressl libcap"
+PKG_PRIORITY="optional"
+PKG_SECTION="audio"
+PKG_SHORTDESC="pulseaudio: Yet another sound server for Unix"
+PKG_LONGDESC="PulseAudio is a sound server for Linux and other Unix-like operating systems. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (esound or esd). In addition to the features esound provides, PulseAudio has an extensible plugin architecture, support for more than one sink per source, better low-latency behavior, the ability to be embedded into other software, a completely asynchronous C API, a simple command line interface for reconfiguring the daemon while running, flexible and implicit sample type conversion and resampling, and a "Zero-Copy" architecture."
+
+PKG_IS_ADDON="no"
+
+# broken
+PKG_AUTORECONF="no"
+
+if [ "$BLUETOOTH_SUPPORT" = "yes" ]; then
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET sbc"
+  PULSEAUDIO_BLUETOOTH="--enable-bluez5"
+else
+  PULSEAUDIO_BLUETOOTH="--disable-bluez5"
+fi
+
+if [ "$AVAHI_DAEMON" = "yes" ]; then
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi"
+  PULSEAUDIO_AVAHI="--enable-avahi"
+else
+  PULSEAUDIO_AVAHI="--disable-avahi"
+fi
+
+# package specific configure options
+PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
+                           --disable-nls \
+                           --enable-largefile \
+                           --disable-rpath \
+                           --disable-x11 \
+                           --disable-tests \
+                           --disable-samplerate \
+                           --disable-oss-output \
+                           --disable-oss-wrapper \
+                           --disable-coreaudio-output \
+                           --enable-alsa \
+                           --disable-esound \
+                           --disable-solaris \
+                           --disable-waveout \
+                           --disable-glib2 \
+                           --disable-gtk3 \
+                           --disable-gconf \
+                           $PULSEAUDIO_AVAHI \
+                           --disable-jack \
+                           --disable-asyncns \
+                           --disable-tcpwrap \
+                           --disable-lirc \
+                           --enable-dbus \
+                           --disable-bluez4 \
+                           $PULSEAUDIO_BLUETOOTH \
+                           --disable-bluez5-ofono-headset \
+                           --disable-bluez5-native-headset \
+                           --enable-udev \
+                           --disable-hal-compat \
+                           --enable-ipv6 \
+                           --enable-openssl \
+                           --disable-xen \
+                           --disable-orc \
+                           --disable-manpages \
+                           --disable-per-user-esound-socket \
+                           --disable-default-build-tests \
+                           --disable-legacy-database-entry-format \
+                           --with-system-user=root \
+                           --with-system-group=root \
+                           --with-access-group=root \
+                           --without-caps \
+                           --without-fftw \
+                           --without-speex \
+                           --with-soxr \
+                           --with-module-dir=/usr/lib/pulse"
+
+post_makeinstall_target() {
+# add_user pulse x 499 498 "PulseAudio System Daemon" "/var/run/pulse" "/bin/sh"
+# add_group pulse 498
+# add_group pulse-access 497
+
+  sed -e 's%user="pulse"%user="root"%g' -i $INSTALL/etc/dbus-1/system.d/pulseaudio-system.conf
+
+  rm -rf $INSTALL/usr/bin/esdcompat
+  rm -rf $INSTALL/usr/include
+  rm -rf $INSTALL/usr/lib/cmake
+  rm -rf $INSTALL/usr/lib/pkgconfig
+  rm -rf $INSTALL/usr/lib/systemd
+  rm -rf $INSTALL/usr/share/vala
+  rm -rf $INSTALL/usr/share/zsh
+  rm -rf $INSTALL/usr/share/bash-completion
+
+  cp $PKG_DIR/config/system.pa $INSTALL/etc/pulse/
+
+  # Remove unwanted symlinks
+  for file in $INSTALL/*; do
+    if [ -L "$file" ]; then
+      rm $file
+    fi
+  done
+}
+
+post_install() {
+  enable_service pulseaudio.service
+}

packages/audio/pulseaudio/patches/pulseaudio-0900.01-never-append-dirty-to-server-module-version.patch

@@ -0,0 +1,24 @@
+From c9d7dcaa87f9ada49d75483a7c604dba27a0d71a Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Tue, 7 Jan 2014 13:22:48 +0200
+Subject: [PATCH] never append -dirty to server/module version
+
+---
+ git-version-gen |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/git-version-gen b/git-version-gen
+index 9d65b80..fcf11fd 100755
+--- a/git-version-gen
++++ b/git-version-gen
+@@ -152,6 +152,7 @@ v=`echo "$v" |sed 's/^v//'`
+ git status > /dev/null 2>&1
+ 
+ dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
++dirty=
+ case "$dirty" in
+     '') ;;
+     *) # Append the suffix only if there isn't one already.
+-- 
+1.7.2.5
+

packages/audio/pulseaudio/patches/pulseaudio-0900.02-check_uid.patch

@@ -0,0 +1,13 @@
+--- pulseaudio-4.0.orig/src/pulsecore/core-util.c	2014-01-12 23:31:26.281525000 -0800
++++ pulseaudio-4.0/src/pulsecore/core-util.c	2014-01-12 23:32:32.977118803 -0800
+@@ -1524,10 +1524,6 @@
+     if (stat(p, &st) < 0)
+         return -errno;
+ 
+-#ifdef HAVE_GETUID
+-    if (st.st_uid != getuid())
+-        return -EACCES;
+-#endif
+
+     return 0;
+ }

packages/audio/pulseaudio/profile.d/04-pulseaudio.conf

@@ -0,0 +1 @@
+export SDL_AUDIODRIVER=pulse

packages/audio/pulseaudio/system.d/pulseaudio.service

@@ -0,0 +1,15 @@
+[Unit]
+Description=PulseAudio Sound System
+After=syslog.target local-fs.target
+Requires=bluetooth.service
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/pulseaudio --start --daemonize --log-level=0
+TimeoutStopSec=5
+Restart=always
+RestartSec=2
+StartLimitInterval=0
+
+[Install]
+WantedBy=multi-user.target

packages/audio/sbc/package.mk

@@ -16,18 +16,21 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="yaml"
-PKG_VERSION="0.1.4"
+PKG_NAME="sbc"
+PKG_VERSION="1.3"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://pyyaml.org"
-PKG_URL="http://pyyaml.org/download/libyaml/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.bluez.org/"
+PKG_URL="http://www.kernel.org/pub/linux/bluetooth/sbc-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="web"
-PKG_SHORTDESC="yaml: a next generation YAML parser and emitter."
-PKG_LONGDESC="yaml is the next generation YAML parser and emitter."
+PKG_SECTION="network"
+PKG_SHORTDESC="sbc: standalone SBC library"
+PKG_LONGDESC="standalone SBC library"
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
+         --disable-tools --disable-tester"

packages/audio/sidplay-libs/package.mk

@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sidplay2.sourceforge.net/"
-PKG_URL=""http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION.tar.gz
+PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"

packages/audio/soxr/package.mk

@@ -0,0 +1,54 @@
+################################################################################
+#      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="soxr"
+PKG_VERSION="0.1.2"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="LGPL"
+PKG_SITE="http://sourceforge.net/p/soxr/wiki/Home/"
+PKG_URL="$SOURCEFORGE_SRC/soxr/$PKG_NAME-$PKG_VERSION-Source.tar.xz"
+PKG_SOURCE_DIR="$PKG_NAME-$PKG_VERSION-Source"
+PKG_DEPENDS_TARGET="toolchain cmake:host"
+PKG_PRIORITY="optional"
+PKG_SECTION="audio"
+PKG_SHORTDESC="soxr: a library which performs one-dimensional sample-rate conversion."
+PKG_LONGDESC="The SoX Resampler library performs one-dimensional sample-rate conversion. it may be used, for example, to resample PCM-encoded audio."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+# package specific configure options
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DHAVE_WORDS_BIGENDIAN_EXITCODE=1 \
+        -DBUILD_TESTS=0 \
+        -DBUILD_EXAMPLES=1 \
+        -DBUILD_SHARED_LIBS=OFF ..
+}
+
+#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/cpio/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="cpio"
-PKG_VERSION="2.11"
+PKG_VERSION="2.12"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/compress/cpio/patches/cpio-2.11-fgets.patch

@@ -1,14 +0,0 @@
-diff --git a/gnu/stdio.in.h b/gnu/stdio.in.h
-index 88b368b..44f1087 100644
---- a/gnu/stdio.in.h
-+++ b/gnu/stdio.in.h
-@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

packages/compress/xz/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xz"
-PKG_VERSION="5.2.1"
+PKG_VERSION="5.2.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/databases/sqlite/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3080900"
+PKG_VERSION="autoconf-3090000"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"
-PKG_SITE="http://www.sqlite.org/"
-PKG_URL="http://sqlite.org/2015/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_SITE="https://www.sqlite.org/"
+PKG_URL="https://www.sqlite.org/2015/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="database"
@@ -63,6 +63,10 @@ PKG_AUTORECONF="yes"
 # mmap_size pragma.
   CFLAGS="$CFLAGS -DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_MMAP_SIZE=268435456"
 
+pre_make_target() {
+  # dont build parallel
+  MAKEFLAGS=-j1
+}
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-shared \
@@ -70,7 +74,3 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --enable-threadsafe \
                            --enable-dynamic-extensions \
                            --with-gnu-ld"
-
-post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
-}

packages/debug/gdb/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gdb"
-PKG_VERSION="7.9"
+PKG_VERSION="7.10"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/arm-mem/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="arm-mem"
-PKG_VERSION="2e6f275"
+PKG_VERSION="4418bb4"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="GPL"
@@ -33,7 +33,17 @@ PKG_LONGDESC="arm-mem is a ARM-accelerated versions of selected functions from s
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-PKG_MAKE_OPTS_TARGET="libarmmem.so"
+if [  "$TARGET_CPU" = "arm1176jzf-s" ]; then
+  ARMMEM_SO=libarmmem.so
+elif [  "$TARGET_CPU" = "cortex-a7" ]; then
+  ARMMEM_SO=libarmmem-a7.so
+fi
+
+PKG_MAKE_OPTS_TARGET="$ARMMEM_SO"
+
+pre_make_target() {
+  export CROSS_COMPILE=$TARGET_PREFIX
+}
 
 make_init() {
   : # reuse make_target()
@@ -41,17 +51,17 @@ make_init() {
 
 makeinstall_target() {
   mkdir -p $INSTALL/lib
-    cp -P libarmmem.so $INSTALL/lib
+    cp -P $ARMMEM_SO $INSTALL/lib
 
   mkdir -p $INSTALL/etc
-    echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload
+    echo "/lib/$ARMMEM_SO" >> $INSTALL/etc/ld.so.preload
 }
 
 makeinstall_init() {
   mkdir -p $INSTALL/lib
-    cp -P libarmmem.so $INSTALL/lib
+    cp -P $ARMMEM_SO $INSTALL/lib
 
   mkdir -p $INSTALL/etc
-    echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload
+    echo "/lib/$ARMMEM_SO" >> $INSTALL/etc/ld.so.preload
 }
 

packages/devel/binutils/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="binutils"
-PKG_VERSION="2.25"
+PKG_VERSION="2.25.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/ccache/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="ccache"
-PKG_VERSION="3.2.1"
+PKG_VERSION="3.2.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -34,6 +34,8 @@ PKG_AUTORECONF="no"
 
 export CC=$LOCAL_CC
 
+PKG_CONFIGURE_OPTS_HOST="--with-bundled-zlib"
+
 post_makeinstall_host() {
 # setup ccache
   $ROOT/$TOOLCHAIN/bin/ccache --max-size=$CCACHE_CACHE_SIZE
@@ -51,4 +53,4 @@ $ROOT/$TOOLCHAIN/bin/ccache $LOCAL_CXX "\$@"
 EOF
 
   chmod +x $HOST_CXX
-}
+}

packages/devel/cmake/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="cmake"
-PKG_VERSION="3.0.2"
+PKG_VERSION="3.3.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.cmake.org/"
-PKG_URL="http://www.cmake.org/files/v3.0/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://www.cmake.org/files/v3.3/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
@@ -36,6 +36,9 @@ configure_host() {
   ../configure --prefix=$ROOT/$TOOLCHAIN \
                --no-qt-gui --no-system-libs \
                -- \
+               -DCMAKE_C_FLAGS="-O2 -Wall -pipe -Wno-format-security" \
+               -DCMAKE_CXX_FLAGS="-O2 -Wall -pipe -Wno-format-security" \
+               -DCMAKE_EXE_LINKER_FLAGS="$HOST_LDFLAGS" \
                -DBUILD_CursesDialog=0
 }
 
@@ -48,6 +51,9 @@ SET(CMAKE_SYSTEM_NAME Linux)
 #this one not so much
 SET(CMAKE_SYSTEM_VERSION 1)
 
+# processor (or hardware) of the target system
+SET(CMAKE_SYSTEM_PROCESSOR  $TARGET_ARCH)
+
 # specify the cross compiler
 SET(CMAKE_C_COMPILER   $TARGET_CC)
 SET(CMAKE_CXX_COMPILER $TARGET_CXX)

packages/devel/enca/package.mk

@@ -32,8 +32,6 @@ PKG_LONGDESC="Enca detects the encoding of text files, on the basis of knowledge
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-export CFLAGS="$CFLAGS -fPIC -DPIC"
-
 PKG_MAKEINSTALL_OPTS_TARGET="-C lib"
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__dev_random=yes \
                            ac_cv_file__dev_urandom=no \
@@ -47,6 +45,10 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__dev_random=yes \
                            --disable-rpath \
                            --with-gnu-ld"
 
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC -DPIC"
+}
+
 pre_make_target() {
   make CC="$HOST_CC" \
        CPPFLAGS="$HOST_CPPFLAGS" \

packages/devel/fribidi/package.mk

@@ -42,8 +42,10 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
                            --with-gnu-ld \
                            --without-glib"
 
-export CFLAGS="$CFLAGS -DFRIBIDI_CHUNK_SIZE=4080"
-export CFLAGS="$CFLAGS -fPIC -DPIC"
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -DFRIBIDI_CHUNK_SIZE=4080"
+  export CFLAGS="$CFLAGS -fPIC -DPIC"
+}
 
 post_makeinstall_target() {
   mkdir -p $ROOT/$TOOLCHAIN/bin

packages/devel/gettext/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gettext"
-PKG_VERSION="0.19.4"
+PKG_VERSION="0.19.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/glib/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="glib"
-PKG_VERSION="2.42.2"
+PKG_VERSION="2.46.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
-PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.42/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.46/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain zlib libffi pcre Python:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"

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

@@ -1,54 +0,0 @@
-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/glibc/config/gai.conf

@@ -51,7 +51,7 @@
 #
 #    For sites which prefer IPv4 connections change the last line to
 #
-precedence ::ffff:0:0/96  100
+#precedence ::ffff:0:0/96  100
 
 #
 # scopev4  <mask>  <value>
@@ -60,6 +60,6 @@ precedence ::ffff:0:0/96  100
 #    used.  Changing these defaults should hardly ever be necessary.
 #    The defaults are equivalent to:
 #
-scopev4 ::ffff:169.254.0.0/112  2
-scopev4 ::ffff:127.0.0.0/104    2
-scopev4 ::ffff:0.0.0.0/96       14
+#scopev4 ::ffff:169.254.0.0/112  2
+#scopev4 ::ffff:127.0.0.0/104    2
+#scopev4 ::ffff:0.0.0.0/96       14

packages/devel/glibc/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="glibc"
-PKG_VERSION="2.21"
+PKG_VERSION="2.22"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -139,10 +139,13 @@ post_makeinstall_target() {
 
 # remove locales and charmaps
   rm -rf $INSTALL/usr/share/i18n/charmaps
-  rm -rf $INSTALL/usr/share/i18n/locales
 
-  mkdir -p $INSTALL/usr/share/i18n/locales
-    cp -PR $ROOT/$PKG_BUILD/localedata/locales/POSIX $INSTALL/usr/share/i18n/locales
+  if [ ! "$GLIBC_LOCALES" = yes ]; then
+    rm -rf $INSTALL/usr/share/i18n/locales
+
+    mkdir -p $INSTALL/usr/share/i18n/locales
+      cp -PR $ROOT/$PKG_BUILD/localedata/locales/POSIX $INSTALL/usr/share/i18n/locales
+  fi
 
 # create default configs
   mkdir -p $INSTALL/etc
@@ -169,6 +172,7 @@ makeinstall_init() {
     cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/elf/ld*.so* $INSTALL/lib
     cp $ROOT/$PKG_BUILD/.$TARGET_NAME/libc.so.6 $INSTALL/lib
     cp $ROOT/$PKG_BUILD/.$TARGET_NAME/nptl/libpthread.so.0 $INSTALL/lib
+    cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/rt/librt.so* $INSTALL/lib
 
     if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then
       ln -sf ld.so $INSTALL/lib/ld-linux.so.3

packages/devel/json-c/package.mk

@@ -0,0 +1,39 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2010-2011 Roman Weber (roman@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="json-c"
+PKG_VERSION="0645020"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/json-c/json-c/wiki"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="accessibility"
+PKG_SHORTDESC="json-c"
+PKG_LONGDESC="JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_realloc_0_nonnull=yes \
+                           ac_cv_func_malloc_0_nonnull=yes \
+                           --enable-static --disable-shared \
+                           --disable-oldname-compat"

packages/devel/libcec/package.mk

@@ -17,46 +17,52 @@
 ################################################################################
 
 PKG_NAME="libcec"
-PKG_VERSION="2.2.0"
+PKG_VERSION="3.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://libcec.pulse-eight.com/"
-PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION-3.tar.gz"
-PKG_DEPENDS_TARGET="toolchain systemd lockdev"
+PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION-6.tar.gz"
+PKG_DEPENDS_TARGET="toolchain systemd lockdev platform"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"
 PKG_SHORTDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor"
 PKG_LONGDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor."
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
-
-PKG_CONFIGURE_OPTS_TARGET="--disable-cubox --disable-exynos"
+PKG_AUTORECONF="no"
 
 if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver"
-
-  export CFLAGS="$CFLAGS \
-                 -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \
-                 -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
-  export CXXFLAGS="$CXXFLAGS \
-                   -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \
-                   -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
-
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-rpi \
-                             --with-rpi-include-path=$SYSROOT_PREFIX/usr/include \
-                             --with-rpi-lib-path=$SYSROOT_PREFIX/usr/lib"
-else
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-rpi"
 fi
 
 if [ "$KODIPLAYER_DRIVER" = "libfslvpuwrap" ]; then
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-imx6"
+  EXTRA_CMAKE_OPTS="-DHAVE_IMX_API=1"
 else
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-imx6"
+  EXTRA_CMAKE_OPTS="-DHAVE_IMX_API=0"
 fi
 
+configure_target() {
+  if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
+    export CXXFLAGS="$CXXFLAGS \
+      -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \
+      -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
 
-# dont use some optimizations because of build problems
-  export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
+    # detecting RPi support fails without -lvchiq_arm
+    export LDFLAGS="$LDFLAGS -lvchiq_arm"
+  fi
+
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DBUILD_SHARED_LIBS=1 \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+        -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \
+        -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \
+        -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+        $EXTRA_CMAKE_OPTS \
+        ..
+}
+
+post_makeinstall_target() {
+  mv $INSTALL/usr/lib/python2.7/dist-packages $INSTALL/usr/lib/python2.7/site-packages
+}

packages/devel/libcec/patches/libcec-00-imx6-support.patch

@@ -1,43 +1,33 @@
-diff -Naur libcec-2.2.0/configure.ac libcec-2.2.0.patch/configure.ac
---- libcec-2.2.0/configure.ac	2014-11-01 01:51:37.000000000 +0100
-+++ libcec-2.2.0.patch/configure.ac	2014-11-10 23:14:45.210162950 +0100
-@@ -100,6 +100,14 @@
-   esac
- fi
- 
-+## i.MX6 support
-+AC_ARG_ENABLE([imx6],
-+  [AS_HELP_STRING([--enable-imx6],
-+  [enable support for freescale i.MX6 (default is no)])],
-+  [use_imx6=$enableval],
-+  [use_imx6=no])
-+
-+
- ## add the top dir and include to the include path, so we can include config.h and cec.h
- CPPFLAGS="$CPPFLAGS -I\$(abs_top_srcdir)/src -I\$(abs_top_srcdir)/include"
- 
-@@ -306,6 +314,17 @@
- fi
- 
- 
-+## mark i.MX6 support as available
-+if test "x$use_imx6" != "xno"; then
-+  AC_DEFINE([HAVE_IMX_API],[1],[Define to 1 to include i.MX6 support])
-+  AM_CONDITIONAL(USE_IMX_API, true)
-+  features="$features\n  i.MX6 support :\t\t\tyes"
-+  LIB_INFO="$LIB_INFO 'i.MX6'"
-+else
-+  AM_CONDITIONAL(USE_IMX_API, false)
-+  features="$features\n  i.MX6 support :\t\t\tno"
-+fi
-+
- ## check if our build system is complete
- AC_CHECK_HEADER(algorithm,,AC_MSG_ERROR($msg_required_header_missing))
- AC_CHECK_HEADER(ctype.h,,AC_MSG_ERROR($msg_required_header_missing))
-diff -Naur libcec-2.2.0/include/cectypes.h libcec-2.2.0.patch/include/cectypes.h
---- libcec-2.2.0/include/cectypes.h	2014-10-28 16:20:50.000000000 +0100
-+++ libcec-2.2.0.patch/include/cectypes.h	2014-11-10 23:21:37.347945493 +0100
-@@ -307,6 +307,17 @@
+From a7f3315333c1a79259a763c6542a6cd71855b357 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Thu, 7 May 2015 11:35:04 +0300
+Subject: [PATCH] imx support
+
+note. I am NOT the author of the patch. just rebased it
+---
+ include/cectypes.h                                 |  14 +-
+ src/libcec/CECTypeUtils.h                          |   2 +
+ src/libcec/adapter/AdapterFactory.cpp              |  29 +-
+ src/libcec/adapter/IMX/AdapterMessageQueue.h       | 134 +++++++++
+ .../adapter/IMX/IMXCECAdapterCommunication.cpp     | 328 +++++++++++++++++++++
+ .../adapter/IMX/IMXCECAdapterCommunication.h       | 119 ++++++++
+ src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp  |  42 +++
+ src/libcec/adapter/IMX/IMXCECAdapterDetection.h    |  36 +++
+ src/libcec/cmake/CheckPlatformSupport.cmake        |  10 +
+ src/libcec/cmake/DisplayPlatformSupport.cmake      |   6 +
+ src/libcec/env.h.in                                |   3 +
+ 11 files changed, 720 insertions(+), 3 deletions(-)
+ create mode 100644 src/libcec/adapter/IMX/AdapterMessageQueue.h
+ create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp
+ create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterCommunication.h
+ create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp
+ create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterDetection.h
+
+diff --git a/include/cectypes.h b/include/cectypes.h
+index acff259..0cfee8c 100644
+--- a/include/cectypes.h
++++ b/include/cectypes.h
+@@ -309,6 +309,17 @@ namespace CEC {
  #define CEC_EXYNOS_VIRTUAL_COM		"Exynos"
  
  /*!
@@ -54,8 +44,8 @@ diff -Naur libcec-2.2.0/include/cectypes.h libcec-2.2.0.patch/include/cectypes.h
 +/*!
   * Mimimum client version
   */
- #define CEC_MIN_LIB_VERSION          2
-@@ -888,7 +899,8 @@
+ #define CEC_MIN_LIB_VERSION          3
+@@ -876,7 +887,8 @@ typedef enum cec_adapter_type
    ADAPTERTYPE_P8_DAUGHTERBOARD = 0x2,
    ADAPTERTYPE_RPI              = 0x100,
    ADAPTERTYPE_TDA995x          = 0x200,
@@ -64,11 +54,25 @@ diff -Naur libcec-2.2.0/include/cectypes.h libcec-2.2.0.patch/include/cectypes.h
 +  ADAPTERTYPE_IMX              = 0x400
  } cec_adapter_type;
  
- typedef struct cec_menu_language
-diff -Naur libcec-2.2.0/src/lib/adapter/AdapterFactory.cpp libcec-2.2.0.patch/src/lib/adapter/AdapterFactory.cpp
---- libcec-2.2.0/src/lib/adapter/AdapterFactory.cpp	2014-10-28 16:20:50.000000000 +0100
-+++ libcec-2.2.0.patch/src/lib/adapter/AdapterFactory.cpp	2014-11-10 23:18:08.761485552 +0100
-@@ -57,6 +57,11 @@
+ /** force exporting through swig */
+diff --git a/src/libcec/CECTypeUtils.h b/src/libcec/CECTypeUtils.h
+index fd8046a..48cb215 100644
+--- a/src/libcec/CECTypeUtils.h
++++ b/src/libcec/CECTypeUtils.h
+@@ -765,6 +765,8 @@ namespace CEC
+         return "Raspberry Pi";
+       case ADAPTERTYPE_TDA995x:
+         return "TDA995x";
++      case ADAPTERTYPE_IMX:
++        return "i.MX";
+       default:
+         return "unknown";
+       }
+diff --git a/src/libcec/adapter/AdapterFactory.cpp b/src/libcec/adapter/AdapterFactory.cpp
+index da05725..92e378b 100644
+--- a/src/libcec/adapter/AdapterFactory.cpp
++++ b/src/libcec/adapter/AdapterFactory.cpp
+@@ -58,6 +58,11 @@
  #include "Exynos/ExynosCECAdapterCommunication.h"
  #endif
  
@@ -77,10 +81,10 @@ diff -Naur libcec-2.2.0/src/lib/adapter/AdapterFactory.cpp libcec-2.2.0.patch/sr
 +#include "IMX/IMXCECAdapterCommunication.h"
 +#endif
 +
- using namespace std;
  using namespace CEC;
  
-@@ -127,7 +132,22 @@
+ int8_t CAdapterFactory::FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath /* = NULL */)
+@@ -127,7 +132,22 @@ int8_t CAdapterFactory::DetectAdapters(cec_adapter_descriptor *deviceList, uint8
  #endif
  
  
@@ -104,7 +108,7 @@ diff -Naur libcec-2.2.0/src/lib/adapter/AdapterFactory.cpp libcec-2.2.0.patch/sr
  #error "libCEC doesn't have support for any type of adapter. please check your build system or configuration"
  #endif
  
-@@ -151,11 +171,16 @@
+@@ -151,11 +171,16 @@ IAdapterCommunication *CAdapterFactory::GetInstance(const char *strPort, uint16_
      return new CRPiCECAdapterCommunication(m_lib->m_cec);
  #endif
  
@@ -122,9 +126,11 @@ diff -Naur libcec-2.2.0/src/lib/adapter/AdapterFactory.cpp libcec-2.2.0.patch/sr
    return NULL;
  #endif
  }
-diff -Naur libcec-2.2.0/src/lib/adapter/IMX/AdapterMessageQueue.h libcec-2.2.0.patch/src/lib/adapter/IMX/AdapterMessageQueue.h
---- libcec-2.2.0/src/lib/adapter/IMX/AdapterMessageQueue.h	1970-01-01 01:00:00.000000000 +0100
-+++ libcec-2.2.0.patch/src/lib/adapter/IMX/AdapterMessageQueue.h	2014-11-10 23:14:45.214162390 +0100
+diff --git a/src/libcec/adapter/IMX/AdapterMessageQueue.h b/src/libcec/adapter/IMX/AdapterMessageQueue.h
+new file mode 100644
+index 0000000..af6742c
+--- /dev/null
++++ b/src/libcec/adapter/IMX/AdapterMessageQueue.h
 @@ -0,0 +1,134 @@
 +#pragma once
 +/*
@@ -159,7 +165,7 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/AdapterMessageQueue.h libcec-2.2.0.p
 + *     http://www.pulse-eight.net/
 + */
 +
-+#include "lib/platform/threads/mutex.h"
++#include "platform/threads/mutex.h"
 +
 +namespace CEC
 +{
@@ -260,9 +266,11 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/AdapterMessageQueue.h libcec-2.2.0.p
 +  };
 + 
 +};
-diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp
---- libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp	2014-11-10 23:14:45.217161982 +0100
+diff --git a/src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp
+new file mode 100644
+index 0000000..2daa8cb
+--- /dev/null
++++ b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp
 @@ -0,0 +1,328 @@
 +/*
 + * This file is part of the libCEC(R) library.
@@ -296,11 +304,11 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp libce
 +#if defined(HAVE_IMX_API)
 +#include "IMXCECAdapterCommunication.h"
 +
-+#include "lib/CECTypeUtils.h"
-+#include "lib/LibCEC.h"
-+#include "lib/platform/sockets/cdevsocket.h"
-+#include "lib/platform/util/StdString.h"
-+#include "lib/platform/util/buffer.h"
++#include "CECTypeUtils.h"
++#include "LibCEC.h"
++#include "platform/sockets/cdevsocket.h"
++#include "platform/util/StdString.h"
++#include "platform/util/buffer.h"
 +
 +/*
 + * Ioctl definitions from kernel header
@@ -592,9 +600,11 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp libce
 +}
 +
 +#endif	// HAVE_IMX_API
-diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.h libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterCommunication.h
---- libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.h	1970-01-01 01:00:00.000000000 +0100
-+++ libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterCommunication.h	2014-11-10 23:14:45.217161982 +0100
+diff --git a/src/libcec/adapter/IMX/IMXCECAdapterCommunication.h b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.h
+new file mode 100644
+index 0000000..9e899a3
+--- /dev/null
++++ b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.h
 @@ -0,0 +1,119 @@
 +#pragma once
 +/*
@@ -626,10 +636,10 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.h libcec-
 +
 +#if defined(HAVE_IMX_API)
 +
-+#include "lib/platform/threads/mutex.h"
-+#include "lib/platform/threads/threads.h"
-+#include "lib/platform/sockets/socket.h"
-+#include "lib/adapter/AdapterCommunication.h"
++#include "platform/threads/mutex.h"
++#include "platform/threads/threads.h"
++#include "platform/sockets/socket.h"
++#include "adapter/AdapterCommunication.h"
 +#include <map>
 +
 +#define IMX_ADAPTER_VID 0x0471 /*FIXME TBD*/
@@ -715,9 +725,11 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.h libcec-
 +};
 +
 +#endif
-diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp
---- libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp	2014-11-10 23:14:45.215162253 +0100
+diff --git a/src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp b/src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp
+new file mode 100644
+index 0000000..6c93c45
+--- /dev/null
++++ b/src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp
 @@ -0,0 +1,42 @@
 +/*
 + * This file is part of the libCEC(R) library.
@@ -761,9 +773,11 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp libcec-2.
 +}
 +
 +#endif
-diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterDetection.h libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterDetection.h
---- libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterDetection.h	1970-01-01 01:00:00.000000000 +0100
-+++ libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterDetection.h	2014-11-10 23:14:45.215162253 +0100
+diff --git a/src/libcec/adapter/IMX/IMXCECAdapterDetection.h b/src/libcec/adapter/IMX/IMXCECAdapterDetection.h
+new file mode 100644
+index 0000000..d54891d
+--- /dev/null
++++ b/src/libcec/adapter/IMX/IMXCECAdapterDetection.h
 @@ -0,0 +1,36 @@
 +#pragma once
 +/*
@@ -801,31 +815,65 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterDetection.h libcec-2.2.
 +    static bool FindAdapter(void);
 +  };
 +}
-diff -Naur libcec-2.2.0/src/lib/CECTypeUtils.h libcec-2.2.0.patch/src/lib/CECTypeUtils.h
---- libcec-2.2.0/src/lib/CECTypeUtils.h	2014-10-28 16:20:50.000000000 +0100
-+++ libcec-2.2.0.patch/src/lib/CECTypeUtils.h	2014-11-10 23:14:45.212162668 +0100
-@@ -877,6 +877,8 @@
-         return "Raspberry Pi";
-       case ADAPTERTYPE_TDA995x:
-         return "TDA995x";
-+      case ADAPTERTYPE_IMX:
-+        return "i.MX";
-       default:
-         return "unknown";
-       }
-diff -Naur libcec-2.2.0/src/lib/Makefile.am libcec-2.2.0.patch/src/lib/Makefile.am
---- libcec-2.2.0/src/lib/Makefile.am	2014-10-28 16:20:50.000000000 +0100
-+++ libcec-2.2.0.patch/src/lib/Makefile.am	2014-11-10 23:20:02.597700521 +0100
-@@ -63,6 +63,12 @@
-                      adapter/TDA995x/TDA995xCECAdapterCommunication.cpp
- endif
+diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake
+index 828cdb2..8b47795 100644
+--- a/src/libcec/cmake/CheckPlatformSupport.cmake
++++ b/src/libcec/cmake/CheckPlatformSupport.cmake
+@@ -8,6 +8,7 @@
+ #	HAVE_RANDR                1 if xrandr is supported
+ #	HAVE_LIBUDEV              1 if udev is supported
+ #	HAVE_RPI_API              1 if Raspberry Pi is supported
++#	HAVE_IMX_API              1 if i.MX is supported
+ #	HAVE_TDA995X_API          1 if TDA995X is supported
+ #	HAVE_EXYNOS_API           1 if Exynos is supported
+ # HAVE_P8_USB_DETECT        1 if Pulse-Eight devices can be auto-detected
+@@ -87,6 +88,15 @@ else()
+     list(APPEND CEC_SOURCES ${CEC_SOURCES_ADAPTER_RPI})
+   endif()
  
-+## i.MX6 support
-+if USE_IMX_API
-+libcec_la_SOURCES += adapter/IMX/IMXCECAdapterDetection.cpp \
-+                     adapter/IMX/IMXCECAdapterCommunication.cpp
-+endif
++  # i.MX
++  if (HAVE_IMX_API)
++    set(LIB_INFO "${LIB_INFO}, 'IMX'")
++    set(CEC_SOURCES_ADAPTER_IMX adapter/IMX/IMXCECAdapterDetection.cpp
++                                adapter/IMX/IMXCECAdapterCommunication.cpp)
++    source_group("Source Files\\adapter\\IMX" FILES ${CEC_SOURCES_ADAPTER_IMX})
++    list(APPEND CEC_SOURCES ${CEC_SOURCES_ADAPTER_IMX})
++  endif()
 +
- ## Exynos support
- if USE_EXYNOS_API
- libcec_la_SOURCES += adapter/Exynos/ExynosCECAdapterDetection.cpp \
+   # TDA995x
+   check_include_files("tda998x_ioctl.h;comps/tmdlHdmiCEC/inc/tmdlHdmiCEC_Types.h" HAVE_TDA995X_API)
+   if (HAVE_TDA995X_API)
+diff --git a/src/libcec/cmake/DisplayPlatformSupport.cmake b/src/libcec/cmake/DisplayPlatformSupport.cmake
+index feee111..0309c56 100644
+--- a/src/libcec/cmake/DisplayPlatformSupport.cmake
++++ b/src/libcec/cmake/DisplayPlatformSupport.cmake
+@@ -32,6 +32,12 @@ else()
+   message(STATUS "Raspberry Pi support:                   no")
+ endif()
+ 
++if (HAVE_IMX_API)
++  message(STATUS "i.MX support:                           yes")
++else()
++  message(STATUS "i.MX support:                           no")
++endif()
++
+ if (HAVE_TDA995X_API)
+   message(STATUS "TDA995x support:                        yes")
+ else()
+diff --git a/src/libcec/env.h.in b/src/libcec/env.h.in
+index a1a1f26..f90e729 100644
+--- a/src/libcec/env.h.in
++++ b/src/libcec/env.h.in
+@@ -60,6 +60,9 @@
+ /* Define to 1 for Raspberry Pi support */
+ #cmakedefine HAVE_RPI_API @HAVE_RPI_API@
+ 
++/* Define to 1 for IMX support */
++#cmakedefine HAVE_IMX_API @HAVE_IMX_API@
++
+ /* Define to 1 for TDA995x support */
+ #cmakedefine HAVE_TDA995X_API @HAVE_TDA995X_API@
+ 
+-- 
+2.1.4
+

packages/devel/libcec/patches/libcec-01-add-repeating-keypress.patch

@@ -0,0 +1,859 @@
+From ec982e9800ae312972d306b67779215a2add6cde Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Fri, 24 Oct 2014 13:45:21 +0100
+Subject: [PATCH 1/6] Make released key polling wait for exact time until key
+ gets released
+
+---
+ src/libcec/CECClient.cpp    | 16 ++++++++++++++--
+ src/libcec/CECClient.h      |  2 +-
+ src/libcec/CECProcessor.cpp |  8 +++++---
+ src/libcec/LibCEC.cpp       | 10 ++++++++--
+ src/libcec/LibCEC.h         |  4 +++-
+ 5 files changed, 31 insertions(+), 9 deletions(-)
+
+diff --git a/src/libcec/CECClient.cpp b/src/libcec/CECClient.cpp
+index 35c2d3e..e307c0e 100644
+--- a/src/libcec/CECClient.cpp
++++ b/src/libcec/CECClient.cpp
+@@ -1067,7 +1067,7 @@ void CCECClient::SetCurrentButton(const cec_user_control_code iButtonCode)
+   AddKey(key);
+ }
+ 
+-void CCECClient::CheckKeypressTimeout(void)
++uint16_t CCECClient::CheckKeypressTimeout(void)
+ {
+   cec_keypress key;
+ 
+@@ -1091,12 +1091,24 @@ void CCECClient::CheckKeypressTimeout(void)
+     }
+     else
+     {
+-      return;
++      // time when this keypress will be released and we'd like to be called again
++      unsigned int timeout = CEC_PROCESSOR_SIGNAL_WAIT_TIME;
++      if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN && m_iCurrentButton == comboKey && iTimeoutMs > 0)
++        timeout = iTimeoutMs - (iNow - m_buttontime) + 1;
++      else if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN && m_iCurrentButton != comboKey)
++        timeout = CEC_BUTTON_TIMEOUT - (iNow - m_buttontime) + 1;
++      if (timeout > CEC_PROCESSOR_SIGNAL_WAIT_TIME)
++      {
++        LIB_CEC->AddLog(CEC_LOG_ERROR, "Unexpected timeout: %d (%.3f %.3f %.3f) k:%02x", timeout, iNow*1e-3, m_buttontime*1e-3, CEC_BUTTON_TIMEOUT*1e-3, m_iCurrentButton);
++        timeout = CEC_PROCESSOR_SIGNAL_WAIT_TIME;
++      }
++      return timeout;
+     }
+   }
+ 
+   LIB_CEC->AddLog(CEC_LOG_DEBUG, "key auto-released: %s (%1x)", ToString(key.keycode), key.keycode);
+   QueueAddKey(key);
++  return CEC_PROCESSOR_SIGNAL_WAIT_TIME;
+ }
+ 
+ bool CCECClient::EnableCallbacks(void *cbParam, ICECCallbacks *callbacks)
+diff --git a/src/libcec/CECClient.h b/src/libcec/CECClient.h
+index 12f8a3b..c9ce5e3 100644
+--- a/src/libcec/CECClient.h
++++ b/src/libcec/CECClient.h
+@@ -272,7 +272,7 @@ namespace CEC
+     virtual void                  AddKey(bool bSendComboKey = false);
+     virtual void                  AddKey(const cec_keypress &key);
+     virtual void                  SetCurrentButton(const cec_user_control_code iButtonCode);
+-    virtual void                  CheckKeypressTimeout(void);
++    virtual uint16_t              CheckKeypressTimeout(void);
+     virtual void                  SourceActivated(const cec_logical_address logicalAddress);
+     virtual void                  SourceDeactivated(const cec_logical_address logicalAddress);
+ 
+diff --git a/src/libcec/CECProcessor.cpp b/src/libcec/CECProcessor.cpp
+index 99f71aa..604b950 100644
+--- a/src/libcec/CECProcessor.cpp
++++ b/src/libcec/CECProcessor.cpp
+@@ -52,7 +52,6 @@
+ using namespace CEC;
+ using namespace PLATFORM;
+ 
+-#define CEC_PROCESSOR_SIGNAL_WAIT_TIME 1000
+ #define ACTIVE_SOURCE_CHECK_INTERVAL   500
+ #define TV_PRESENT_CHECK_INTERVAL      30000
+ 
+@@ -260,6 +259,7 @@ bool CCECProcessor::OnCommandReceived(const cec_command &command)
+ 
+ void *CCECProcessor::Process(void)
+ {
++  uint16_t timeout = CEC_PROCESSOR_SIGNAL_WAIT_TIME;
+   m_libcec->AddLog(CEC_LOG_DEBUG, "processor thread started");
+ 
+   if (!m_connCheck)
+@@ -274,13 +274,13 @@ void *CCECProcessor::Process(void)
+   while (!IsStopped() && m_communication->IsOpen())
+   {
+     // wait for a new incoming command, and process it
+-    if (m_inBuffer.Pop(command, CEC_PROCESSOR_SIGNAL_WAIT_TIME))
++    if (m_inBuffer.Pop(command, timeout))
+       ProcessCommand(command);
+ 
+     if (CECInitialised() && !IsStopped())
+     {
+       // check clients for keypress timeouts
+-      m_libcec->CheckKeypressTimeout();
++      timeout = m_libcec->CheckKeypressTimeout();
+ 
+       // check if we need to replace handlers
+       ReplaceHandlers();
+@@ -311,6 +311,8 @@ void *CCECProcessor::Process(void)
+         tvPresentCheck.Init(TV_PRESENT_CHECK_INTERVAL);
+       }
+     }
++    else
++      timeout = CEC_PROCESSOR_SIGNAL_WAIT_TIME;
+   }
+ 
+   return NULL;
+diff --git a/src/libcec/LibCEC.cpp b/src/libcec/LibCEC.cpp
+index af36b79..5ccb8dd 100644
+--- a/src/libcec/LibCEC.cpp
++++ b/src/libcec/LibCEC.cpp
+@@ -361,11 +361,17 @@ bool CLibCEC::IsValidPhysicalAddress(uint16_t iPhysicalAddress)
+          iPhysicalAddress <= CEC_MAX_PHYSICAL_ADDRESS;
+ }
+ 
+-void CLibCEC::CheckKeypressTimeout(void)
++uint16_t CLibCEC::CheckKeypressTimeout(void)
+ {
++  uint16_t timeout = CEC_PROCESSOR_SIGNAL_WAIT_TIME;
+   // check all clients
+   for (std::vector<CECClientPtr>::iterator it = m_clients.begin(); it != m_clients.end(); it++)
+-    (*it)->CheckKeypressTimeout();
++  {
++    uint16_t t = (*it)->CheckKeypressTimeout();
++    if (t < timeout)
++      timeout = t;
++  }
++  return timeout;
+ }
+ 
+ void CLibCEC::AddLog(const cec_log_level level, const char *strFormat, ...)
+diff --git a/src/libcec/LibCEC.h b/src/libcec/LibCEC.h
+index 6d9a229..d9d1e7b 100644
+--- a/src/libcec/LibCEC.h
++++ b/src/libcec/LibCEC.h
+@@ -39,6 +39,8 @@
+ #include "CECTypeUtils.h"
+ #include <memory>
+ 
++#define CEC_PROCESSOR_SIGNAL_WAIT_TIME 1000
++
+ namespace CEC
+ {
+   class CAdapterCommunication;
+@@ -125,7 +127,7 @@ namespace CEC
+ 
+       void AddLog(const cec_log_level level, const char *strFormat, ...);
+       void AddCommand(const cec_command &command);
+-      void CheckKeypressTimeout(void);
++      uint16_t CheckKeypressTimeout(void);
+       void Alert(const libcec_alert type, const libcec_parameter &param);
+ 
+       static bool IsValidPhysicalAddress(uint16_t iPhysicalAddress);
+-- 
+1.9.1
+
+
+From 41f0f3ec9ac136da3565c96fd5a7075499f3938d Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Fri, 24 Oct 2014 13:51:34 +0100
+Subject: [PATCH 2/6] Keep track of time since initial button press and last
+ button update
+
+---
+ src/libcec/CECClient.cpp | 44 +++++++++++++++++++++++++++-----------------
+ src/libcec/CECClient.h   |  3 ++-
+ 2 files changed, 29 insertions(+), 18 deletions(-)
+
+diff --git a/src/libcec/CECClient.cpp b/src/libcec/CECClient.cpp
+index e307c0e..e7935b9 100644
+--- a/src/libcec/CECClient.cpp
++++ b/src/libcec/CECClient.cpp
+@@ -54,7 +54,8 @@ CCECClient::CCECClient(CCECProcessor *processor, const libcec_configuration &con
+     m_bInitialised(false),
+     m_bRegistered(false),
+     m_iCurrentButton(CEC_USER_CONTROL_CODE_UNKNOWN),
+-    m_buttontime(0),
++    m_initialButtontime(0),
++    m_updateButtontime(0),
+     m_iPreventForwardingPowerOffCommand(0),
+     m_iLastKeypressTime(0)
+ {
+@@ -981,9 +982,10 @@ void CCECClient::AddKey(bool bSendComboKey /* = false */)
+     CLockObject lock(m_mutex);
+     if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN)
+     {
+-      key.duration = (unsigned int) (GetTimeMs() - m_buttontime);
++      unsigned int duration = (unsigned int) (GetTimeMs() - m_updateButtontime);
++      key.duration = (unsigned int) (GetTimeMs() - m_initialButtontime);
+ 
+-      if (key.duration > m_configuration.iComboKeyTimeoutMs ||
++      if (duration > m_configuration.iComboKeyTimeoutMs ||
+           m_configuration.iComboKeyTimeoutMs == 0 ||
+           m_iCurrentButton != m_configuration.comboKey ||
+           bSendComboKey)
+@@ -991,14 +993,15 @@ void CCECClient::AddKey(bool bSendComboKey /* = false */)
+         key.keycode = m_iCurrentButton;
+ 
+         m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN;
+-        m_buttontime = 0;
++        m_initialButtontime = 0;
++        m_updateButtontime = 0;
+       }
+     }
+   }
+ 
+   if (key.keycode != CEC_USER_CONTROL_CODE_UNKNOWN)
+   {
+-    LIB_CEC->AddLog(CEC_LOG_DEBUG, "key released: %s (%1x)", ToString(key.keycode), key.keycode);
++    LIB_CEC->AddLog(CEC_LOG_DEBUG, "key released: %s (%1x) D:%dms", ToString(key.keycode), key.keycode, key.duration);
+     QueueAddKey(key);
+   }
+ }
+@@ -1012,7 +1015,7 @@ void CCECClient::AddKey(const cec_keypress &key)
+     AddKey();
+     return;
+   }
+-
++  bool isrepeat = false;
+   cec_keypress transmitKey(key);
+   cec_user_control_code comboKey(m_configuration.clientVersion >= LIBCEC_VERSION_TO_UINT(2, 0, 5) ?
+       m_configuration.comboKey : CEC_USER_CONTROL_CODE_STOP);
+@@ -1035,22 +1038,27 @@ void CCECClient::AddKey(const cec_keypress &key)
+         AddKey(true);
+     }
+ 
++    LIB_CEC->AddLog(CEC_LOG_DEBUG, "key pressed: %s (%1x) current(%lx) duration(%d)", ToString(transmitKey.keycode), transmitKey.keycode, m_iCurrentButton, key.duration);
++
+     if (m_iCurrentButton == key.keycode)
+     {
+-      m_buttontime = GetTimeMs();
++      m_updateButtontime = GetTimeMs();
++      isrepeat = true;
+     }
+     else
+     {
+-      AddKey();
++      if (m_iCurrentButton != transmitKey.keycode)
++        AddKey();
+       if (key.duration == 0)
+       {
+         m_iCurrentButton = transmitKey.keycode;
+-        m_buttontime = m_iCurrentButton == CEC_USER_CONTROL_CODE_UNKNOWN || key.duration > 0 ? 0 : GetTimeMs();
++        m_initialButtontime = m_iCurrentButton == CEC_USER_CONTROL_CODE_UNKNOWN || key.duration > 0 ? 0 : GetTimeMs();
++        m_updateButtontime = m_initialButtontime;
+       }
+     }
+   }
+ 
+-  if (key.keycode != comboKey || key.duration > 0)
++  if (!isrepeat && (key.keycode != comboKey || key.duration > 0))
+   {
+     LIB_CEC->AddLog(CEC_LOG_DEBUG, "key pressed: %s (%1x)", ToString(transmitKey.keycode), transmitKey.keycode);
+     QueueAddKey(transmitKey);
+@@ -1074,32 +1082,34 @@ uint16_t CCECClient::CheckKeypressTimeout(void)
+   {
+     CLockObject lock(m_mutex);
+     uint64_t iNow = GetTimeMs();
++    LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s T:%.3f", __FUNCTION__, iNow*1e-3);
+     cec_user_control_code comboKey(m_configuration.clientVersion >= LIBCEC_VERSION_TO_UINT(2, 0, 5) ?
+         m_configuration.comboKey : CEC_USER_CONTROL_CODE_STOP);
+     uint32_t iTimeoutMs(m_configuration.clientVersion >= LIBCEC_VERSION_TO_UINT(2, 0, 5) ?
+         m_configuration.iComboKeyTimeoutMs : CEC_DEFAULT_COMBO_TIMEOUT_MS);
+ 
+     if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN &&
+-          ((m_iCurrentButton == comboKey && iTimeoutMs > 0 && iNow - m_buttontime > iTimeoutMs) ||
+-          (m_iCurrentButton != comboKey && iNow - m_buttontime > CEC_BUTTON_TIMEOUT)))
++          ((m_iCurrentButton == comboKey && iTimeoutMs > 0 && iNow - m_updateButtontime > iTimeoutMs) ||
++          (m_iCurrentButton != comboKey && iNow - m_updateButtontime > CEC_BUTTON_TIMEOUT)))
+     {
+-      key.duration = (unsigned int) (iNow - m_buttontime);
++      key.duration = (unsigned int) (iNow - m_initialButtontime);
+       key.keycode = m_iCurrentButton;
+ 
+       m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN;
+-      m_buttontime = 0;
++      m_initialButtontime = 0;
++      m_updateButtontime = 0;
+     }
+     else
+     {
+       // time when this keypress will be released and we'd like to be called again
+       unsigned int timeout = CEC_PROCESSOR_SIGNAL_WAIT_TIME;
+       if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN && m_iCurrentButton == comboKey && iTimeoutMs > 0)
+-        timeout = iTimeoutMs - (iNow - m_buttontime) + 1;
++        timeout = iTimeoutMs - (iNow - m_updateButtontime) + 1;
+       else if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN && m_iCurrentButton != comboKey)
+-        timeout = CEC_BUTTON_TIMEOUT - (iNow - m_buttontime) + 1;
++        timeout = CEC_BUTTON_TIMEOUT - (iNow - m_updateButtontime) + 1;
+       if (timeout > CEC_PROCESSOR_SIGNAL_WAIT_TIME)
+       {
+-        LIB_CEC->AddLog(CEC_LOG_ERROR, "Unexpected timeout: %d (%.3f %.3f %.3f) k:%02x", timeout, iNow*1e-3, m_buttontime*1e-3, CEC_BUTTON_TIMEOUT*1e-3, m_iCurrentButton);
++        LIB_CEC->AddLog(CEC_LOG_ERROR, "Unexpected timeout: %d (%.3f %.3f %.3f) k:%02x", timeout, iNow*1e-3, m_updateButtontime*1e-3, CEC_BUTTON_TIMEOUT*1e-3, m_iCurrentButton);
+         timeout = CEC_PROCESSOR_SIGNAL_WAIT_TIME;
+       }
+       return timeout;
+diff --git a/src/libcec/CECClient.h b/src/libcec/CECClient.h
+index c9ce5e3..611c68b 100644
+--- a/src/libcec/CECClient.h
++++ b/src/libcec/CECClient.h
+@@ -404,7 +404,8 @@ namespace CEC
+     PLATFORM::CMutex      m_mutex;                             /**< mutex for changes to this instance */
+     PLATFORM::CMutex      m_cbMutex;                           /**< mutex that is held when doing anything with callbacks */
+     cec_user_control_code m_iCurrentButton;                    /**< the control code of the button that's currently held down (if any) */
+-    int64_t               m_buttontime;                        /**< the timestamp when the button was pressed (in seconds since epoch), or 0 if none was pressed. */
++    int64_t               m_initialButtontime;                 /**< the timestamp when the button was initially pressed (in seconds since epoch), or 0 if none was pressed. */
++    int64_t               m_updateButtontime;                  /**< the timestamp when the button was updated (in seconds since epoch), or 0 if none was pressed. */
+     int64_t               m_iPreventForwardingPowerOffCommand; /**< prevent forwarding standby commands until this time */
+     int64_t               m_iLastKeypressTime;                 /**< last time a key press was sent to the client */
+     cec_keypress          m_lastKeypress;                      /**< the last key press that was sent to the client */
+-- 
+1.9.1
+
+
+From 273ead6980b69eddf98810eb1eb33d94a7d74fce Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Tue, 28 Oct 2014 00:09:18 +0000
+Subject: [PATCH 3/6] Support repeating button presses with configurable repeat
+ rate
+
+---
+ include/cectypes.h                               |   6 ++
+ src/libcec/CECClient.cpp                         | 100 +++++++++++++++++++----
+ src/libcec/CECClient.h                           |   6 +-
+ src/libcec/implementations/CECCommandHandler.cpp |   2 +-
+ 4 files changed, 96 insertions(+), 18 deletions(-)
+
+diff --git a/include/cectypes.h b/include/cectypes.h
+index acff259..8f098ef 100644
+--- a/include/cectypes.h
++++ b/include/cectypes.h
+@@ -1493,6 +1493,8 @@ struct libcec_configuration
+                                                    XXX changed meaning in 2.2.0 to not break binary compatibility. next major (3.0) release will fix it in a nicer way */
+   cec_user_control_code comboKey;             /*!< key code that initiates combo keys. defaults to CEC_USER_CONTROL_CODE_F1_BLUE. CEC_USER_CONTROL_CODE_UNKNOWN to disable. added in 2.0.5 */
+   uint32_t              iComboKeyTimeoutMs;   /*!< timeout until the combo key is sent as normal keypress */
++  uint32_t              iButtonRepeatRateMs;  /*!< rate at which buttons autorepeat. 0 means rely on CEC device */
++  uint32_t              iButtonReleaseDelayMs;/*!< duration after last update until a button is considered released */
+ 
+ #ifdef __cplusplus
+    libcec_configuration(void) { Clear(); }
+@@ -1527,6 +1529,8 @@ struct libcec_configuration
+                  cecVersion                == other.cecVersion &&
+                  adapterType               == other.adapterType &&
+                  iDoubleTapTimeout50Ms     == other.iDoubleTapTimeout50Ms &&
++                 iButtonRepeatRateMs       == other.iButtonRepeatRateMs &&
++                 iButtonReleaseDelayMs     == other.iButtonReleaseDelayMs &&
+                  (other.clientVersion <= LIBCEC_VERSION_TO_UINT(2, 0, 4) || comboKey            == other.comboKey) &&
+                  (other.clientVersion <= LIBCEC_VERSION_TO_UINT(2, 0, 4) || iComboKeyTimeoutMs  == other.iComboKeyTimeoutMs) &&
+                  (other.clientVersion <  LIBCEC_VERSION_TO_UINT(2, 1, 0) || bPowerOnScreensaver == other.bPowerOnScreensaver));
+@@ -1567,6 +1571,8 @@ struct libcec_configuration
+     iDoubleTapTimeout50Ms =           CEC_DOUBLE_TAP_TIMEOUT_50_MS;
+     comboKey =                        CEC_USER_CONTROL_CODE_STOP;
+     iComboKeyTimeoutMs =              CEC_DEFAULT_COMBO_TIMEOUT_MS;
++    iButtonRepeatRateMs =             0;
++    iButtonReleaseDelayMs =           CEC_BUTTON_TIMEOUT;
+ 
+     memset(strDeviceName, 0, 13);
+     deviceTypes.Clear();
+diff --git a/src/libcec/CECClient.cpp b/src/libcec/CECClient.cpp
+index e7935b9..598628d 100644
+--- a/src/libcec/CECClient.cpp
++++ b/src/libcec/CECClient.cpp
+@@ -56,6 +56,10 @@ CCECClient::CCECClient(CCECProcessor *processor, const libcec_configuration &con
+     m_iCurrentButton(CEC_USER_CONTROL_CODE_UNKNOWN),
+     m_initialButtontime(0),
+     m_updateButtontime(0),
++    m_repeatButtontime(0),
++    m_releaseButtontime(0),
++    m_pressedButtoncount(0),
++    m_releasedButtoncount(0),
+     m_iPreventForwardingPowerOffCommand(0),
+     m_iLastKeypressTime(0)
+ {
+@@ -851,6 +855,9 @@ bool CCECClient::GetCurrentConfiguration(libcec_configuration &configuration)
+   configuration.bMonitorOnly              = m_configuration.bMonitorOnly;
+   configuration.cecVersion                = m_configuration.cecVersion;
+   configuration.adapterType               = m_configuration.adapterType;
++  configuration.iDoubleTapTimeout50Ms     = m_configuration.iDoubleTapTimeout50Ms;
++  configuration.iButtonRepeatRateMs       = m_configuration.iButtonRepeatRateMs;
++  configuration.iButtonReleaseDelayMs     = m_configuration.iButtonReleaseDelayMs;
+ 
+   return true;
+ }
+@@ -894,6 +901,9 @@ bool CCECClient::SetConfiguration(const libcec_configuration &configuration)
+     m_configuration.cecVersion                 = configuration.cecVersion;
+     m_configuration.adapterType                = configuration.adapterType;
+     m_configuration.iDoubleTapTimeout50Ms      = configuration.iDoubleTapTimeout50Ms;
++    m_configuration.iButtonRepeatRateMs        = configuration.iButtonRepeatRateMs;
++    m_configuration.iButtonReleaseDelayMs      = configuration.iButtonReleaseDelayMs;
++
+     m_configuration.deviceTypes.Add(configuration.deviceTypes[0]);
+ 
+     if (m_configuration.clientVersion >= LIBCEC_VERSION_TO_UINT(2, 0, 5))
+@@ -950,6 +960,7 @@ bool CCECClient::SetConfiguration(const libcec_configuration &configuration)
+     primary->ActivateSource();
+   }
+ 
++  LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: %d:%d:%d", __FUNCTION__, DoubleTapTimeoutMS(), m_configuration.iButtonRepeatRateMs, m_configuration.iButtonReleaseDelayMs);
+   return true;
+ }
+ 
+@@ -973,11 +984,15 @@ void CCECClient::AddCommand(const cec_command &command)
+   }
+ }
+ 
+-void CCECClient::AddKey(bool bSendComboKey /* = false */)
++void CCECClient::AddKey(bool bSendComboKey /* = false */, bool bButtonRelease /* = false */)
+ {
+   cec_keypress key;
+   key.keycode = CEC_USER_CONTROL_CODE_UNKNOWN;
+ 
++  // we ignore button releases when supporting repeating keys
++  if (bButtonRelease && m_configuration.iButtonRepeatRateMs && m_configuration.iButtonReleaseDelayMs)
++    return;
++
+   {
+     CLockObject lock(m_mutex);
+     if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN)
+@@ -995,6 +1010,10 @@ void CCECClient::AddKey(bool bSendComboKey /* = false */)
+         m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN;
+         m_initialButtontime = 0;
+         m_updateButtontime = 0;
++        m_repeatButtontime = 0;
++        m_releaseButtontime = 0;
++        m_pressedButtoncount = 0;
++        m_releasedButtoncount = 0;
+       }
+     }
+   }
+@@ -1012,6 +1031,7 @@ void CCECClient::AddKey(const cec_keypress &key)
+       key.keycode < CEC_USER_CONTROL_CODE_SELECT)
+   {
+     // send back the previous key if there is one
++    LIB_CEC->AddLog(CEC_LOG_DEBUG, "Unexpected key %s (%1x) D:%dms", ToString(key.keycode), key.keycode, key.duration);
+     AddKey();
+     return;
+   }
+@@ -1035,7 +1055,10 @@ void CCECClient::AddKey(const cec_keypress &key)
+         transmitKey.keycode = CEC_USER_CONTROL_CODE_DOT;
+       // default, send back the previous key
+       else
++      {
++        LIB_CEC->AddLog(CEC_LOG_DEBUG, "Combo key %s (%1x) D%dms:", ToString(key.keycode), key.keycode, key.duration);
+         AddKey(true);
++      }
+     }
+ 
+     LIB_CEC->AddLog(CEC_LOG_DEBUG, "key pressed: %s (%1x) current(%lx) duration(%d)", ToString(transmitKey.keycode), transmitKey.keycode, m_iCurrentButton, key.duration);
+@@ -1043,17 +1066,44 @@ void CCECClient::AddKey(const cec_keypress &key)
+     if (m_iCurrentButton == key.keycode)
+     {
+       m_updateButtontime = GetTimeMs();
+-      isrepeat = true;
++      m_releaseButtontime = m_updateButtontime + (m_configuration.iButtonReleaseDelayMs ? m_configuration.iButtonReleaseDelayMs : CEC_BUTTON_TIMEOUT);
++      // want to have seen some updated before considering a repeat
++      if (m_configuration.iButtonRepeatRateMs)
++      {
++        if (!m_repeatButtontime && m_pressedButtoncount > 1)
++          m_repeatButtontime = m_initialButtontime + DoubleTapTimeoutMS();
++        isrepeat = true;
++      }
++      m_pressedButtoncount++;
+     }
+     else
+     {
+       if (m_iCurrentButton != transmitKey.keycode)
++      {
++        LIB_CEC->AddLog(CEC_LOG_DEBUG, "Changed key %s (%1x) D:%dms cur:%lx", ToString(transmitKey.keycode), transmitKey.keycode, transmitKey.duration, m_iCurrentButton);
+         AddKey();
++      }
+       if (key.duration == 0)
+       {
+         m_iCurrentButton = transmitKey.keycode;
+-        m_initialButtontime = m_iCurrentButton == CEC_USER_CONTROL_CODE_UNKNOWN || key.duration > 0 ? 0 : GetTimeMs();
+-        m_updateButtontime = m_initialButtontime;
++        if (m_iCurrentButton == CEC_USER_CONTROL_CODE_UNKNOWN)
++        {
++          m_initialButtontime = 0;
++          m_updateButtontime = 0;
++          m_repeatButtontime = 0;
++          m_releaseButtontime = 0;
++          m_pressedButtoncount = 0;
++          m_releasedButtoncount = 0;
++        }
++        else
++        {
++          m_initialButtontime = GetTimeMs();
++          m_updateButtontime = m_initialButtontime;
++          m_repeatButtontime = 0; // set this on next update
++          m_releaseButtontime = m_initialButtontime + (m_configuration.iButtonReleaseDelayMs ? m_configuration.iButtonReleaseDelayMs : CEC_BUTTON_TIMEOUT);
++          m_pressedButtoncount = 1;
++          m_releasedButtoncount = 0;
++        }
+       }
+     }
+   }
+@@ -1072,12 +1122,16 @@ void CCECClient::SetCurrentButton(const cec_user_control_code iButtonCode)
+   key.duration = 0;
+   key.keycode = iButtonCode;
+ 
++  LIB_CEC->AddLog(CEC_LOG_DEBUG, "SetCurrentButton %s (%1x) D:%dms cur:%lx", ToString(key.keycode), key.keycode, key.duration);
+   AddKey(key);
+ }
+ 
+ uint16_t CCECClient::CheckKeypressTimeout(void)
+ {
++  // time when we'd like to be called again
++  unsigned int timeout = CEC_PROCESSOR_SIGNAL_WAIT_TIME;
+   cec_keypress key;
++  key.keycode = CEC_USER_CONTROL_CODE_UNKNOWN;
+ 
+   {
+     CLockObject lock(m_mutex);
+@@ -1089,8 +1143,8 @@ uint16_t CCECClient::CheckKeypressTimeout(void)
+         m_configuration.iComboKeyTimeoutMs : CEC_DEFAULT_COMBO_TIMEOUT_MS);
+ 
+     if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN &&
+-          ((m_iCurrentButton == comboKey && iTimeoutMs > 0 && iNow - m_updateButtontime > iTimeoutMs) ||
+-          (m_iCurrentButton != comboKey && iNow - m_updateButtontime > CEC_BUTTON_TIMEOUT)))
++          ((m_iCurrentButton == comboKey && iTimeoutMs > 0 && iNow - m_updateButtontime >= iTimeoutMs) ||
++          (m_iCurrentButton != comboKey && m_releaseButtontime && iNow >= (uint64_t)m_releaseButtontime)))
+     {
+       key.duration = (unsigned int) (iNow - m_initialButtontime);
+       key.keycode = m_iCurrentButton;
+@@ -1098,27 +1152,41 @@ uint16_t CCECClient::CheckKeypressTimeout(void)
+       m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN;
+       m_initialButtontime = 0;
+       m_updateButtontime = 0;
++      m_repeatButtontime = 0;
++      m_releaseButtontime = 0;
++      m_pressedButtoncount = 0;
++      m_releasedButtoncount = 0;
++    }
++    else if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN &&
++          (m_iCurrentButton != comboKey && m_repeatButtontime && iNow >= (uint64_t)m_repeatButtontime))
++    {
++      key.duration = 0;
++      key.keycode = m_iCurrentButton;
++      m_repeatButtontime = iNow + m_configuration.iButtonRepeatRateMs;
++      timeout = std::min((uint64_t)timeout, m_repeatButtontime - iNow);
+     }
+     else
+     {
+-      // time when this keypress will be released and we'd like to be called again
+-      unsigned int timeout = CEC_PROCESSOR_SIGNAL_WAIT_TIME;
+       if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN && m_iCurrentButton == comboKey && iTimeoutMs > 0)
+-        timeout = iTimeoutMs - (iNow - m_updateButtontime) + 1;
+-      else if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN && m_iCurrentButton != comboKey)
+-        timeout = CEC_BUTTON_TIMEOUT - (iNow - m_updateButtontime) + 1;
++        timeout = std::min((uint64_t)timeout, m_updateButtontime - iNow + iTimeoutMs);
++      if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN && m_iCurrentButton != comboKey && m_releaseButtontime)
++        timeout = std::min((uint64_t)timeout, m_releaseButtontime - iNow);
++      if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN && m_iCurrentButton != comboKey && m_repeatButtontime)
++        timeout = std::min((uint64_t)timeout, m_repeatButtontime - iNow);
+       if (timeout > CEC_PROCESSOR_SIGNAL_WAIT_TIME)
+       {
+-        LIB_CEC->AddLog(CEC_LOG_ERROR, "Unexpected timeout: %d (%.3f %.3f %.3f) k:%02x", timeout, iNow*1e-3, m_updateButtontime*1e-3, CEC_BUTTON_TIMEOUT*1e-3, m_iCurrentButton);
++        LIB_CEC->AddLog(CEC_LOG_ERROR, "Unexpected timeout: %d (%.3f %.3f %.3f) k:%02x", timeout, iNow*1e-3, m_updateButtontime*1e-3, m_releaseButtontime*1e-3, m_iCurrentButton);
+         timeout = CEC_PROCESSOR_SIGNAL_WAIT_TIME;
+       }
+-      return timeout;
+     }
++    LIB_CEC->AddLog(CEC_LOG_DEBUG, "key %s: %s (%1x) timeout:%dms (rel:%d,rep:%d,prs:%d,rel:%d)", key.keycode == CEC_USER_CONTROL_CODE_UNKNOWN ? "idle" : key.duration ? "released" : "repeated",
++        ToString(m_iCurrentButton), m_iCurrentButton, timeout, (int)(m_releaseButtontime ? m_releaseButtontime - iNow : 0), (int)(m_repeatButtontime ? m_repeatButtontime - iNow : 0), m_pressedButtoncount, m_releasedButtoncount);
+   }
+ 
+-  LIB_CEC->AddLog(CEC_LOG_DEBUG, "key auto-released: %s (%1x)", ToString(key.keycode), key.keycode);
+-  QueueAddKey(key);
+-  return CEC_PROCESSOR_SIGNAL_WAIT_TIME;
++  if (key.keycode != CEC_USER_CONTROL_CODE_UNKNOWN)
++    QueueAddKey(key);
++
++  return timeout;
+ }
+ 
+ bool CCECClient::EnableCallbacks(void *cbParam, ICECCallbacks *callbacks)
+diff --git a/src/libcec/CECClient.h b/src/libcec/CECClient.h
+index 611c68b..adeb5af 100644
+--- a/src/libcec/CECClient.h
++++ b/src/libcec/CECClient.h
+@@ -269,7 +269,7 @@ namespace CEC
+     // callbacks
+     virtual void                  Alert(const libcec_alert type, const libcec_parameter &param) { QueueAlert(type, param); }
+     virtual void                  AddLog(const cec_log_message &message) { QueueAddLog(message); }
+-    virtual void                  AddKey(bool bSendComboKey = false);
++    virtual void                  AddKey(bool bSendComboKey = false, bool bButtonRelease = false);
+     virtual void                  AddKey(const cec_keypress &key);
+     virtual void                  SetCurrentButton(const cec_user_control_code iButtonCode);
+     virtual uint16_t              CheckKeypressTimeout(void);
+@@ -406,6 +406,10 @@ namespace CEC
+     cec_user_control_code m_iCurrentButton;                    /**< the control code of the button that's currently held down (if any) */
+     int64_t               m_initialButtontime;                 /**< the timestamp when the button was initially pressed (in seconds since epoch), or 0 if none was pressed. */
+     int64_t               m_updateButtontime;                  /**< the timestamp when the button was updated (in seconds since epoch), or 0 if none was pressed. */
++    int64_t               m_repeatButtontime;                  /**< the timestamp when the button will next repeat (in seconds since epoch), or 0 if repeat is disabled. */
++    int64_t               m_releaseButtontime;                 /**< the timestamp when the button will be released (in seconds since epoch), or 0 if none was pressed. */
++    int32_t               m_pressedButtoncount;                /**< the number of times a button released message has been seen for this press. */
++    int32_t               m_releasedButtoncount;               /**< the number of times a button pressed message has been seen for this press. */
+     int64_t               m_iPreventForwardingPowerOffCommand; /**< prevent forwarding standby commands until this time */
+     int64_t               m_iLastKeypressTime;                 /**< last time a key press was sent to the client */
+     cec_keypress          m_lastKeypress;                      /**< the last key press that was sent to the client */
+diff --git a/src/libcec/implementations/CECCommandHandler.cpp b/src/libcec/implementations/CECCommandHandler.cpp
+index 6d6244e..d64186f 100644
+--- a/src/libcec/implementations/CECCommandHandler.cpp
++++ b/src/libcec/implementations/CECCommandHandler.cpp
+@@ -770,7 +770,7 @@ int CCECCommandHandler::HandleUserControlRelease(const cec_command &command)
+ 
+   CECClientPtr client = m_processor->GetClient(command.destination);
+   if (client)
+-    client->AddKey();
++    client->AddKey(false, true);
+ 
+   return COMMAND_HANDLED;
+ }
+-- 
+1.9.1
+
+
+From 3336d0827f7fd159430f3431642b07090c06c869 Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Tue, 28 Oct 2014 01:21:35 +0000
+Subject: [PATCH 4/6] Skip double press removal. It is handled through other
+ means.
+
+---
+ src/libcec/CECClient.cpp | 18 +-----------------
+ src/libcec/CECClient.h   |  2 --
+ 2 files changed, 1 insertion(+), 19 deletions(-)
+
+diff --git a/src/libcec/CECClient.cpp b/src/libcec/CECClient.cpp
+index 598628d..dccd874 100644
+--- a/src/libcec/CECClient.cpp
++++ b/src/libcec/CECClient.cpp
+@@ -60,11 +60,8 @@ CCECClient::CCECClient(CCECProcessor *processor, const libcec_configuration &con
+     m_releaseButtontime(0),
+     m_pressedButtoncount(0),
+     m_releasedButtoncount(0),
+-    m_iPreventForwardingPowerOffCommand(0),
+-    m_iLastKeypressTime(0)
++    m_iPreventForwardingPowerOffCommand(0)
+ {
+-  m_lastKeypress.keycode = CEC_USER_CONTROL_CODE_UNKNOWN;
+-  m_lastKeypress.duration = 0;
+   m_configuration.Clear();
+   // set the initial configuration
+   SetConfiguration(configuration);
+@@ -1647,20 +1644,7 @@ void CCECClient::CallbackAddKey(const cec_keypress &key)
+ {
+   CLockObject lock(m_cbMutex);
+   if (m_configuration.callbacks && m_configuration.callbacks->CBCecKeyPress)
+-  {
+-    // prevent double taps
+-    int64_t now = GetTimeMs();
+-    if (m_lastKeypress.keycode != key.keycode ||
+-        key.duration > 0 ||
+-        now - m_iLastKeypressTime >= DoubleTapTimeoutMS())
+-    {
+-      // no double tap
+-      if (key.duration == 0)
+-        m_iLastKeypressTime = now;
+-      m_lastKeypress = key;
+       m_configuration.callbacks->CBCecKeyPress(m_configuration.callbackParam, key);
+-    }
+-  }
+ }
+ 
+ void CCECClient::CallbackAddLog(const cec_log_message &message)
+diff --git a/src/libcec/CECClient.h b/src/libcec/CECClient.h
+index adeb5af..43a713b 100644
+--- a/src/libcec/CECClient.h
++++ b/src/libcec/CECClient.h
+@@ -411,8 +411,6 @@ namespace CEC
+     int32_t               m_pressedButtoncount;                /**< the number of times a button released message has been seen for this press. */
+     int32_t               m_releasedButtoncount;               /**< the number of times a button pressed message has been seen for this press. */
+     int64_t               m_iPreventForwardingPowerOffCommand; /**< prevent forwarding standby commands until this time */
+-    int64_t               m_iLastKeypressTime;                 /**< last time a key press was sent to the client */
+-    cec_keypress          m_lastKeypress;                      /**< the last key press that was sent to the client */
+     PLATFORM::SyncedBuffer<CCallbackWrap*> m_callbackCalls;
+   };
+ }
+-- 
+1.9.1
+
+
+From 0dd0234f620a546bfa843172648383f83d88088c Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Mon, 3 Nov 2014 23:28:04 +0000
+Subject: [PATCH 5/6] Pass through duration on all button repeats
+
+---
+ src/libcec/CECClient.cpp | 34 ++++++++++++++++++++++++----------
+ 1 file changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/src/libcec/CECClient.cpp b/src/libcec/CECClient.cpp
+index dccd874..1946148 100644
+--- a/src/libcec/CECClient.cpp
++++ b/src/libcec/CECClient.cpp
+@@ -986,10 +986,6 @@ void CCECClient::AddKey(bool bSendComboKey /* = false */, bool bButtonRelease /*
+   cec_keypress key;
+   key.keycode = CEC_USER_CONTROL_CODE_UNKNOWN;
+ 
+-  // we ignore button releases when supporting repeating keys
+-  if (bButtonRelease && m_configuration.iButtonRepeatRateMs && m_configuration.iButtonReleaseDelayMs)
+-    return;
+-
+   {
+     CLockObject lock(m_mutex);
+     if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN)
+@@ -1015,6 +1011,10 @@ void CCECClient::AddKey(bool bSendComboKey /* = false */, bool bButtonRelease /*
+     }
+   }
+ 
++  // we don't forward releases when supporting repeating keys
++  if (bButtonRelease && m_configuration.iButtonRepeatRateMs)
++    return;
++
+   if (key.keycode != CEC_USER_CONTROL_CODE_UNKNOWN)
+   {
+     LIB_CEC->AddLog(CEC_LOG_DEBUG, "key released: %s (%1x) D:%dms", ToString(key.keycode), key.keycode, key.duration);
+@@ -1107,7 +1107,7 @@ void CCECClient::AddKey(const cec_keypress &key)
+ 
+   if (!isrepeat && (key.keycode != comboKey || key.duration > 0))
+   {
+-    LIB_CEC->AddLog(CEC_LOG_DEBUG, "key pressed: %s (%1x)", ToString(transmitKey.keycode), transmitKey.keycode);
++    LIB_CEC->AddLog(CEC_LOG_DEBUG, "key pressed: %s (%1x, %d)", ToString(transmitKey.keycode), transmitKey.keycode, transmitKey.duration);
+     QueueAddKey(transmitKey);
+   }
+ }
+@@ -1129,6 +1129,7 @@ uint16_t CCECClient::CheckKeypressTimeout(void)
+   unsigned int timeout = CEC_PROCESSOR_SIGNAL_WAIT_TIME;
+   cec_keypress key;
+   key.keycode = CEC_USER_CONTROL_CODE_UNKNOWN;
++  key.duration = 0;
+ 
+   {
+     CLockObject lock(m_mutex);
+@@ -1140,8 +1141,7 @@ uint16_t CCECClient::CheckKeypressTimeout(void)
+         m_configuration.iComboKeyTimeoutMs : CEC_DEFAULT_COMBO_TIMEOUT_MS);
+ 
+     if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN &&
+-          ((m_iCurrentButton == comboKey && iTimeoutMs > 0 && iNow - m_updateButtontime >= iTimeoutMs) ||
+-          (m_iCurrentButton != comboKey && m_releaseButtontime && iNow >= (uint64_t)m_releaseButtontime)))
++          m_iCurrentButton == comboKey && iTimeoutMs > 0 && iNow - m_updateButtontime >= iTimeoutMs)
+     {
+       key.duration = (unsigned int) (iNow - m_initialButtontime);
+       key.keycode = m_iCurrentButton;
+@@ -1155,9 +1155,23 @@ uint16_t CCECClient::CheckKeypressTimeout(void)
+       m_releasedButtoncount = 0;
+     }
+     else if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN &&
++          m_iCurrentButton != comboKey && m_releaseButtontime && iNow >= (uint64_t)m_releaseButtontime)
++    {
++      key.duration = (unsigned int) (iNow - m_initialButtontime);
++      key.keycode = CEC_USER_CONTROL_CODE_UNKNOWN;
++
++      m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN;
++      m_initialButtontime = 0;
++      m_updateButtontime = 0;
++      m_repeatButtontime = 0;
++      m_releaseButtontime = 0;
++      m_pressedButtoncount = 0;
++      m_releasedButtoncount = 0;
++    }
++    else if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN &&
+           (m_iCurrentButton != comboKey && m_repeatButtontime && iNow >= (uint64_t)m_repeatButtontime))
+     {
+-      key.duration = 0;
++      key.duration = (unsigned int) (iNow - m_initialButtontime);
+       key.keycode = m_iCurrentButton;
+       m_repeatButtontime = iNow + m_configuration.iButtonRepeatRateMs;
+       timeout = std::min((uint64_t)timeout, m_repeatButtontime - iNow);
+@@ -1176,8 +1190,8 @@ uint16_t CCECClient::CheckKeypressTimeout(void)
+         timeout = CEC_PROCESSOR_SIGNAL_WAIT_TIME;
+       }
+     }
+-    LIB_CEC->AddLog(CEC_LOG_DEBUG, "key %s: %s (%1x) timeout:%dms (rel:%d,rep:%d,prs:%d,rel:%d)", key.keycode == CEC_USER_CONTROL_CODE_UNKNOWN ? "idle" : key.duration ? "released" : "repeated",
+-        ToString(m_iCurrentButton), m_iCurrentButton, timeout, (int)(m_releaseButtontime ? m_releaseButtontime - iNow : 0), (int)(m_repeatButtontime ? m_repeatButtontime - iNow : 0), m_pressedButtoncount, m_releasedButtoncount);
++    LIB_CEC->AddLog(CEC_LOG_DEBUG, "Key %s: %s (duration:%d) (%1x) timeout:%dms (rel:%d,rep:%d,prs:%d,rel:%d)", ToString(m_iCurrentButton), key.keycode == CEC_USER_CONTROL_CODE_UNKNOWN ? "idle" : m_repeatButtontime ? "repeated" : "released", key.duration,
++        m_iCurrentButton, timeout, (int)(m_releaseButtontime ? m_releaseButtontime - iNow : 0), (int)(m_repeatButtontime ? m_repeatButtontime - iNow : 0), m_pressedButtoncount, m_releasedButtoncount);
+   }
+ 
+   if (key.keycode != CEC_USER_CONTROL_CODE_UNKNOWN)
+-- 
+1.9.1
+
+
+From 1ea01f59d8186d4d53af41961aaccbbc11651115 Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Wed, 5 Nov 2014 21:04:25 +0000
+Subject: [PATCH 6/6] squash: Fix for stop needing to be pressed twice
+
+---
+ src/libcec/CECClient.cpp | 17 ++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/src/libcec/CECClient.cpp b/src/libcec/CECClient.cpp
+index 1946148..f4f114b 100644
+--- a/src/libcec/CECClient.cpp
++++ b/src/libcec/CECClient.cpp
+@@ -1131,6 +1131,8 @@ uint16_t CCECClient::CheckKeypressTimeout(void)
+   key.keycode = CEC_USER_CONTROL_CODE_UNKNOWN;
+   key.duration = 0;
+ 
++  if (m_iCurrentButton == CEC_USER_CONTROL_CODE_UNKNOWN)
++    return timeout;
+   {
+     CLockObject lock(m_mutex);
+     uint64_t iNow = GetTimeMs();
+@@ -1140,8 +1142,7 @@ uint16_t CCECClient::CheckKeypressTimeout(void)
+     uint32_t iTimeoutMs(m_configuration.clientVersion >= LIBCEC_VERSION_TO_UINT(2, 0, 5) ?
+         m_configuration.iComboKeyTimeoutMs : CEC_DEFAULT_COMBO_TIMEOUT_MS);
+ 
+-    if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN &&
+-          m_iCurrentButton == comboKey && iTimeoutMs > 0 && iNow - m_updateButtontime >= iTimeoutMs)
++    if (m_iCurrentButton == comboKey && iTimeoutMs > 0 && iNow - m_updateButtontime >= iTimeoutMs)
+     {
+       key.duration = (unsigned int) (iNow - m_initialButtontime);
+       key.keycode = m_iCurrentButton;
+@@ -1154,8 +1155,7 @@ uint16_t CCECClient::CheckKeypressTimeout(void)
+       m_pressedButtoncount = 0;
+       m_releasedButtoncount = 0;
+     }
+-    else if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN &&
+-          m_iCurrentButton != comboKey && m_releaseButtontime && iNow >= (uint64_t)m_releaseButtontime)
++    else if (m_iCurrentButton != comboKey && m_releaseButtontime && iNow >= (uint64_t)m_releaseButtontime)
+     {
+       key.duration = (unsigned int) (iNow - m_initialButtontime);
+       key.keycode = CEC_USER_CONTROL_CODE_UNKNOWN;
+@@ -1168,8 +1168,7 @@ uint16_t CCECClient::CheckKeypressTimeout(void)
+       m_pressedButtoncount = 0;
+       m_releasedButtoncount = 0;
+     }
+-    else if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN &&
+-          (m_iCurrentButton != comboKey && m_repeatButtontime && iNow >= (uint64_t)m_repeatButtontime))
++    else if (m_iCurrentButton != comboKey && m_repeatButtontime && iNow >= (uint64_t)m_repeatButtontime)
+     {
+       key.duration = (unsigned int) (iNow - m_initialButtontime);
+       key.keycode = m_iCurrentButton;
+@@ -1178,11 +1177,11 @@ uint16_t CCECClient::CheckKeypressTimeout(void)
+     }
+     else
+     {
+-      if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN && m_iCurrentButton == comboKey && iTimeoutMs > 0)
++      if (m_iCurrentButton == comboKey && iTimeoutMs > 0)
+         timeout = std::min((uint64_t)timeout, m_updateButtontime - iNow + iTimeoutMs);
+-      if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN && m_iCurrentButton != comboKey && m_releaseButtontime)
++      if (m_iCurrentButton != comboKey && m_releaseButtontime)
+         timeout = std::min((uint64_t)timeout, m_releaseButtontime - iNow);
+-      if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN && m_iCurrentButton != comboKey && m_repeatButtontime)
++      if (m_iCurrentButton != comboKey && m_repeatButtontime)
+         timeout = std::min((uint64_t)timeout, m_repeatButtontime - iNow);
+       if (timeout > CEC_PROCESSOR_SIGNAL_WAIT_TIME)
+       {
+-- 
+1.9.1
+

packages/devel/libffi/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libffi"
-PKG_VERSION="3.1"
+PKG_VERSION="3.2.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/mpfr/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="mpfr"
-PKG_VERSION="3.1.2"
+PKG_VERSION="3.1.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/devel/pkg-config/patches/pkg-config-01_rebuild.patch

@@ -0,0 +1,26 @@
+diff --git a/Makefile.am b/Makefile.am
+index 41e48e8..7178ec8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -39,7 +39,7 @@ pkg_config_SOURCES= \
+ if HOST_TOOL
+ host_tool = $(host)-pkg-config$(EXEEXT)
+ install-exec-hook:
+-	cd $(DESTDIR)$(bindir) && $(LN) pkg-config$(EXEEXT) $(host_tool)
++	cd $(DESTDIR)$(bindir) && rm -f $(host_tool) && $(LN) pkg-config$(EXEEXT) $(host_tool)
+ uninstall-hook:
+ 	cd $(DESTDIR)$(bindir) && rm -f $(host_tool)
+ endif
+diff --git a/Makefile.in b/Makefile.in
+index a1ad77c..88a421c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1093,7 +1093,7 @@ uninstall-man: uninstall-man1
+ 	uninstall-man1
+ 
+ @HOST_TOOL_TRUE@install-exec-hook:
+-@HOST_TOOL_TRUE@	cd $(DESTDIR)$(bindir) && $(LN) pkg-config$(EXEEXT) $(host_tool)
++@HOST_TOOL_TRUE@	cd $(DESTDIR)$(bindir) && rm -f $(host_tool) && $(LN) pkg-config$(EXEEXT) $(host_tool)
+ @HOST_TOOL_TRUE@uninstall-hook:
+ @HOST_TOOL_TRUE@	cd $(DESTDIR)$(bindir) && rm -f $(host_tool)
+ 

packages/graphics/bcm2835-driver/package.mk

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

packages/graphics/ftgl/package.mk

@@ -16,26 +16,24 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="scons"
-PKG_VERSION="2.2.0"
+PKG_NAME="ftgl"
+PKG_VERSION="2.1.2"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.scons.org/"
-PKG_URL="$SOURCEFORGE_SRC/scons/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="Python:host"
+PKG_LICENSE="GPL"
+PKG_SITE="http://sourceforge.net/projects/ftgl/"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain freetype"
 PKG_PRIORITY="optional"
-PKG_SECTION="python/devel"
-PKG_SHORTDESC="SCons: an Open Source software construction tool—that is, a next-generation build tool."
-PKG_LONGDESC="SCons is an Open Source software construction tool—that is, a next-generation build tool."
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="ftgl:"
+PKG_LONGDESC="ftgl:"
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-make_host() {
- : # nothing todo
-}
-
-makeinstall_host() {
-  python setup.py install --prefix=$ROOT/$TOOLCHAIN
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DOUTPUT_DIR=$SYSROOT_PREFIX/usr \
+        ..
 }

packages/graphics/ftgl/patches/ftgl-01-cmake.patch

@@ -0,0 +1,35 @@
+From c6dea8249d50f1f463db6ca89bc582259c54b86a Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sat, 4 Jul 2015 12:42:40 +0300
+Subject: [PATCH] cmake
+
+---
+ CMakeLists.txt |   16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+ create mode 100644 CMakeLists.txt
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..18791c4
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,16 @@
++project(ftgl)
++
++cmake_minimum_required(VERSION 2.6)
++enable_language(CXX)
++
++include(ExternalProject)
++
++externalproject_add(ftgl
++                    SOURCE_DIR ${CMAKE_SOURCE_DIR}
++                    UPDATE_COMMAND cd unix && autoreconf -vif 
++                    CONFIGURE_COMMAND cd unix && CXXFLAGS=-fpermissive ./configure --prefix=${OUTPUT_DIR} --with-pic
++                    BUILD_COMMAND cd unix && make
++                    INSTALL_COMMAND ""
++                    BUILD_IN_SOURCE 1)
++
++install(CODE "execute_process(COMMAND make install WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/unix)")
+-- 
+1.7.10.4
+

packages/graphics/ftgl/patches/ftgl-01-ftgl-disable-docs.patch

@@ -0,0 +1,12 @@
+--- ftgl.orig/unix/Makefile	2014-08-04 17:21:22.210742862 +0200
++++ ftgl/unix/Makefile	2003-01-12 22:27:04.000000000 +0100
+@@ -1,7 +1,7 @@
+ top_builddir=.
+ -include $(top_builddir)/Make.conf
+ 
+-SUBDIRS = src demo docs
++SUBDIRS = src demo
+ 
+ AUTOGEN = Make.conf config.log config.status libtool autom4te.cache ftgl.pc
+ AUTOGEN_MAINT = aclocal.m4 acinclude.m4 config.guess config.sub configure ltmain.sh install-sh
+

packages/graphics/giflib/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="giflib"
-PKG_VERSION="5.0.5"
+PKG_VERSION="5.1.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/graphics/glfw/package.mk

@@ -0,0 +1,45 @@
+################################################################################
+#      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="glfw"
+PKG_VERSION="2.7.9"
+PKG_REV="1"
+PKG_ARCH="x86_64"
+PKG_LICENSE="BSD"
+PKG_SITE="http://glfw.org"
+PKG_URL="$SOURCEFORGE_SRC/glfw/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain mesa glu"
+PKG_PRIORITY="optional"
+PKG_SECTION="graphics"
+PKG_SHORTDESC="glfw:"
+PKG_LONGDESC="glfw:"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+if [ "$OPENGL" = "no" ] ; then
+  exit 0
+fi
+
+make_target() {
+  make x11 PREFIX=$SYSROOT_PREFIX/usr
+}
+
+makeinstall_target() {
+  make x11-install PREFIX=$SYSROOT_PREFIX/usr
+}

packages/graphics/libdrm/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libdrm"
-PKG_VERSION="2.4.60"
+PKG_VERSION="2.4.65"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -53,4 +53,5 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-udev \
                            $DRM_CONFIG \
                            --disable-install-test-programs \
                            --disable-cairo-tests \
-                           --disable-manpages"
+                           --disable-manpages \
+                           --disable-valgrind"

packages/graphics/libepoxy/package.mk

@@ -22,12 +22,12 @@
 # in Xorg.log
 
 PKG_NAME="libepoxy"
-PKG_VERSION="b2ae054"
+PKG_VERSION="1.3.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/anholt/libepoxy"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/anholt/libepoxy/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain $OPENGL"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"

packages/graphics/libjpeg-turbo/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libjpeg-turbo"
-PKG_VERSION="1.4.0"
+PKG_VERSION="1.4.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/graphics/libpng/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libpng"
-PKG_VERSION="1.6.16"
+PKG_VERSION="1.6.18"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/graphics/libprojectM/package.mk

@@ -0,0 +1,41 @@
+################################################################################
+#      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="libprojectM"
+PKG_VERSION="2.0.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://projectm.sourceforge.net/"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain ftgl"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="libprojectM:"
+PKG_LONGDESC="libprojectM:"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+        -DBUILD_PROJECTM_STATIC=1 \
+        ..
+}

packages/graphics/libprojectM/patches/libprojectM-01-pm-fix-freetype.patch

@@ -0,0 +1,38 @@
+--- projectm/cmake/FindFreetype2.orig.cmake	2013-07-17 11:47:46.844351322 +0200
++++ projectm/cmake/FindFreetype2.cmake	2013-07-17 11:48:14.912350387 +0200
+@@ -64,7 +64,7 @@
+       /sw/include/freetype2
+       ${VISUS_INCLUDE}
+       ${VISUS_INCLUDE}/freetype2
+-      NO_DEFAULT_PATH
++      #      NO_DEFAULT_PATH
+ )
+ 
+ FIND_PATH(FREETYPE2_FT2BUILD ft2build.h
+@@ -74,7 +74,7 @@
+       /usr/X11R6/include
+       /sw/include
+       ${VISUS_INCLUDE}
+-      NO_DEFAULT_PATH
++      #      NO_DEFAULT_PATH
+ )
+ 
+ FIND_PATH(FREETYPE2_FT_CONFIG bin/freetype-config
+@@ -84,7 +84,7 @@
+       /usr/X11R6
+       /sw/bin
+       ${VISUS_BINARY_DIR}
+-      NO_DEFAULT_PATH
++      #      NO_DEFAULT_PATH
+ )
+ 
+ IF (NOT WIN32)
+@@ -95,7 +95,7 @@
+       /usr/X11R6/lib
+       /sw/lib
+       ${VISUS_LIBRARIES}   
+-      NO_DEFAULT_PATH
++      #      NO_DEFAULT_PATH
+ )
+ 
+ ELSE (NOT WIN32)

packages/graphics/libprojectM/patches/libprojectM-02-fix-projectm-cmakelists.patch

@@ -0,0 +1,108 @@
+--- projectM-2.0.0-Source.orig/CMakeLists.txt	2009-12-01 07:38:42.000000000 +0100
++++ projectM-2.0.0-Source/CMakeLists.txt	2014-09-02 18:13:37.650948971 +0200
+@@ -18,6 +18,7 @@
+ 
+ cmake_policy(SET CMP0005 OLD)
+ 
++ADD_DEFINITIONS(-fPIC)
+ 
+ set( CMAKE_MODULE_PATH    ${CMAKE_MODULE_PATH}
+                           ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
+@@ -100,15 +101,6 @@
+ ADD_DEFINITIONS(-DUSE_FBO)
+ endif(USE_FBO)
+ 
+-if(USE_FTGL)
+-ADD_DEFINITIONS(-DUSE_FTGL)
+-
+-find_package( Freetype2 REQUIRED)
+-include_directories( ${FREETYPE2_INCLUDE_DIR} )
+-
+-endif(USE_FTGL)
+-
+-
+ if(COMMAND cmake_policy)
+        cmake_policy(SET CMP0003 NEW)
+ endif(COMMAND cmake_policy)
+@@ -138,58 +130,54 @@
+ 
+ add_subdirectory(Renderer)
+ 
+-#ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"") 
+-
+ FIND_PACKAGE(OpenGL)
+ 
+ INCLUDE(FindPkgConfig.cmake)
+ 
+-pkg_search_module (FTGL ftgl)
+-
+-#set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH};/opt/local/include;/Developer/SDKs/MACOSX10.5.sdk/usr/X11/include)
+-#set(CMAKE_LIBRARY_PATH /opt/local/lib;/Developer/SDKs/MACOSX10.5.sdk;/Developer/SDKs/MacOSX10.5.sdk/usr/X11/lib/)
+-
+ IF(USE_FTGL)
+-	if (FTGL_FOUND)
++        pkg_check_modules (FREETYPE freetype2)
++        if(FREETYPE_FOUND)
++                include(FindPackageHandleStandardArgs)
++                find_package_handle_standard_args(FREETYPE DEFAULT_MSG FREETYPE_INCLUDE_DIRS FREETYPE_LIBRARIES FREETYPE_LIBRARY_DIRS)
++                set(FREETYPE2_INCLUDE_DIR ${FREETYPE_INCLUDE_DIRS})
++                include_directories(${FREETYPE_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS}/include/freetype2)
++        endif()
++        message(STATUS "FREETYPE2_INCLUDE_DIR: ${FREETYPE2_INCLUDE_DIR}")
++
++	pkg_check_modules (FTGL ftgl)
++	if(FTGL_FOUND)
++		include(FindPackageHandleStandardArgs)
++		find_package_handle_standard_args(FTGL DEFAULT_MSG FTGL_INCLUDE_DIRS FTGL_LIBRARIES FTGL_LIBRARY_DIRS)
++		ADD_DEFINITIONS(-DUSE_FTGL)
++
+ 		MESSAGE(STATUS "[projectM] FTGL font support was detected and enabled.")
+ 	else (FTGL_FOUND)
+-		MESSAGE(STATUS 
+-	"[projectM] Warning! FTGL has been enabled but not detected. Your compilation will probably break. Turn off FTGL support by setting USE_FTGL to false, or visit http://ftgl.wiki.sourceforge.net/ for help on installing FTGL.")
++		MESSAGE(FATAL_ERROR "[projectM] Warning! FTGL has been enabled but not detected. Your compilation will probably break. Turn off FTGL support by setting USE_FTGL to false, or visit http://ftgl.wiki.sourceforge.net/ for help on installing FTGL.")
+ 	endif (FTGL_FOUND)
+ 	
+-	ADD_DEFINITIONS(-DUSE_FTGL)
+-	
+ 	set (FTGL_INCUDE_DIRS ${FTGL_INCLUDE_DIRS} ${CMAKE_INCLUDE_PATH} ${OPENGL_INCLUDE_DIR})
+-	set (FTGL_LINK_DIRS ${FTGL_LIBRARY_DIRS} )
++	set (FTGL_LINK_DIRS ${FTGL_LIBRARIES} )
++	set (FTGL_LINK_LIBS -L${FTGL_LIBRARY_DIRS} ${FTGL_LIBRARIES} -L${FREETYPE_LIBRARY_DIRS} ${FREETYPE_LIBRARIES})
+ 	set (FTGL_LINK_TARGETS ftgl freetype)
+ 	
+-ELSE (USE_FTGL)
+-	IF (FTGL_FOUND)
+-		MESSAGE(STATUS "[projectM] Warning: FTGL font support was detected but NOT enabled. You can enable it by setting USE_FTGL=true")
+-	ELSE (FTGL_FOUND)
+-		MESSAGE(STATUS "[projectM] Warning: FTGL font support was not detected. Visit http://ftgl.wiki.sourceforge.net/ for help on installing FTGL.")
+-	ENDIF(FTGL_FOUND)
+-	
+-	# todo: change this because its obscure and probably not being used
+-	set (FTGL_INCLUDE_DIRS "/opt/local/include")
+-	set (FTGL_LINK_DIRS )
+-	set (FTGL_LINK_TARGETS )
+ ENDIF(USE_FTGL)
+ 
+-
+ IF(USE_OPENMP)
+ 	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
+ 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+ ENDIF(USE_OPENMP)
+ 
+ INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${FTGL_INCLUDE_DIRS} ${Renderer_SOURCE_DIR} ${PRESET_FACTORY_SOURCES})
+-LINK_DIRECTORIES(${FTGL_LINK_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR})
++LINK_DIRECTORIES(${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR})
+ 
+ if(BUILD_PROJECTM_STATIC)
+-		TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
++message(STATUS "OPENGL_LIBRARIES: ${OPENGL_LIBRARIES}")
++	set(OPENGL_LIBRARIES "-lGLEW -lGLU -lGL -lm -ldl -ldrm -lXdamage -lX11-xcb -lxcb-glx -lxcb-dri2 -lxcb-dri3 -lxcb-present -lxcb-sync -lxshmfence -lXxf86vm -lXfixes -lXext -lX11 -lpthread -lxcb -lXau -lXdmcp")
++message(STATUS "OPENGL_LIBRARIES: ${OPENGL_LIBRARIES}")
++	TARGET_LINK_LIBRARIES(projectM Renderer ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} m ${FTGL_LINK_LIBS} ${OPENGL_LIBRARIES}  ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS})
+ else(BUILD_PROJECTM_STATIC)
+ 
+-TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES}  ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
++	TARGET_LINK_LIBRARIES(projectM Renderer ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} m dl ${FTGL_LINK_LIBS} ${OPENGL_LIBRARIES}  ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS})
+ 
+ endif(BUILD_PROJECTM_STATIC)

packages/graphics/libprojectM/patches/libprojectM-03-pm-remove-cache.patch

@@ -0,0 +1,758 @@
+--- projectm/CMakeCache.txt	2009-12-01 07:38:42.000000000 +0100
++++ /dev/null	2013-10-24 12:04:38.043396310 +0200
+@@ -1,755 +0,0 @@
+-# This is the CMakeCache file.
+-# For build in directory: /home/struktured/release/2.0.0/src/libprojectM
+-# It was generated by CMake: /usr/bin/cmake
+-# You can edit this file to change values found and used by cmake.
+-# If you do not want to change any of the values, simply exit the editor.
+-# If you do want to change a value, simply edit, save, and exit the editor.
+-# The syntax for the file is as follows:
+-# KEY:TYPE=VALUE
+-# KEY is the name of a variable in the cache.
+-# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!.
+-# VALUE is the current value for the KEY.
+-
+-########################
+-# EXTERNAL cache entries
+-########################
+-
+-//Build the projectM target library in the platform's native static
+-// (NOT shared) format.
+-BUILD_PROJECTM_STATIC:BOOL=OFF
+-
+-//Path to a program.
+-CMAKE_AR:FILEPATH=/usr/bin/ar
+-
+-//For backwards compatibility, what version of CMake commands and
+-// syntax should this version of CMake try to support.
+-CMAKE_BACKWARDS_COMPATIBILITY:STRING=2.4
+-
+-//Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
+-// CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.
+-CMAKE_BUILD_TYPE:STRING=Release
+-
+-//Enable/Disable color output during build.
+-CMAKE_COLOR_MAKEFILE:BOOL=ON
+-
+-//CXX compiler.
+-CMAKE_CXX_COMPILER:FILEPATH=/usr/lib64/ccache/c++
+-
+-//Flags used by the compiler during all build types.
+-CMAKE_CXX_FLAGS:STRING=
+-
+-//Flags used by the compiler during debug builds.
+-CMAKE_CXX_FLAGS_DEBUG:STRING=-g
+-
+-//Flags used by the compiler during release minsize builds.
+-CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
+-
+-//Flags used by the compiler during release builds (/MD /Ob1 /Oi
+-// /Ot /Oy /Gs will produce slightly less optimized but smaller
+-// files).
+-CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
+-
+-//Flags used by the compiler during Release with Debug Info builds.
+-CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
+-
+-//C compiler.
+-CMAKE_C_COMPILER:FILEPATH=/usr/lib64/ccache/gcc
+-
+-//Flags used by the compiler during all build types.
+-CMAKE_C_FLAGS:STRING=
+-
+-//Flags used by the compiler during debug builds.
+-CMAKE_C_FLAGS_DEBUG:STRING=-g
+-
+-//Flags used by the compiler during release minsize builds.
+-CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
+-
+-//Flags used by the compiler during release builds (/MD /Ob1 /Oi
+-// /Ot /Oy /Gs will produce slightly less optimized but smaller
+-// files).
+-CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
+-
+-//Flags used by the compiler during Release with Debug Info builds.
+-CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
+-
+-//Flags used by the linker.
+-CMAKE_EXE_LINKER_FLAGS:STRING=
+-
+-//Flags used by the linker during debug builds.
+-CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=
+-
+-//Flags used by the linker during release minsize builds.
+-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=
+-
+-//Flags used by the linker during release builds.
+-CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=
+-
+-//Flags used by the linker during Release with Debug Info builds.
+-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+-
+-//Install path prefix, prepended onto install directories.
+-CMAKE_INSTALL_PREFIX:PATH=/usr/local
+-
+-//Path to a program.
+-CMAKE_LINKER:FILEPATH=/usr/bin/ld
+-
+-//Path to a program.
+-CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/gmake
+-
+-//Flags used by the linker during the creation of modules.
+-CMAKE_MODULE_LINKER_FLAGS:STRING=
+-
+-//Flags used by the linker during debug builds.
+-CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=
+-
+-//Flags used by the linker during release minsize builds.
+-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=
+-
+-//Flags used by the linker during release builds.
+-CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=
+-
+-//Flags used by the linker during Release with Debug Info builds.
+-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+-
+-//Path to a program.
+-CMAKE_NM:FILEPATH=/usr/bin/nm
+-
+-//Path to a program.
+-CMAKE_OBJCOPY:FILEPATH=/usr/bin/objcopy
+-
+-//Path to a program.
+-CMAKE_OBJDUMP:FILEPATH=/usr/bin/objdump
+-
+-//Path to a program.
+-CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib
+-
+-//Flags used by the linker during the creation of dll's.
+-CMAKE_SHARED_LINKER_FLAGS:STRING=
+-
+-//Flags used by the linker during debug builds.
+-CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=
+-
+-//Flags used by the linker during release minsize builds.
+-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=
+-
+-//Flags used by the linker during release builds.
+-CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=
+-
+-//Flags used by the linker during Release with Debug Info builds.
+-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+-
+-//If set, runtime paths are not added when using shared libraries.
+-CMAKE_SKIP_RPATH:BOOL=NO
+-
+-//Path to a program.
+-CMAKE_STRIP:FILEPATH=/usr/bin/strip
+-
+-//If true, cmake will use relative paths in makefiles and projects.
+-CMAKE_USE_RELATIVE_PATHS:BOOL=OFF
+-
+-//If this value is on, makefiles will be generated without the
+-// .SILENT directive, and all commands will be echoed to the console
+-// during the make.  This is useful for debugging only. With Visual
+-// Studio IDE projects all commands are done without /nologo.
+-CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
+-
+-//Enable to build Debian packages
+-CPACK_BINARY_DEB:BOOL=OFF
+-
+-//Enable to build NSIS packages
+-CPACK_BINARY_NSIS:BOOL=OFF
+-
+-//Enable to build RPM packages
+-CPACK_BINARY_RPM:BOOL=OFF
+-
+-//Enable to build STGZ packages
+-CPACK_BINARY_STGZ:BOOL=ON
+-
+-//Enable to build TBZ2 packages
+-CPACK_BINARY_TBZ2:BOOL=OFF
+-
+-//Enable to build TGZ packages
+-CPACK_BINARY_TGZ:BOOL=ON
+-
+-//Enable to build TZ packages
+-CPACK_BINARY_TZ:BOOL=OFF
+-
+-//Enable to build TBZ2 source packages
+-CPACK_SOURCE_TBZ2:BOOL=OFF
+-
+-//Enable to build TGZ source packages
+-CPACK_SOURCE_TGZ:BOOL=ON
+-
+-//Enable to build TZ source packages
+-CPACK_SOURCE_TZ:BOOL=OFF
+-
+-//Enable to build ZIP source packages
+-CPACK_SOURCE_ZIP:BOOL=OFF
+-
+-//Turn off support for Milkdrop (.milk / .prjm) presets
+-DISABLE_MILKDROP_PRESETS:BOOL=OFF
+-
+-//Turn off support for native (C++ style) presets
+-DISABLE_NATIVE_PRESETS:BOOL=OFF
+-
+-//Single output directory for building all executables.
+-EXECUTABLE_OUTPUT_PATH:PATH=
+-
+-//Path to a file.
+-FREETYPE2_FT2BUILD:PATH=/usr/include
+-
+-//Path to a file.
+-FREETYPE2_FT_CONFIG:PATH=/usr
+-
+-//Path to a file.
+-FREETYPE2_INCLUDE_DIR:PATH=/usr/include/freetype2
+-
+-//Path to a library.
+-FREETYPE2_LIBRARIES:FILEPATH=/usr/lib64/libfreetype.so
+-
+-//Single output directory for building all libraries.
+-LIBRARY_OUTPUT_PATH:PATH=
+-
+-//Value Computed by CMake
+-MilkdropPresetFactory_BINARY_DIR:STATIC=/home/struktured/release/2.0.0/src/libprojectM/MilkdropPresetFactory
+-
+-//Dependencies for the target
+-MilkdropPresetFactory_LIB_DEPENDS:STATIC=general;Renderer;
+-
+-//Value Computed by CMake
+-MilkdropPresetFactory_SOURCE_DIR:STATIC=/home/struktured/release/2.0.0/src/libprojectM/MilkdropPresetFactory
+-
+-//Value Computed by CMake
+-NativePresetFactory_BINARY_DIR:STATIC=/home/struktured/release/2.0.0/src/libprojectM/NativePresetFactory
+-
+-//Dependencies for the target
+-NativePresetFactory_LIB_DEPENDS:STATIC=general;Renderer;general;m;
+-
+-//Value Computed by CMake
+-NativePresetFactory_SOURCE_DIR:STATIC=/home/struktured/release/2.0.0/src/libprojectM/NativePresetFactory
+-
+-//Path to a file.
+-OPENGL_INCLUDE_DIR:PATH=/usr/include
+-
+-//Path to a library.
+-OPENGL_gl_LIBRARY:FILEPATH=/usr/lib64/libGL.so
+-
+-//Path to a library.
+-OPENGL_glu_LIBRARY:FILEPATH=/usr/lib64/libGLU.so
+-
+-//Path to a file.
+-OPENGL_xmesa_INCLUDE_DIR:PATH=OPENGL_xmesa_INCLUDE_DIR-NOTFOUND
+-
+-//pkg-config executable
+-PKG_CONFIG_EXECUTABLE:FILEPATH=/usr/bin/pkg-config
+-
+-//Value Computed by CMake
+-Renderer_BINARY_DIR:STATIC=/home/struktured/release/2.0.0/src/libprojectM/Renderer
+-
+-//Dependencies for the target
+-Renderer_LIB_DEPENDS:STATIC=general;m;
+-
+-//Value Computed by CMake
+-Renderer_SOURCE_DIR:STATIC=/home/struktured/release/2.0.0/src/libprojectM/Renderer
+-
+-//Experimental feature to synchronize preset switches internally
+-SYNC_PRESET_SWITCHES:BOOL=OFF
+-
+-//Use Cg for Pixel Shader support
+-USE_CG:BOOL=ON
+-
+-//Use devIL for image loading rather than the builtin SOIL library
+-USE_DEVIL:BOOL=OFF
+-
+-//Use Framebuffer Objects for increased rendering quality.  Disable
+-// this for OpenGL ES 1.x or if you are experiencing problems on
+-// older or poorly supported hardware.
+-USE_FBO:BOOL=ON
+-
+-//Use FTGL for on-screen fonts (found on your system)
+-USE_FTGL:BOOL=ON
+-
+-//Use OpenGL ES 1.x
+-USE_GLES1:BOOL=OFF
+-
+-//Use projectM's native implemention of GLEW.
+-USE_NATIVE_GLEW:BOOL=OFF
+-
+-//Use OpenMP and OMPTL for multi-core paralellization
+-USE_OPENMP:BOOL=ON
+-
+-//Path to a file.
+-X11_ICE_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_ICE_LIB:FILEPATH=/usr/lib64/libICE.so
+-
+-//Path to a library.
+-X11_SM_LIB:FILEPATH=/usr/lib64/libSM.so
+-
+-//Path to a file.
+-X11_X11_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so
+-
+-//Path to a file.
+-X11_XShm_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a file.
+-X11_XTest_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_XTest_LIB:FILEPATH=/usr/lib64/libXtst.so
+-
+-//Path to a file.
+-X11_Xaccessrules_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a file.
+-X11_Xaccessstr_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a file.
+-X11_Xau_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_Xau_LIB:FILEPATH=/usr/lib64/libXau.so
+-
+-//Path to a file.
+-X11_Xcomposite_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_Xcomposite_LIB:FILEPATH=/usr/lib64/libXcomposite.so
+-
+-//Path to a file.
+-X11_Xcursor_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_Xcursor_LIB:FILEPATH=/usr/lib64/libXcursor.so
+-
+-//Path to a file.
+-X11_Xdamage_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_Xdamage_LIB:FILEPATH=/usr/lib64/libXdamage.so
+-
+-//Path to a file.
+-X11_Xdmcp_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_Xdmcp_LIB:FILEPATH=/usr/lib64/libXdmcp.so
+-
+-//Path to a library.
+-X11_Xext_LIB:FILEPATH=/usr/lib64/libXext.so
+-
+-//Path to a file.
+-X11_Xfixes_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_Xfixes_LIB:FILEPATH=/usr/lib64/libXfixes.so
+-
+-//Path to a file.
+-X11_Xft_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_Xft_LIB:FILEPATH=/usr/lib64/libXft.so
+-
+-//Path to a file.
+-X11_Xinerama_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_Xinerama_LIB:FILEPATH=/usr/lib64/libXinerama.so
+-
+-//Path to a file.
+-X11_Xinput_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_Xinput_LIB:FILEPATH=/usr/lib64/libXi.so
+-
+-//Path to a file.
+-X11_Xkb_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a file.
+-X11_Xkblib_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a file.
+-X11_Xlib_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a file.
+-X11_Xpm_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_Xpm_LIB:FILEPATH=/usr/lib64/libXpm.so
+-
+-//Path to a file.
+-X11_Xrandr_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_Xrandr_LIB:FILEPATH=/usr/lib64/libXrandr.so
+-
+-//Path to a file.
+-X11_Xrender_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_Xrender_LIB:FILEPATH=/usr/lib64/libXrender.so
+-
+-//Path to a file.
+-X11_Xscreensaver_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_Xscreensaver_LIB:FILEPATH=/usr/lib64/libXss.so
+-
+-//Path to a file.
+-X11_Xshape_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a file.
+-X11_Xt_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_Xt_LIB:FILEPATH=/usr/lib64/libXt.so
+-
+-//Path to a file.
+-X11_Xutil_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a file.
+-X11_Xv_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a library.
+-X11_Xv_LIB:FILEPATH=/usr/lib64/libXv.so
+-
+-//Path to a library.
+-X11_Xxf86misc_LIB:FILEPATH=/usr/lib64/libXxf86misc.so
+-
+-//Path to a file.
+-X11_dpms_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a file.
+-X11_xf86misc_INCLUDE_PATH:PATH=/usr/include
+-
+-//Path to a file.
+-X11_xf86vmode_INCLUDE_PATH:PATH=/usr/include
+-
+-//Value Computed by CMake
+-projectM_BINARY_DIR:STATIC=/home/struktured/release/2.0.0/src/libprojectM
+-
+-//Dependencies for the target
+-projectM_LIB_DEPENDS:STATIC=general;GLEW;general;m;general;ftgl;general;freetype;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;Cg;general;CgGL;general;NativePresetFactory;general;MilkdropPresetFactory;
+-
+-//Value Computed by CMake
+-projectM_SOURCE_DIR:STATIC=/home/struktured/release/2.0.0/src/libprojectM
+-
+-
+-########################
+-# INTERNAL cache entries
+-########################
+-
+-//Advanced flag for variable: CMAKE_AR
+-CMAKE_AR-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_BUILD_TOOL
+-CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1
+-//What is the target build tool cmake is generating for.
+-CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/gmake
+-//Modified flag for variable: CMAKE_BUILD_TYPE
+-CMAKE_BUILD_TYPE-MODIFIED:INTERNAL=1
+-//This is the directory where this CMakeCahe.txt was created
+-CMAKE_CACHEFILE_DIR:INTERNAL=/home/struktured/release/2.0.0/src/libprojectM
+-//Major version of cmake used to create the current loaded cache
+-CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2
+-//Minor version of cmake used to create the current loaded cache
+-CMAKE_CACHE_MINOR_VERSION:INTERNAL=6
+-//Major version of cmake used to create the current loaded cache
+-CMAKE_CACHE_RELEASE_VERSION:INTERNAL=patch 4
+-//Advanced flag for variable: CMAKE_COLOR_MAKEFILE
+-CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
+-//Path to CMake executable.
+-CMAKE_COMMAND:INTERNAL=/usr/bin/cmake
+-//Path to cpack program executable.
+-CMAKE_CPACK_COMMAND:INTERNAL=/usr/bin/cpack
+-//Path to ctest program executable.
+-CMAKE_CTEST_COMMAND:INTERNAL=/usr/bin/ctest
+-//Advanced flag for variable: CMAKE_CXX_COMPILER
+-CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
+-CMAKE_CXX_COMPILER_WORKS:INTERNAL=1
+-//Advanced flag for variable: CMAKE_CXX_FLAGS
+-CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_CXX_FLAGS_DEBUG
+-CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_CXX_FLAGS_MINSIZEREL
+-CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_CXX_FLAGS_RELEASE
+-CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO
+-CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_C_COMPILER
+-CMAKE_C_COMPILER-ADVANCED:INTERNAL=1
+-CMAKE_C_COMPILER_WORKS:INTERNAL=1
+-//Advanced flag for variable: CMAKE_C_FLAGS
+-CMAKE_C_FLAGS-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_C_FLAGS_DEBUG
+-CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_C_FLAGS_MINSIZEREL
+-CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_C_FLAGS_RELEASE
+-CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_C_FLAGS_RELWITHDEBINFO
+-CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+-//Result of TRY_COMPILE
+-CMAKE_DETERMINE_CXX_ABI_COMPILED:INTERNAL=TRUE
+-//Result of TRY_COMPILE
+-CMAKE_DETERMINE_C_ABI_COMPILED:INTERNAL=TRUE
+-//Path to cache edit program executable.
+-CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/ccmake
+-//Executable file format
+-CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF
+-//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS
+-CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG
+-CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
+-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE
+-CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
+-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+-//Name of generator.
+-CMAKE_GENERATOR:INTERNAL=Unix Makefiles
+-//Have function connect
+-CMAKE_HAVE_CONNECT:INTERNAL=1
+-//Have function gethostbyname
+-CMAKE_HAVE_GETHOSTBYNAME:INTERNAL=1
+-//Have function remove
+-CMAKE_HAVE_REMOVE:INTERNAL=1
+-//Have function shmat
+-CMAKE_HAVE_SHMAT:INTERNAL=1
+-//Start directory with the top level CMakeLists.txt file for this
+-// project
+-CMAKE_HOME_DIRECTORY:INTERNAL=/home/struktured/release/2.0.0/src/libprojectM
+-//Install .so files without execute permission.
+-CMAKE_INSTALL_SO_NO_EXE:INTERNAL=0
+-//Have library ICE
+-CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER:INTERNAL=1
+-//Advanced flag for variable: CMAKE_LINKER
+-CMAKE_LINKER-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_MAKE_PROGRAM
+-CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS
+-CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG
+-CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
+-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE
+-CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
+-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_NM
+-CMAKE_NM-ADVANCED:INTERNAL=1
+-//number of local generators
+-CMAKE_NUMBER_OF_LOCAL_GENERATORS:INTERNAL=4
+-//Advanced flag for variable: CMAKE_OBJCOPY
+-CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_OBJDUMP
+-CMAKE_OBJDUMP-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_RANLIB
+-CMAKE_RANLIB-ADVANCED:INTERNAL=1
+-//Path to CMake installation.
+-CMAKE_ROOT:INTERNAL=/usr/share/cmake
+-//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS
+-CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
+-CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
+-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE
+-CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
+-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_SKIP_RPATH
+-CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_STRIP
+-CMAKE_STRIP-ADVANCED:INTERNAL=1
+-//uname command
+-CMAKE_UNAME:INTERNAL=/bin/uname
+-//Advanced flag for variable: CMAKE_USE_RELATIVE_PATHS
+-CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CMAKE_VERBOSE_MAKEFILE
+-CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CPACK_BINARY_DEB
+-CPACK_BINARY_DEB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CPACK_BINARY_NSIS
+-CPACK_BINARY_NSIS-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CPACK_BINARY_RPM
+-CPACK_BINARY_RPM-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CPACK_BINARY_STGZ
+-CPACK_BINARY_STGZ-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CPACK_BINARY_TBZ2
+-CPACK_BINARY_TBZ2-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CPACK_BINARY_TGZ
+-CPACK_BINARY_TGZ-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CPACK_BINARY_TZ
+-CPACK_BINARY_TZ-ADVANCED:INTERNAL=1
+-//Modified flag for variable: CPACK_BINARY_TZ
+-CPACK_BINARY_TZ-MODIFIED:INTERNAL=1
+-//Advanced flag for variable: CPACK_SOURCE_TBZ2
+-CPACK_SOURCE_TBZ2-ADVANCED:INTERNAL=1
+-//Modified flag for variable: CPACK_SOURCE_TBZ2
+-CPACK_SOURCE_TBZ2-MODIFIED:INTERNAL=1
+-//Advanced flag for variable: CPACK_SOURCE_TGZ
+-CPACK_SOURCE_TGZ-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: CPACK_SOURCE_TZ
+-CPACK_SOURCE_TZ-ADVANCED:INTERNAL=1
+-//Modified flag for variable: CPACK_SOURCE_TZ
+-CPACK_SOURCE_TZ-MODIFIED:INTERNAL=1
+-//Advanced flag for variable: CPACK_SOURCE_ZIP
+-CPACK_SOURCE_ZIP-ADVANCED:INTERNAL=1
+-//Details about finding X11
+-FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include]
+-FTGL_CFLAGS:INTERNAL=-I/usr/include/freetype2
+-FTGL_CFLAGS_I:INTERNAL=
+-FTGL_CFLAGS_OTHER:INTERNAL=
+-FTGL_FOUND:INTERNAL=1
+-FTGL_INCLUDEDIR:INTERNAL=/usr/include
+-FTGL_INCLUDE_DIRS:INTERNAL=/usr/include/freetype2
+-FTGL_LDFLAGS:INTERNAL=-lGLU;-lGL;-lftgl;-lfreetype
+-FTGL_LDFLAGS_OTHER:INTERNAL=
+-FTGL_LIBDIR:INTERNAL=/usr/lib64
+-FTGL_LIBRARIES:INTERNAL=GLU;GL;ftgl;freetype
+-FTGL_LIBRARY_DIRS:INTERNAL=
+-FTGL_LIBS:INTERNAL=
+-FTGL_LIBS_L:INTERNAL=
+-FTGL_LIBS_OTHER:INTERNAL=
+-FTGL_LIBS_PATHS:INTERNAL=
+-FTGL_PREFIX:INTERNAL=/usr
+-FTGL_STATIC_CFLAGS:INTERNAL=-I/usr/include/freetype2
+-FTGL_STATIC_CFLAGS_I:INTERNAL=
+-FTGL_STATIC_CFLAGS_OTHER:INTERNAL=
+-FTGL_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/freetype2
+-FTGL_STATIC_LDFLAGS:INTERNAL=-lGLU;-lGL;-lftgl;-lfreetype
+-FTGL_STATIC_LDFLAGS_OTHER:INTERNAL=
+-FTGL_STATIC_LIBDIR:INTERNAL=
+-FTGL_STATIC_LIBRARIES:INTERNAL=GLU;GL;ftgl;freetype
+-FTGL_STATIC_LIBRARY_DIRS:INTERNAL=
+-FTGL_STATIC_LIBS:INTERNAL=
+-FTGL_STATIC_LIBS_L:INTERNAL=
+-FTGL_STATIC_LIBS_OTHER:INTERNAL=
+-FTGL_STATIC_LIBS_PATHS:INTERNAL=
+-FTGL_VERSION:INTERNAL=2.1.2
+-FTGL_ftgl_INCLUDEDIR:INTERNAL=
+-FTGL_ftgl_LIBDIR:INTERNAL=
+-FTGL_ftgl_PREFIX:INTERNAL=
+-FTGL_ftgl_VERSION:INTERNAL=
+-//Advanced flag for variable: OPENGL_INCLUDE_DIR
+-OPENGL_INCLUDE_DIR-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: OPENGL_gl_LIBRARY
+-OPENGL_gl_LIBRARY-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: OPENGL_glu_LIBRARY
+-OPENGL_glu_LIBRARY-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: OPENGL_xmesa_INCLUDE_DIR
+-OPENGL_xmesa_INCLUDE_DIR-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: PKG_CONFIG_EXECUTABLE
+-PKG_CONFIG_EXECUTABLE-ADVANCED:INTERNAL=1
+-//Modified flag for variable: USE_CG
+-USE_CG-MODIFIED:INTERNAL=1
+-//Advanced flag for variable: X11_ICE_INCLUDE_PATH
+-X11_ICE_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_ICE_LIB
+-X11_ICE_LIB-ADVANCED:INTERNAL=1
+-//Have library /usr/lib64/libX11.so;/usr/lib64/libXext.so
+-X11_LIB_X11_SOLO:INTERNAL=1
+-//Advanced flag for variable: X11_SM_LIB
+-X11_SM_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_X11_INCLUDE_PATH
+-X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_X11_LIB
+-X11_X11_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_XShm_INCLUDE_PATH
+-X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_XTest_INCLUDE_PATH
+-X11_XTest_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_XTest_LIB
+-X11_XTest_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xaccessrules_INCLUDE_PATH
+-X11_Xaccessrules_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xaccessstr_INCLUDE_PATH
+-X11_Xaccessstr_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xau_INCLUDE_PATH
+-X11_Xau_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xau_LIB
+-X11_Xau_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xcomposite_INCLUDE_PATH
+-X11_Xcomposite_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xcomposite_LIB
+-X11_Xcomposite_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xcursor_INCLUDE_PATH
+-X11_Xcursor_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xcursor_LIB
+-X11_Xcursor_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xdamage_INCLUDE_PATH
+-X11_Xdamage_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xdamage_LIB
+-X11_Xdamage_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xdmcp_INCLUDE_PATH
+-X11_Xdmcp_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xdmcp_LIB
+-X11_Xdmcp_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xext_LIB
+-X11_Xext_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xfixes_INCLUDE_PATH
+-X11_Xfixes_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xfixes_LIB
+-X11_Xfixes_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xft_INCLUDE_PATH
+-X11_Xft_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xft_LIB
+-X11_Xft_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xinerama_INCLUDE_PATH
+-X11_Xinerama_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xinerama_LIB
+-X11_Xinerama_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xinput_INCLUDE_PATH
+-X11_Xinput_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xinput_LIB
+-X11_Xinput_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xkb_INCLUDE_PATH
+-X11_Xkb_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xkblib_INCLUDE_PATH
+-X11_Xkblib_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xlib_INCLUDE_PATH
+-X11_Xlib_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xpm_INCLUDE_PATH
+-X11_Xpm_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xpm_LIB
+-X11_Xpm_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xrandr_INCLUDE_PATH
+-X11_Xrandr_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xrandr_LIB
+-X11_Xrandr_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xrender_INCLUDE_PATH
+-X11_Xrender_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xrender_LIB
+-X11_Xrender_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xscreensaver_INCLUDE_PATH
+-X11_Xscreensaver_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xscreensaver_LIB
+-X11_Xscreensaver_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xshape_INCLUDE_PATH
+-X11_Xshape_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xt_INCLUDE_PATH
+-X11_Xt_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xt_LIB
+-X11_Xt_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xutil_INCLUDE_PATH
+-X11_Xutil_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xv_INCLUDE_PATH
+-X11_Xv_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xv_LIB
+-X11_Xv_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_Xxf86misc_LIB
+-X11_Xxf86misc_LIB-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_dpms_INCLUDE_PATH
+-X11_dpms_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_xf86misc_INCLUDE_PATH
+-X11_xf86misc_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-//Advanced flag for variable: X11_xf86vmode_INCLUDE_PATH
+-X11_xf86vmode_INCLUDE_PATH-ADVANCED:INTERNAL=1
+-__pkg_config_checked_FTGL:INTERNAL=1
+-

packages/graphics/libprojectM/patches/libprojectM-04-fix-pkgconfig.patch

@@ -0,0 +1,17 @@
+--- projectm/libprojectM.pc.in.orig	2015-03-16 14:02:55.733369674 +0100
++++ projectm/libprojectM.pc.in	2015-03-16 14:03:42.685370237 +0100
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_INSTALL_DIR@
++libdir=@CMAKE_INSTALL_PREFIX@/lib
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+ pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
+ sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
+@@ -9,5 +9,5 @@
+ Version: 2.0.0
+ Description: projectM - OpenGL Milkdrop
+ Requires:
+-Libs: -L${libdir} -lprojectM 
++Libs: -L${libdir} -lprojectM -lMilkdropPresetFactory -lprojectM -lNativePresetFactory -lRenderer -lm
+ Cflags: -I${includedir} 

packages/graphics/libprojectM/patches/libprojectM-04-fix-pkgconfig.patch.old

@@ -0,0 +1,17 @@
+--- projectm/libprojectM.pc.in.orig	2015-03-16 14:02:55.733369674 +0100
++++ projectm/libprojectM.pc.in	2015-03-16 14:03:42.685370237 +0100
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_INSTALL_DIR@
++libdir=@CMAKE_INSTALL_PREFIX@/lib
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+ pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
+ sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
+@@ -9,5 +9,5 @@
+ Version: 2.0.0
+ Description: projectM - OpenGL Milkdrop
+ Requires:
+-Libs: -L${libdir} -lprojectM 
++Libs: -L${libdir} -lprojectM -lMilkdropPresetFactory -lNativePresetFactory -lRenderer -lm
+ Cflags: -I${includedir} 

packages/graphics/libprojectM/patches/libprojectM-05-install-renderlib.patch

@@ -0,0 +1,9 @@
+--- projectm/Renderer/CMakeLists.txt.orig	2015-03-16 13:30:27.909346320 +0100
++++ projectm/Renderer/CMakeLists.txt	2015-03-16 13:30:57.221346672 +0100
+@@ -14,3 +14,6 @@
+ ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES})
+ SET_TARGET_PROPERTIES(Renderer PROPERTIES VERSION 2.00 SOVERSION 2)
+ TARGET_LINK_LIBRARIES(Renderer m)
++IF(BUILD_PROJECTM_STATIC)
++  INSTALL(TARGETS Renderer DESTINATION lib${LIB_SUFFIX})
++endif()

packages/graphics/libprojectM/patches/libprojectM-06-install-nativefactory.patch

@@ -0,0 +1,9 @@
+--- projectm/NativePresetFactory/CMakeLists.txt.orig	2015-03-16 13:31:17.965346920 +0100
++++ projectm/NativePresetFactory/CMakeLists.txt	2015-03-16 13:31:38.921347172 +0100
+@@ -13,3 +13,6 @@
+ ADD_LIBRARY(NativePresetFactory STATIC ${NativePresetFactory_SOURCES})
+ SET_TARGET_PROPERTIES(NativePresetFactory PROPERTIES VERSION 2.00 SOVERSION 2)
+ TARGET_LINK_LIBRARIES(NativePresetFactory Renderer m)
++IF(BUILD_PROJECTM_STATIC)
++  INSTALL(TARGETS NativePresetFactory DESTINATION lib${LIB_SUFFIX})
++endif()

packages/graphics/libprojectM/patches/libprojectM-07-install-milkdropfactory.patch

@@ -0,0 +1,9 @@
+--- projectm/MilkdropPresetFactory/CMakeLists.txt.orig	2015-03-16 13:27:41.557344326 +0100
++++ projectm/MilkdropPresetFactory/CMakeLists.txt	2015-03-16 13:31:00.769346714 +0100
+@@ -15,3 +15,6 @@
+ ADD_LIBRARY(MilkdropPresetFactory STATIC ${MilkdropPresetFactory_SOURCES})
+ SET_TARGET_PROPERTIES(MilkdropPresetFactory PROPERTIES VERSION 2.00 SOVERSION 2)
+ TARGET_LINK_LIBRARIES(MilkdropPresetFactory Renderer)
++IF(BUILD_PROJECTM_STATIC)
++  INSTALL(TARGETS MilkdropPresetFactory DESTINATION lib${LIB_SUFFIX})
++endif()

packages/graphics/mesa/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="mesa"
-PKG_VERSION="10.5.4"
+PKG_VERSION="10.6.9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
@@ -66,7 +66,6 @@ PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \
                            --enable-opengl \
                            --disable-gles1 \
                            --disable-gles2 \
-                           --disable-openvg \
                            --enable-dri \
                            --disable-dri3 \
                            --enable-glx \

packages/graphics/soil/package.mk

@@ -16,29 +16,31 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="mt7601u"
-PKG_VERSION="42f4084"
+PKG_NAME="soil"
+PKG_VERSION="1.07"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="GPL"
-# mediatek: PKG_SITE="http://www.mediatek.com/en/downloads/mt7601u-usb/"
-PKG_SITE="https://github.com/kuba-moo/mt7601u"
+PKG_LICENSE="PD"
+PKG_SITE="http://www.lonesock.net/soil.html"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain linux"
-PKG_NEED_UNPACK="$LINUX_DEPENDS"
+PKG_DEPENDS_TARGET="mesa"
 PKG_PRIORITY="optional"
-PKG_SECTION="driver"
-PKG_SHORTDESC="mt7601u linux 3.19+ driver"
-PKG_LONGDESC="mt7601u linux 3.19+ driver"
+PKG_SECTION="graphics"
+PKG_SHORTDESC="libsoil: Simple OpenGL Image Library"
+PKG_LONGDESC="libsoil: Simple OpenGL Image Library"
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 make_target() {
-  KDIR=$(kernel_path) make
+  mkdir projects/makefile/obj
+  make CXX="$CXX" CC="$CC" LD="$CC" AR="$AR" CFLAGS="-fPIC -O2" CXXFLAGS="-fPIC -O2" -C projects/makefile
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
-    cp $ROOT/$PKG_BUILD/mt7601u.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+  mkdir -p $SYSROOT_PREFIX/usr/lib
+    cp -PR lib/libSOIL.a $SYSROOT_PREFIX/usr/lib
+
+  mkdir -p $SYSROOT_PREFIX/usr/include/SOIL
+    cp -P src/SOIL.h $SYSROOT_PREFIX/usr/include/SOIL
 }

packages/graphics/vsxu/package.mk

@@ -0,0 +1,59 @@
+################################################################################
+#      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="vsxu"
+PKG_VERSION="0.5.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.vsxu.com"
+# repackaged from https://github.com/vovoid/vsxu/archive/$PKG_VERSION.tar.gz
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain glew glfw"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vsxu:"
+PKG_LONGDESC="vsxu:"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+        -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \
+        -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \
+        -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+        -DBUILD_SHARED_LIBS=0 \
+	-DVSXU_STATIC=1 \
+	-DCMAKE_POSITION_INDEPENDENT_CODE=1 \
+	-DCMAKE_CXX_FLAGS="-I$SYSROOT_PREFIX/usr/include/freetype2" \
+        ..
+}
+
+post_makeinstall_target() {
+  mkdir -p $SYSROOT_PREFIX/usr/lib/vsxu
+  cp -PR $INSTALL/usr/lib/* $SYSROOT_PREFIX/usr/lib
+
+  mkdir -p $SYSROOT_PREFIX/usr/include/
+  cp -RP $INSTALL/usr/include/* $SYSROOT_PREFIX/usr/include
+
+  mkdir -p $SYSROOT_PREFIX/usr/share/
+    cp -RP $INSTALL/usr/share/vsxu $SYSROOT_PREFIX/usr/share
+}

packages/graphics/vsxu/patches/vsxu-01-fix-order.patch

@@ -0,0 +1,75 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1e61faf..435cf29 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -389,10 +389,11 @@ add_definitions(-DVSXU_INSTALL_LIB_DIR="${VSXU_INSTALL_LIB_DIR}")
+ ################################################################################
+ # VSXU LIBRARIES ###############################################################
+ ################################################################################
+-add_subdirectory(engine)
+ add_subdirectory(engine_audiovisual)
+ add_subdirectory(engine_graphics)
++# order matters - need to add plugins before engine to create static glue
+ add_subdirectory(plugins)
++add_subdirectory(engine)
+ add_subdirectory(widget)
+ 
+ ################################################################################
+--- vsxu-0.5.1/CMakeLists.txt.orig	2015-05-12 14:43:04.427596836 +0200
++++ vsxu-0.5.1/CMakeLists.txt	2015-05-12 14:43:13.995596648 +0200
+@@ -56,27 +56,6 @@
+ endif()
+ 
+ ################################################################################
+-# The pkg-config file
+-################################################################################
+-IF (UNIX OR VSXU_WINDOWS_LIB_BUILD)
+-  if (VSXU_STATIC EQUAL 1 AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugins/static_factory_pkgconfig_libs")
+-    file (STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/plugins/static_factory_pkgconfig_libs" VSXU_PLUGIN_PKGCONFIG_LIBS)
+-    CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/libvsxu.pc.in.static
+-                    ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
+-                    @ONLY)
+-
+-  else()
+-    CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/libvsxu.pc.in.dynamic
+-                    ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
+-                    @ONLY)
+-  endif()
+-
+-  INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
+-           DESTINATION ${VSXU_INSTALL_LIB_DIR}/pkgconfig)
+-ENDIF()
+-
+-
+-################################################################################
+ # CPACK OPTIONS ################################################################
+ ################################################################################
+ SET(CPACK_PACKAGE_NAME "vsxu")
+@@ -417,6 +396,27 @@
+     add_subdirectory(tools/vsxl)
+ endif(UNIX)
+ 
++################################################################################
++# The pkg-config file
++################################################################################
++IF (UNIX OR VSXU_WINDOWS_LIB_BUILD)
++  if (VSXU_STATIC EQUAL 1 AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugins/static_factory_pkgconfig_libs")
++    file (STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/plugins/static_factory_pkgconfig_libs" VSXU_PLUGIN_PKGCONFIG_LIBS)
++    CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/libvsxu.pc.in.static
++                    ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
++                    @ONLY)
++
++  else()
++    CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/libvsxu.pc.in.dynamic
++                    ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
++                    @ONLY)
++  endif()
++
++  INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
++           DESTINATION ${VSXU_INSTALL_LIB_DIR}/pkgconfig)
++ENDIF()
++
++
+ 
+ 
+ 

packages/graphics/vsxu/patches/vsxu-02-fix-glfw.patch

@@ -0,0 +1,27 @@
+--- vsxu-0.5.1/cmake/modules/FindGLFW.cmake.orig	2015-05-12 14:22:23.123621176 +0200
++++ vsxu-0.5.1/cmake/modules/FindGLFW.cmake	2015-05-12 14:23:14.863620161 +0200
+@@ -19,6 +19,14 @@
+ # TODO:
+ # Allow the user to select to link to a shared library or to a static library.
+ 
++find_package(PkgConfig)
++
++pkg_check_modules(GLFW libglfw)
++set(GLFW_INCLUDE_PATH ${GLFW_INCLUDE_DIRS})
++set(GLFW_LIBRARY ${GLFW_LIBRARIES} -lXrandr)
++
++if(NOT GLFW_FOUND)
++
+ #Search for the include file...
+ FIND_PATH(GLFW_INCLUDE_PATH GL/glfw.h DOC "Path to GLFW include directory."
+   HINTS
+@@ -45,5 +53,7 @@
+   ${GLFW_ROOT_DIR}/lib-msvc100/release # added by ptr
+ )
+ 
++endif()
++
+ INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLFW DEFAULT_MSG GLFW_LIBRARY GLFW_INCLUDE_PATH)
+\ No newline at end of file
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLFW DEFAULT_MSG GLFW_LIBRARY GLFW_INCLUDE_PATH)

packages/graphics/vsxu/patches/vsxu-03-fix-exr.patch

@@ -0,0 +1,11 @@
+--- vsxu-0.5.1/plugins/src/texture/CMakeLists.txt.orig	2015-05-12 14:04:42.659641970 +0200
++++ vsxu-0.5.1/plugins/src/texture/CMakeLists.txt	2015-05-12 14:05:43.315640780 +0200
+@@ -8,7 +8,7 @@
+ 
+ message("configuring vsxu module            " ${module_id})
+ 
+-include_directories(/usr/include/OpenEXR)
++#include_directories(/usr/include/OpenEXR)
+ 
+ # set defines for MOD_CM, MOD_DM, MOD_NM
+ CREATE_STATIC_GLUE(${module_id})

packages/graphics/vsxu/patches/vsxu-04-fix-freetype.patch

@@ -0,0 +1,11 @@
+--- vsxu-0.5.1/plugins/src/render.text/CMakeLists.txt.orig	2015-05-12 14:07:20.367638877 +0200
++++ vsxu-0.5.1/plugins/src/render.text/CMakeLists.txt	2015-05-12 14:07:24.371638799 +0200
+@@ -20,7 +20,7 @@
+ endif(WIN32)
+ 
+ if(UNIX)
+-  include_directories(/usr/include/freetype2)
++  #  include_directories(/usr/include/freetype2)
+ endif(UNIX)
+ 
+ # include common

packages/lang/Python/package.mk

@@ -136,7 +136,7 @@ makeinstall_target() {
 }
 
 post_makeinstall_target() {
-  EXCLUDE_DIRS="bsddb curses idlelib lib-tk lib2to3 msilib pydoc_data test unittest distutils"
+  EXCLUDE_DIRS="bsddb curses idlelib lib-tk lib2to3 msilib pydoc_data test unittest"
   for dir in $EXCLUDE_DIRS; do
     rm -rf $INSTALL/usr/lib/python*/$dir
   done

packages/lang/gcc/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gcc"
-PKG_VERSION="4.9.2"
+PKG_VERSION="4.9.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/lang/llvm/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="llvm"
-PKG_VERSION="3.6.0"
+PKG_VERSION="3.6.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux-drivers/RTL8188EU/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="RTL8188EU"
-PKG_VERSION="fcc9034"
+PKG_VERSION="3091828"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux-drivers/RTL8188EU/patches/RTL8188EU-gcc-4.9.patch

@@ -1,11 +0,0 @@
-diff -Naur RTL8188EU-fcc9034/os_dep/usb_intf.c RTL8188EU-fcc9034.patch/os_dep/usb_intf.c
---- RTL8188EU-fcc9034/os_dep/usb_intf.c	2014-03-25 15:05:52.000000000 +0100
-+++ RTL8188EU-fcc9034.patch/os_dep/usb_intf.c	2014-04-28 17:42:46.059538024 +0200
-@@ -865,7 +865,6 @@
- 	RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+rtw_drv_entry\n"));
- 
- 	DBG_88E(DRV_NAME " driver version=%s\n", DRIVERVERSION);
--	DBG_88E("build time: %s %s\n", __DATE__, __TIME__);
- 
- 	rtw_suspend_lock_init();
- 

packages/linux-drivers/RTL8188EU/patches/RTL8188EU-kernel-4.0.patch

@@ -1,25 +0,0 @@
-diff -Naur RTL8188EU-fcc9034/os_dep/rtw_android.c RTL8188EU-fcc9034.patch/os_dep/rtw_android.c
---- RTL8188EU-fcc9034/os_dep/rtw_android.c	2014-03-25 15:05:52.000000000 +0100
-+++ RTL8188EU-fcc9034.patch/os_dep/rtw_android.c	2015-04-04 20:44:25.386732963 +0200
-@@ -20,6 +20,7 @@
- 
- #include <linux/module.h>
- #include <linux/netdevice.h>
-+#include <linux/version.h>
- 
- #include <rtw_android.h>
- #include <osdep_service.h>
-@@ -80,8 +81,13 @@
- {
- 	int cmd_num;
- 	for (cmd_num = 0; cmd_num < ANDROID_WIFI_CMD_MAX; cmd_num++)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0))
-+		if (!strncasecmp(cmdstr , android_wifi_cmd_str[cmd_num],
-+				  strlen(android_wifi_cmd_str[cmd_num])))
-+#else
- 		if (0 == strnicmp(cmdstr , android_wifi_cmd_str[cmd_num],
- 				  strlen(android_wifi_cmd_str[cmd_num])))
-+#endif
- 			break;
- 	return cmd_num;
- }

packages/linux-drivers/RTL8192DU/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="RTL8192DU"
-PKG_VERSION="085e206"
+PKG_VERSION="7498302"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux-drivers/RTL8192DU/patches/RTL8192DU-kernel-4.0.patch

@@ -1,16 +0,0 @@
-diff -Naur RTL8192DU-085e206/os_dep/rtw_android.c RTL8192DU-085e206.patch/os_dep/rtw_android.c
---- RTL8192DU-085e206/os_dep/rtw_android.c	2014-03-25 15:48:57.000000000 +0100
-+++ RTL8192DU-085e206.patch/os_dep/rtw_android.c	2015-04-04 20:23:03.589408056 +0200
-@@ -219,7 +219,11 @@
- {
- 	int cmd_num;
- 	for (cmd_num=0 ; cmd_num<ANDROID_WIFI_CMD_MAX; cmd_num++)
--		if (0 == strnicmp(cmdstr , android_wifi_cmd_str[cmd_num], strlen(android_wifi_cmd_str[cmd_num])))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0))
-+		if (!strncasecmp(cmdstr , android_wifi_cmd_str[cmd_num], strlen(android_wifi_cmd_str[cmd_num])))
-+#else
-+		if (0 == strnicmp(cmdstr , android_wifi_cmd_str[cmd_num], strlen(android_wifi_cmd_str[cmd_num])))
-+#endif
- 			break;
- 
- 	return cmd_num;

packages/linux-drivers/RTL8812AU/package.mk

@@ -17,11 +17,11 @@
 ################################################################################
 
 PKG_NAME="RTL8812AU"
-PKG_VERSION="b22cbdf"
+PKG_VERSION="3f015f0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="git@github.com:wuzzeb/rtl8812AU_8821AU_linux.git"
+PKG_SITE="git@github.com:abperiasamy/rtl8812AU_8821AU_linux.git"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain linux"
 PKG_NEED_UNPACK="$LINUX_DEPENDS"