Merge pull request #578 from drieschel/updater-script

WeTek_Core:Revised install/update procedure

config/functions

@@ -211,15 +211,19 @@ strip_lto() {
   if [ -n "$GCC_OPTIM_LTO" ] ; then
     CFLAGS=`echo $CFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
     CXXFLAGS=`echo $CXXFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
+    TARGET_CFLAGS=`echo $TARGET_CFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
+    TARGET_CXXFLAGS=`echo $TARGET_CXXFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
   fi
   if [ -n "$LD_OPTIM_LTO" ] ; then
     LDFLAGS=`echo $LDFLAGS | sed -e "s|$LD_OPTIM_LTO||g"`
+    TARGET_LDFLAGS=`echo $TARGET_LDFLAGS | sed -e "s|$LD_OPTIM_LTO||g"`
   fi
 }
 
 strip_gold() {
   # strip out usage from GOLD linker
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-ld=gold||g"`
+  TARGET_LDFLAGS=`echo $TARGET_LDFLAGS | sed -e "s|-fuse-ld=gold||g"`
 }
 
 fix_module_depends() {

packages/addons/addon-depends/bash/package.mk

@@ -0,0 +1,43 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="bash"
+PKG_VERSION="4.3.46"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.gnu.org/software/bash/bash.html"
+PKG_URL="ftp://ftp.cwru.edu/pub/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_PRIORITY="optional"
+PKG_SECTION="devel"
+PKG_SHORTDESC="The GNU Bourne Again shell"
+PKG_LONGDESC="The GNU Bourne Again shell"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static \
+                           --disable-shared \
+                           --with-curses \
+                           --enable-readline \
+                           --without-bash-malloc \
+                           --with-installed-readline"
+
+pre_configure_target() {
+  export LIBS="-lterminfo"
+}

packages/addons/addon-depends/containerd/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="containerd"
-PKG_VERSION="9dc2b32"
+PKG_VERSION="0ac3cd1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="APL"
@@ -66,7 +66,6 @@ pre_make_target() {
 
 make_target() {
   mkdir -p bin
-  $GOLANG build -v -o bin/ctr             -a -tags "static_build" -ldflags "$LDFLAGS" ./ctr
   $GOLANG build -v -o bin/containerd      -a -tags "static_build" -ldflags "$LDFLAGS" ./containerd
   $GOLANG build -v -o bin/containerd-shim -a -tags "static_build" -ldflags "$LDFLAGS" ./containerd-shim
 }

packages/addons/addon-depends/go/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="go"
-PKG_VERSION="1.6.2"
+PKG_VERSION="1.6.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/addons/addon-depends/moonlight-embedded/package.mk

@@ -49,6 +49,8 @@ pre_build_target() {
 }
 
 configure_target() {
+  [ "$PROJECT" = "imx6" ] && strip_gold
+
   cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_INSTALL_LIBDIR=/usr/lib \

packages/addons/addon-depends/rpi_ws281x/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="rpi_ws281x"
-PKG_VERSION="dfcf740"
+PKG_VERSION="3e6ea50"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE=""
-PKG_SITE="https://github.com/penfold42/rpi_ws281x"
-PKG_URL="https://github.com/penfold42/rpi_ws281x/archive/$PKG_VERSION.tar.gz"
+PKG_SITE="https://github.com/hyperion-project/rpi_ws281x"
+PKG_URL="https://github.com/hyperion-project/rpi_ws281x/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION=""

packages/addons/addon-depends/runc/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="runc"
-PKG_VERSION="baf6536"
+PKG_VERSION="cc29e3d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="APL"

packages/addons/driver/sapphire/changelog.txt

@@ -0,0 +1,2 @@
+8.0.100
+- Initial add-on

packages/addons/driver/sapphire/package.mk

@@ -0,0 +1,76 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="sapphire"
+PKG_VERSION="6.6"
+PKG_REV="100"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="https://libreelec.tv"
+PKG_URL="http://www.rtr.ca/sapphire_remote/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain linux bash"
+PKG_PRIORITY="optional"
+PKG_SECTION="driver.remote"
+PKG_SHORTDESC="A Linux driver to add support for sapphire remotes"
+PKG_LONGDESC="A Linux driver to add support for sapphire remotes"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="Sapphire Remote Driver"
+PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_REPOVERSION="8.0"
+
+if [ -f $SYSROOT_PREFIX/usr/include/linux/input-event-codes.h ]; then
+  INPUT_H="$SYSROOT_PREFIX/usr/include/linux/input-event-codes.h"
+else
+  INPUT_H="$SYSROOT_PREFIX/usr/include/linux/input.h"
+fi
+
+make_target() {
+  KVER=$(kernel_version) KDIR=$(kernel_path) INPUT_H=$INPUT_H make
+}
+
+post_make_target() {
+  sed -i -e 's|modprobe sapphire|insmod /storage/.kodi/addons/driver.remote.sapphire/lib/sapphire.ko|' \
+         -e 's|/etc/sapphire.keymap|/storage/.kodi/userdata/addon_data/driver.remote.sapphire/sapphire.keymap|' \
+         -e 's|/usr/local/bin/sapphire_keymap.sh|/storage/.kodi/addons/driver.remote.sapphire/bin/sapphire_keymap.sh|' \
+         -e 's|\&\& /usr/local/bin/sapphire_keymap.sh|\&\& /storage/.kodi/addons/driver.remote.sapphire/bin/sapphire_keymap.sh /storage/.kodi/userdata/addon_data/driver.remote.sapphire/sapphire.keymap|' \
+         sapphire_startup.sh
+
+  sed -i -e 's|\#\!/bin/bash|\#\!/storage/.kodi/addons/driver.remote.sapphire/bin/bash|' \
+         sapphire_startup.sh sapphire_keymap.sh
+}
+
+makeinstall_target() {
+  :
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/
+    cp $PKG_BUILD/*.ko $ADDON_BUILD/$PKG_ADDON_ID/lib
+
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/etc
+    cp $PKG_BUILD/keymap.default $ADDON_BUILD/$PKG_ADDON_ID/etc
+
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
+    cp $PKG_BUILD/sapphire_startup.sh $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp $PKG_BUILD/sapphire_keymap.sh $ADDON_BUILD/$PKG_ADDON_ID/bin
+
+  # bash
+    cp $(get_build_dir bash)/.install_pkg/usr/bin/bash $ADDON_BUILD/$PKG_ADDON_ID/bin
+}

packages/addons/driver/sapphire/patches/sapphire-0001-fix-makefile.patch

@@ -0,0 +1,29 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2016-04-24 18:28:49.000000000 -0700
++++ b/Makefile	2016-07-09 13:39:17.008211023 -0700
+@@ -8,14 +8,14 @@
+ BLACKLIST=/etc/modprobe.d/blacklist-$(CONFLICTS).conf
+ KEYMAP_SCRIPT=sapphire_keymap.sh
+ EXTRACT_KEYDEFS=extract_keydefs.sh
+-INPUT_H=$(shell [ -e /usr/include/linux/input-event-codes.h ] && echo /usr/include/linux/input-event-codes.h || echo /usr/include/linux/input.h)
++INPUT_H ?= $(shell [ -e /usr/include/linux/input-event-codes.h ] && echo /usr/include/linux/input-event-codes.h || echo /usr/include/linux/input.h)
+ 
+ ## MODPARMS is not used any more, but we have to nuke old copies to prevent issues:
+ MODPARMS=/etc/modprobe.d/$(MODNAME).conf
+ 
+ CWD    = $(shell pwd -P)
+ KVER  ?= $(shell uname -r)
+-KDIR  = /lib/modules/$(KVER)
++KDIR  ?= /lib/modules/$(KVER)
+ obj-m += $(MODNAME).o
+ 
+ #EXTRA_CFLAGS += -Werror
+@@ -31,7 +31,7 @@
+ 	@exit 1
+ 
+ kmod:
+-	$(MAKE) -C $(KDIR)/build M=$(CWD) modules
++	$(MAKE) -C $(KDIR) M=$(CWD) modules
+ 
+ $(MODNAME).ko: $(MODSOURCE) $(MODNAME).h
+ 	$(MAKE) kmod

packages/addons/driver/sapphire/source/bin/sapphire-config

@@ -0,0 +1,25 @@
+#!/bin/sh
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+. /etc/profile
+oe_setup_addon driver.remote.sapphire
+
+if [ ! -f $ADDON_HOME/sapphire.keymap ]; then
+  cp $ADDON_DIR/etc/keymap.default $ADDON_HOME/sapphire.keymap
+fi

packages/addons/driver/sapphire/source/default.py

@@ -0,0 +1,18 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+

packages/addons/driver/sapphire/source/system.d/driver.remote.sapphire.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Sapphire remote start script
+Before=kodi.service
+
+[Service]
+Type=oneshot
+Environment=HOME=/storage
+ExecStartPre=/storage/.kodi/addons/driver.remote.sapphire/bin/sapphire-config
+ExecStart=/storage/.kodi/addons/driver.remote.sapphire/bin/sapphire_startup.sh
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

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

@@ -1,3 +1,9 @@
+8.0.102
+- automatically update driver to latest version on first install
+  show driver version in addon settings
+  allow update for aarch64 architecture
+  german translations
+
 8.0.101
 - system wait-for-online preference is now respected
 

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

@@ -18,7 +18,7 @@
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="7.0"
-PKG_REV="101"
+PKG_REV="102"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
@@ -27,7 +27,7 @@ PKG_DEPENDS_TARGET=""
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="Sundtek MediaTV: a Linux driver to add support for SUNDTEK USB DVB devices"
-PKG_LONGDESC="Install this to add support for SundTek USB DVB devices."
+PKG_LONGDESC="Install this to add support for Sundtek USB DVB devices."
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Sundtek MediaTV"

packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.start

@@ -36,8 +36,17 @@ SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml"
 
 mkdir -p $SUNDTEK_ADDON_HOME
 
+# remove the entry
+BUILD_DATE="#"
+sed -i "s|\(id=\"BUILD_DATE\" .* values=\)\"[^\"]*\"|\1\"$BUILD_DATE\"|" $SUNDTEK_ADDON_DIR/resources/settings.xml
+
 if [ ! -f "$SUNDTEK_ADDON_HOME/sundtek.conf" ]; then
   cp $SUNDTEK_ADDON_DIR/config/* $SUNDTEK_ADDON_HOME/
+  
+  # update driver on first run
+  echo "update driver" >/tmp/ppp
+  systemd-run $SUNDTEK_ADDON_DIR/bin/sundtek-update-driver.sh
+  exit 0	# will be started later
 else
   # in case of missing entries in addon home's sundtek.conf
   entry_set="$(grep use_hwpidfilter $SUNDTEK_ADDON_HOME/sundtek.conf 2>/dev/null)"
@@ -244,4 +253,8 @@ if [ -z "$(pidof mediasrv)" ]; then
   fi
 fi
 
-logger -t Sundtek "### Sundtek ready ###"
+# change build date in addon settings
+BUILD_DATE=$(mediasrv --build 2>&1)
+sed -i "s|\(id=\"BUILD_DATE\" .* values=\)\"[^\"]*\"|\1\"$BUILD_DATE\"|" $SUNDTEK_ADDON_DIR/resources/settings.xml
+
+logger -t Sundtek "### Sundtek ready ($BUILD_DATE) ###"

packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh

@@ -36,6 +36,10 @@ systemctl stop driver.dvb.sundtek-mediatv
 killall -9 mediaclient &>/dev/null
 killall -9 mediasrv &>/dev/null
 
+# remove the entry
+BUILD_DATE="#"
+sed -i "s|\(id=\"BUILD_DATE\" .* values=\)\"[^\"]*\"|\1\"$BUILD_DATE\"|" $SUNDTEK_ADDON_DIR/resources/settings.xml
+
 # exit on errors
 set -e
 
@@ -47,7 +51,7 @@ mkdir tmp
 cd tmp
 
 logger -t Sundtek "### Starting updating driver ###"
-kodi-send -a "Notification(Sundtek, Starting updating driver, 2000, $SUNDTEK_ADDON_DIR/icon.png)"
+kodi-send -a "Notification(Sundtek, Starting updating driver, 3000, $SUNDTEK_ADDON_DIR/icon.png)"
 
 wget -O ../version.used http://sundtek.de/media/latest.phtml
 if [ $? -ne 0 ]; then
@@ -63,6 +67,8 @@ if [ "$ARCH" = "x86_64" ]; then
   INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz"
 elif [ "$ARCH" = "arm" ]; then
   INSTALLER_URL="http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz"
+elif [ "$ARCH" = "aarch64" ]; then
+  INSTALLER_URL="http://sundtek.de/media/netinst/arm64/installer.tar.gz"
 else
   logger -t Sundtek "### Unsupported architecture ###"
   kodi-send -a "Notification(Sundtek, Unsupported architecture, 8000, $SUNDTEK_ADDON_DIR/icon.png)"
@@ -72,7 +78,7 @@ else
 fi
 
 logger -t Sundtek "### Downloading driver archive for $ARCH ###"
-kodi-send -a "Notification(Sundtek, Downloading driver archive for $ARCH, 2000, $SUNDTEK_ADDON_DIR/icon.png)"
+kodi-send -a "Notification(Sundtek, Downloading driver archive for $ARCH, 3000, $SUNDTEK_ADDON_DIR/icon.png)"
 wget -O installer.tar.gz $INSTALLER_URL
 if [ $? -ne 0 ]; then
   logger -t Sundtek "### Archive damaged ###"
@@ -83,7 +89,7 @@ if [ $? -ne 0 ]; then
 fi
 
 logger -t Sundtek "### Extracting archive ###"
-kodi-send -a "Notification(Sundtek, Extracting archive, 2000, $SUNDTEK_ADDON_DIR/icon.png)"
+kodi-send -a "Notification(Sundtek, Extracting archive, 3000, $SUNDTEK_ADDON_DIR/icon.png)"
 tar -xzf installer.tar.gz
 if [ $? -ne 0 ]; then
   logger -t Sundtek "### Archive damaged ###"

packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml

@@ -24,11 +24,12 @@
 
   <string id="9000">Tuner settings</string>
   <string id="9005">Enable modifying settings</string>
-  <string id="9010">Refresh tuners... (press me)</string>
+  <string id="9010"><![CDATA[       >>> Refresh tuners <<< ]]></string>
   <string id="9020">    IR protocol</string>
   <string id="9030">    keymap filename</string>
 
   <string id="3000">Driver</string>
+  <string id="3005">Driver version</string>
   <string id="3020">Check for new driver version at boot</string>
-  <string id="3010">Update from web... (press me)</string>
+  <string id="3010"><![CDATA[       >>> Update driver now <<< ]]></string>
 </strings>

packages/addons/driver/sundtek-mediatv/source/resources/language/German/strings.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+  <string id="1000">Allgemein</string>
+  <string id="1014">Verzögerung bevor Treiber gestartet wird [Sek.]</string>
+  <string id="1015">Skript welches vom Treiber-Stack gestartet werden soll</string>
+  <string id="1030">Hardware PID Filter einschalten</string>
+  <string id="1035">Fernbedienung unterstützen</string>
+  <string id="1040">Niedrigste Adapter Nummer (/dev/dvb/adapterX/)</string>
+  <string id="1050">Suspend / Resume des Treibers zulassen</string>
+
+  <string id="2000">Netzwerksupport</string>
+  <string id="2005">Netzwerkserver aktivieren</string>
+  <string id="2010">Mit Netzwerk-Tunern verbinden</string>
+  <string id="2020">Server 1 IP Adresse</string>
+  <string id="2021">    # Tuner ID</string>
+  <string id="2030">Server 2 IP Adresse</string>
+  <string id="2031">    # Tuner ID</string>
+  <string id="2040">Server 3 IP Adresse</string>
+  <string id="2041">    # Tuner ID</string>
+  <string id="2050">Server 4 IP Adresse</string>
+  <string id="2051">    # Tuner ID</string>
+  <string id="2060">Server 5 IP Adresse</string>
+  <string id="2061">    # Tuner ID</string>
+
+  <string id="9000">Geräte Einstellungen</string>
+  <string id="9005">Geräte-Einstellung ändern</string>
+  <string id="9010"><![CDATA[       >>> Tuner-Liste aktualisieren <<< ]]></string>
+  <string id="9020">    IR Protokoll</string>
+  <string id="9030">    Keymap Datei</string>
+
+  <string id="3000">Treiber</string>
+  <string id="3005">Treiber-Version</string>
+  <string id="3020">Bei Neustart auf neue Treiber-Version prüfen</string>
+  <string id="3010"><![CDATA[       >>> Treiber jetzt aktualisieren <<< ]]></string>
+</strings>

packages/addons/driver/sundtek-mediatv/source/resources/settings.xml

@@ -31,6 +31,7 @@
   </category>
   <category label="3000">
     <setting type="sep" />
+    <setting id="BUILD_DATE" type="enum" label="3005" values="#" /> 
     <setting id="CHECK_BOOT" type="bool" label="3020" default="false" />
     <setting label="3010" option="close" type="action" id="update_driver" action="RunScript($CWD/resources/actions.py, update_driver)" />
   </category>

packages/addons/service/dispmanx_vnc/changelog.txt

@@ -1,3 +1,6 @@
+8.0.102
+- Build with Linux 4.7 RPi libraries
+
 8.0.101
 - Move settings to Kodi
 

packages/addons/service/dispmanx_vnc/package.mk

@@ -18,7 +18,7 @@
 
 PKG_NAME="dispmanx_vnc"
 PKG_VERSION="78e6673"
-PKG_REV="101"
+PKG_REV="102"
 PKG_ARCH="arm"
 PKG_ADDON_PROJECTS="RPi RPi2"
 PKG_LICENSE="OSS"
@@ -27,15 +27,15 @@ PKG_URL="https://github.com/patrikolausson/dispmanx_vnc/archive/$PKG_VERSION.tar
 PKG_DEPENDS_TARGET="toolchain libvncserver bcm2835-bootloader bcm2835-driver libconfig libressl"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/system"
-PKG_SHORTDESC="VNC Server for Raspberry Pi"
-PKG_LONGDESC="VNC Server for Raspberry Pi using dispmanx"
+PKG_SHORTDESC="Raspberry Pi VNC: a Virtual Network Computing server for Raspberry Pi"
+PKG_LONGDESC="Raspberry Pi VNC ($PKG_VERSION) is a Virtual Network Computing (VNC) server for Raspberry Pi using dispmanx"
 PKG_AUTORECONF="no"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Raspberry Pi VNC"
 PKG_ADDON_TYPE="xbmc.service"
 PKG_ADDON_REPOVERSION="8.0"
-PKG_MAINTAINER="Anton Voyl (awiouy at gmail dot com)"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 pre_make_target() {
   export SYSROOT_PREFIX

packages/addons/service/dispmanx_vnc/patches/dispmanx_vnc-0001_fix-cross-compile.patch

@@ -14,7 +14,7 @@ diff -Naur a/Makefile b/Makefile
 +
 +INCLUDES = -I$(SYSROOT_PREFIX)/usr/include/ -I$(SYSROOT_PREFIX)/usr/include/interface/vcos/pthreads -I$(SYSROOT_PREFIX)/usr/include/interface/vmcs_host/linux
 +LIB_PATHS = -L$(SYSROOT_PREFIX)/usr/lib/
-+LIBS = -lGLESv2 -lEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -lconfig++ -lz -lssl -lcrypto -lresolv -lvncserver -ljpeg -lpng16
++LIBS = -lbrcmGLESv2 -lbrcmEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -lconfig++ -lz -lssl -lcrypto -lresolv -lvncserver -ljpeg -lpng16
  
  SOURCES = main.cpp \
  		UFile.cpp \

packages/addons/service/docker/changelog.txt

@@ -1,3 +1,12 @@
+8.0.106
+- Include missing docker-proxy
+
+8.0.105
+- Update to docker 1.12.0
+- Update to golang 1.6.3
+- Use overlay2 driver (new installs only)
+- Remove docker-containerd-ctr
+
 8.0.104
 - Update to docker 1.11.2
 

packages/addons/service/docker/package.mk

@@ -17,10 +17,10 @@
 ################################################################################
 
 PKG_NAME="docker"
-PKG_VERSION="1.11.2"
-PKG_REV="104"
+PKG_VERSION="1.12.0"
+PKG_REV="106"
 PKG_ARCH="any"
-PKG_ADDON_PROJECTS="Generic RPi RPi2"
+PKG_ADDON_PROJECTS="Generic RPi RPi2 imx6"
 PKG_LICENSE="ASL"
 PKG_SITE="http://www.docker.com/"
 PKG_URL="https://github.com/docker/docker/archive/v${PKG_VERSION}.tar.gz"
@@ -54,7 +54,7 @@ configure_target() {
         arm1176jzf-s)
           export GOARM=6
           ;;
-        cortex-a7)
+        cortex-a7|cortex-a9)
          export GOARM=7
          ;;
       esac
@@ -82,7 +82,9 @@ configure_target() {
 
 make_target() {
   mkdir -p bin
-  $GOLANG build -v -o bin/docker -a -tags "$DOCKER_BUILDTAGS" -ldflags "$LDFLAGS" ./docker
+  $GOLANG build -v -o bin/docker -a -tags "$DOCKER_BUILDTAGS" -ldflags "$LDFLAGS" ./cmd/docker
+  $GOLANG build -v -o bin/dockerd -a -tags "$DOCKER_BUILDTAGS" -ldflags "$LDFLAGS" ./cmd/dockerd
+  $GOLANG build -v -o bin/docker-proxy -a -ldflags "$LDFLAGS" ./vendor/src/github.com/docker/libnetwork/cmd/proxy
 }
 
 makeinstall_target() {
@@ -92,11 +94,12 @@ makeinstall_target() {
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
     cp -P $ROOT/$PKG_BUILD/bin/docker $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $ROOT/$PKG_BUILD/bin/dockerd $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $ROOT/$PKG_BUILD/bin/docker-proxy $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # containerd
     cp -P $(get_build_dir containerd)/bin/containerd $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-containerd
     cp -P $(get_build_dir containerd)/bin/containerd-shim $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-containerd-shim
-    cp -P $(get_build_dir containerd)/bin/ctr $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-containerd-ctr
 
     # runc
     cp -P $(get_build_dir runc)/bin/runc $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-runc

packages/addons/service/docker/patches/docker-001-use-addon-storage-location.patch

@@ -1,19 +1,31 @@
 # Created with
 # find . -name "*.go" -print | xargs sed -i 's/\/etc\/docker/\/storage\/.kodi\/userdata\/addon_data\/service.system.docker\/config/g'
 
-diff -Naur a/docker/daemon_unix.go b/docker/daemon_unix.go
---- a/docker/daemon_unix.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/docker/daemon_unix.go	2016-05-02 12:19:20.461479163 -0700
-@@ -16,7 +16,7 @@
- 	"github.com/docker/docker/pkg/system"
+diff -Naur a/cmd/dockerd/daemon_solaris.go b/cmd/dockerd/daemon_solaris.go
+--- a/cmd/dockerd/daemon_solaris.go	2016-06-17 13:28:45.000000000 -0700
++++ b/cmd/dockerd/daemon_solaris.go	2016-06-23 10:53:28.544141675 -0700
+@@ -39,7 +39,7 @@
+ }
+ 
+ func getDaemonConfDir() string {
+-	return "/etc/docker"
++	return "/storage/.kodi/userdata/addon_data/service.system.docker/config"
+ }
+ 
+ // setupConfigReloadTrap configures the USR2 signal to reload the configuration.
+diff -Naur a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go
+--- a/cmd/dockerd/daemon_unix.go	2016-06-17 13:28:45.000000000 -0700
++++ b/cmd/dockerd/daemon_unix.go	2016-06-23 10:53:28.542141655 -0700
+@@ -18,7 +18,7 @@
+ 	"github.com/docker/libnetwork/portallocator"
  )
  
 -const defaultDaemonConfigFile = "/etc/docker/daemon.json"
 +const defaultDaemonConfigFile = "/storage/.kodi/userdata/addon_data/service.system.docker/config/daemon.json"
  
- func setPlatformServerConfig(serverConfig *apiserver.Config, daemonCfg *daemon.Config) *apiserver.Config {
- 	serverConfig.EnableCors = daemonCfg.EnableCors
-@@ -49,7 +49,7 @@
+ // currentUserIsOwner checks whether the current user is the owner of the given
+ // file.
+@@ -44,7 +44,7 @@
  }
  
  func getDaemonConfDir() string {
@@ -23,9 +35,9 @@ diff -Naur a/docker/daemon_unix.go b/docker/daemon_unix.go
  
  // setupConfigReloadTrap configures the USR2 signal to reload the configuration.
 diff -Naur a/integration-cli/docker_cli_authz_unix_test.go b/integration-cli/docker_cli_authz_unix_test.go
---- a/integration-cli/docker_cli_authz_unix_test.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/integration-cli/docker_cli_authz_unix_test.go	2016-05-02 12:19:20.291477565 -0700
-@@ -134,10 +134,10 @@
+--- a/integration-cli/docker_cli_authz_unix_test.go	2016-06-17 13:28:45.000000000 -0700
++++ b/integration-cli/docker_cli_authz_unix_test.go	2016-06-23 10:53:28.339139631 -0700
+@@ -142,10 +142,10 @@
  		w.Write(b)
  	})
  
@@ -38,7 +50,7 @@ diff -Naur a/integration-cli/docker_cli_authz_unix_test.go b/integration-cli/doc
  	err = ioutil.WriteFile(fileName, []byte(s.server.URL), 0644)
  	c.Assert(err, checker.IsNil)
  }
-@@ -186,7 +186,7 @@
+@@ -194,7 +194,7 @@
  
  	s.server.Close()
  
@@ -48,9 +60,9 @@ diff -Naur a/integration-cli/docker_cli_authz_unix_test.go b/integration-cli/doc
  }
  
 diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go
---- a/integration-cli/docker_cli_daemon_test.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/integration-cli/docker_cli_daemon_test.go	2016-05-02 12:19:20.356478174 -0700
-@@ -512,13 +512,13 @@
+--- a/integration-cli/docker_cli_daemon_test.go	2016-06-17 13:28:45.000000000 -0700
++++ b/integration-cli/docker_cli_daemon_test.go	2016-06-23 10:53:28.411140349 -0700
+@@ -553,13 +553,13 @@
  
  func (s *DockerDaemonSuite) TestDaemonKeyGeneration(c *check.C) {
  	// TODO: skip or update for Windows daemon
@@ -66,7 +78,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err != nil {
  		c.Fatalf("Error opening key file")
  	}
-@@ -531,7 +531,7 @@
+@@ -572,7 +572,7 @@
  
  func (s *DockerDaemonSuite) TestDaemonKeyMigration(c *check.C) {
  	// TODO: skip or update for Windows daemon
@@ -75,7 +87,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	k1, err := libtrust.GenerateECP256PrivateKey()
  	if err != nil {
  		c.Fatalf("Error generating private key: %s", err)
-@@ -548,7 +548,7 @@
+@@ -589,7 +589,7 @@
  	}
  	s.d.Stop()
  
@@ -84,7 +96,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err != nil {
  		c.Fatalf("Error opening key file")
  	}
-@@ -1296,7 +1296,7 @@
+@@ -1337,7 +1337,7 @@
  		Y   string `json:"y"`
  	}
  
@@ -93,7 +105,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err := s.d.Start(); err != nil {
  		c.Fatalf("Failed to start daemon: %v", err)
  	}
-@@ -1306,7 +1306,7 @@
+@@ -1347,7 +1347,7 @@
  	}
  
  	config := &Config{}
@@ -102,7 +114,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err != nil {
  		c.Fatalf("Error reading key.json file: %s", err)
  	}
-@@ -1326,11 +1326,11 @@
+@@ -1367,11 +1367,11 @@
  	}
  
  	// write back
@@ -117,9 +129,9 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err := s.d.Start(); err == nil {
  		c.Fatalf("It should not be successful to start daemon with wrong key: %v", err)
 diff -Naur a/integration-cli/docker_cli_external_graphdriver_unix_test.go b/integration-cli/docker_cli_external_graphdriver_unix_test.go
---- a/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-05-02 12:19:20.382478419 -0700
-@@ -306,10 +306,10 @@
+--- a/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-06-17 13:28:45.000000000 -0700
++++ b/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-06-23 10:53:28.444140678 -0700
+@@ -321,10 +321,10 @@
  		respond(w, &graphDriverResponse{Size: size})
  	})
  
@@ -133,7 +145,7 @@ diff -Naur a/integration-cli/docker_cli_external_graphdriver_unix_test.go b/inte
  	err = ioutil.WriteFile(specFile, b, 0644)
  	c.Assert(err, check.IsNil, check.Commentf("error writing to %s", specFile))
  }
-@@ -318,8 +318,8 @@
+@@ -333,8 +333,8 @@
  	s.server.Close()
  	s.jserver.Close()
  
@@ -144,41 +156,11 @@ diff -Naur a/integration-cli/docker_cli_external_graphdriver_unix_test.go b/inte
  }
  
  func (s *DockerExternalGraphdriverSuite) TestExternalGraphDriver(c *check.C) {
-diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go
---- a/integration-cli/docker_cli_network_unix_test.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/integration-cli/docker_cli_network_unix_test.go	2016-05-02 12:19:20.380478400 -0700
-@@ -200,14 +200,14 @@
- 		}
- 	})
- 
--	err := os.MkdirAll("/etc/docker/plugins", 0755)
-+	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
- 	c.Assert(err, checker.IsNil)
- 
--	fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", netDrv)
-+	fileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", netDrv)
- 	err = ioutil.WriteFile(fileName, []byte(url), 0644)
- 	c.Assert(err, checker.IsNil)
- 
--	ipamFileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", ipamDrv)
-+	ipamFileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", ipamDrv)
- 	err = ioutil.WriteFile(ipamFileName, []byte(url), 0644)
- 	c.Assert(err, checker.IsNil)
- }
-@@ -219,7 +219,7 @@
- 
- 	s.server.Close()
- 
--	err := os.RemoveAll("/etc/docker/plugins")
-+	err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins")
- 	c.Assert(err, checker.IsNil)
- }
- 
-diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integration-cli/docker_cli_start_volume_driver_unix_test.go
---- a/integration-cli/docker_cli_start_volume_driver_unix_test.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/integration-cli/docker_cli_start_volume_driver_unix_test.go	2016-05-02 12:19:20.387478466 -0700
-@@ -216,17 +216,17 @@
- 		send(w, nil)
+diff -Naur a/integration-cli/docker_cli_external_volume_driver_unix_test.go b/integration-cli/docker_cli_external_volume_driver_unix_test.go
+--- a/integration-cli/docker_cli_external_volume_driver_unix_test.go	2016-06-17 13:28:45.000000000 -0700
++++ b/integration-cli/docker_cli_external_volume_driver_unix_test.go	2016-06-23 10:53:28.435140588 -0700
+@@ -239,17 +239,17 @@
+ 		send(w, `{"Capabilities": { "Scope": "global" }}`)
  	})
  
 -	err := os.MkdirAll("/etc/docker/plugins", 0755)
@@ -198,7 +180,7 @@ diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integ
  	c.Assert(err, checker.IsNil)
  }
  
-@@ -311,7 +311,7 @@
+@@ -334,7 +334,7 @@
  
  // Make sure a request to use a down driver doesn't block other requests
  func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverLookupNotBlocked(c *check.C) {
@@ -207,7 +189,7 @@ diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integ
  	err := ioutil.WriteFile(specPath, []byte("tcp://127.0.0.7:9999"), 0644)
  	c.Assert(err, check.IsNil)
  	defer os.RemoveAll(specPath)
-@@ -350,7 +350,7 @@
+@@ -373,7 +373,7 @@
  	err := s.d.StartWithBusybox()
  	c.Assert(err, checker.IsNil)
  
@@ -216,9 +198,39 @@ diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integ
  	os.RemoveAll(specPath)
  	defer os.RemoveAll(specPath)
  
+diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go
+--- a/integration-cli/docker_cli_network_unix_test.go	2016-06-17 13:28:45.000000000 -0700
++++ b/integration-cli/docker_cli_network_unix_test.go	2016-06-23 10:53:28.441140648 -0700
+@@ -201,14 +201,14 @@
+ 		}
+ 	})
+ 
+-	err := os.MkdirAll("/etc/docker/plugins", 0755)
++	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
+ 	c.Assert(err, checker.IsNil)
+ 
+-	fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", netDrv)
++	fileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", netDrv)
+ 	err = ioutil.WriteFile(fileName, []byte(url), 0644)
+ 	c.Assert(err, checker.IsNil)
+ 
+-	ipamFileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", ipamDrv)
++	ipamFileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", ipamDrv)
+ 	err = ioutil.WriteFile(ipamFileName, []byte(url), 0644)
+ 	c.Assert(err, checker.IsNil)
+ }
+@@ -220,7 +220,7 @@
+ 
+ 	s.server.Close()
+ 
+-	err := os.RemoveAll("/etc/docker/plugins")
++	err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins")
+ 	c.Assert(err, checker.IsNil)
+ }
+ 
 diff -Naur a/pkg/plugins/discovery.go b/pkg/plugins/discovery.go
---- a/pkg/plugins/discovery.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/pkg/plugins/discovery.go	2016-05-02 12:19:20.540479907 -0700
+--- a/pkg/plugins/discovery.go	2016-06-17 13:28:45.000000000 -0700
++++ b/pkg/plugins/discovery.go	2016-06-23 10:53:28.636142593 -0700
 @@ -16,7 +16,7 @@
  	// ErrNotFound plugin not found
  	ErrNotFound = errors.New("plugin not found")
@@ -229,8 +241,8 @@ diff -Naur a/pkg/plugins/discovery.go b/pkg/plugins/discovery.go
  
  // localRegistry defines a registry that is local (using unix socket).
 diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
---- a/pkg/plugins/plugins.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/pkg/plugins/plugins.go	2016-05-02 12:19:20.539479898 -0700
+--- a/pkg/plugins/plugins.go	2016-06-17 13:28:45.000000000 -0700
++++ b/pkg/plugins/plugins.go	2016-06-23 10:53:28.636142593 -0700
 @@ -4,7 +4,7 @@
  // Docker discovers plugins by looking for them in the plugin directory whenever
  // a user or container tries to use one by name. UNIX domain socket files must
@@ -241,8 +253,8 @@ diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
  // its name if it exists.
  //
 diff -Naur a/registry/config_unix.go b/registry/config_unix.go
---- a/registry/config_unix.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/registry/config_unix.go	2016-05-02 12:19:20.502479549 -0700
+--- a/registry/config_unix.go	2016-06-17 13:28:45.000000000 -0700
++++ b/registry/config_unix.go	2016-06-23 10:53:28.594142174 -0700
 @@ -4,7 +4,7 @@
  
  var (
@@ -253,8 +265,8 @@ diff -Naur a/registry/config_unix.go b/registry/config_unix.go
  
  // cleanPath is used to ensure that a directory name is valid on the target
 diff -Naur a/registry/endpoint_v1.go b/registry/endpoint_v1.go
---- a/registry/endpoint_v1.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/registry/endpoint_v1.go	2016-05-02 12:19:20.501479540 -0700
+--- a/registry/endpoint_v1.go	2016-06-17 13:28:45.000000000 -0700
++++ b/registry/endpoint_v1.go	2016-06-23 10:53:28.593142164 -0700
 @@ -49,7 +49,7 @@
  		if endpoint.IsSecure {
  			// If registry is secure and HTTPS failed, show user the error and tell them about `--insecure-registry`

packages/addons/service/docker/source/config/docker.conf

@@ -1,2 +1,2 @@
 DOCKER_DAEMON_OPTS="--graph=/storage/.kodi/userdata/addon_data/service.system.docker/docker"
-DOCKER_STORAGE_OPTS="--storage-driver=overlay"
+DOCKER_STORAGE_OPTS="--storage-driver=overlay2"

packages/addons/service/docker/source/systemd/service.system.docker.service

@@ -9,7 +9,7 @@ Type=notify
 Environment=PATH=/bin:/sbin:/usr/bin:/usr/sbin:/storage/.kodi/addons/service.system.docker/bin
 ExecStartPre=/storage/.kodi/addons/service.system.docker/bin/docker-config
 EnvironmentFile=-/storage/.kodi/userdata/addon_data/service.system.docker/config/docker.conf
-ExecStart=/storage/.kodi/addons/service.system.docker/bin/docker daemon -H fd:// $DOCKER_DAEMON_OPTS $DOCKER_STORAGE_OPTS
+ExecStart=/storage/.kodi/addons/service.system.docker/bin/dockerd --host=fd:// --group=root $DOCKER_DAEMON_OPTS $DOCKER_STORAGE_OPTS
 MountFlags=slave
 LimitNOFILE=1048576
 LimitNPROC=1048576

packages/addons/service/emby/changelog.txt

@@ -1,2 +1,6 @@
+8.0.101
+- Updated to version 3.0.5985
+- Removed mono build dependency
+
 8.0.100
 - Initial release

packages/addons/service/emby/package.mk

@@ -17,27 +17,25 @@
 ################################################################################
 
 PKG_NAME="emby"
-PKG_VERSION="3.0.5972"
-PKG_REV="100"
-PKG_ARCH="any"
+PKG_VERSION="3.0.5985"
+PKG_REV="101"
+PKG_ARCH="arm x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="http://emby.media"
 PKG_URL="https://github.com/MediaBrowser/Emby/releases/download/$PKG_VERSION/Emby.Mono.zip"
-PKG_DEPENDS_TARGET="toolchain mono imagemagick"
+PKG_DEPENDS_TARGET="toolchain imagemagick"
 PKG_PRIORITY="optional"
 PKG_SECTION="service"
 PKG_SHORTDESC="Emby: a personal media server"
 PKG_LONGDESC="Emby ($PKG_VERSION) brings your home videos, music, and photos together, automatically converting and streaming your media on-the-fly to any device"
-PKG_MAINTAINER="Anton Voyl (awiouy)"
+PKG_AUTORECONF="no"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Emby (beta)"
 PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_PROVIDES=""
 PKG_ADDON_REPOVERSION="8.0"
 PKG_ADDON_REQUIRES="tools.mono:0.0.0"
-
-PKG_AUTORECONF="no"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 unpack() {
   mkdir -p $PKG_BUILD

packages/addons/service/hyperion/changelog.txt

@@ -1,3 +1,6 @@
+8.0.102
+- Update to version 85fcec3
+
 8.0.101
 - Update to version d2f4725
 

packages/addons/service/hyperion/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="hyperion"
-PKG_VERSION="d2f4725"
-PKG_REV="101"
+PKG_VERSION="85fcec3"
+PKG_REV="102"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/tvdzwan/hyperion"
 PKG_URL="https://github.com/tvdzwan/hyperion/archive/$PKG_VERSION.tar.gz"

packages/addons/service/hyperion/patches/hyperion-0001-make-protobuf-use-system-version.patch

@@ -1,76 +0,0 @@
-From f0884ec25b5f56cea3ed135efaf5fca744d3f1ee Mon Sep 17 00:00:00 2001
-From: redPanther <redPanther@users.noreply.github.com>
-Date: Mon, 13 Jun 2016 08:11:57 +0200
-Subject: [PATCH] add support for using system protoc instead of version in
- submodule (#698)
-
----
- dependencies/CMakeLists.txt | 44 ++++++++++++++++++++++++++------------------
- 1 file changed, 26 insertions(+), 18 deletions(-)
-
-diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
-index 52d7f74..26dd96c 100644
---- a/dependencies/CMakeLists.txt
-+++ b/dependencies/CMakeLists.txt
-@@ -9,27 +9,35 @@ if(ENABLE_WS281XPWM)
- 		external/rpi_ws281x/mailbox.c external/rpi_ws281x/ws2811.c
- 		external/rpi_ws281x/pwm.c external/rpi_ws281x/dma.c
- 		external/rpi_ws281x/rpihw.c)
--endif(ENABLE_WS281XPWM)
-+endif()
- 
--set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared protobuf library")
--add_subdirectory(external/protobuf)
-+set(USE_SYSTEM_PROTO_LIBS OFF CACHE BOOL "use protobuf library from system")
- 
--if(CMAKE_CROSSCOMPILING)
--	# when crosscompiling import the protoc executable targets from a file generated by a native build
--	option(IMPORT_PROTOC "Protoc export file (protoc_export.cmake) from a native build" "IMPORT_PROTOC-FILE_NOT_FOUND")
--	include(${IMPORT_PROTOC})
--else()
--	# export the protoc compiler so it can be used when cross compiling
--	export(TARGETS protoc_compiler FILE "${CMAKE_BINARY_DIR}/protoc_export.cmake")
--endif()
-+if (USE_SYSTEM_PROTO_LIBS)
-+	find_package(Protobuf REQUIRED)
-+	include_directories(${PROTOBUF_INCLUDE_DIRS})
-+else ()
-+	set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared protobuf library")
-+	add_subdirectory(external/protobuf)
- 
--# define the include for the protobuf library at the parent scope
--set(PROTOBUF_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/external/protobuf/src")
--set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS} PARENT_SCOPE)
-+	if(CMAKE_CROSSCOMPILING)
-+		# when crosscompiling import the protoc executable targets from a file generated by a native build
-+		option(IMPORT_PROTOC "Protoc export file (protoc_export.cmake) from a native build" "IMPORT_PROTOC-FILE_NOT_FOUND")
-+		include(${IMPORT_PROTOC})
-+	else()
-+		# export the protoc compiler so it can be used when cross compiling
-+		export(TARGETS protoc_compiler FILE "${CMAKE_BINARY_DIR}/protoc_export.cmake")
-+	endif()
-+
-+	# define the include for the protobuf library at the parent scope
-+	set(PROTOBUF_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/external/protobuf/src")
-+	set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS} PARENT_SCOPE)
-+
-+	# define the protoc executable at the parent scope
-+	get_property(PROTOBUF_PROTOC_EXECUTABLE TARGET protoc_compiler PROPERTY LOCATION)
-+	set(PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE} PARENT_SCOPE)
-+endif()
- 
--# define the protoc executable at the parent scope
--get_property(PROTOBUF_PROTOC_EXECUTABLE TARGET protoc_compiler PROPERTY LOCATION)
--set(PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE} PARENT_SCOPE)
- message(STATUS "Using protobuf compiler: " ${PROTOBUF_PROTOC_EXECUTABLE})
- 
- #=============================================================================
-@@ -76,7 +84,7 @@ function(PROTOBUF_GENERATE_CPP SRCS HDRS)
- 		endforeach()
- 	endif()
- 
--	if(CMAKE_CROSSCOMPILING)
-+	if(CMAKE_CROSSCOMPILING OR USE_SYSTEM_PROTO_LIBS)
- 		set(PROTOC_DEPENDENCY ${PROTOBUF_PROTOC_EXECUTABLE})
- 	else()
- 		set(PROTOC_DEPENDENCY protoc_compiler)

packages/addons/service/inadyn/package.mk

@@ -26,16 +26,16 @@ PKG_URL="ftp://troglobit.com/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libressl"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/system"
-PKG_SHORTDESC="Inadyn, a small and simple DDNS client"
-PKG_LONGDESC="Inadyn is a small and simple DDNS client with HTTPS support. It is commonly available in many GNU/Linux distributions, used in off-the-shelf routers and Internet gateways to automate the task of keeping your DNS record up to date with any IP address changes from your ISP. It can also be used in installations with redundant (backup) connections to the Internet."
-PKG_MAINTAINER="Anton Voyl (awiouy at gmail.com)"
+PKG_SHORTDESC="Inadyn: a small and simple Dynamic Domain Name System client"
+PKG_LONGDESC="Inadyn ($PKG_VERSION) is a small and simple Dynamic Domain Name System (DDNS) client with HTTPS support. It is commonly available in many GNU/Linux distributions, used in off-the-shelf routers and Internet gateways to automate the task of keeping your DNS record up to date with any IP address changes from your ISP. It can also be used in installations with redundant (backup) connections to the Internet."
+PKG_AUTORECONF="yes"
 
 PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="Inadyn"
 PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_PROVIDES=""
 PKG_ADDON_REPOVERSION="8.0"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
 
-PKG_AUTORECONF="yes"
 PKG_CONFIGURE_OPTS_TARGET="--enable-openssl" # --sysconfdir is ineffective
 
 pre_configure_target() {

packages/addons/service/spotify-connect-web/changelog.txt

@@ -0,0 +1,2 @@
+8.0.100
+- Initial addon

packages/addons/service/spotify-connect-web/package.mk

@@ -0,0 +1,53 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="spotify-connect-web"
+PKG_VERSION="0.0.3-alpha"
+PKG_REV="100"
+PKG_ARCH="arm"
+PKG_ADDON_PROJECTS="RPi2"
+PKG_LICENSE="prop."
+PKG_SITE="https://github.com/Fornoth/spotify-connect-web"
+PKG_URL="https://github.com/Fornoth/spotify-connect-web/releases/download/$PKG_VERSION/${PKG_NAME}_$PKG_VERSION.tar.gz"
+PKG_SOURCE_DIR="spotify-connect-web"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="service"
+PKG_SHORTDESC="Spotify Connect Web: play Spotify through LibreELEC"
+PKG_LONGDESC="Spotify Connect Web ($PKG_VERSION) plays Spotify through LibreELEC, using a Spotify app as a remote."
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="Spotify Connect Web"
+PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_REPOVERSION="8.0"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
+
+make_target() {
+  : # nop
+}
+
+makeinstall_target() {
+  : # nop
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
+  cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/
+  rm $ADDON_BUILD/$PKG_ADDON_ID/libasound.so.2
+}

packages/addons/service/spotify-connect-web/source/bin/spotify-connect-web.start

@@ -0,0 +1,58 @@
+#!/bin/sh
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+. /etc/profile
+oe_setup_addon service.spotify-connect-web
+
+mkdir -p "$ADDON_HOME"
+
+if [ ! -f "$ADDON_HOME/spotify_appkey.key" ]
+then
+  echo "Exiting: no key"
+  exit
+fi
+
+if [ ! "$scw_p" ]
+then
+  echo "Exiting: no password"
+  exit
+fi
+
+if [ !  "$scw_u" ]
+then
+  echo "Exiting: no username"
+  exit
+fi
+
+amixer &> /dev/null || dtoverlay dtparam audio=on
+amixer cset numid=3 "$pcm_3"
+
+[ "$scw_b" ] && scw_B="-b $scw_b"
+[ "$scw_m" ] && scw_M="-m $scw_m"
+[ "$scw_o" ] && scw_O="-o $scw_o"
+
+cd $ADDON_DIR
+chmod +x spotify-connect-web
+./spotify-connect-web $scw_B \
+                      -k "$ADDON_HOME/spotify_appkey.key" \
+                      $scw_M \
+                      -n "$HOSTNAME" \
+                      $scw_O \
+                      -p "$scw_p" \
+                      -u "$scw_u"

packages/addons/service/spotify-connect-web/source/default.py

@@ -0,0 +1,35 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+import subprocess
+import xbmc
+import xbmcaddon
+
+
+class Monitor(xbmc.Monitor):
+
+   def __init__(self, *args, **kwargs):
+      xbmc.Monitor.__init__(self)
+      self.id = xbmcaddon.Addon().getAddonInfo('id')
+
+   def onSettingsChanged(self):
+      subprocess.call(['systemctl', 'restart', self.id])
+
+
+if __name__ == "__main__":
+   Monitor().waitForAbort()

packages/addons/service/spotify-connect-web/source/resources/language/English/strings.po

@@ -0,0 +1,68 @@
+# Kodi Media Center language file
+# Addon Name: spotify-connect-web
+msgid ""
+msgstr ""
+
+msgctxt "#30000"
+msgid "Configuration"
+msgstr ""
+
+msgctxt "#30001"
+msgid "Spotify"
+msgstr ""
+
+msgctxt "#30002"
+msgid "username"
+msgstr ""
+
+msgctxt "#30003"
+msgid "password"
+msgstr ""
+
+msgctxt "#30004"
+msgid "bit rate"
+msgstr ""
+
+msgctxt "#30005"
+msgid ""
+msgstr ""
+
+msgctxt "#30006"
+msgid "90"
+msgstr ""
+
+msgctxt "#30007"
+msgid "160"
+msgstr ""
+
+msgctxt "#30008"
+msgid "320"
+msgstr ""
+
+msgctxt "#30009"
+msgid "ALSA"
+msgstr ""
+
+msgctxt "#30010"
+msgid "playback device"
+msgstr ""
+
+msgctxt "#30011"
+msgid "playback route"
+msgstr ""
+
+msgctxt "#30012"
+msgid "auto detect"
+msgstr ""
+
+msgctxt "#30013"
+msgid "headphone jack"
+msgstr ""
+
+msgctxt "#30014"
+msgid "HDMI"
+msgstr ""
+
+msgctxt "#30015"
+msgid "mixer"
+msgstr ""

packages/addons/service/spotify-connect-web/source/resources/settings.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+   <category   label="30000">
+      <setting label="30001" type="lsep"/>
+      <setting label="30002" id="scw_u" type="text" />
+      <setting label="30003" id="scw_p" type="text" option="hidden" />
+      <setting label="30004" id="scw_b" type="labelenum" lvalues="30005|30006|30007|30008" />
+      <setting label="30009" type="lsep"/>
+      <setting label="30010" id="scw_o" type="text" default="hw:0,1"/>
+      <setting label="30011" id="pcm_3" type="enum" lvalues="30012|30013|30014" />
+      <setting label="30015" id="scw_m" type="text" />
+    </category>
+</settings>

packages/addons/service/spotify-connect-web/source/settings-default.xml

@@ -0,0 +1,8 @@
+<settings>
+    <setting id="pcm_3" value="0" />
+    <setting id="scw_b" value="" />
+    <setting id="scw_m" value="" />
+    <setting id="scw_o" value="hw:0,1" />
+    <setting id="scw_p" value="" />
+    <setting id="scw_u" value="" />
+</settings>

packages/addons/service/spotify-connect-web/source/system.d/service.spotify-connect-web.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=spotify-connect-web
+After=network-online.target
+Requires=network-online.target
+
+[Service]
+ExecStart=/bin/sh /storage/.kodi/addons/service.spotify-connect-web/bin/spotify-connect-web.start
+Restart=on-failure
+
+[Install]
+WantedBy=kodi.target

packages/addons/service/syncthing/changelog.txt

@@ -1,3 +1,6 @@
+8.0.103
+- Update to version 0.14.3
+
 8.0.102
 - Enable automatic upgrades
 

packages/addons/service/syncthing/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="syncthing"
-PKG_VERSION="0.12.24"
-PKG_REV="102"
+PKG_VERSION="0.14.3"
+PKG_REV="103"
 PKG_ARCH="any"
 PKG_LICENSE="MPLv2"
 PKG_SITE="https://syncthing.net/"
@@ -26,19 +26,22 @@ PKG_URL="https://github.com/syncthing/syncthing/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain go:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/system"
-
-PKG_SHORTDESC="Open Source Continuous File Synchronization"
-PKG_LONGDESC="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet."
-PKG_MAINTAINER="Anton Voyl (awiouy at gmail dot com)"
-PKG_ADDON_REPOVERSION="8.0"
+PKG_SHORTDESC="Syncthing: open source continuous file synchronization"
+PKG_LONGDESC="Syncthing ($PKG_VERSION) replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet."
+PKG_AUTORECONF="no"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Syncthing"
 PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_PROVIDES=""
-PKG_AUTORECONF="no"
+PKG_ADDON_REPOVERSION="8.0"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 configure_target() {
+  go run build.go assets
+
+  mkdir -p $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing
+  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing
+  ln -fs $ROOT/$PKG_BUILD/vendor $ROOT/$PKG_BUILD/vendor/src
 
   case $TARGET_ARCH in
     x86_64)
@@ -66,16 +69,13 @@ configure_target() {
   export CGO_CFLAGS=$CFLAGS
   export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $TARGET_CC -X main.Version=v$PKG_VERSION"
   export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
-  export GOPATH=$ROOT/$PKG_BUILD:$ROOT/$PKG_BUILD/Godeps/_workspace
+  export GOPATH=$ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing:$ROOT/$PKG_BUILD/vendor:$ROOT/$PKG_BUILD/Godeps/_workspace
   export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
-
-  mkdir -p $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing
-  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing
-
 }
 
 make_target() {
+  cd $ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing
   mkdir -p bin
   $GOLANG build -v -o bin/syncthing -a -ldflags "$LDFLAGS" ./cmd/syncthing
 }

packages/addons/service/tinc/package.mk

@@ -26,16 +26,15 @@ PKG_URL="${PKG_SITE}/packages/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libressl lzo zlib"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/system"
-PKG_SHORTDESC="tinc Virtual Private Network Daemon"
-PKG_LONGDESC="tinc is a virtual private network (VPN) daemon that uses tunnelling and encryption to create a secure private network between hosts on the Internet. Because the VPN appears to the IP level network code as a normal network device, there is no need to adapt any existing software. This allows VPN sites to share information with each other over the Internet without exposing any information to others."
-
+PKG_SHORTDESC="tinc: a Virtual Private Network daemon"
+PKG_LONGDESC="tinc ($PKG_VERSION) is a Virtual Private Network (VPN) daemon that uses tunnelling and encryption to create a secure private network between hosts on the Internet. Because the VPN appears to the IP level network code as a normal network device, there is no need to adapt any existing software. This allows VPN sites to share information with each other over the Internet without exposing any information to others."
 PKG_AUTORECONF="yes"
 
 PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="tinc"
 PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_PROVIDES=""
 PKG_ADDON_REPOVERSION="8.0"
-PKG_MAINTAINER="Anton Voyl (awiouy at gmail dot com)"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-curses   \
                            --disable-readline \

packages/addons/service/webgrabplus/changelog.txt

@@ -0,0 +1,6 @@
+8.0.101
+- Upgrade WebGrab+Plus to 56.28.pre
+- Upgrade siteini.pack to 20160729
+
+8.0.100
+- Initial addon

packages/addons/service/webgrabplus/package.mk

@@ -0,0 +1,33 @@
+PKG_NAME="webgrabplus"
+PKG_VERSION="56.28pre-20160729"
+PKG_REV="101"
+PKG_ARCH="arm x86_64"
+PKG_LICENSE="prop."
+PKG_SITE="http://www.webgrabplus.com/"
+PKG_URL="https://github.com/awiouy/webgrabplus/archive/$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="service"
+PKG_SHORTDESC="WebGrab+Plus: a multi-site incremental xmltv epg grabber"
+PKG_LONGDESC="WebGrab+Plus ($PKG_VERSION) collects tv-program guide data from selected tvguide sites for your favourite channels."
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="WebGrab+Plus"
+PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_REPOVERSION="8.0"
+PKG_ADDON_REQUIRES="tools.mono:0.0.0"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
+
+make_target() {
+  : # nop
+}
+
+makeinstall_target() {
+  : # nop
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
+  cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID
+}

packages/addons/service/webgrabplus/source/bin/webgrabplus.start

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+. /etc/profile
+oe_setup_addon service.webgrabplus
+
+mkdir -p "$ADDON_HOME"
+cd "$ADDON_HOME"
+
+for p in chans2correct.xml mdb rex siteini.pack WebGrab++.config.xml
+do
+  if [ ! -e "$p" ]
+  then
+    cp -r "$ADDON_DIR/config/$p" .
+  fi
+done
+
+sid="$(basename $(find $ADDON_DIR/config/siteini.pack -name SiteIni.Pack_*.txt))"
+sih="$(basename $(find siteini.pack -name SiteIni.Pack_*.txt))"
+if [ "$sid" \> "$sih" ]
+then
+  rm -rf siteini.pack
+  cp -r "$ADDON_DIR/config/siteini.pack" .
+fi
+
+mono $ADDON_DIR/WebGrab+Plus/WebGrab+Plus.exe
+
+cp guide_wgp.xml guide.xml
+mono $ADDON_DIR/WebGrab+Plus/xmltv_time_correct.exe guide_wgp.xml guide.xml < /dev/zero
+
+mono $ADDON_DIR/WebGrab+Plus/WG2MP.exe guide.xml mediaportal.xml

packages/addons/service/webgrabplus/source/default.py

@@ -0,0 +1,17 @@
+import subprocess
+import xbmc
+import xbmcaddon
+
+
+class Monitor(xbmc.Monitor):
+
+   def __init__(self, *args, **kwargs):
+      xbmc.Monitor.__init__(self)
+      self.id = xbmcaddon.Addon().getAddonInfo('id')
+
+   def onSettingsChanged(self):
+      subprocess.call(['systemctl', 'restart', self.id])
+
+
+if __name__ == "__main__":
+   Monitor().waitForAbort()

packages/addons/service/webgrabplus/source/system.d/service.webgrabplus.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=WebGrab+Plus
+Documentation=http://www.webgrabplus.com/
+After=network.target
+Requires=network.target
+
+[Service]
+ExecStart=/bin/sh /storage/.kodi/addons/service.webgrabplus/bin/webgrabplus.start
+Restart=always
+RestartSec=21600
+
+[Install]
+WantedBy=kodi.target

packages/addons/tools/mono/package.mk

@@ -19,7 +19,7 @@
 PKG_NAME="mono"
 PKG_VERSION="4.0.5.1"
 PKG_REV="100"
-PKG_ARCH="any"
+PKG_ARCH="arm x86_64"
 PKG_LICENSE="MIT"
 PKG_SITE="http://www.mono-project.com"
 PKG_URL="http://download.mono-project.com/sources/mono/$PKG_NAME-$PKG_VERSION.tar.bz2"
@@ -27,17 +27,15 @@ PKG_SOURCE_DIR="$PKG_NAME-${PKG_VERSION%.*}"
 PKG_DEPENDS_TARGET="toolchain mono:host libgdiplus sqlite mono_sqlite zlib"
 PKG_PRIORITY="optional"
 PKG_SECTION="tools"
-PKG_SHORTDESC="Cross platform, open source .NET framework"
+PKG_SHORTDESC="Mono: a cross platform, open source .NET framework"
 PKG_LONGDESC="Mono ($PKG_VERSION) is a software platform designed to allow developers to easily create cross platform applications part of the .NET Foundation"
-PKG_MAINTAINER="Anton Voyl (awiouy)"
+PKG_AUTORECONF="yes"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Mono (beta)"
 PKG_ADDON_TYPE="xbmc.python.script"
-PKG_ADDON_PROVIDES=""
 PKG_ADDON_REPOVERSION="8.0"
-
-PKG_AUTORECONF="yes"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 prefix="/storage/.kodi/addons/$PKG_SECTION.$PKG_NAME"
 configure_opts="--prefix=$prefix         \

packages/compress/zlib/package.mk

@@ -36,6 +36,17 @@ PKG_AUTORECONF="no"
 TARGET_CONFIGURE_OPTS="--prefix=/usr"
 HOST_CONFIGURE_OPTS="--prefix=$ROOT/$TOOLCHAIN"
 
+post_configure_target() {
+ ## configure minizip
+ (
+  cd $ROOT/$PKG_BUILD/.$TARGET_NAME/contrib/minizip
+  rm Makefile
+  export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:../../"
+  do_autoreconf
+  ./configure --host=$TARGET_NAME --build=$HOST_NAME $TARGET_CONFIGURE_OPTS --disable-shared --enable-static
+ )
+}
+
 pre_build_target() {
   mkdir -p $PKG_BUILD/.$TARGET_NAME
   cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
@@ -45,3 +56,14 @@ pre_build_host() {
   mkdir -p $PKG_BUILD/.$HOST_NAME
   cp -RP $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME
 }
+
+post_make_target() {
+ # make minizip
+ make -C $ROOT/$PKG_BUILD/.$TARGET_NAME/contrib/minizip
+}
+
+post_makeinstall_target() {
+ # Install minizip
+ make -C $ROOT/$PKG_BUILD/.$TARGET_NAME/contrib/minizip DESTDIR=$SYSROOT_PREFIX install
+}
+

packages/databases/mysql/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="mysql"
-PKG_VERSION="5.7.12"
+PKG_VERSION="5.7.13"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/devel/ccache/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="ccache"
-PKG_VERSION="3.2.5"
+PKG_VERSION="3.2.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/gettext/package.mk

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

packages/devel/glib/package.mk

@@ -1,6 +1,7 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2016-     Team LibreELEC
 #
 #  OpenELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -33,6 +34,7 @@ PKG_LONGDESC="GLib is a library which includes support routines for C such as li
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
+PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared"
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_mmap_fixed_mapped=yes \
                            ac_cv_func_posix_getpwuid_r=yes \
                            ac_cv_func_posix_getgrgid_r=yes \

packages/devel/gmp/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gmp"
-PKG_VERSION="6.1.0"
+PKG_VERSION="6.1.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPLv3+"

packages/devel/pcre/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pcre"
-PKG_VERSION="8.38"
+PKG_VERSION="8.39"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/devel/swig/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="swig"
-PKG_VERSION="3.0.9"
+PKG_VERSION="3.0.10"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/graphics/bcm2835-driver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="1ba9c9a"
+PKG_VERSION="b8ef00f"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
@@ -43,8 +43,10 @@ make_target() {
     cp -PRv $FLOAT/opt/vc/include/* $SYSROOT_PREFIX/usr/include
 
   mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp -PRv $FLOAT/opt/vc/lib/libEGL.so $SYSROOT_PREFIX/usr/lib
-    cp -PRv $FLOAT/opt/vc/lib/libGLESv2.so $SYSROOT_PREFIX/usr/lib
+    cp -PRv $FLOAT/opt/vc/lib/libbrcmEGL.so $SYSROOT_PREFIX/usr/lib
+    ln -sf $SYSROOT_PREFIX/usr/lib/libbrcmEGL.so $SYSROOT_PREFIX/usr/lib/libEGL.so
+    cp -PRv $FLOAT/opt/vc/lib/libbrcmGLESv2.so $SYSROOT_PREFIX/usr/lib
+    ln -sf $SYSROOT_PREFIX/usr/lib/libbrcmGLESv2.so $SYSROOT_PREFIX/usr/lib/libGLESv2.so
     cp -PRv $FLOAT/opt/vc/lib/libbcm_host.so $SYSROOT_PREFIX/usr/lib
     cp -PRv $FLOAT/opt/vc/lib/libcontainers.so $SYSROOT_PREFIX/usr/lib
     cp -PRv $FLOAT/opt/vc/lib/libopenmaxil.so $SYSROOT_PREFIX/usr/lib
@@ -64,8 +66,10 @@ makeinstall_target() {
     cp -PRv $FLOAT/opt/vc/sbin/vcfiled $INSTALL/usr/sbin
 
   mkdir -p $INSTALL/usr/lib
-    cp -PRv $FLOAT/opt/vc/lib/libEGL.so $INSTALL/usr/lib
-    cp -PRv $FLOAT/opt/vc/lib/libGLESv2.so $INSTALL/usr/lib
+    cp -PRv $FLOAT/opt/vc/lib/libbrcmEGL.so $INSTALL/usr/lib
+    ln -s /usr/lib/libbrcmEGL.so $INSTALL/usr/lib/libEGL.so
+    cp -PRv $FLOAT/opt/vc/lib/libbrcmGLESv2.so $INSTALL/usr/lib
+    ln -s /usr/lib/libbrcmGLESv2.so $INSTALL/usr/lib/libGLESv2.so
     cp -PRv $FLOAT/opt/vc/lib/libbcm_host.so $INSTALL/usr/lib
     cp -PRv $FLOAT/opt/vc/lib/libcontainers.so $INSTALL/usr/lib
     cp -PRv $FLOAT/opt/vc/lib/libopenmaxil.so $INSTALL/usr/lib

packages/graphics/libdrm/package.mk

@@ -1,3 +1,4 @@
+
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
@@ -17,7 +18,7 @@
 ################################################################################
 
 PKG_NAME="libdrm"
-PKG_VERSION="2.4.68"
+PKG_VERSION="2.4.70"
 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.22"
+PKG_VERSION="1.6.23"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/lang/llvm/package.mk

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

packages/linux-drivers/RTL8192CU/patches/RTL8192CU-kernel-4.7.patch

@@ -0,0 +1,259 @@
+diff -Naur a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
+--- a/os_dep/linux/ioctl_cfg80211.c	2016-06-23 13:32:35.544763290 +0100
++++ b/os_dep/linux/ioctl_cfg80211.c	2016-06-23 13:33:02.888918609 +0100
+@@ -57,7 +57,7 @@
+ 	}
+ 
+ #define CHAN2G(_channel, _freq, _flags) {			\
+-	.band			= IEEE80211_BAND_2GHZ,		\
++	.band			= NL80211_BAND_2GHZ,		\
+ 	.center_freq		= (_freq),			\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -66,7 +66,7 @@
+ }
+ 
+ #define CHAN5G(_channel, _flags) {				\
+-	.band			= IEEE80211_BAND_5GHZ,		\
++	.band			= NL80211_BAND_5GHZ,		\
+ 	.center_freq		= 5000 + (5 * (_channel)),	\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -166,18 +166,18 @@
+ }
+ 
+ struct ieee80211_supported_band *rtw_spt_band_alloc(
+-	enum ieee80211_band band
++	enum nl80211_band band
+ 	)
+ {
+ 	struct ieee80211_supported_band *spt_band = NULL;
+ 	int n_channels, n_bitrates;
+ 
+-	if(band == IEEE80211_BAND_2GHZ)
++	if(band == NL80211_BAND_2GHZ)
+ 	{
+ 		n_channels = RTW_2G_CHANNELS_NUM;
+ 		n_bitrates = RTW_G_RATES_NUM;
+ 	}
+-	else if(band == IEEE80211_BAND_5GHZ)
++	else if(band == NL80211_BAND_5GHZ)
+ 	{
+ 		n_channels = RTW_5G_CHANNELS_NUM;
+ 		n_bitrates = RTW_A_RATES_NUM;
+@@ -201,12 +201,12 @@
+ 	spt_band->n_channels = n_channels;
+ 	spt_band->n_bitrates = n_bitrates;
+ 
+-	if(band == IEEE80211_BAND_2GHZ)
++	if(band == NL80211_BAND_2GHZ)
+ 	{
+ 		rtw_2g_channels_init(spt_band->channels);
+ 		rtw_2g_rates_init(spt_band->bitrates);
+ 	}
+-	else if(band == IEEE80211_BAND_5GHZ)
++	else if(band == NL80211_BAND_5GHZ)
+ 	{
+ 		rtw_5g_channels_init(spt_band->channels);
+ 		rtw_5g_rates_init(spt_band->bitrates);
+@@ -226,13 +226,13 @@
+ 	if(!spt_band)
+ 		return;
+ 	
+-	if(spt_band->band == IEEE80211_BAND_2GHZ)
++	if(spt_band->band == NL80211_BAND_2GHZ)
+ 	{
+ 		size = sizeof(struct ieee80211_supported_band)
+ 			+ sizeof(struct ieee80211_channel)*RTW_2G_CHANNELS_NUM
+ 			+ sizeof(struct ieee80211_rate)*RTW_G_RATES_NUM;
+ 	}
+-	else if(spt_band->band == IEEE80211_BAND_5GHZ)
++	else if(spt_band->band == NL80211_BAND_5GHZ)
+ 	{
+ 		size = sizeof(struct ieee80211_supported_band)
+ 			+ sizeof(struct ieee80211_channel)*RTW_5G_CHANNELS_NUM
+@@ -301,12 +301,12 @@
+ 	/* see 802.11 17.3.8.3.2 and Annex J
+ 	* there are overlapping channel numbers in 5GHz and 2GHz bands */
+            
+-	if (band == IEEE80211_BAND_5GHZ) {
++	if (band == NL80211_BAND_5GHZ) {
+        	if (chan >= 182 && chan <= 196)
+ 			return 4000 + chan * 5;
+              else
+                     return 5000 + chan * 5;
+-       } else { /* IEEE80211_BAND_2GHZ */
++       } else { /* NL80211_BAND_2GHZ */
+ 		if (chan == 14)
+ 			return 2484;
+              else if (chan < 14)
+@@ -391,9 +391,9 @@
+ 					DBG_871X("%s, got sr, but ssid mismatch, to remove this bss\n", __func__);
+ 
+ 					if (pselect_network->Configuration.DSConfig <= RTW_CH_MAX_2G_CHANNEL)
+-						freq = rtw_ieee80211_channel_to_frequency(pselect_network->Configuration.DSConfig, IEEE80211_BAND_2GHZ);
++						freq = rtw_ieee80211_channel_to_frequency(pselect_network->Configuration.DSConfig, NL80211_BAND_2GHZ);
+ 					else
+-						freq = rtw_ieee80211_channel_to_frequency(pselect_network->Configuration.DSConfig, IEEE80211_BAND_5GHZ);
++						freq = rtw_ieee80211_channel_to_frequency(pselect_network->Configuration.DSConfig, NL80211_BAND_5GHZ);
+ 
+ 					notify_channel = ieee80211_get_channel(wiphy, freq);
+ 					pselect_bss = cfg80211_get_bss(wiphy, NULL/*notify_channel*/,
+@@ -424,9 +424,9 @@
+ 
+ 	channel = pnetwork->network.Configuration.DSConfig;
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 	
+ 	notify_channel = ieee80211_get_channel(wiphy, freq);
+ 
+@@ -569,9 +569,9 @@
+ 		return _FALSE;
+ 
+ 	if (pnetwork->Configuration.DSConfig <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(pnetwork->Configuration.DSConfig, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(pnetwork->Configuration.DSConfig, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(pnetwork->Configuration.DSConfig, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(pnetwork->Configuration.DSConfig, NL80211_BAND_5GHZ);
+ 
+ 	notify_channel = ieee80211_get_channel(padapter->rtw_wdev->wiphy, freq);
+ 	bss = cfg80211_get_bss(padapter->rtw_wdev->wiphy, notify_channel,
+@@ -626,9 +626,9 @@
+ 		u16 channel = cur_network->network.Configuration.DSConfig;
+ 
+ 		if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-			freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++			freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 		else
+-			freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++			freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ 		notify_channel = ieee80211_get_channel(wiphy, freq);
+ 		#endif
+@@ -3097,9 +3097,9 @@
+ #else /* defined(RTW_USE_CFG80211_STA_EVENT) */
+ 	channel = pmlmeext->cur_channel;
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ 	#ifdef COMPAT_KERNEL_RELEASE
+ 	rtw_cfg80211_rx_mgmt(padapter, freq, 0, pmgmt_frame, frame_len, GFP_ATOMIC);
+@@ -3142,9 +3142,9 @@
+ #else /* defined(RTW_USE_CFG80211_STA_EVENT) */
+ 	channel = pmlmeext->cur_channel;
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ 	pmgmt_frame = mgmt_buf;	
+ 	pwlanhdr = (struct rtw_ieee80211_hdr *)pmgmt_frame;
+@@ -3950,9 +3950,9 @@
+ 
+ indicate:
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
+ 	rtw_cfg80211_rx_mgmt(padapter, freq, 0, pmgmt_frame, frame_len, GFP_ATOMIC);
+@@ -3990,9 +3990,9 @@
+ 
+ indicate:
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
+ 	rtw_cfg80211_rx_mgmt(padapter, freq, 0, pmgmt_frame, frame_len, GFP_ATOMIC);
+@@ -4020,9 +4020,9 @@
+ 		DBG_871X("RTW_Rx:category(%u), action(%u)\n", category, action);
+ 
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
+ 	rtw_cfg80211_rx_mgmt(adapter, freq, 0, frame, frame_len, GFP_ATOMIC);
+@@ -5199,7 +5199,7 @@
+ #endif
+ };
+ 
+-static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum ieee80211_band band, u8 rf_type)
++static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum nl80211_band band, u8 rf_type)
+ {
+ 
+ #define MAX_BIT_RATE_40MHZ_MCS15 	300	/* Mbps */
+@@ -5223,7 +5223,7 @@
+ 	ht_cap->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
+ 
+ 	/*
+-	 *hw->wiphy->bands[IEEE80211_BAND_2GHZ]
++	 *hw->wiphy->bands[NL80211_BAND_2GHZ]
+ 	 *base on ant_num
+ 	 *rx_mask: RX mask
+ 	 *if rx_ant =1 rx_mask[0]=0xff;==>MCS0-MCS7
+@@ -5268,16 +5268,16 @@
+ 
+ 	/* if (padapter->registrypriv.wireless_mode & WIRELESS_11G) */
+ 	{
+-		bands = wiphy->bands[IEEE80211_BAND_2GHZ];
++		bands = wiphy->bands[NL80211_BAND_2GHZ];
+ 		if(bands)
+-			rtw_cfg80211_init_ht_capab(&bands->ht_cap, IEEE80211_BAND_2GHZ, rf_type);
++			rtw_cfg80211_init_ht_capab(&bands->ht_cap, NL80211_BAND_2GHZ, rf_type);
+ 	}
+ 
+ 	/* if (padapter->registrypriv.wireless_mode & WIRELESS_11A) */
+ 	{
+-		bands = wiphy->bands[IEEE80211_BAND_5GHZ];
++		bands = wiphy->bands[NL80211_BAND_5GHZ];
+ 		if(bands)
+-			rtw_cfg80211_init_ht_capab(&bands->ht_cap, IEEE80211_BAND_5GHZ, rf_type);
++			rtw_cfg80211_init_ht_capab(&bands->ht_cap, NL80211_BAND_5GHZ, rf_type);
+ 	}
+ }
+ 
+@@ -5348,9 +5348,9 @@
+ 	wiphy->n_cipher_suites = ARRAY_SIZE(rtw_cipher_suites);
+ 
+ 	/* if (padapter->registrypriv.wireless_mode & WIRELESS_11G) */
+-		wiphy->bands[IEEE80211_BAND_2GHZ] = rtw_spt_band_alloc(IEEE80211_BAND_2GHZ);
++		wiphy->bands[NL80211_BAND_2GHZ] = rtw_spt_band_alloc(NL80211_BAND_2GHZ);
+ 	/* if (padapter->registrypriv.wireless_mode & WIRELESS_11A) */
+-		wiphy->bands[IEEE80211_BAND_5GHZ] = rtw_spt_band_alloc(IEEE80211_BAND_5GHZ);
++		wiphy->bands[NL80211_BAND_5GHZ] = rtw_spt_band_alloc(NL80211_BAND_5GHZ);
+ 	
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) && LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
+ 	wiphy->flags |= WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS;
+@@ -5456,8 +5456,8 @@
+ 
+ 	pwdev_priv = wdev_to_priv(wdev);
+ 
+-	rtw_spt_band_free(wdev->wiphy->bands[IEEE80211_BAND_2GHZ]);
+-	rtw_spt_band_free(wdev->wiphy->bands[IEEE80211_BAND_5GHZ]);
++	rtw_spt_band_free(wdev->wiphy->bands[NL80211_BAND_2GHZ]);
++	rtw_spt_band_free(wdev->wiphy->bands[NL80211_BAND_5GHZ]);
+ 	
+ 	wiphy_free(wdev->wiphy);
+ 

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

@@ -0,0 +1,236 @@
+diff -Naur a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c
+--- a/os_dep/ioctl_cfg80211.c	2016-06-23 13:12:55.005653163 +0100
++++ b/os_dep/ioctl_cfg80211.c	2016-06-23 13:13:25.961839084 +0100
+@@ -47,7 +47,7 @@
+ 	}
+ 
+ #define CHAN2G(_channel, _freq, _flags) {			\
+-	.band			= IEEE80211_BAND_2GHZ,		\
++	.band			= NL80211_BAND_2GHZ,		\
+ 	.center_freq		= (_freq),			\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -56,7 +56,7 @@
+ }
+ 
+ #define CHAN5G(_channel, _flags) {				\
+-	.band			= IEEE80211_BAND_5GHZ,		\
++	.band			= NL80211_BAND_5GHZ,		\
+ 	.center_freq		= 5000 + (5 * (_channel)),	\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -155,19 +155,19 @@
+ }
+ 
+ static struct ieee80211_supported_band *rtw_spt_band_alloc(
+-	enum ieee80211_band band
++	enum nl80211_band band
+ 	)
+ {
+ 	struct ieee80211_supported_band *spt_band = NULL;
+ 	int n_channels, n_bitrates;
+ 	int len;
+ 
+-	if (band == IEEE80211_BAND_2GHZ)
++	if (band == NL80211_BAND_2GHZ)
+ 	{
+ 		n_channels = RTW_2G_CHANNELS_NUM;
+ 		n_bitrates = RTW_G_RATES_NUM;
+ 	}
+-	else if (band == IEEE80211_BAND_5GHZ)
++	else if (band == NL80211_BAND_5GHZ)
+ 	{
+ 		n_channels = RTW_5G_CHANNELS_NUM;
+ 		n_bitrates = RTW_A_RATES_NUM;
+@@ -190,12 +190,12 @@
+ 	spt_band->n_channels = n_channels;
+ 	spt_band->n_bitrates = n_bitrates;
+ 
+-	if (band == IEEE80211_BAND_2GHZ)
++	if (band == NL80211_BAND_2GHZ)
+ 	{
+ 		rtw_2g_channels_init(spt_band->channels);
+ 		rtw_2g_rates_init(spt_band->bitrates);
+ 	}
+-	else if (band == IEEE80211_BAND_5GHZ)
++	else if (band == NL80211_BAND_5GHZ)
+ 	{
+ 		rtw_5g_channels_init(spt_band->channels);
+ 		rtw_5g_rates_init(spt_band->bitrates);
+@@ -215,13 +215,13 @@
+ 	if (!spt_band)
+ 		return;
+ 
+-	if (spt_band->band == IEEE80211_BAND_2GHZ)
++	if (spt_band->band == NL80211_BAND_2GHZ)
+ 	{
+ 		size = sizeof(struct ieee80211_supported_band)
+ 			+ sizeof(struct ieee80211_channel)*RTW_2G_CHANNELS_NUM
+ 			+ sizeof(struct ieee80211_rate)*RTW_G_RATES_NUM;
+ 	}
+-	else if (spt_band->band == IEEE80211_BAND_5GHZ)
++	else if (spt_band->band == NL80211_BAND_5GHZ)
+ 	{
+ 		size = sizeof(struct ieee80211_supported_band)
+ 			+ sizeof(struct ieee80211_channel)*RTW_5G_CHANNELS_NUM
+@@ -290,12 +290,12 @@
+ 	/* see 802.11 17.3.8.3.2 and Annex J
+ 	* there are overlapping channel numbers in 5GHz and 2GHz bands */
+ 
+-	if (band == IEEE80211_BAND_5GHZ) {
++	if (band == NL80211_BAND_5GHZ) {
+ 	if (chan >= 182 && chan <= 196)
+ 			return 4000 + chan * 5;
+              else
+                     return 5000 + chan * 5;
+-       } else { /* IEEE80211_BAND_2GHZ */
++       } else { /* NL80211_BAND_2GHZ */
+ 		if (chan == 14)
+ 			return 2484;
+              else if (chan < 14)
+@@ -335,9 +335,9 @@
+ 
+ 	channel = pnetwork->network.Configuration.DSConfig;
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ 	notify_channel = ieee80211_get_channel(wiphy, freq);
+ 
+@@ -435,9 +435,9 @@
+ 		u16 channel = cur_network->network.Configuration.DSConfig;
+ 
+ 		if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-			freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++			freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 		else
+-			freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++			freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ 		notify_channel = ieee80211_get_channel(wiphy, freq);
+ 		#endif
+@@ -2434,9 +2434,9 @@
+ #else /* defined(RTW_USE_CFG80211_STA_EVENT) */
+ 	channel = pmlmeext->cur_channel;
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ 	rtw_cfg80211_rx_mgmt(padapter, freq, 0, pmgmt_frame, frame_len, flags);
+ #endif /* defined(RTW_USE_CFG80211_STA_EVENT) */
+@@ -2463,9 +2463,9 @@
+ #else /* defined(RTW_USE_CFG80211_STA_EVENT) */
+ 	channel = pmlmeext->cur_channel;
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ 	pmgmt_frame = mgmt_buf;
+ 	pwlanhdr = (struct rtw_ieee80211_hdr *)pmgmt_frame;
+@@ -3148,9 +3148,9 @@
+ 
+ indicate:
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ 	rtw_cfg80211_rx_mgmt(padapter, freq, 0, pmgmt_frame, frame_len, flags);
+ }
+@@ -3172,9 +3172,9 @@
+ 
+ indicate:
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ 	rtw_cfg80211_rx_mgmt(padapter, freq, 0, frame, frame_len, flags);
+ }
+@@ -3199,9 +3199,9 @@
+ 		DBG_8192D("RTW_Rx:category(%u), action(%u)\n", category, action);
+ 
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ 	rtw_cfg80211_rx_mgmt(adapter, freq, 0, frame, frame_len, flags);
+ }
+@@ -3633,7 +3633,7 @@
+ 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
+ };
+ 
+-static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum ieee80211_band band, u8 rf_type)
++static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum nl80211_band band, u8 rf_type)
+ {
+ 
+ #define MAX_BIT_RATE_40MHZ_MCS15	300	/* Mbps */
+@@ -3657,7 +3657,7 @@
+ 	ht_cap->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
+ 
+ 	/*
+-	 *hw->wiphy->bands[IEEE80211_BAND_2GHZ]
++	 *hw->wiphy->bands[NL80211_BAND_2GHZ]
+ 	 *base on ant_num
+ 	 *rx_mask: RX mask
+ 	 *if rx_ant =1 rx_mask[0]=0xff;==>MCS0-MCS7
+@@ -3701,16 +3701,16 @@
+ 
+ 	/* if (padapter->registrypriv.wireless_mode & WIRELESS_11G) */
+ 	{
+-		bands = wiphy->bands[IEEE80211_BAND_2GHZ];
++		bands = wiphy->bands[NL80211_BAND_2GHZ];
+ 		if (bands)
+-			rtw_cfg80211_init_ht_capab(&bands->ht_cap, IEEE80211_BAND_2GHZ, rf_type);
++			rtw_cfg80211_init_ht_capab(&bands->ht_cap, NL80211_BAND_2GHZ, rf_type);
+ 	}
+ 
+ 	/* if (padapter->registrypriv.wireless_mode & WIRELESS_11A) */
+ 	{
+-		bands = wiphy->bands[IEEE80211_BAND_5GHZ];
++		bands = wiphy->bands[NL80211_BAND_5GHZ];
+ 		if (bands)
+-			rtw_cfg80211_init_ht_capab(&bands->ht_cap, IEEE80211_BAND_5GHZ, rf_type);
++			rtw_cfg80211_init_ht_capab(&bands->ht_cap, NL80211_BAND_5GHZ, rf_type);
+ 	}
+ }
+ 
+@@ -3750,9 +3750,9 @@
+ 	wiphy->n_cipher_suites = ARRAY_SIZE(rtw_cipher_suites);
+ 
+ 	/* if (padapter->registrypriv.wireless_mode & WIRELESS_11G) */
+-		wiphy->bands[IEEE80211_BAND_2GHZ] = rtw_spt_band_alloc(IEEE80211_BAND_2GHZ);
++		wiphy->bands[NL80211_BAND_2GHZ] = rtw_spt_band_alloc(NL80211_BAND_2GHZ);
+ 	/* if (padapter->registrypriv.wireless_mode & WIRELESS_11A) */
+-		wiphy->bands[IEEE80211_BAND_5GHZ] = rtw_spt_band_alloc(IEEE80211_BAND_5GHZ);
++		wiphy->bands[NL80211_BAND_5GHZ] = rtw_spt_band_alloc(NL80211_BAND_5GHZ);
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) && LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
+ 	wiphy->flags |= WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS;
+@@ -3855,8 +3855,8 @@
+ 
+ 	pwdev_priv = wdev_to_priv(wdev);
+ 
+-	rtw_spt_band_free(wdev->wiphy->bands[IEEE80211_BAND_2GHZ]);
+-	rtw_spt_band_free(wdev->wiphy->bands[IEEE80211_BAND_5GHZ]);
++	rtw_spt_band_free(wdev->wiphy->bands[NL80211_BAND_2GHZ]);
++	rtw_spt_band_free(wdev->wiphy->bands[NL80211_BAND_5GHZ]);
+ 
+ 	wiphy_free(wdev->wiphy);
+ 

packages/linux-drivers/RTL8192EU/patches/RTL8192EU-kernel-4.7.patch

@@ -0,0 +1,346 @@
+diff -Naur a/os_dep/linux/wifi_regd.c b/os_dep/linux/wifi_regd.c
+--- a/os_dep/linux/wifi_regd.c	2016-06-23 13:37:11.270350569 +0100
++++ b/os_dep/linux/wifi_regd.c	2016-06-23 13:37:39.606515916 +0100
+@@ -143,7 +143,7 @@
+ static void _rtw_reg_apply_beaconing_flags(struct wiphy *wiphy,
+ 					   enum nl80211_reg_initiator initiator)
+ {
+-	enum ieee80211_band band;
++	enum nl80211_band band;
+ 	struct ieee80211_supported_band *sband;
+ 	const struct ieee80211_reg_rule *reg_rule;
+ 	struct ieee80211_channel *ch;
+@@ -205,9 +205,9 @@
+ 	u32 bandwidth = 0;
+ 	int r;
+ 
+-	if (!wiphy->bands[IEEE80211_BAND_2GHZ])
++	if (!wiphy->bands[NL80211_BAND_2GHZ])
+ 		return;
+-	sband = wiphy->bands[IEEE80211_BAND_2GHZ];
++	sband = wiphy->bands[NL80211_BAND_2GHZ];
+ 
+ 	/*
+ 	 * If no country IE has been received always enable active scan
+@@ -258,10 +258,10 @@
+ 	struct ieee80211_channel *ch;
+ 	unsigned int i;
+ 
+-	if (!wiphy->bands[IEEE80211_BAND_5GHZ])
++	if (!wiphy->bands[NL80211_BAND_5GHZ])
+ 		return;
+ 
+-	sband = wiphy->bands[IEEE80211_BAND_5GHZ];
++	sband = wiphy->bands[NL80211_BAND_5GHZ];
+ 
+ 	for (i = 0; i < sband->n_channels; i++) {
+ 		ch = &sband->channels[i];
+@@ -298,12 +298,12 @@
+ 	/* see 802.11 17.3.8.3.2 and Annex J
+ 	 * there are overlapping channel numbers in 5GHz and 2GHz bands */
+ 
+-	if (band == IEEE80211_BAND_5GHZ) {
++	if (band == NL80211_BAND_5GHZ) {
+ 		if (chan >= 182 && chan <= 196)
+ 			return 4000 + chan * 5;
+ 		else
+ 			return 5000 + chan * 5;
+-	} else {		/* IEEE80211_BAND_2GHZ */
++	} else {		/* NL80211_BAND_2GHZ */
+ 		if (chan == 14)
+ 			return 2484;
+ 		else if (chan < 14)
+@@ -348,11 +348,11 @@
+ 		if (channel <= 14)
+ 			freq =
+ 			    rtw_ieee80211_channel_to_frequency(channel,
+-							       IEEE80211_BAND_2GHZ);
++							       NL80211_BAND_2GHZ);
+ 		else
+ 			freq =
+ 			    rtw_ieee80211_channel_to_frequency(channel,
+-							       IEEE80211_BAND_5GHZ);
++							       NL80211_BAND_5GHZ);
+ 
+ 		ch = ieee80211_get_channel(wiphy, freq);
+ 		if (ch) {
+@@ -393,11 +393,11 @@
+ 		if (channel <= 14)
+ 			freq =
+ 			    rtw_ieee80211_channel_to_frequency(channel,
+-							       IEEE80211_BAND_2GHZ);
++							       NL80211_BAND_2GHZ);
+ 		else
+ 			freq =
+ 			    rtw_ieee80211_channel_to_frequency(channel,
+-							       IEEE80211_BAND_5GHZ);
++							       NL80211_BAND_5GHZ);
+ 
+ 		ch = ieee80211_get_channel(wiphy, freq);
+ 		if (ch) {
+@@ -544,4 +544,4 @@
+ 
+ 	return _rtw_reg_notifier_apply(wiphy, request, reg);
+ }
+-#endif //CONFIG_IOCTL_CFG80211
+\ No newline at end of file
++#endif //CONFIG_IOCTL_CFG80211
+diff -Naur a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
+--- a/os_dep/linux/ioctl_cfg80211.c	2016-06-23 13:37:16.990383918 +0100
++++ b/os_dep/linux/ioctl_cfg80211.c	2016-06-23 13:37:48.786569554 +0100
+@@ -74,7 +74,7 @@
+ 	}
+ 
+ #define CHAN2G(_channel, _freq, _flags) {			\
+-	.band			= IEEE80211_BAND_2GHZ,		\
++	.band			= NL80211_BAND_2GHZ,		\
+ 	.center_freq		= (_freq),			\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -83,7 +83,7 @@
+ }
+ 
+ #define CHAN5G(_channel, _flags) {				\
+-	.band			= IEEE80211_BAND_5GHZ,		\
++	.band			= NL80211_BAND_5GHZ,		\
+ 	.center_freq		= 5000 + (5 * (_channel)),	\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -200,18 +200,18 @@
+ }
+ 
+ struct ieee80211_supported_band *rtw_spt_band_alloc(
+-	enum ieee80211_band band
++	enum nl80211_band band
+ 	)
+ {
+ 	struct ieee80211_supported_band *spt_band = NULL;
+ 	int n_channels, n_bitrates;
+ 
+-	if(band == IEEE80211_BAND_2GHZ)
++	if(band == NL80211_BAND_2GHZ)
+ 	{
+ 		n_channels = RTW_2G_CHANNELS_NUM;
+ 		n_bitrates = RTW_G_RATES_NUM;
+ 	}
+-	else if(band == IEEE80211_BAND_5GHZ)
++	else if(band == NL80211_BAND_5GHZ)
+ 	{
+ 		n_channels = RTW_5G_CHANNELS_NUM;
+ 		n_bitrates = RTW_A_RATES_NUM;
+@@ -235,12 +235,12 @@
+ 	spt_band->n_channels = n_channels;
+ 	spt_band->n_bitrates = n_bitrates;
+ 
+-	if(band == IEEE80211_BAND_2GHZ)
++	if(band == NL80211_BAND_2GHZ)
+ 	{
+ 		rtw_2g_channels_init(spt_band->channels);
+ 		rtw_2g_rates_init(spt_band->bitrates);
+ 	}
+-	else if(band == IEEE80211_BAND_5GHZ)
++	else if(band == NL80211_BAND_5GHZ)
+ 	{
+ 		rtw_5g_channels_init(spt_band->channels);
+ 		rtw_5g_rates_init(spt_band->bitrates);
+@@ -260,13 +260,13 @@
+ 	if(!spt_band)
+ 		return;
+ 	
+-	if(spt_band->band == IEEE80211_BAND_2GHZ)
++	if(spt_band->band == NL80211_BAND_2GHZ)
+ 	{
+ 		size = sizeof(struct ieee80211_supported_band)
+ 			+ sizeof(struct ieee80211_channel)*RTW_2G_CHANNELS_NUM
+ 			+ sizeof(struct ieee80211_rate)*RTW_G_RATES_NUM;
+ 	}
+-	else if(spt_band->band == IEEE80211_BAND_5GHZ)
++	else if(spt_band->band == NL80211_BAND_5GHZ)
+ 	{
+ 		size = sizeof(struct ieee80211_supported_band)
+ 			+ sizeof(struct ieee80211_channel)*RTW_5G_CHANNELS_NUM
+@@ -335,12 +335,12 @@
+ 	/* see 802.11 17.3.8.3.2 and Annex J
+ 	* there are overlapping channel numbers in 5GHz and 2GHz bands */
+            
+-	if (band == IEEE80211_BAND_5GHZ) {
++	if (band == NL80211_BAND_5GHZ) {
+        	if (chan >= 182 && chan <= 196)
+ 			return 4000 + chan * 5;
+              else
+                     return 5000 + chan * 5;
+-       } else { /* IEEE80211_BAND_2GHZ */
++       } else { /* NL80211_BAND_2GHZ */
+ 		if (chan == 14)
+ 			return 2484;
+              else if (chan < 14)
+@@ -441,9 +441,9 @@
+ 					DBG_871X("%s, got sr, but ssid mismatch, to remove this bss\n", __func__);
+ 
+ 					if (pselect_network->Configuration.DSConfig <= RTW_CH_MAX_2G_CHANNEL)
+-						freq = rtw_ieee80211_channel_to_frequency(pselect_network->Configuration.DSConfig, IEEE80211_BAND_2GHZ);
++						freq = rtw_ieee80211_channel_to_frequency(pselect_network->Configuration.DSConfig, NL80211_BAND_2GHZ);
+ 					else
+-						freq = rtw_ieee80211_channel_to_frequency(pselect_network->Configuration.DSConfig, IEEE80211_BAND_5GHZ);
++						freq = rtw_ieee80211_channel_to_frequency(pselect_network->Configuration.DSConfig, NL80211_BAND_5GHZ);
+ 
+ 					notify_channel = ieee80211_get_channel(wiphy, freq);
+ 					pselect_bss = cfg80211_get_bss(wiphy, NULL/*notify_channel*/,
+@@ -475,9 +475,9 @@
+ 
+ 	channel = pnetwork->network.Configuration.DSConfig;
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 	
+ 	notify_channel = ieee80211_get_channel(wiphy, freq);
+ 
+@@ -617,9 +617,9 @@
+ 		return _FALSE;
+ 
+ 	if (pnetwork->Configuration.DSConfig <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(pnetwork->Configuration.DSConfig, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(pnetwork->Configuration.DSConfig, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(pnetwork->Configuration.DSConfig, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(pnetwork->Configuration.DSConfig, NL80211_BAND_5GHZ);
+ 
+ 	notify_channel = ieee80211_get_channel(padapter->rtw_wdev->wiphy, freq);
+ 	bss = cfg80211_get_bss(padapter->rtw_wdev->wiphy, notify_channel,
+@@ -771,9 +771,9 @@
+ 		u16 channel = cur_network->network.Configuration.DSConfig;
+ 
+ 		if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-			freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++			freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 		else
+-			freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++			freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ 		notify_channel = ieee80211_get_channel(wiphy, freq);
+ 		#endif
+@@ -3400,9 +3400,9 @@
+ #else /* defined(RTW_USE_CFG80211_STA_EVENT) */
+ 	channel = pmlmeext->cur_channel;
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ 	#ifdef COMPAT_KERNEL_RELEASE
+ 	rtw_cfg80211_rx_mgmt(padapter, freq, 0, pmgmt_frame, frame_len, GFP_ATOMIC);
+@@ -3445,9 +3445,9 @@
+ #else /* defined(RTW_USE_CFG80211_STA_EVENT) */
+ 	channel = pmlmeext->cur_channel;
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ 	pmgmt_frame = mgmt_buf;	
+ 	pwlanhdr = (struct rtw_ieee80211_hdr *)pmgmt_frame;
+@@ -4257,9 +4257,9 @@
+ 
+ indicate:
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
+ 	rtw_cfg80211_rx_mgmt(padapter, freq, 0, pmgmt_frame, frame_len, GFP_ATOMIC);
+@@ -4297,9 +4297,9 @@
+ 
+ indicate:
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
+ 	rtw_cfg80211_rx_mgmt(padapter, freq, 0, pmgmt_frame, frame_len, GFP_ATOMIC);
+@@ -4327,9 +4327,9 @@
+ 		DBG_871X("RTW_Rx:category(%u), action(%u)\n", category, action);
+ 
+ 	if (channel <= RTW_CH_MAX_2G_CHANNEL)
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ 	else
+-		freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
++		freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_5GHZ);
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
+ 	rtw_cfg80211_rx_mgmt(adapter, freq, 0, frame, frame_len, GFP_ATOMIC);
+@@ -5718,7 +5718,7 @@
+ 	
+ }
+ 
+-static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum ieee80211_band band, u8 rf_type)
++static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum nl80211_band band, u8 rf_type)
+ {
+ 
+ #define MAX_BIT_RATE_40MHZ_MCS15 	300	/* Mbps */
+@@ -5742,7 +5742,7 @@
+ 	ht_cap->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
+ 
+ 	/*
+-	 *hw->wiphy->bands[IEEE80211_BAND_2GHZ]
++	 *hw->wiphy->bands[NL80211_BAND_2GHZ]
+ 	 *base on ant_num
+ 	 *rx_mask: RX mask
+ 	 *if rx_ant =1 rx_mask[0]=0xff;==>MCS0-MCS7
+@@ -5787,16 +5787,16 @@
+ 
+ 	/* if (padapter->registrypriv.wireless_mode & WIRELESS_11G) */
+ 	{
+-		bands = wiphy->bands[IEEE80211_BAND_2GHZ];
++		bands = wiphy->bands[NL80211_BAND_2GHZ];
+ 		if(bands)
+-			rtw_cfg80211_init_ht_capab(&bands->ht_cap, IEEE80211_BAND_2GHZ, rf_type);
++			rtw_cfg80211_init_ht_capab(&bands->ht_cap, NL80211_BAND_2GHZ, rf_type);
+ 	}
+ 
+ 	/* if (padapter->registrypriv.wireless_mode & WIRELESS_11A) */
+ 	{
+-		bands = wiphy->bands[IEEE80211_BAND_5GHZ];
++		bands = wiphy->bands[NL80211_BAND_5GHZ];
+ 		if(bands)
+-			rtw_cfg80211_init_ht_capab(&bands->ht_cap, IEEE80211_BAND_5GHZ, rf_type);
++			rtw_cfg80211_init_ht_capab(&bands->ht_cap, NL80211_BAND_5GHZ, rf_type);
+ 	}
+ 
+ 	/* init regulary domain */
+@@ -5874,9 +5874,9 @@
+ 	wiphy->n_cipher_suites = ARRAY_SIZE(rtw_cipher_suites);
+ 
+ 	/* if (padapter->registrypriv.wireless_mode & WIRELESS_11G) */
+-		wiphy->bands[IEEE80211_BAND_2GHZ] = rtw_spt_band_alloc(IEEE80211_BAND_2GHZ);
++		wiphy->bands[NL80211_BAND_2GHZ] = rtw_spt_band_alloc(NL80211_BAND_2GHZ);
+ 	/* if (padapter->registrypriv.wireless_mode & WIRELESS_11A) */
+-		wiphy->bands[IEEE80211_BAND_5GHZ] = rtw_spt_band_alloc(IEEE80211_BAND_5GHZ);
++		wiphy->bands[NL80211_BAND_5GHZ] = rtw_spt_band_alloc(NL80211_BAND_5GHZ);
+ 	
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) && LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
+ 	wiphy->flags |= WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS;
+@@ -6071,8 +6071,8 @@
+ 	if (!wdev)
+ 		return;
+ 
+-	rtw_spt_band_free(wdev->wiphy->bands[IEEE80211_BAND_2GHZ]);
+-	rtw_spt_band_free(wdev->wiphy->bands[IEEE80211_BAND_5GHZ]);
++	rtw_spt_band_free(wdev->wiphy->bands[NL80211_BAND_2GHZ]);
++	rtw_spt_band_free(wdev->wiphy->bands[NL80211_BAND_5GHZ]);
+ 	
+ 	wiphy_free(wdev->wiphy);
+ 

packages/linux-drivers/RTL8812AU/package.mk

@@ -17,7 +17,8 @@
 ################################################################################
 
 PKG_NAME="RTL8812AU"
-PKG_VERSION="928e27f"
+# Branch: 4.3.22_beta
+PKG_VERSION="73b88d5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux-drivers/RTL8812AU/patches/RTL8812AU-04-kernel-4.6.patch

@@ -1,30 +0,0 @@
-diff -Naur a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c
---- a/os_dep/linux/ioctl_linux.c	2016-02-07 05:05:49.000000000 -0800
-+++ b/os_dep/linux/ioctl_linux.c	2016-04-19 12:35:27.647180055 -0700
-@@ -13908,7 +13908,11 @@
- static int rtw_ioctl_wext_private(struct net_device *dev, struct ifreq *rq)
- {
- #ifdef CONFIG_COMPAT
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
-+    if(in_compat_syscall())
-+#else
-     if(is_compat_task())
-+#endif
-         return rtw_ioctl_compat_wext_private( dev, rq );
-     else
- #endif // CONFIG_COMPAT
-diff -Naur a/os_dep/linux/rtw_android.c b/os_dep/linux/rtw_android.c
---- a/os_dep/linux/rtw_android.c	2016-02-07 05:05:49.000000000 -0800
-+++ b/os_dep/linux/rtw_android.c	2016-04-19 12:39:24.551833041 -0700
-@@ -577,7 +577,11 @@
-             goto exit;
-     }
- #ifdef CONFIG_COMPAT
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
-+    if (in_compat_syscall()) {
-+#else
-     if (is_compat_task()) {
-+#endif
-         /* User space is 32-bit, use compat ioctl */
-         compat_android_wifi_priv_cmd compat_priv_cmd;
- 

packages/linux-drivers/bcm_sta/patches/bcm_sta-0006-kernel-4.7.patch

@@ -0,0 +1,198 @@
+diff -Naur a/x86-32/src/wl/sys/wl_cfg80211_hybrid.c b/x86-32/src/wl/sys/wl_cfg80211_hybrid.c
+--- a/x86-32/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-23 14:26:16.911221749 +0100
++++ b/x86-32/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-23 14:26:49.071406220 +0100
+@@ -236,7 +236,7 @@
+ #endif				
+ 
+ #define CHAN2G(_channel, _freq, _flags) {			\
+-	.band			= IEEE80211_BAND_2GHZ,		\
++	.band			= NL80211_BAND_2GHZ,		\
+ 	.center_freq		= (_freq),			\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -245,7 +245,7 @@
+ }
+ 
+ #define CHAN5G(_channel, _flags) {				\
+-	.band			= IEEE80211_BAND_5GHZ,		\
++	.band			= NL80211_BAND_5GHZ,		\
+ 	.center_freq		= 5000 + (5 * (_channel)),	\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -379,7 +379,7 @@
+ };
+ 
+ static struct ieee80211_supported_band __wl_band_2ghz = {
+-	.band = IEEE80211_BAND_2GHZ,
++	.band = NL80211_BAND_2GHZ,
+ 	.channels = __wl_2ghz_channels,
+ 	.n_channels = ARRAY_SIZE(__wl_2ghz_channels),
+ 	.bitrates = wl_g_rates,
+@@ -387,7 +387,7 @@
+ };
+ 
+ static struct ieee80211_supported_band __wl_band_5ghz_a = {
+-	.band = IEEE80211_BAND_5GHZ,
++	.band = NL80211_BAND_5GHZ,
+ 	.channels = __wl_5ghz_a_channels,
+ 	.n_channels = ARRAY_SIZE(__wl_5ghz_a_channels),
+ 	.bitrates = wl_a_rates,
+@@ -395,7 +395,7 @@
+ };
+ 
+ static struct ieee80211_supported_band __wl_band_5ghz_n = {
+-	.band = IEEE80211_BAND_5GHZ,
++	.band = NL80211_BAND_5GHZ,
+ 	.channels = __wl_5ghz_n_channels,
+ 	.n_channels = ARRAY_SIZE(__wl_5ghz_n_channels),
+ 	.bitrates = wl_a_rates,
+@@ -1876,8 +1876,8 @@
+ 	wdev->wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
+ #endif
+ 	wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
+-	wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;
+-	wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
++	wdev->wiphy->bands[NL80211_BAND_2GHZ] = &__wl_band_2ghz;
++	wdev->wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
+ 	wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
+ 	wdev->wiphy->cipher_suites = __wl_cipher_suites;
+ 	wdev->wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);
+@@ -2000,7 +2000,7 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
+ 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel,
+ 		(notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ?
+-		IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
++		NL80211_BAND_2GHZ : NL80211_BAND_5GHZ);
+ #else
+ 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel);
+ #endif
+@@ -2116,7 +2116,7 @@
+ 				return err;
+ 			}
+ 			chan = wf_chspec_ctlchan(chanspec);
+-			band = (chan <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
++			band = (chan <= CH_MAX_2G_CHANNEL) ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
+ 			freq = ieee80211_channel_to_frequency(chan, band);
+ 			channel = ieee80211_get_channel(wiphy, freq);
+ 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
+@@ -2250,10 +2250,10 @@
+ 		join_params->params.chanspec_list[0] =
+ 		    ieee80211_frequency_to_channel(chan->center_freq);
+ 
+-		if (chan->band == IEEE80211_BAND_2GHZ) {
++		if (chan->band == NL80211_BAND_2GHZ) {
+ 			chanspec |= WL_CHANSPEC_BAND_2G;
+ 		}
+-		else if (chan->band == IEEE80211_BAND_5GHZ) {
++		else if (chan->band == NL80211_BAND_5GHZ) {
+ 			chanspec |= WL_CHANSPEC_BAND_5G;
+ 		}
+ 		else {
+@@ -2885,7 +2885,7 @@
+ 
+ 	if (phy == 'n' || phy == 'a' || phy == 'v') {
+ 		wiphy = wl_to_wiphy(wl);
+-		wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_n;
++		wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_n;
+ 	}
+ 
+ 	return err;
+diff -Naur a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
+--- a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-23 14:26:22.639254590 +0100
++++ b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-23 14:27:01.507477603 +0100
+@@ -236,7 +236,7 @@
+ #endif				
+ 
+ #define CHAN2G(_channel, _freq, _flags) {			\
+-	.band			= IEEE80211_BAND_2GHZ,		\
++	.band			= NL80211_BAND_2GHZ,		\
+ 	.center_freq		= (_freq),			\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -245,7 +245,7 @@
+ }
+ 
+ #define CHAN5G(_channel, _flags) {				\
+-	.band			= IEEE80211_BAND_5GHZ,		\
++	.band			= NL80211_BAND_5GHZ,		\
+ 	.center_freq		= 5000 + (5 * (_channel)),	\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -379,7 +379,7 @@
+ };
+ 
+ static struct ieee80211_supported_band __wl_band_2ghz = {
+-	.band = IEEE80211_BAND_2GHZ,
++	.band = NL80211_BAND_2GHZ,
+ 	.channels = __wl_2ghz_channels,
+ 	.n_channels = ARRAY_SIZE(__wl_2ghz_channels),
+ 	.bitrates = wl_g_rates,
+@@ -387,7 +387,7 @@
+ };
+ 
+ static struct ieee80211_supported_band __wl_band_5ghz_a = {
+-	.band = IEEE80211_BAND_5GHZ,
++	.band = NL80211_BAND_5GHZ,
+ 	.channels = __wl_5ghz_a_channels,
+ 	.n_channels = ARRAY_SIZE(__wl_5ghz_a_channels),
+ 	.bitrates = wl_a_rates,
+@@ -395,7 +395,7 @@
+ };
+ 
+ static struct ieee80211_supported_band __wl_band_5ghz_n = {
+-	.band = IEEE80211_BAND_5GHZ,
++	.band = NL80211_BAND_5GHZ,
+ 	.channels = __wl_5ghz_n_channels,
+ 	.n_channels = ARRAY_SIZE(__wl_5ghz_n_channels),
+ 	.bitrates = wl_a_rates,
+@@ -1876,8 +1876,8 @@
+ 	wdev->wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
+ #endif
+ 	wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
+-	wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;
+-	wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
++	wdev->wiphy->bands[NL80211_BAND_2GHZ] = &__wl_band_2ghz;
++	wdev->wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
+ 	wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
+ 	wdev->wiphy->cipher_suites = __wl_cipher_suites;
+ 	wdev->wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);
+@@ -2000,7 +2000,7 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
+ 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel,
+ 		(notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ?
+-		IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
++		NL80211_BAND_2GHZ : NL80211_BAND_5GHZ);
+ #else
+ 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel);
+ #endif
+@@ -2116,7 +2116,7 @@
+ 				return err;
+ 			}
+ 			chan = wf_chspec_ctlchan(chanspec);
+-			band = (chan <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
++			band = (chan <= CH_MAX_2G_CHANNEL) ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
+ 			freq = ieee80211_channel_to_frequency(chan, band);
+ 			channel = ieee80211_get_channel(wiphy, freq);
+ 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
+@@ -2250,10 +2250,10 @@
+ 		join_params->params.chanspec_list[0] =
+ 		    ieee80211_frequency_to_channel(chan->center_freq);
+ 
+-		if (chan->band == IEEE80211_BAND_2GHZ) {
++		if (chan->band == NL80211_BAND_2GHZ) {
+ 			chanspec |= WL_CHANSPEC_BAND_2G;
+ 		}
+-		else if (chan->band == IEEE80211_BAND_5GHZ) {
++		else if (chan->band == NL80211_BAND_5GHZ) {
+ 			chanspec |= WL_CHANSPEC_BAND_5G;
+ 		}
+ 		else {
+@@ -2885,7 +2885,7 @@
+ 
+ 	if (phy == 'n' || phy == 'a' || phy == 'v') {
+ 		wiphy = wl_to_wiphy(wl);
+-		wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_n;
++		wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_n;
+ 	}
+ 
+ 	return err;

packages/linux/package.mk

@@ -55,7 +55,7 @@ case "$LINUX" in
     PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan irqbalanced"
     ;;
   *)
-    PKG_VERSION="4.6.3"
+    PKG_VERSION="4.7"
     PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
 esac
@@ -118,6 +118,15 @@ post_patch() {
     sed -i -e "s|^CONFIG_ISCSI_IBFT=.*$|# CONFIG_ISCSI_IBFT is not set|" $PKG_BUILD/.config
   fi
 
+  # enable different libcec version for imx6 project with kernel 4.4
+  # using customized kernel driver
+  if [ "$PROJECT" = "imx6" ]; then
+    if [ "$LIBCEC_TYPE" = "xbian" -a "$LINUX" = "imx6-4.4-xbian" ]; then
+      sed -i -e "s|# CONFIG_MXC_HDMI_CEC is not set|CONFIG_MXC_HDMI_CEC=y|" $PKG_BUILD/.config
+      sed -i -e "s|CONFIG_MXC_HDMI_CEC_SR=y||" $PKG_BUILD/.config
+    fi
+  fi
+
   # copy some extra firmware to linux tree
   cp -R $PKG_DIR/firmware/* $PKG_BUILD/firmware
 

packages/linux/patches/4.6.3/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch

@@ -1,21 +0,0 @@
-diff -Naur linux-3.17.1/drivers/media/rc/mceusb.c linux-3.17.1.patch/drivers/media/rc/mceusb.c
---- linux-3.17.1/drivers/media/rc/mceusb.c	2014-10-15 12:29:30.000000000 +0200
-+++ linux-3.17.1.patch/drivers/media/rc/mceusb.c	2014-10-16 11:45:57.480176874 +0200
-@@ -188,6 +188,8 @@
- #define VENDOR_TWISTEDMELON	0x2596
- #define VENDOR_HAUPPAUGE	0x2040
- #define VENDOR_PCTV		0x2013
-+#define VENDOR_ADAPTEC		0x03f3
-+
- 
- enum mceusb_model_type {
- 	MCE_GEN2 = 0,		/* Most boards */
-@@ -401,6 +403,8 @@
- 	  .driver_info = HAUPPAUGE_CX_HYBRID_TV },
- 	{ USB_DEVICE(VENDOR_PCTV, 0x025e),
- 	  .driver_info = HAUPPAUGE_CX_HYBRID_TV },
-+	/* Adaptec / HP eHome Receiver */
-+	{ USB_DEVICE(VENDOR_ADAPTEC, 0x0094) },
- 
- 	/* Terminating entry */
- 	{ }

packages/linux/patches/4.6.3/linux-063-xpad-add-3rdparty-controllers.patch

@@ -1,34 +0,0 @@
-From 627e828fcf1bb9fc71dbbeca29acd33162efb448 Mon Sep 17 00:00:00 2001
-From: Matt DeVillier <matt.devillier@gmail.com>
-Date: Wed, 2 Mar 2016 23:11:33 -0600
-Subject: [PATCH 1/1] linux/drivers/input/joystick/xpad: add support for 3rd party XBONE controllers
-
-linux/drivers/input/joystick/xpad: add support for 3rd party XBONE controllers
-
-Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
----
- drivers/input/joystick/xpad.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
-index e8a84d1..d1ab48a 100644
---- a/drivers/input/joystick/xpad.c
-+++ b/drivers/input/joystick/xpad.c
-@@ -129,6 +129,7 @@ static const struct xpad_device {
- 	{ 0x045e, 0x028e, "Microsoft X-Box 360 pad", 0, XTYPE_XBOX360 },
- 	{ 0x045e, 0x02d1, "Microsoft X-Box One pad", 0, XTYPE_XBOXONE },
- 	{ 0x045e, 0x02dd, "Microsoft X-Box One pad (Firmware 2015)", 0, XTYPE_XBOXONE },
-+	{ 0x0e6f, 0x0139, "Afterglow Prismatic Wired Controller", 0, XTYPE_XBOXONE },
- 	{ 0x045e, 0x0291, "Xbox 360 Wireless Receiver (XBOX)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
- 	{ 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
- 	{ 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },
-@@ -301,6 +302,7 @@ static struct usb_device_id xpad_table[] = {
- 	XPAD_XBOX360_VENDOR(0x044f),		/* Thrustmaster X-Box 360 controllers */
- 	XPAD_XBOX360_VENDOR(0x045e),		/* Microsoft X-Box 360 controllers */
- 	XPAD_XBOXONE_VENDOR(0x045e),		/* Microsoft X-Box One controllers */
-+	XPAD_XBOXONE_VENDOR(0x0e6f), 		/* 0x0e6f X-Box One controllers */
- 	XPAD_XBOX360_VENDOR(0x046d),		/* Logitech X-Box 360 style controllers */
- 	XPAD_XBOX360_VENDOR(0x0738),		/* Mad Catz X-Box 360 controllers */
- 	{ USB_DEVICE(0x0738, 0x4540) },		/* Mad Catz Beat Pad */
--- 
-2.5.0

packages/linux/patches/4.6.3/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch

@@ -1,17 +0,0 @@
-diff -Naur linux-3.7.9/drivers/media/usb/dvb-usb/pctv452e.c linux-3.7.9.patch/drivers/media/usb/dvb-usb/pctv452e.c
---- linux-3.7.9/drivers/media/usb/dvb-usb/pctv452e.c    2013-01-11 18:19:28.000000000 +0100
-+++ linux-3.7.9.patch/drivers/media/usb/dvb-usb/pctv452e.c      2013-01-16 10:35:01.131342123 +0100
-@@ -995,11 +995,11 @@
-			/* parameter for the MPEG2-data transfer */
-			.stream = {
-				.type = USB_ISOC,
--				.count = 7,
-+				.count = 4,
-				.endpoint = 0x02,
-				.u = {
-					.isoc = {
--						.framesperurb = 4,
-+						.framesperurb = 64,
-						.framesize = 940,
-						.interval = 1
-					}

packages/linux/patches/4.6.3/linux-230-elgato-eyetv-sat-v3.patch

@@ -1,50 +0,0 @@
-diff --git a/drivers/media/usb/dvb-usb/az6027.c b/drivers/media/usb/dvb-usb/az6027.c
-index 92e47d6..2e71136 100644
---- a/drivers/media/usb/dvb-usb/az6027.c
-+++ b/drivers/media/usb/dvb-usb/az6027.c
-@@ -1090,6 +1090,7 @@ static struct usb_device_id az6027_usb_table[] = {
- 	{ USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_HDCI_V2) },
- 	{ USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_SAT) },
- 	{ USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_SAT_V2) },
-+	{ USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_SAT_V3) },
- 	{ },
- };
- 
-@@ -1138,7 +1139,7 @@ static struct dvb_usb_device_properties az6027_properties = {
- 
- 	.i2c_algo         = &az6027_i2c_algo,
- 
--	.num_device_descs = 7,
-+	.num_device_descs = 8,
- 	.devices = {
- 		{
- 			.name = "AZUREWAVE DVB-S/S2 USB2.0 (AZ6027)",
-@@ -1168,6 +1169,10 @@ static struct dvb_usb_device_properties az6027_properties = {
- 			.name = "Elgato EyeTV Sat",
- 			.cold_ids = { &az6027_usb_table[6], NULL },
- 			.warm_ids = { NULL },
-+		}, {
-+			.name = "Elgato EyeTV Sat",
-+			.cold_ids = { &az6027_usb_table[7], NULL },
-+			.warm_ids = { NULL },
- 		},
- 		{ NULL },
- 	}
-
-warning: LF will be replaced by CRLF in az6027.c.
-The file will have its original line endings in your working directory.
-diff --git a/drivers/media/dvb-core/dvb-usb-ids.h b/drivers/media/dvb-core/dvb-usb-ids.h
-index c117fb3..7552f38 100644
---- a/drivers/media/dvb-core/dvb-usb-ids.h
-+++ b/drivers/media/dvb-core/dvb-usb-ids.h
-@@ -365,6 +365,7 @@
- #define USB_PID_ELGATO_EYETV_DTT_Dlx			0x0020
- #define USB_PID_ELGATO_EYETV_SAT			0x002a
- #define USB_PID_ELGATO_EYETV_SAT_V2			0x0025
-+#define USB_PID_ELGATO_EYETV_SAT_V3			0x0036
- #define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD		0x5000
- #define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM		0x5001
- #define USB_PID_FRIIO_WHITE				0x0001
-
-warning: LF will be replaced by CRLF in dvb-usb-ids.h.
-The file will have its original line endings in your working directory.

packages/linux/patches/4.7/linux-999-i915-extend-fake-hdmi-live-status-to-valley-view.patch

@@ -0,0 +1,29 @@
+Subject: [PATCH] drm/i915: Extend Fake HDMI live status to Valley View
+
+On Atom E38xx based boards from two different manufacturers we have 
+encountered the HDMI display being disabled early during the boot process.
+
+Extending the Fake HDMI live status to include Valley View chipsets 
+fixes this problem on both boards.
+
+Signed-off-by: James Stafford <jstafford at ampltd.com>
+---
+  drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_hdmi.c 
+b/drivers/gpu/drm/i915/intel_hdmi.c
+index 6b52c6a..358f9b2 100644
+--- a/drivers/gpu/drm/i915/intel_hdmi.c
++++ b/drivers/gpu/drm/i915/intel_hdmi.c
+@@ -1507,7 +1507,7 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
+ 		 * So consider live_status only for certain platforms, for
+ 		 * others, read EDID to determine presence of sink.
+ 		 */
+-		if (INTEL_INFO(dev_priv)->gen < 7 || IS_IVYBRIDGE(dev_priv))
++		if (INTEL_INFO(dev_priv)->gen < 7 || IS_IVYBRIDGE(dev_priv) || IS_VALLEYVIEW(dev_priv))
+ 			live_status = true;
+ 	}
+
+-- 
+2.7.4

packages/linux/patches/4.7/linux-999-partly-revert-media-rc-core.patch

@@ -0,0 +1,42 @@
+From patchwork Sat Jul 30 13:19:27 2016
+From: Ole Ernst <olebowle@gmx.com>
+Date: Sat, 30 Jul 2016 15:19:27 +0200
+Subject: Partly revert "[media] rc-core: allow calling rc_open with device not initialized"
+
+This partly reverts commit 078600f514a12fd763ac84c86af68ef5b5267563.
+
+Due to the relocation of input_register_device() call, holding down a
+button on an IR remote no longer resulted in repeated key down events.
+
+Signed-off-by: Ole Ernst <olebowle@gmx.com>
+---
+ drivers/media/rc/rc-main.c | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
+index 8e7f292..26fd63b 100644
+--- a/drivers/media/rc/rc-main.c
++++ b/drivers/media/rc/rc-main.c
+@@ -1460,6 +1460,10 @@ int rc_register_device(struct rc_dev *dev)
+ 	dev->input_dev->phys = dev->input_phys;
+ 	dev->input_dev->name = dev->input_name;
+ 
++	rc = input_register_device(dev->input_dev);
++	if (rc)
++		goto out_table;
++
+ 	/*
+ 	 * Default delay of 250ms is too short for some protocols, especially
+ 	 * since the timeout is currently set to 250ms. Increase it to 500ms,
+@@ -1475,11 +1479,6 @@ int rc_register_device(struct rc_dev *dev)
+ 	 */
+ 	dev->input_dev->rep[REP_PERIOD] = 125;
+ 
+-	/* rc_open will be called here */
+-	rc = input_register_device(dev->input_dev);
+-	if (rc)
+-		goto out_table;
+-
+ 	path = kobject_get_path(&dev->dev.kobj, GFP_KERNEL);
+ 	dev_info(&dev->dev, "%s as %s\n",
+ 		dev->input_name ?: "Unspecified device", path ?: "N/A");