cleanup buildroot GfA patches

GfA-buildroot-LegalInfo_zip_in_separate_script.patch

@@ -1,42 +0,0 @@
-diff --git a/MakeIMAGE.sh b/MakeIMAGE.sh
-index de5c68588..02271d3a7 100755
---- a/MakeIMAGE.sh
-+++ b/MakeIMAGE.sh
-@@ -86,12 +86,6 @@ kpartx -dsv $IMAGEFILE
- #-- packen des Imagefiles
- rm $IMAGEFILE.zip
- zip -j $IMAGEFILE.zip $IMAGEFILE
--#-- legalinfo erstellen
--TMPWRKDIR=`pwd`
--cd output
--rm ../../Display001-$BUILD-legal-info.zip
--zip -r ../../Display001-$BUILD-legal-info.zip ./legal-info/*
--cd $TMPWRKDIR
- 
- export LC_ALL=$SAVE_LC
-                                                                                                                 
-\ No newline at end of file
-diff --git a/MakeLegalInfo.sh b/MakeLegalInfo.sh
-new file mode 100755
-index 000000000..429486fe5
---- /dev/null
-+++ b/MakeLegalInfo.sh
-@@ -0,0 +1,17 @@
-+#!/bin/sh
-+
-+SAVE_LC=$LC_ALL
-+export LC_ALL=C
-+
-+BUILD=`cat ../GfA/board/GfA/Display001/BUILD`
-+IMAGEFILE=../Display001_Build_$BUILD-img
-+
-+#-- legalinfo erstellen
-+TMPWRKDIR=`pwd`
-+cd output
-+rm ../../Display001-$BUILD-legal-info.zip
-+zip -r ../../Display001-$BUILD-legal-info.zip ./legal-info/*
-+cd $TMPWRKDIR
-+
-+export LC_ALL=$SAVE_LC
-+                                                                                                                
-\ No newline at end of file

GfA-buildroot-MakeDTSupdate.patch

@@ -1,263 +0,0 @@
-diff --git a/MakeDTSUpdate.sh b/MakeDTSUpdate.sh
-new file mode 100755
-index 0000000000..f25b04b975
---- /dev/null
-+++ b/MakeDTSUpdate.sh
-@@ -0,0 +1,58 @@
-+#!/bin/bash
-+WRKDIR=/tmp/XXXUpdateDTS
-+BUILD=`cat ../GfA/board/GfA/Display001/BUILD`
-+UPDATE_BINARY=$WRKDIR/dest/UpdateDTS.tar.Z
-+UPDATE_FILENAME="../UpdateDTS_$BUILD.sh"
-+UPDATE_IN_SCRIPT="UpdateDTS.sh.in"
-+
-+rm -rf $WRKDIR
-+mkdir -p $WRKDIR/dest
-+
-+cp ./output/images/*.dtb $WRKDIR
-+
-+tar -C $WRKDIR --exclude=./dest -czvf $UPDATE_BINARY ./
-+
-+# Check for payload format option (default is binary).
-+binary=1
-+uuencode=0
-+
-+if [[ "$1" == '--binary' ]]; then
-+	binary=1
-+	uuencode=0
-+	shift
-+fi
-+if [[ "$1" == '--uuencode' ]]; then
-+	binary=0
-+	uuencode=1
-+	shift
-+fi
-+
-+if [[ ! -f $UPDATE_BINARY ]]; then
-+	echo "       UPDATE_BINARY $UPDATE_BINARY doesn't exist!"
-+	echo "Usage: $0 [--binary | --uuencode]"
-+	exit 1
-+fi
-+
-+
-+if [[ $binary -ne 0 ]]; then
-+	# Append binary data.
-+	sed \
-+		-e 's/uuencode=./uuencode=0/' \
-+		-e 's/binary=./binary=1/' \
-+			 $UPDATE_IN_SCRIPT > $UPDATE_FILENAME
-+	echo "PAYLOAD:" >> $UPDATE_FILENAME
-+
-+	cat $UPDATE_BINARY >> $UPDATE_FILENAME
-+fi
-+if [[ $uuencode -ne 0 ]]; then
-+	# Append uuencoded data.
-+	sed \
-+		-e 's/uuencode=./uuencode=1/' \
-+		-e 's/binary=./binary=0/' \
-+			 $UPDATE_IN_SCRIPT > $UPDATE_FILENAME
-+	echo "PAYLOAD:" >> $UPDATE_FILENAME
-+
-+	cat $UPDATE_BINARY | uuencode - >> $UPDATE_FILENAME
-+fi
-+
-+chmod a+x $UPDATE_FILENAME
-diff --git a/UpdateDTS.sh.in b/UpdateDTS.sh.in
-new file mode 100644
-index 0000000000..e123282a66
---- /dev/null
-+++ b/UpdateDTS.sh.in
-@@ -0,0 +1,120 @@
-+#!/bin/sh
-+
-+uuencode=0
-+binary=1
-+
-+##TAR_PARAMETERS="-C / --exclude=./opt --exclude=./etc/inittab -xzvf -"
-+TMP_PATH="/__GfA_UpdateDTS"
-+TAR_PARAMETERS="-C $TMP_PATH -xzvf -"
-+
-+untar_payload ()
-+{
-+
-+	echo "remove $TMP_PATH : "
-+	rm -rf $TMP_PATH
-+	echo ">> $? "
-+	mkdir -p $TMP_PATH
-+
-+	match=$(grep -n -m 1 '^PAYLOAD:$' $0 | cut -d ':' -f 1)
-+	payload_start=$((match + 1))
-+	if [[ $binary -ne 0 ]]; then
-+		tail -n +$payload_start $0 | tar $TAR_PARAMETERS
-+	fi
-+	if [[ $uuencode -ne 0 ]]; then
-+		tail -n +$payload_start $0 | uudecode | tar $TAR_PARAMETERS
-+	fi
-+}
-+
-+## --- Kommandos zum Installieren
-+## -- get bootpartition
-+such="root=/dev/mmcblk1"
-+grep -q $such /proc/cmdline
-+if [ $? == 0 ]
-+then
-+	bootpart="/dev/mmcblk1p1"
-+else
-+	bootpart="/dev/mmcblk0p1"
-+fi	
-+
-+umount /mnt
-+mount $bootpart /mnt
-+
-+#--- Kernel MLO und Rootfs-Tarball entpacken
-+untar_payload
-+# --- 
-+
-+cp $TMP_PATH/*.dtb /mnt
-+
-+echo "sync mmc be patient ...."
-+sync
-+sync
-+
-+# Get Graphics resolution and set dtb to the right resolution
-+BASEBOARD=`cat /tmp/BASEBOARD`
-+
-+DONE=0
-+YRES="$(fbset | awk '/geom/ {print $3}')"
-+XRES="$(fbset | awk '/geom/ {print $2}')"
-+
-+echo "XRES $XRES, YRES $YRES"
-+
-+if [ "$XRES" == "480" -a "$YRES" == "272" ]; then
-+if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
-+  echo "4.3 Inch Display 2"
-+  sh /root/Display2To_4_3inch.sh
-+  DONE=1
-+else
-+  echo "4.3 Inch"
-+  sh /root/DisplayTo_4_3inch.sh
-+  DONE=1
-+fi
-+fi
-+
-+if [ "$XRES" == "800" -a "$YRES" == "480" ]; then
-+if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
-+  echo "7 Inch Display 2"
-+  sh /root/Display2To_7inch.sh
-+  DONE=1
-+else
-+  echo "7 Inch"
-+  sh /root/DisplayTo_7inch.sh
-+  DONE=1
-+fi
-+fi
-+
-+if [ "$XRES" == "1280" -a "$YRES" == "800" ]; then
-+if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
-+  echo "10 Inch Display 2"
-+  sh /root/Display2To_10inch.sh
-+  DONE=1
-+else
-+  echo "10 Inch"
-+  sh /root/DisplayTo_10inch.sh
-+  DONE=1
-+fi
-+fi
-+
-+if [ "$XRES" == "1920" -a "$YRES" == "1080" ]; then
-+if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
-+  echo "10 Inch Display 2"
-+  sh /root/Display2To_15inch.sh
-+  DONE=1
-+else
-+  echo "10 Inch"
-+  sh /root/DisplayTo_15inch.sh
-+  DONE=1
-+fi
-+fi
-+
-+if [ "$DONE" == "0" ]; then
-+  echo "Unknown Display Resolution"
-+fi
-+
-+
-+
-+
-+#=================
-+echo "Update Done, pls. reboot System"
-+umount /mnt
-+echo "."
-+exit 0
-diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
-index e53210dbdb..76a75fb9b8 100644
---- a/UpdateRootfs.sh.in
-+++ b/UpdateRootfs.sh.in
-@@ -124,6 +124,7 @@ chown -Rv mysql:nogroup /var/mysql
- chown -Rv postgres:postgres /var/lib/pgsql
- #==============================================================================
- # Get Graphics resolution and set dtb to the right resolution
-+BASEBOARD=`cat /tmp/BASEBOARD`
- 
- DONE=0
- YRES="$(fbset | awk '/geom/ {print $3}')"
-@@ -132,36 +133,57 @@ XRES="$(fbset | awk '/geom/ {print $2}')"
- echo "XRES $XRES, YRES $YRES"
- 
- if [ "$XRES" == "480" -a "$YRES" == "272" ]; then
-+if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
-+  echo "4.3 Inch Display 2"
-+  sh /root/Display2To_4_3inch.sh
-+  DONE=1
-+else
-   echo "4.3 Inch"
-   sh /root/DisplayTo_4_3inch.sh
-   DONE=1
- fi
-+fi
- 
- if [ "$XRES" == "800" -a "$YRES" == "480" ]; then
-+if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
-+  echo "7 Inch Display 2"
-+  sh /root/Display2To_7inch.sh
-+  DONE=1
-+else
-   echo "7 Inch"
-   sh /root/DisplayTo_7inch.sh
-   DONE=1
- fi
-+fi
- 
- if [ "$XRES" == "1280" -a "$YRES" == "800" ]; then
-+if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
-+  echo "10 Inch Display 2"
-+  sh /root/Display2To_10inch.sh
-+  DONE=1
-+else
-   echo "10 Inch"
-   sh /root/DisplayTo_10inch.sh
-   DONE=1
- fi
-+fi
- 
- if [ "$XRES" == "1920" -a "$YRES" == "1080" ]; then
-+if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
-+  echo "10 Inch Display 2"
-+  sh /root/Display2To_15inch.sh
-+  DONE=1
-+else
-   echo "10 Inch"
-   sh /root/DisplayTo_15inch.sh
-   DONE=1
- fi
-+fi
- 
- if [ "$DONE" == "0" ]; then
-   echo "Unknown Display Resolution"
- fi
- 
--
--
--
- #=================
- echo "Update Done, pls. reboot System"
- umount /mnt

GfA-buildroot-add-5-7-inch-to-update.patch

@@ -1,32 +0,0 @@
-diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
-index 42b1ddc..3939298 100644
---- a/UpdateRootfs.sh.in
-+++ b/UpdateRootfs.sh.in
-@@ -53,7 +53,7 @@ cp $TMP_PATH/uImage /mnt
- cp $TMP_PATH/*.dtb /mnt
- 
- #rootfs auspacken
--tar -C / --exclude=./opt --exclude=./tmp --exclude=./etc/inittab \
-+tar -C / --exclude=./tmp --exclude=./etc/inittab \
- 	--exclude=./etc/network/interfaces \
- 	--exclude=./etc/hosts --exclude=./etc/hostname \
- 	--exclude=./etc/passwd --exclude=./etc/shadow \
-@@ -156,6 +156,18 @@ else
- fi
- fi
- 
-+if [ "$XRES" == "640" -a "$YRES" == "480" ]; then
-+if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
-+  echo "5.7 Inch Display 2"
-+  sh /root/Display2To_5_7inch.sh
-+  DONE=1
-+else
-+  echo "5.7 Inch"
-+  sh /root/DisplayTo_5_7inch.sh
-+  DONE=1
-+fi
-+fi
-+
- if [ "$XRES" == "1280" -a "$YRES" == "800" ]; then
- if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
-   echo "10 Inch Display 2"

GfA-buildroot-add-7inch_rs485-dts.patch

@@ -1,65 +0,0 @@
-diff --git a/UpdateDTS.sh.in b/UpdateDTS.sh.in
-index e123282..3a5cb18 100644
---- a/UpdateDTS.sh.in
-+++ b/UpdateDTS.sh.in
-@@ -76,11 +76,17 @@ if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
-   sh /root/Display2To_7inch.sh
-   DONE=1
- else
-+if [ "$BASEBOARD" == "DISPLAY002_RS485" ]; then
-+  echo "7 Inch Display 2 rs485"
-+  sh /root/Display2To_7inch_rs485.sh
-+  DONE=1
-+else
-   echo "7 Inch"
-   sh /root/DisplayTo_7inch.sh
-   DONE=1
- fi
- fi
-+fi
- 
- if [ "$XRES" == "1280" -a "$YRES" == "800" ]; then
- if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
-diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
-index 42b1ddc..2ee5587 100644
---- a/UpdateRootfs.sh.in
-+++ b/UpdateRootfs.sh.in
-@@ -53,7 +53,7 @@ cp $TMP_PATH/uImage /mnt
- cp $TMP_PATH/*.dtb /mnt
- 
- #rootfs auspacken
--tar -C / --exclude=./opt --exclude=./tmp --exclude=./etc/inittab \
-+tar -C / --exclude=./tmp --exclude=./etc/inittab \
- 	--exclude=./etc/network/interfaces \
- 	--exclude=./etc/hosts --exclude=./etc/hostname \
- 	--exclude=./etc/passwd --exclude=./etc/shadow \
-@@ -150,11 +150,29 @@ if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
-   sh /root/Display2To_7inch.sh
-   DONE=1
- else
-+if [ "$BASEBOARD" == "DISPLAY002_RS485" ]; then
-+  echo "7 Inch Display 2 rs485"
-+  sh /root/Display2To_7inch_rs485.sh
-+  DONE=1
-+else
-   echo "7 Inch"
-   sh /root/DisplayTo_7inch.sh
-   DONE=1
- fi
- fi
-+fi
-+
-+if [ "$XRES" == "640" -a "$YRES" == "480" ]; then
-+if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
-+  echo "5.7 Inch Display 2"
-+  sh /root/Display2To_5_7inch.sh
-+  DONE=1
-+else
-+  echo "5.7 Inch"
-+  sh /root/DisplayTo_5_7inch.sh
-+  DONE=1
-+fi
-+fi
- 
- if [ "$XRES" == "1280" -a "$YRES" == "800" ]; then
- if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then

GfA-buildroot-libmodbus-GfA.patch

@@ -1,111 +0,0 @@
-diff --git a/package/libmodbus/001-GfA-echo-rtu.patch b/package/libmodbus/001-GfA-echo-rtu.patch
-new file mode 100644
-index 0000000000..386172f970
---- /dev/null
-+++ b/package/libmodbus/001-GfA-echo-rtu.patch
-@@ -0,0 +1,105 @@
-+diff -Naur a/src/modbus-rtu.c b/src/modbus-rtu.c
-+--- a/src/modbus-rtu.c	2017-10-11 23:07:11.623017506 +0200
-++++ b/src/modbus-rtu.c	2017-10-11 23:07:20.495035402 +0200
-+@@ -257,6 +257,27 @@
-+ }
-+ #endif
-+ 
-++
-++ssize_t _modbus_rtu_write_n_read(modbus_t *ctx, const uint8_t *req, int req_length) {
-++ ssize_t w, r, i;
-++ uint8_t rb[req_length];
-++
-++ // Transmit
-++ w = write(ctx->s, req, req_length);
-++
-++ // Read back written bytes if hw has echo
-++ r = 0;
-++ while (r < w)
-++  r += read(ctx->s, rb + r, w - r);
-++ if (ctx->debug) {
-++  for (i = 0; i < r; ++i)
-++  fprintf(stderr, "|%02X|", rb[i]);
-++  fprintf(stderr, "\n");
-++ }
-++
-++ return w;
-++}
-++
-+ ssize_t _modbus_rtu_send(modbus_t *ctx, const uint8_t *req, int req_length)
-+ {
-+ #if defined(_WIN32)
-+@@ -264,7 +285,14 @@
-+     DWORD n_bytes = 0;
-+     return (WriteFile(ctx_rtu->w_ser.fd, req, req_length, &n_bytes, NULL)) ? n_bytes : -1;
-+ #else
-+-    return write(ctx->s, req, req_length);
-++    modbus_rtu_t *ctx_rtu = ctx->backend_data;
-++    ssize_t w;
-++    
-++    if(!ctx_rtu->echohw)    
-++      w = write(ctx->s, req, req_length);
-++     else
-++      w = _modbus_rtu_write_n_read(ctx, req, req_length);
-++    return w;
-+ #endif
-+ }
-+ 
-+@@ -772,6 +800,30 @@
-+     }
-+ }
-+ 
-++
-++int modbus_rtu_set_echohw_mode(modbus_t* ctx, uint8_t mode) {
-++ if (ctx->backend->backend_type == _MODBUS_BACKEND_TYPE_RTU) {
-++ modbus_rtu_t* rtu = (modbus_rtu_t*) ctx->backend_data;
-++ rtu->echohw= mode;
-++ return 0;
-++ }
-++ /* Wrong backend and invalid mode specified */
-++ errno = EINVAL;
-++ return -1;
-++
-++}
-++
-++int modbus_rtu_get_echohw_mode(modbus_t* ctx) {
-++ if (ctx->backend->backend_type == _MODBUS_BACKEND_TYPE_RTU) {
-++ modbus_rtu_t* rtu = (modbus_rtu_t*) ctx->backend_data;
-++ return rtu->echohw;
-++ }
-++ /* Wrong backend and invalid mode specified */
-++ errno = EINVAL;
-++ return -1;
-++
-++}
-++
-+ void _modbus_rtu_close(modbus_t *ctx)
-+ {
-+     /* Closes the file descriptor in RTU mode */
-+diff -Naur a/src/modbus-rtu.h b/src/modbus-rtu.h
-+--- a/src/modbus-rtu.h	2017-10-11 23:07:11.623017506 +0200
-++++ b/src/modbus-rtu.h	2017-10-11 23:07:20.495035402 +0200
-+@@ -37,6 +37,12 @@
-+ int modbus_rtu_set_serial_mode(modbus_t *ctx, int mode);
-+ int modbus_rtu_get_serial_mode(modbus_t *ctx);
-+ 
-++#define MODBUS_RTU_HAS_ECHOHW 1
-++#define MODBUS_RTU_NO_ECHOHW 0
-++
-++int modbus_rtu_set_echohw_mode(modbus_t *ctx, uint8_t mode);
-++int modbus_rtu_get_echohw_mode(modbus_t *ctx);
-++
-+ MODBUS_END_DECLS
-+ 
-+ #endif /* _MODBUS_RTU_H_ */
-+diff -Naur a/src/modbus-rtu-private.h b/src/modbus-rtu-private.h
-+--- a/src/modbus-rtu-private.h	2017-10-11 23:07:11.623017506 +0200
-++++ b/src/modbus-rtu-private.h	2017-10-11 23:07:20.495035402 +0200
-+@@ -81,6 +81,7 @@
-+ #if HAVE_DECL_TIOCSRS485
-+     int serial_mode;
-+ #endif
-++    uint8_t echohw;
-+ } modbus_rtu_t;
-+ 
-+ #endif /* _MODBUS_RTU_PRIVATE_H_ */

GfA-buildroot-qt57_on_Kernel_4_4_104.patch

@@ -1,2611 +0,0 @@
-diff --git a/package/qt5/Config.in b/package/qt5/Config.in
-index aeec188143..fb57d2574a 100644
---- a/package/qt5/Config.in
-+++ b/package/qt5/Config.in
-@@ -1,15 +1,15 @@
- config BR2_PACKAGE_QT5_GL_AVAILABLE
- 	bool
--	default y
- 	depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES
-+	default y
- 
- config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	bool
--	default y
- 	# Javascript engine is only available on certain architectures
- 	depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
- 	# ARM needs BLX, so v5t+
- 	depends on !BR2_ARM_CPU_ARMV4
-+	default y
- 
- comment "Qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library"
- 	depends on !BR2_PACKAGE_QT
-@@ -30,36 +30,8 @@ menuconfig BR2_PACKAGE_QT5
- 	  http://qt.io
- 
- if BR2_PACKAGE_QT5
--
--choice
--	prompt "Qt5 version"
--
--config BR2_PACKAGE_QT5_VERSION_LATEST
--	bool "Latest (5.8)"
--	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
--	depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11
--	depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+
--	# no built-in double-conversion support
--	depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa
--	help
--	  This option builds Qt 5.8, which is licensed under
--	  (L)GPL-3.0+.
--
--comment "Latest Qt version needs host/toolchain w/ gcc >= 4.8"
--	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_HOST_GCC_AT_LEAST_4_8
--	depends on !BR2_ARM_CPU_ARMV4
--	depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa
--
--config BR2_PACKAGE_QT5_VERSION_5_6
--	bool "LTS (5.6)"
--	help
--	  This option builds Qt 5.6, which is licensed under
--	  (L)GPL-2.0+.
--
--endchoice
--
--source "package/qt5/qt53d/Config.in"
- source "package/qt5/qt5base/Config.in"
-+source "package/qt5/qt53d/Config.in"
- source "package/qt5/qt5canvas3d/Config.in"
- source "package/qt5/qt5connectivity/Config.in"
- source "package/qt5/qt5declarative/Config.in"
-@@ -69,20 +41,22 @@ source "package/qt5/qt5imageformats/Config.in"
- source "package/qt5/qt5location/Config.in"
- source "package/qt5/qt5multimedia/Config.in"
- source "package/qt5/qt5quickcontrols/Config.in"
--source "package/qt5/qt5quickcontrols2/Config.in"
--source "package/qt5/qt5script/Config.in"
- source "package/qt5/qt5sensors/Config.in"
--source "package/qt5/qt5charts/Config.in"
--source "package/qt5/qt5virtualkeyboard/Config.in"
--source "package/qt5/qt5wayland/Config.in"
- source "package/qt5/qt5serialbus/Config.in"
- source "package/qt5/qt5serialport/Config.in"
-+source "package/qt5/qt5wayland/Config.in"
- source "package/qt5/qt5svg/Config.in"
- source "package/qt5/qt5tools/Config.in"
- source "package/qt5/qt5webchannel/Config.in"
--source "package/qt5/qt5webkit/Config.in"
--source "package/qt5/qt5webengine/Config.in"
- source "package/qt5/qt5websockets/Config.in"
- source "package/qt5/qt5x11extras/Config.in"
-+source "package/qt5/qt5webengine/Config.in"
- source "package/qt5/qt5xmlpatterns/Config.in"
-+source "package/qt5/qt5virtualkeyboard/Config.in"
-+source "package/qt5/qt5charts/Config.in"
-+source "package/qt5/qt5datavis3d/Config.in"
-+source "package/qt5/qt5quickcontrols2/Config.in"
-+comment "legacy compatibility"
-+source "package/qt5/qt5script/Config.in"
-+source "package/qt5/qt5webkit/Config.in"
- endif
-diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
-index 5c7af3926e..0710ef432c 100644
---- a/package/qt5/qt5.mk
-+++ b/package/qt5/qt5.mk
-@@ -1,21 +1,8 @@
--################################################################################
--#
--# qt5
--#
--################################################################################
--
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5_VERSION_MAJOR = 5.8
-+QT5_VERSION_MAJOR = 5.7
- QT5_VERSION = $(QT5_VERSION_MAJOR).0
- QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
--QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules
--else
--QT5_VERSION_MAJOR = 5.6
--QT5_VERSION = $(QT5_VERSION_MAJOR).2
--QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
--QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules
--endif
--
-+##QT5_VERSION = $(QT5_VERSION_MAJOR).1
-+##QT5_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules
- include $(sort $(wildcard package/qt5/*/*.mk))
- 
- define QT5_LA_PRL_FILES_FIXUP
-diff --git a/package/qt5/qt53d/Config.in b/package/qt5/qt53d/Config.in
-index f776da2c87..ff50204fc8 100644
---- a/package/qt5/qt53d/Config.in
-+++ b/package/qt5/qt53d/Config.in
-@@ -1,21 +1,17 @@
- config BR2_PACKAGE_QT53D
- 	bool "qt53d"
--	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
--	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative_quick
- 	select BR2_PACKAGE_QT5BASE
- 	select BR2_PACKAGE_QT5BASE_GUI
- 	select BR2_PACKAGE_QT5DECLARATIVE
- 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
-+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
-+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative_quick
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
- 	  This package corresponds to the qt53d module.
- 
--
--	  This module was in tech preview in Qt 5.6, and promoted
--	  to a core module in Qt 5.7.0.
--
- 	  Enable the assimp package to gain the assimp sceneparser plugin.
- 
- 	  http://doc.qt.io/qt-5/qt3d-index.html
-diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk
-index d66923677e..5dac5b0b62 100644
---- a/package/qt5/qt53d/qt53d.mk
-+++ b/package/qt5/qt53d/qt53d.mk
-@@ -14,8 +14,13 @@ ifeq ($(BR2_PACKAGE_ASSIMP),y)
- QT53D_DEPENDENCIES += assimp
- endif
- 
--QT53D_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT53D_LICENSE = GPLv2 or GPLv3 or LGPLv3
- QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.GPLv3 LICENSE.LGPLv3
-+else
-+QT53D_LICENSE = Commercial license
-+QT53D_REDISTRIBUTE = NO
-+endif
- 
- define QT53D_CONFIGURE_CMDS
- 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-diff --git a/package/qt5/qt5base/5.6.2/0001-eglfs-rasp-pi-header-inclusion.patch b/package/qt5/qt5base/5.6.2/0001-eglfs-rasp-pi-header-inclusion.patch
-deleted file mode 100644
-index f1f6d9b0b7..0000000000
---- a/package/qt5/qt5base/5.6.2/0001-eglfs-rasp-pi-header-inclusion.patch
-+++ /dev/null
-@@ -1,45 +0,0 @@
--From 91c3b111e45dd476aba057836b1b618eacf90f3f Mon Sep 17 00:00:00 2001
--From: Julien Corjon <corjon.j@ecagroup.com>
--Date: Tue, 21 Jul 2015 09:58:14 +0200
--Subject: [PATCH] eglfs - fix rasp-pi header inclusion
--
--eglplateform.h include headers for low level instruction and fail on brcm
--headers inclusion
--  For the brcm presence test we use egl pkg-config file
--  For the eglfs-plugin compilation we use the egl configuration
--
--Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47339
--Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
-----
-- config.tests/qpa/eglfs-brcm/eglfs-brcm.pro   | 2 ++
-- src/plugins/platforms/eglfs/eglfs-plugin.pro | 1 +
-- 2 files changed, 3 insertions(+)
--
--diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
--index ce16a3a..192a8ad 100644
----- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
--+++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
--@@ -1,6 +1,8 @@
-- SOURCES = eglfs-brcm.cpp
-- 
-- CONFIG -= qt
--+CONFIG += link_pkgconfig
--+PKGCONFIG += egl
-- 
-- INCLUDEPATH += $$QMAKE_INCDIR_EGL
-- 
--diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro
--index 0f493fd..8479496 100644
----- a/src/plugins/platforms/eglfs/eglfs-plugin.pro
--+++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro
--@@ -6,6 +6,7 @@ PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin
-- load(qt_plugin)
-- 
-- QT += platformsupport-private eglfs_device_lib-private
--+CONFIG += egl
-- 
-- SOURCES += $$PWD/qeglfsmain.cpp
-- 
---- 
--2.1.0
--
-diff --git a/package/qt5/qt5base/5.6.2/0002-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch b/package/qt5/qt5base/5.6.2/0002-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch
-deleted file mode 100644
-index cbafb397bb..0000000000
---- a/package/qt5/qt5base/5.6.2/0002-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch
-+++ /dev/null
-@@ -1,53 +0,0 @@
--From b6c602e4264021f98ec2c72316e2a2000bf35e82 Mon Sep 17 00:00:00 2001
--From: Peter Seiderer <ps.report@gmx.net>
--Date: Mon, 14 Nov 2016 23:42:25 +0100
--Subject: [PATCH] eglfs: fix eglfs_mali compile for odroid-mali
--
--Avoid duplicated struct fbdev_window definition (introduced by [1]) by
--renaming struct fbdev_window to shadow_fbdev_window.
--
--Fixes the following buildroot compile failure ([2]):
--
--qeglfsmaliintegration.cpp:45:8: error: redefinition of 'struct fbdev_window'
-- struct fbdev_window {
--        ^
--In file included from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:28:0,
--                 from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/egl.h:36,
--                 from ../../../eglfs/qeglfsglobal.h:45,
--                 from ../../../eglfs/qeglfsdeviceintegration.h:48,
--                 from qeglfsmaliintegration.h:37,
--                 from qeglfsmaliintegration.cpp:34:
--
--[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?h=dev&id=58bed4cda98e8e25db8adc61c7db73b6853077dc
--[2] http://autobuild.buildroot.net/results/48c/48c458c035162169e8ca7c34ae65e9064822f25a
--
--Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-----
-- .../eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp      | 4 ++--
-- 1 file changed, 2 insertions(+), 2 deletions(-)
--
--diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp
--index 43decdf..aeba83f 100644
----- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp
--+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp
--@@ -42,7 +42,7 @@
-- 
-- QT_BEGIN_NAMESPACE
-- 
---struct fbdev_window {
--+struct shadow_fbdev_window {
--     unsigned short width;
--     unsigned short height;
-- };
--@@ -85,7 +85,7 @@ EGLNativeWindowType QEglFSMaliIntegration::createNativeWindow(QPlatformWindow *w
--     Q_UNUSED(window);
--     Q_UNUSED(format);
-- 
---    fbdev_window *fbwin = reinterpret_cast<fbdev_window *>(malloc(sizeof(fbdev_window)));
--+    shadow_fbdev_window *fbwin = reinterpret_cast<shadow_fbdev_window *>(malloc(sizeof(shadow_fbdev_window)));
--     if (NULL == fbwin)
--         return 0;
-- 
---- 
--2.8.1
--
-diff --git a/package/qt5/qt5base/5.8.0/0001-fix-parallel-builds-with-qt-freetype-system-libpng.patch b/package/qt5/qt5base/5.8.0/0001-fix-parallel-builds-with-qt-freetype-system-libpng.patch
-deleted file mode 100644
-index 8548ef0e25..0000000000
---- a/package/qt5/qt5base/5.8.0/0001-fix-parallel-builds-with-qt-freetype-system-libpng.patch
-+++ /dev/null
-@@ -1,34 +0,0 @@
--From 74af93f5298b54bc2327843f390bf202776f2f48 Mon Sep 17 00:00:00 2001
--From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
--Date: Tue, 10 Jan 2017 14:18:02 +0100
--Subject: [PATCH] fix parallel builds with -qt-freetype -system-libpng
--
--freetype has no dependency on gui, so it needs to pull in gui's
--configuration manually, as that's where the system libpng is found.
--
--Task-number: QTBUG-58038
--Change-Id: I881495f7d2a8f7c1a45d7d4c9e7698ff1d30f2a9
--Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
--Reviewed-by: Joni Poikelin <joni.poikelin@qt.io>
--
--Upstream: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4dcfd90e4fd7d4c49138038dbbcbda8794a9fbff
--Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-----
-- src/3rdparty/freetype/freetype.pro | 1 +
-- 1 file changed, 1 insertion(+)
--
--diff --git a/src/3rdparty/freetype/freetype.pro b/src/3rdparty/freetype/freetype.pro
--index 5b1eb92e..390a6da7 100644
----- a/src/3rdparty/freetype/freetype.pro
--+++ b/src/3rdparty/freetype/freetype.pro
--@@ -69,6 +69,7 @@ DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB
-- include(../zlib_dependency.pri)
-- 
-- DEFINES += FT_CONFIG_OPTION_USE_PNG
--+include($$OUT_PWD/../../gui/qtgui-config.pri)
-- QMAKE_USE_PRIVATE += libpng
-- 
-- DEFINES += TT_CONFIG_OPTION_SUBPIXEL_HINTING
---- 
--2.11.0
--
-diff --git a/package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch b/package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch
-deleted file mode 100644
-index e7d7ee3600..0000000000
---- a/package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch
-+++ /dev/null
-@@ -1,97 +0,0 @@
--From 35ee8b53549fab6ebffe289417e1d94298447af7 Mon Sep 17 00:00:00 2001
--From: Shawn Rutledge <shawn.rutledge@digia.com>
--Date: Fri, 10 Feb 2017 13:56:58 +0100
--Subject: [PATCH] fix VNC platform plugin build on big-endian machines
--
--Task-number: QTBUG-58734
--Change-Id: I3e44ee4be5003acaba2f1b8ed2658a3ff1bd700e
--Reviewed-by: Lars Knoll <lars.knoll@qt.io>
--Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
--
--Upstream: http://code.qt.io/cgit/qt/qtbase.git/patch/?id=6f64bfa654fb7e20bb75ec3b0544b81482babb44
--Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-----
-- src/plugins/platforms/vnc/qvncclient.cpp | 6 +++---
-- src/plugins/platforms/vnc/qvncscreen.cpp | 7 ++++++-
-- src/plugins/platforms/vnc/qvncscreen.h   | 2 +-
-- 3 files changed, 10 insertions(+), 5 deletions(-)
--
--diff --git a/src/plugins/platforms/vnc/qvncclient.cpp b/src/plugins/platforms/vnc/qvncclient.cpp
--index dae3e83f..58dcfc9b 100644
----- a/src/plugins/platforms/vnc/qvncclient.cpp
--+++ b/src/plugins/platforms/vnc/qvncclient.cpp
--@@ -142,7 +142,7 @@ void QVncClient::convertPixels(char *dst, const char *src, int count) const
--         case 16: {
--             quint16 p = *reinterpret_cast<const quint16*>(src);
-- #if Q_BYTE_ORDER == Q_BIG_ENDIAN
---            if (swapBytes)
--+            if (m_swapBytes)
--                 p = ((p & 0xff) << 8) | ((p & 0xff00) >> 8);
-- #endif
--             r = (p >> 11) & 0x1f;
--@@ -484,7 +484,7 @@ void QVncClient::setPixelFormat()
--         m_sameEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian) == !!m_pixelFormat.bigEndian;
--         m_needConversion = pixelConversionNeeded();
-- #if Q_BYTE_ORDER == Q_BIG_ENDIAN
---        m_swapBytes = qvnc_screen->swapBytes();
--+        m_swapBytes = server()->screen()->swapBytes();
-- #endif
--     }
-- }
--@@ -639,7 +639,7 @@ bool QVncClient::pixelConversionNeeded() const
--         return true;
-- 
-- #if Q_BYTE_ORDER == Q_BIG_ENDIAN
---    if (qvnc_screen->swapBytes())
--+    if (server()->screen()->swapBytes())
--         return true;
-- #endif
-- 
--diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp
--index 34def457..64f1bc0b 100644
----- a/src/plugins/platforms/vnc/qvncscreen.cpp
--+++ b/src/plugins/platforms/vnc/qvncscreen.cpp
--@@ -43,6 +43,7 @@
-- #include <QtFbSupport/private/qfbcursor_p.h>
-- 
-- #include <QtGui/QPainter>
--+#include <QtGui/QScreen>
-- #include <QtCore/QRegularExpression>
-- 
-- 
--@@ -172,14 +173,18 @@ QPixmap QVncScreen::grabWindow(WId wid, int x, int y, int width, int height) con
-- }
-- 
-- #if Q_BYTE_ORDER == Q_BIG_ENDIAN
---bool QVNCScreen::swapBytes() const
--+bool QVncScreen::swapBytes() const
-- {
--+    return false;
--+
--+    /* TODO
--     if (depth() != 16)
--         return false;
-- 
--     if (screen())
--         return screen()->frameBufferLittleEndian();
--     return frameBufferLittleEndian();
--+    */
-- }
-- #endif
-- 
--diff --git a/src/plugins/platforms/vnc/qvncscreen.h b/src/plugins/platforms/vnc/qvncscreen.h
--index 785abd6d..0b42c3c7 100644
----- a/src/plugins/platforms/vnc/qvncscreen.h
--+++ b/src/plugins/platforms/vnc/qvncscreen.h
--@@ -73,7 +73,7 @@ public:
--     void clearDirty() { dirtyRegion = QRegion(); }
-- 
-- #if Q_BYTE_ORDER == Q_BIG_ENDIAN
---    bool swapBytes() const
--+    bool swapBytes() const;
-- #endif
-- 
--     QStringList mArgs;
---- 
--2.11.0
--
-diff --git a/package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch b/package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch
-deleted file mode 100644
-index 3a43584eeb..0000000000
---- a/package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch
-+++ /dev/null
-@@ -1,65 +0,0 @@
--From c5d7425f8ad391112758db161e3e08f18dc9d299 Mon Sep 17 00:00:00 2001
--From: Marc Mutz <marc.mutz@kdab.com>
--Date: Thu, 26 May 2016 08:30:26 +0200
--Subject: [PATCH] QAtomic: pass explicit failure mode to
-- std::atomic::compare_exchange_strong
--
--... in an attempt to avoid GCC 4.8 errors such as
--
--  bits/atomic_base.h:577:70: error: failure memory model cannot be stronger than success memory model for '__atomic_compare_exchange'
--  return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 0, __m1, __m2);
--                                                                      ^
--
--as seen on Android.
--
--Change-Id: If046e735888cf331d2d6506d8d5ca9aa7402f9ad
--[Bug report: https://bugreports.qt.io/browse/QTBUG-59399
-- Patch sent upstream: https://codereview.qt-project.org/#/c/187980/]
--Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.org>
-----
-- src/corelib/arch/qatomic_cxx11.h |    8 ++++----
-- 1 file changed, 4 insertions(+), 4 deletions(-)
--
--diff --git a/src/corelib/arch/qatomic_cxx11.h b/src/corelib/arch/qatomic_cxx11.h
--index bb49aae..d6731ec 100644
----- a/src/corelib/arch/qatomic_cxx11.h
--+++ b/src/corelib/arch/qatomic_cxx11.h
--@@ -153,7 +153,7 @@ template <typename X> struct QAtomicOps
--     template <typename T>
--     static bool testAndSetRelaxed(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW
--     {
---        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_relaxed);
--+        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_relaxed, std::memory_order_relaxed);
--         if (currentValue)
--             *currentValue = expectedValue;
--         return tmp;
--@@ -162,7 +162,7 @@ template <typename X> struct QAtomicOps
--     template <typename T>
--     static bool testAndSetAcquire(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW
--     {
---        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acquire);
--+        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acquire, std::memory_order_acquire);
--         if (currentValue)
--             *currentValue = expectedValue;
--         return tmp;
--@@ -171,7 +171,7 @@ template <typename X> struct QAtomicOps
--     template <typename T>
--     static bool testAndSetRelease(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW
--     {
---        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_release);
--+        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_release, std::memory_order_relaxed);
--         if (currentValue)
--             *currentValue = expectedValue;
--         return tmp;
--@@ -180,7 +180,7 @@ template <typename X> struct QAtomicOps
--     template <typename T>
--     static bool testAndSetOrdered(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW
--     {
---        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acq_rel);
--+        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acq_rel, std::memory_order_acquire);
--         if (currentValue)
--             *currentValue = expectedValue;
--         return tmp;
---- 
--1.7.10.4
--
-diff --git a/package/qt5/qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch b/package/qt5/qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch
-deleted file mode 100644
-index 0e8bcffa2e..0000000000
---- a/package/qt5/qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch
-+++ /dev/null
-@@ -1,36 +0,0 @@
--From 8902f4d7b7c532592d1a34ad117698d3e380e9e1 Mon Sep 17 00:00:00 2001
--From: Peter Seiderer <ps.report@gmx.net>
--Date: Fri, 10 Mar 2017 22:23:06 +0100
--Subject: [PATCH] eglfs: fix x11 header related compile failure
--
--Add egl config and QT_EGL_NO_X11 define (as all other eglfs project
--files do).
--
--Task-number: QTBUG-59427
--Change-Id: Ifbb11eae0fdf0e58c0b7feecb9a7914a889c8f77
--
--Upstream: https://codereview.qt-project.org/188158
--Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-----
-- src/plugins/platforms/eglfs/eglfs-plugin.pro | 5 +++++
-- 1 file changed, 5 insertions(+)
--
--diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro
--index cf4863975a..ec229796e5 100644
----- a/src/plugins/platforms/eglfs/eglfs-plugin.pro
--+++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro
--@@ -2,6 +2,11 @@ TARGET = qeglfs
-- 
-- QT += eglfsdeviceintegration-private
-- 
--+CONFIG += egl
--+
--+# Avoid X11 header collision, use generic EGL native types
--+DEFINES += QT_EGL_NO_X11
--+
-- SOURCES += $$PWD/qeglfsmain.cpp
-- 
-- OTHER_FILES += $$PWD/eglfs.json
---- 
--2.11.0
--
-diff --git a/package/qt5/qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch b/package/qt5/qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch
-deleted file mode 100644
-index 148ced8004..0000000000
---- a/package/qt5/qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch
-+++ /dev/null
-@@ -1,42 +0,0 @@
--From fe8a9bacf781fcf290e04a08f2b8e37d881d58bb Mon Sep 17 00:00:00 2001
--From: Peter Seiderer <ps.report@gmx.net>
--Date: Thu, 27 Apr 2017 22:41:28 +0200
--Subject: [PATCH] examples: fix compile without gui module
--
--Fixes:
--
--  Project ERROR: Could not find feature opengl.
--
--Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-----
-- examples/gui/gui.pro         | 2 +-
-- examples/widgets/widgets.pro | 2 +-
-- 2 files changed, 2 insertions(+), 2 deletions(-)
--
--diff --git a/examples/gui/gui.pro b/examples/gui/gui.pro
--index a4d960d3f5..b8080c2075 100644
----- a/examples/gui/gui.pro
--+++ b/examples/gui/gui.pro
--@@ -6,5 +6,5 @@ CONFIG += no_docs_target
-- 
-- SUBDIRS += analogclock
-- SUBDIRS += rasterwindow
---qtConfig(opengl): \
--+qtHaveModule(gui):qtConfig(opengl): \
--     SUBDIRS += openglwindow
--diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro
--index 513ddc91f2..cef4936d32 100644
----- a/examples/widgets/widgets.pro
--+++ b/examples/widgets/widgets.pro
--@@ -22,7 +22,7 @@ SUBDIRS       = \
--                 tutorials \
--                 widgets
-- 
---qtConfig(opengl): \
--+qtHaveModule(gui):qtConfig(opengl): \
--     SUBDIRS += windowcontainer
-- 
-- contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
---- 
--2.11.0
--
-diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
-index 5d1ff1339c..64a7f65386 100644
---- a/package/qt5/qt5base/Config.in
-+++ b/package/qt5/qt5base/Config.in
-@@ -16,16 +16,17 @@ config BR2_PACKAGE_QT5BASE
- 
- if BR2_PACKAGE_QT5BASE
- 
--config BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS
--	string "Custom configuration options"
-+config BR2_PACKAGE_QT5BASE_LICENSE_APPROVED
-+	bool "Approve free license"
- 	help
--	  Define custom qt5 configuration options which can be used to
--	  enable or disable options not managed by buildroot. These
--	  options are appended to the ones generated by buildroot and
--	  passed to qt5base during configuration.
-+	  Select this if you approve one of the available free licenses for the
-+	  Qt5 library.
-+	  By doing this you will not be asked while the library is compiled.
-+	  Please read and understand the license terms before approving this.
- 
--	  E.g. to remove the Windows Vista style option, add the option
--	  -no-feature-style_windowsvista.
-+	  LGPL: http://doc.qt.io/qt-5/lgpl.html
-+
-+	  See also http://doc.qt.io/qt-5/licensing.html
- 
- config BR2_PACKAGE_QT5BASE_CONFIG_FILE
- 	string "Config file"
-@@ -61,19 +62,19 @@ config BR2_PACKAGE_QT5BASE_SQL
- if BR2_PACKAGE_QT5BASE_SQL
- config BR2_PACKAGE_QT5BASE_MYSQL
- 	bool "MySQL Plugin"
--	depends on BR2_USE_MMU # mysql
- 	select BR2_PACKAGE_MYSQL
- 	select BR2_PACKAGE_NCURSES
- 	select BR2_PACKAGE_READLINE
-+	depends on BR2_USE_MMU # mysql
- 	help
- 	  Build MySQL plugin
- 	  If unsure, say n.
- 
- config BR2_PACKAGE_QT5BASE_PSQL
- 	bool "PostgreSQL Plugin"
-+	select BR2_PACKAGE_POSTGRESQL
- 	depends on BR2_USE_MMU # postgresql
- 	depends on !BR2_STATIC_LIBS
--	select BR2_PACKAGE_POSTGRESQL
- 	help
- 	  Build PostgreSQL plugin
- 	  If unsure, say n.
-@@ -116,7 +117,6 @@ config BR2_PACKAGE_QT5BASE_XML
- 
- config BR2_PACKAGE_QT5BASE_GUI
- 	bool "gui module"
--	select BR2_PACKAGE_FREETYPE
- 	# At least one graphic backend must be enabled, so enable
- 	# linuxfb if nothing is enabled.
- 	select BR2_PACKAGE_QT5BASE_LINUXFB if \
-@@ -180,7 +180,7 @@ config BR2_PACKAGE_QT5BASE_DIRECTFB
- 	bool "directfb support"
- 	depends on BR2_PACKAGE_DIRECTFB
- 
--comment "directfb backend available if directfb is enabled"
-+comment "directfb backend if directb is enabled"
- 	depends on !BR2_PACKAGE_DIRECTFB
- 
- config BR2_PACKAGE_QT5BASE_XCB
-@@ -198,9 +198,9 @@ comment "X.org XCB backend available if X.org is enabled"
- 
- config BR2_PACKAGE_QT5BASE_EGLFS
- 	bool "eglfs support"
-+	select BR2_PACKAGE_QT5BASE_OPENGL
- 	depends on BR2_PACKAGE_HAS_LIBEGL
- 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
--	select BR2_PACKAGE_QT5BASE_OPENGL
- 
- comment "eglfs backend available if OpenGL and EGL are enabled"
- 	depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_QT5_GL_AVAILABLE
-@@ -250,16 +250,16 @@ endif
- 
- config BR2_PACKAGE_QT5BASE_DBUS
- 	bool "DBus module"
-+	select BR2_PACKAGE_DBUS
- 	depends on BR2_TOOLCHAIN_HAS_THREADS
- 	depends on BR2_USE_MMU
--	select BR2_PACKAGE_DBUS
- 	help
- 	  This option enables the D-Bus module.
- 
- config BR2_PACKAGE_QT5BASE_ICU
- 	bool "Enable ICU support"
--	depends on !BR2_BINFMT_FLAT # icu
- 	select BR2_PACKAGE_ICU
-+	depends on !BR2_BINFMT_FLAT # icu
- 	help
- 	  This option enables ICU support in Qt5. This is for example
- 	  needed for Qt5Webkit.
-diff --git a/package/qt5/qt5base/qmake.conf b/package/qt5/qt5base/qmake.conf
-index 49cf898316..2152d3c7a4 100644
---- a/package/qt5/qt5base/qmake.conf
-+++ b/package/qt5/qt5base/qmake.conf
-@@ -19,7 +19,6 @@ QMAKE_CXXFLAGS_RELEASE += -O3
- CONFIG                 += nostrip
- 
- QMAKE_LIBS             += -lrt -lpthread -ldl
--QMAKE_CFLAGS_ISYSTEM   =
- 
- include(../common/linux_device_post.conf)
- load(qt_config)
-diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
-index 0c088350e5..81666d6994 100644
---- a/package/qt5/qt5base/qt5base.mk
-+++ b/package/qt5/qt5base/qt5base.mk
-@@ -20,44 +20,31 @@ QT5BASE_INSTALL_STAGING = YES
- #    want to use the one packaged in Buildroot
- QT5BASE_CONFIGURE_OPTS += \
- 	-optimized-qmake \
-+	-no-kms \
- 	-no-cups \
-+	-no-nis \
- 	-no-iconv \
- 	-system-zlib \
- 	-system-pcre \
-+	-system-harfbuzz \
- 	-no-pch \
- 	-shared
- 
--QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
--
--# Uses libgbm from mesa3d
--ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
--QT5BASE_CONFIGURE_OPTS += -kms -gbm
--QT5BASE_DEPENDENCIES += mesa3d
--else
--QT5BASE_CONFIGURE_OPTS += -no-kms
--endif
--
- ifeq ($(BR2_ENABLE_DEBUG),y)
- QT5BASE_CONFIGURE_OPTS += -debug
- else
- QT5BASE_CONFIGURE_OPTS += -release
- endif
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
- QT5BASE_CONFIGURE_OPTS += -largefile
--endif
- 
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
- QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
--QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5BASE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+QT5BASE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
--endif
--ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--QT5BASE_LICENSE := $(QT5BASE_LICENSE), BSD-3-Clause (examples)
--QT5BASE_LICENSE_FILES += header.BSD
-+else
-+QT5BASE_LICENSE = Commercial license
-+QT5BASE_REDISTRIBUTE = NO
- endif
- 
- QT5BASE_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_QT5BASE_CONFIG_FILE))
-@@ -66,10 +53,6 @@ ifneq ($(QT5BASE_CONFIG_FILE),)
- QT5BASE_CONFIGURE_OPTS += -qconfig buildroot
- endif
- 
--ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
--QT5BASE_DEPENDENCIES += udev
--endif
--
- # Qt5 SQL Plugins
- ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
- ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y)
-@@ -92,16 +75,10 @@ QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite)
- QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite)
- endif
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_GUI),y)
--QT5BASE_CONFIGURE_OPTS += -gui -system-freetype
--QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5_VERSION_5_6),-I$(STAGING_DIR)/usr/include/freetype2)
--QT5BASE_DEPENDENCIES += freetype
--else
--QT5BASE_CONFIGURE_OPTS += -no-gui -no-freetype
--endif
--QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
- # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
- # is to add a link against the "inuxfb" library.
-+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui)
-+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
- QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb)
- QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb)
- QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
-@@ -167,7 +144,6 @@ QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu)
- 
- QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
- # gstreamer 0.10 support is broken in qt5multimedia
- ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
- QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0
-@@ -175,14 +151,6 @@ QT5BASE_DEPENDENCIES   += gst1-plugins-base
- else
- QT5BASE_CONFIGURE_OPTS += -no-gstreamer
- endif
--endif
--
--ifeq ($(BR2_PACKAGE_LIBINPUT),y)
--QT5BASE_CONFIGURE_OPTS += -libinput
--QT5BASE_DEPENDENCIES += libinput
--else
--QT5BASE_CONFIGURE_OPTS += -no-libinput
--endif
- 
- # Build the list of libraries to be installed on the target
- QT5BASE_INSTALL_LIBS_y                                 += Qt5Core
-@@ -193,14 +161,7 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL)        += Qt5Sql
- QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST)       += Qt5Test
- QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML)        += Qt5Xml
- QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglFSDeviceIntegration
--ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
--QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglFsKmsSupport
--endif
--else
- QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglDeviceIntegration
--endif
- 
- QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI)          += Qt5Gui
- QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS)      += Qt5Widgets
-@@ -266,14 +227,12 @@ define QT5BASE_INSTALL_TARGET_PLUGINS
- 	fi
- endef
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
- define QT5BASE_INSTALL_TARGET_FONTS
- 	if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \
- 		mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \
- 		cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \
- 	fi
- endef
--endif
- 
- define QT5BASE_INSTALL_TARGET_EXAMPLES
- 	if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \
-diff --git a/package/qt5/qt5canvas3d/Config.in b/package/qt5/qt5canvas3d/Config.in
-index 04c04730bd..3ae5192844 100644
---- a/package/qt5/qt5canvas3d/Config.in
-+++ b/package/qt5/qt5canvas3d/Config.in
-@@ -1,17 +1,16 @@
- config BR2_PACKAGE_QT5CANVAS3D
- 	bool "qt5canvas3d"
--	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
--	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	select BR2_PACKAGE_QT5DECLARATIVE
- 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
-+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
-+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  Qt Canvas 3D module provides a way to make WebGL-like
--	  3D drawing calls from Qt Quick JavaScript.
-+	  This package corresponds to the qt5canvas3d module.
- 
--	  http://doc.qt.io/qt-5/qtcanvas3d-index.html
-+	  http://qt.io
- 
- comment "qt5canvas3d needs an OpenGL-capable backend"
- 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
-diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.mk b/package/qt5/qt5canvas3d/qt5canvas3d.mk
-index c0448cfd54..3f605ab031 100644
---- a/package/qt5/qt5canvas3d/qt5canvas3d.mk
-+++ b/package/qt5/qt5canvas3d/qt5canvas3d.mk
-@@ -10,8 +10,13 @@ QT5CANVAS3D_SOURCE = qtcanvas3d-opensource-src-$(QT5CANVAS3D_VERSION).tar.xz
- QT5CANVAS3D_DEPENDENCIES = qt5base qt5declarative
- QT5CANVAS3D_INSTALL_STAGING = YES
- 
--QT5CANVAS3D_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5CANVAS3D_LICENSE = GPLv2 or GPLv3 or LGPLv3
- QT5CANVAS3D_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3
-+else
-+QT5CANVAS3D_LICENSE = Commercial license
-+QT5CANVAS3D_REDISTRIBUTE = NO
-+endif
- 
- define QT5CANVAS3D_CONFIGURE_CMDS
- 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-diff --git a/package/qt5/qt5charts/Config.in b/package/qt5/qt5charts/Config.in
-index bd659878ff..d354bb2fc9 100644
---- a/package/qt5/qt5charts/Config.in
-+++ b/package/qt5/qt5charts/Config.in
-@@ -3,7 +3,6 @@ config BR2_PACKAGE_QT5CHARTS
- 	select BR2_PACKAGE_QT5DECLARATIVE
- 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
- 	select BR2_PACKAGE_QT5BASE_WIDGETS
--	depends on BR2_PACKAGE_QT5_VERSION_LATEST
- 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
- 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	help
-diff --git a/package/qt5/qt5connectivity/Config.in b/package/qt5/qt5connectivity/Config.in
-index 8bda8de66a..d529ea7f85 100644
---- a/package/qt5/qt5connectivity/Config.in
-+++ b/package/qt5/qt5connectivity/Config.in
-@@ -1,19 +1,21 @@
- config BR2_PACKAGE_QT5CONNECTIVITY
- 	bool "qt5connectivity"
--	depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS
-+	select BR2_PACKAGE_BLUEZ_UTILS
- 	select BR2_PACKAGE_QT5BASE
- 	select BR2_PACKAGE_QT5BASE_CONCURRENT
- 	select BR2_PACKAGE_QT5BASE_DBUS
-+	depends on !BR2_STATIC_LIBS # bluez_utils
-+	depends on BR2_USE_WCHAR # bluez_utils
-+	depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils
-+	depends on BR2_USE_MMU # bluez_utils
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  Qt Connectivity module provides support for Bluetooth/NFC
--	  peripherials.
-+	  This package corresponds to the qt5connectivity module.
- 
--	  http://doc.qt.io/qt-5/qtbluetooth-index.html
--	  http://doc.qt.io/qt-5/qtnfc-index.html
-+	  http://qt.io
- 
--comment "qt5connectivity needs neard and/or bluez(5)_utils"
--	depends on !BR2_PACKAGE_NEARD && !BR2_PACKAGE_BLUEZ_UTILS && \
--		!BR2_PACKAGE_BLUEZ5_UTILS
-+comment "qt5connectivity needs a toolchain w/ wchar, threads, dynamic library"
-+	depends on BR2_USE_MMU
-+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
-index d53aa91f22..936bc6f63c 100644
---- a/package/qt5/qt5connectivity/qt5connectivity.mk
-+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
-@@ -7,24 +7,20 @@
- QT5CONNECTIVITY_VERSION = $(QT5_VERSION)
- QT5CONNECTIVITY_SITE = $(QT5_SITE)
- QT5CONNECTIVITY_SOURCE = qtconnectivity-opensource-src-$(QT5CONNECTIVITY_VERSION).tar.xz
--QT5CONNECTIVITY_DEPENDENCIES = qt5base
-+QT5CONNECTIVITY_DEPENDENCIES = bluez_utils qt5base
- QT5CONNECTIVITY_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
--QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5CONNECTIVITY_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
--endif
--ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--QT5CONNECTIVITY_LICENSE := $(QT5CONNECTIVITY_LICENSE), BSD-3-Clause (examples)
-+else
-+QT5CONNECTIVITY_LICENSE = Commercial license
-+QT5CONNECTIVITY_REDISTRIBUTE = NO
- endif
- 
--QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5DECLARATIVE),qt5declarative)
--QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils)
--QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ5_UTILS),bluez5_utils)
--QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_NEARD),neard)
-+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
-+QT5CONNECTIVITY_DEPENDENCIES += qt5declarative
-+endif
- 
- define QT5CONNECTIVITY_CONFIGURE_CMDS
- 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-@@ -40,48 +36,15 @@ define QT5CONNECTIVITY_INSTALL_STAGING_CMDS
- endef
- 
- ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
--ifneq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_BLUEZ5_UTILS),)
--define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS
-+define QT5CONNECTIVITY_INSTALL_TARGET_QMLS
- 	cp -dpfr $(STAGING_DIR)/usr/qml/QtBluetooth $(TARGET_DIR)/usr/qml/
- endef
- endif
--ifeq ($(BR2_PACKAGE_NEARD),y)
--define QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS
--	cp -dpfr $(STAGING_DIR)/usr/qml/QtNfc $(TARGET_DIR)/usr/qml/
--endef
--endif
--endif
- 
--ifneq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_BLUEZ5_UTILS),)
--define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH
-+define QT5CONNECTIVITY_INSTALL_TARGET_CMDS
- 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Bluetooth.so.* $(TARGET_DIR)/usr/lib
- 	cp -dpf $(STAGING_DIR)/usr/bin/sdpscanner $(TARGET_DIR)/usr/bin
--endef
--ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_EXAMPLES
--	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/bluetooth $(TARGET_DIR)/usr/lib/qt/examples/
--endef
--endif
--endif
--
--ifeq ($(BR2_PACKAGE_NEARD),y)
--define QT5CONNECTIVITY_INSTALL_TARGET_NFC
--	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Nfc.so.* $(TARGET_DIR)/usr/lib
--endef
--ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--define QT5CONNECTIVITY_INSTALL_TARGET_NFC_EXAMPLES
--	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/nfc $(TARGET_DIR)/usr/lib/qt/examples/
--endef
--endif
--endif
--
--define QT5CONNECTIVITY_INSTALL_TARGET_CMDS
--	$(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH)
--	$(QT5CONNECTIVITY_INSTALL_TARGET_NFC)
--	$(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS)
--	$(QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS)
--	$(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_EXAMPLES)
--	$(QT5CONNECTIVITY_INSTALL_TARGET_NFC_EXAMPLES)
-+	$(QT5CONNECTIVITY_INSTALL_TARGET_QMLS)
- endef
- 
- $(eval $(generic-package))
-diff --git a/package/qt5/qt5declarative/0001-examples-photoviewer-needs-widgets-support.patch b/package/qt5/qt5declarative/0001-examples-photoviewer-needs-widgets-support.patch
-deleted file mode 100644
-index aeaaa91770..0000000000
---- a/package/qt5/qt5declarative/0001-examples-photoviewer-needs-widgets-support.patch
-+++ /dev/null
-@@ -1,32 +0,0 @@
--From b616a7e2a7e03e2eb189dca3dc428c0e19e1652b Mon Sep 17 00:00:00 2001
--From: Peter Seiderer <ps.report@gmx.net>
--Date: Thu, 6 Apr 2017 21:53:40 +0200
--Subject: [PATCH] examples: photoviewer needs widgets support
--
--Fixes:
--
--  .../qt5declarative-5.8.0/examples/quick/demos/photoviewer/photoviewer.pro
--  Project ERROR: Unknown module(s) in QT: widgets
--
--Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-----
-- examples/quick/demos/demos.pro | 6 ++++--
-- 1 file changed, 4 insertions(+), 2 deletions(-)
--
--diff --git a/examples/quick/demos/demos.pro b/examples/quick/demos/demos.pro
--index 0644b81a2..5a6fd52ba 100644
----- a/examples/quick/demos/demos.pro
--+++ b/examples/quick/demos/demos.pro
--@@ -7,5 +7,7 @@ SUBDIRS = samegame \
--             photosurface \
--             stocqt
-- 
---qtHaveModule(xmlpatterns): SUBDIRS += rssnews photoviewer
---
--+qtHaveModule(xmlpatterns) {
--+    SUBDIRS += rssnews
--+    qtHaveModule(widgets): SUBDIRS += photoviewer
--+}
---- 
--2.11.0
--
-diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
-index 5384b5f187..eba4c8d61d 100644
---- a/package/qt5/qt5declarative/Config.in
-+++ b/package/qt5/qt5declarative/Config.in
-@@ -1,18 +1,16 @@
- config BR2_PACKAGE_QT5DECLARATIVE
- 	bool "qt5declarative"
--	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	select BR2_PACKAGE_QT5XMLPATTERNS
- 	select BR2_PACKAGE_QT5BASE
- 	select BR2_PACKAGE_QT5BASE_GUI
-+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  Qt Declarative module provides the Qt QML and Qt Quick
--	  modules for developing UIs with the QML language
-+	  This package corresponds to the qt5declarative module.
- 
--	  http://doc.qt.io/qt-5/qtqml-index.html
--	  http://doc.qt.io/qt-5/qtquick-index.html
-+	  http://qt.io
- 
- if BR2_PACKAGE_QT5DECLARATIVE
- 
-@@ -21,7 +19,7 @@ comment "quick module needs an OpenGL-capable backend"
- 
- config BR2_PACKAGE_QT5DECLARATIVE_QUICK
- 	bool "quick module"
--	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
- 	select BR2_PACKAGE_QT5BASE_OPENGL
-+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
- 
- endif
-diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
-index f9ed8c7515..be3a7b7d7a 100644
---- a/package/qt5/qt5declarative/qt5declarative.mk
-+++ b/package/qt5/qt5declarative/qt5declarative.mk
-@@ -10,12 +10,12 @@ QT5DECLARATIVE_SOURCE = qtdeclarative-opensource-src-$(QT5DECLARATIVE_VERSION).t
- QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns
- QT5DECLARATIVE_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
--QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5DECLARATIVE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5DECLARATIVE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+else
-+QT5DECLARATIVE_LICENSE = Commercial license
-+QT5DECLARATIVE_REDISTRIBUTE = NO
- endif
- 
- define QT5DECLARATIVE_CONFIGURE_CMDS
-@@ -23,11 +23,14 @@ define QT5DECLARATIVE_CONFIGURE_CMDS
- endef
- 
- define QT5DECLARATIVE_BUILD_CMDS
--	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
-+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-+		sub-src-all sub-tools-all
- endef
- 
- define QT5DECLARATIVE_INSTALL_STAGING_CMDS
--	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
-+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-+		sub-src-install_subtargets \
-+		sub-tools-install_subtargets
- 	$(QT5_LA_PRL_FILES_FIXUP)
- endef
- 
-@@ -37,9 +40,6 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
- define QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS
- 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
- endef
--define QT5DECLARATIVE_INSTALL_TARGET_QUICK_EXAMPLES
--	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/quick/ $(TARGET_DIR)/usr/lib/qt/examples/
--endef
- endif
- 
- define QT5DECLARATIVE_INSTALL_TARGET_LIBS
-@@ -50,17 +50,9 @@ endef
- 
- endif
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--define QT5DECLARATIVE_INSTALL_TARGET_EXAMPLES
--	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/qml* $(TARGET_DIR)/usr/lib/qt/examples/
--	$(QT5DECLARATIVE_INSTALL_TARGET_QUICK_EXAMPLES)
--endef
--endif
--
- define QT5DECLARATIVE_INSTALL_TARGET_CMDS
- 	cp -dpf $(STAGING_DIR)/usr/bin/qml* $(TARGET_DIR)/usr/bin
- 	cp -dpfr $(STAGING_DIR)/usr/qml $(TARGET_DIR)/usr
--	$(QT5DECLARATIVE_INSTALL_TARGET_EXAMPLES)
- 	$(QT5DECLARATIVE_INSTALL_TARGET_LIBS)
- endef
- 
-diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in
-index 102058e7c5..fcb866cd6d 100644
---- a/package/qt5/qt5enginio/Config.in
-+++ b/package/qt5/qt5enginio/Config.in
-@@ -8,10 +8,6 @@ config BR2_PACKAGE_QT5ENGINIO
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  Enginio is a Backend-as-a-Service solution for simplifying
--	  backend development of connected and data-driven applications.
-+	  This package corresponds to the qt5enginio module.
- 
--	  This package has been tagged as deprecated since version
--	  5.6 and not recommended for new design.
--
--	  http://doc.qt.io/archives/qt-5.5/enginio-index.html
-+	  http://qt.io
-diff --git a/package/qt5/qt5enginio/qt5enginio.mk b/package/qt5/qt5enginio/qt5enginio.mk
-index bffd1f6274..b858d1cbbf 100644
---- a/package/qt5/qt5enginio/qt5enginio.mk
-+++ b/package/qt5/qt5enginio/qt5enginio.mk
-@@ -6,16 +6,18 @@
- 
- # Qt5Enginio does not follow Qt versionning
- # see https://bugreports.qt.io/browse/QTBUG-50111
--QT5ENGINIO_VERSION = 1.6.2
-+QT5ENGINIO_VERSION = 1.6.0
- QT5ENGINIO_SITE = $(QT5_SITE)
- QT5ENGINIO_SOURCE = qtenginio-opensource-src-$(QT5ENGINIO_VERSION).tar.xz
- QT5ENGINIO_DEPENDENCIES = openssl qt5base
- QT5ENGINIO_INSTALL_STAGING = YES
- 
--QT5ENGINIO_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5ENGINIO_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5ENGINIO_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
--ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--QT5ENGINIO_LICENSE := $(QT5ENGINIO_LICENSE), BSD-3-Clause (examples)
-+else
-+QT5ENGINIO_LICENSE = Commercial license
-+QT5ENGINIO_REDISTRIBUTE = NO
- endif
- 
- ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
-diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in
-index 69b7fca413..a42e1f8f2a 100644
---- a/package/qt5/qt5graphicaleffects/Config.in
-+++ b/package/qt5/qt5graphicaleffects/Config.in
-@@ -1,18 +1,16 @@
- config BR2_PACKAGE_QT5GRAPHICALEFFECTS
- 	bool "qt5graphicaleffects"
--	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
--	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	select BR2_PACKAGE_QT5DECLARATIVE
- 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
-+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
-+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  The Qt Graphical Effects module provides a set of QML types
--	  for adding visually impressive and configurable effects to
--	  user interfaces.
-+	  This package corresponds to the qt5graphicaleffects module.
- 
--	  http://doc.qt.io/qt-5/qtgraphicaleffects-index.html
-+	  http://qt.io
- 
- comment "qt5graphicaleffects needs an OpenGL-capable backend"
- 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
-diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
-index 929a62e2dd..223374a27c 100644
---- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
-+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
-@@ -10,12 +10,12 @@ QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-opensource-src-$(QT5GRAPHICALEFF
- QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative
- QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
--QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5GRAPHICALEFFECTS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+else
-+QT5GRAPHICALEFFECTS_LICENSE = Commercial license
-+QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO
- endif
- 
- define QT5GRAPHICALEFFECTS_CONFIGURE_CMDS
-diff --git a/package/qt5/qt5imageformats/Config.in b/package/qt5/qt5imageformats/Config.in
-index 44c85c9b38..4dd848e41f 100644
---- a/package/qt5/qt5imageformats/Config.in
-+++ b/package/qt5/qt5imageformats/Config.in
-@@ -6,7 +6,6 @@ config BR2_PACKAGE_QT5IMAGEFORMATS
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  The Qt Image Formats module provides plugins for
--	  additional image formats: TIFF, MNG, TGA, WBMP
-+	  This package corresponds to the qt5imageformats module.
- 
--	  http://doc.qt.io/qt-5/qtimageformats-index.html
-+	  http://qt.io
-diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
-index f3d9d7427f..921656d0aa 100644
---- a/package/qt5/qt5imageformats/qt5imageformats.mk
-+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
-@@ -10,12 +10,12 @@ QT5IMAGEFORMATS_SOURCE = qtimageformats-opensource-src-$(QT5IMAGEFORMATS_VERSION
- QT5IMAGEFORMATS_DEPENDENCIES = qt5base
- QT5IMAGEFORMATS_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
--QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5IMAGEFORMATS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+else
-+QT5IMAGEFORMATS_LICENSE = Commercial license
-+QT5IMAGEFORMATS_REDISTRIBUTE = NO
- endif
- 
- define QT5IMAGEFORMATS_CONFIGURE_CMDS
-diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in
-index e1778182a0..209d134215 100644
---- a/package/qt5/qt5location/Config.in
-+++ b/package/qt5/qt5location/Config.in
-@@ -5,8 +5,6 @@ config BR2_PACKAGE_QT5LOCATION
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  The Qt Location API helps you create viable mapping
--	  solutions using the data available from some of the
--	  popular location services.
-+	  This package corresponds to the qt5location module.
- 
--	  http://doc.qt.io/qt-5/qtlocation-index.html
-+	  http://qt.io
-diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk
-index b31bee7d17..358b1621c5 100644
---- a/package/qt5/qt5location/qt5location.mk
-+++ b/package/qt5/qt5location/qt5location.mk
-@@ -10,12 +10,12 @@ QT5LOCATION_SOURCE = qtlocation-opensource-src-$(QT5LOCATION_VERSION).tar.xz
- QT5LOCATION_DEPENDENCIES = qt5base
- QT5LOCATION_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
--QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5LOCATION_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5LOCATION_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+else
-+QT5LOCATION_LICENSE = Commercial license
-+QT5LOCATION_REDISTRIBUTE = NO
- endif
- 
- ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
-@@ -57,4 +57,5 @@ define QT5LOCATION_INSTALL_TARGET_CMDS
- 	$(QT5LOCATION_INSTALL_TARGET_QMLS)
- endef
- 
-+
- $(eval $(generic-package))
-diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in
-index 5b14ac57f1..59c3984781 100644
---- a/package/qt5/qt5multimedia/Config.in
-+++ b/package/qt5/qt5multimedia/Config.in
-@@ -3,14 +3,10 @@ config BR2_PACKAGE_QT5MULTIMEDIA
- 	select BR2_PACKAGE_QT5BASE
- 	select BR2_PACKAGE_QT5BASE_GUI
- 	select BR2_PACKAGE_QT5BASE_NETWORK
--	select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5BASE_OPENGL
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  The Qt Multimedia module provides a rich feature set that
--	  enables you to easily take advantage of a platform's multimedia
--	  capabilities such as media playback and the use of camera and
--	  radio devices.
-+	  This package corresponds to the qt5multimedia module.
- 
--	  http://doc.qt.io/qt-5/multimediaoverview.html
-+	  http://qt.io
-diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
-index 133536e1ab..67e79686cb 100644
---- a/package/qt5/qt5multimedia/qt5multimedia.mk
-+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
-@@ -10,12 +10,12 @@ QT5MULTIMEDIA_SOURCE = qtmultimedia-opensource-src-$(QT5MULTIMEDIA_VERSION).tar.
- QT5MULTIMEDIA_DEPENDENCIES = qt5base
- QT5MULTIMEDIA_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
--QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5MULTIMEDIA_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+else
-+QT5MULTIMEDIA_LICENSE = Commercial license
-+QT5MULTIMEDIA_REDISTRIBUTE = NO
- endif
- 
- ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
-@@ -59,16 +59,9 @@ define QT5MULTIMEDIA_INSTALL_TARGET_QMLS
- endef
- endif
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--define QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES
--	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/multimedia* $(TARGET_DIR)/usr/lib/qt/examples/
--endef
--endif
--
- define QT5MULTIMEDIA_INSTALL_TARGET_CMDS
- 	$(QT5MULTIMEDIA_INSTALL_TARGET_LIBS)
- 	$(QT5MULTIMEDIA_INSTALL_TARGET_QMLS)
--	$(QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES)
- endef
- 
- $(eval $(generic-package))
-diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in
-index 3cc5821b1e..0fe8465e2e 100644
---- a/package/qt5/qt5quickcontrols/Config.in
-+++ b/package/qt5/qt5quickcontrols/Config.in
-@@ -1,17 +1,16 @@
- config BR2_PACKAGE_QT5QUICKCONTROLS
- 	bool "qt5quickcontrols"
--	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
--	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	select BR2_PACKAGE_QT5DECLARATIVE
- 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
-+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
-+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  The Qt Quick Controls module provides a set of controls
--	  that can be used to build complete interfaces in Qt Quick.
-+	  This package corresponds to the qt5quickcontrols module.
- 
--	  http://doc.qt.io/qt-5/qtquickcontrols-index.html
-+	  http://qt.io
- 
- comment "qt5quickcontrols needs an OpenGL-capable backend"
- 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
-diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
-index 5fee6ff424..b33ff1575e 100644
---- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
-+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
-@@ -10,8 +10,13 @@ QT5QUICKCONTROLS_SOURCE = qtquickcontrols-opensource-src-$(QT5QUICKCONTROLS_VERS
- QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
- QT5QUICKCONTROLS_INSTALL_STAGING = YES
- 
--QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5QUICKCONTROLS_LICENSE = GPLv2 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
- QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
-+else
-+QT5QUICKCONTROLS_LICENSE = Commercial license
-+QT5QUICKCONTROLS_REDISTRIBUTE = NO
-+endif
- 
- define QT5QUICKCONTROLS_CONFIGURE_CMDS
- 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-@@ -25,24 +30,8 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
- 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
- endef
- 
--ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy)
--define QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS
--	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick
--endef
--endif
--
--ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
--define QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS
--	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick
--endef
--endif
--
- define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
--	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
--	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
--	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
--	$(QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS)
--	$(QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS)
-+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml
- endef
- 
- $(eval $(generic-package))
-diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in
-index 1066b173bd..1e57674dc8 100644
---- a/package/qt5/qt5quickcontrols2/Config.in
-+++ b/package/qt5/qt5quickcontrols2/Config.in
-@@ -1,19 +1,16 @@
- config BR2_PACKAGE_QT5QUICKCONTROLS2
- 	bool "qt5quickcontrols2"
--	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick
--	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick
- 	select BR2_PACKAGE_QT5DECLARATIVE
- 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
-+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick
-+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
- 	  This package corresponds to the qt5quickcontrols2 module.
- 
--	  This module was in tech preview in Qt 5.6, and promoted
--	  to a core module in Qt 5.7.0.
--
--	  https://doc.qt.io/qt-5/qtquickcontrols2-index.html
-+	  http://qt.io
- 
- comment "qt5quickcontrols2 needs an OpenGL-capable backend"
- 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
-diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
-index 23bcbad737..23bbb2cc0d 100644
---- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
-+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
-@@ -10,8 +10,13 @@ QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-opensource-src-$(QT5QUICKCONTROLS2_V
- QT5QUICKCONTROLS2_DEPENDENCIES = qt5base qt5declarative
- QT5QUICKCONTROLS2_INSTALL_STAGING = YES
- 
--QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5QUICKCONTROLS2_LICENSE = GPLv3 or LGPLv3, GFDLv1.3 (docs)
- QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
-+else
-+QT5QUICKCONTROLS2_LICENSE = Commercial license
-+QT5QUICKCONTROLS2_REDISTRIBUTE = NO
-+endif
- 
- define QT5QUICKCONTROLS2_CONFIGURE_CMDS
- 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-@@ -25,30 +30,16 @@ define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS
- 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
- endef
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--define QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES
--	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/quickcontrols2 $(TARGET_DIR)/usr/lib/qt/examples/
--endef
--endif
--
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
- define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
- 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib
- 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib
- 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
--	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs
-+#	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs
-+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/folderlistmodel $(TARGET_DIR)/usr/qml/Qt/labs
-+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/settings $(TARGET_DIR)/usr/qml/Qt/labs
- 	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick
- 	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick
- 	$(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES)
- endef
--else
--define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
--	cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib
--	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs
--	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
--	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs
--	$(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES)
--endef
--endif
- 
- $(eval $(generic-package))
-diff --git a/package/qt5/qt5script/Config.in b/package/qt5/qt5script/Config.in
-index 034b7d2fcb..0d15ef265c 100644
---- a/package/qt5/qt5script/Config.in
-+++ b/package/qt5/qt5script/Config.in
-@@ -1,16 +1,15 @@
- config BR2_PACKAGE_QT5SCRIPT
- 	bool "qt5script"
--	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	select BR2_PACKAGE_QT5BASE
-+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  Qt Script provides support for making Qt applications
--	  scriptable. Provided for Qt 4.x compatibility.
-+	  This package corresponds to the qt5script module.
- 
- 	  This package has been tagged as deprecated since version
- 	  5.5.0 and should be replaced by Qt QML module in new
- 	  design.
- 
--	  http://doc.qt.io/qt-5/qtscript-index.html
-+	  http://qt.io
-diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
-index 50ee52ad0a..57ba6f0072 100644
---- a/package/qt5/qt5script/qt5script.mk
-+++ b/package/qt5/qt5script/qt5script.mk
-@@ -10,8 +10,13 @@ QT5SCRIPT_SOURCE = qtscript-opensource-src-$(QT5SCRIPT_VERSION).tar.xz
- QT5SCRIPT_DEPENDENCIES = qt5base
- QT5SCRIPT_INSTALL_STAGING = YES
- 
--QT5SCRIPT_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5SCRIPT_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5SCRIPT_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+else
-+QT5SCRIPT_LICENSE = Commercial license
-+QT5SCRIPT_REDISTRIBUTE = NO
-+endif
- 
- define QT5SCRIPT_CONFIGURE_CMDS
- 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-diff --git a/package/qt5/qt5sensors/Config.in b/package/qt5/qt5sensors/Config.in
-index 4846a3f95f..741ebba142 100644
---- a/package/qt5/qt5sensors/Config.in
-+++ b/package/qt5/qt5sensors/Config.in
-@@ -5,7 +5,6 @@ config BR2_PACKAGE_QT5SENSORS
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  The Qt Sensors API provides access to sensor hardware
--	  via QML and C++ interfaces.
-+	  This package corresponds to the qt5sensors module.
- 
--	  http://doc.qt.io/qt-5/qtsensors-index.html
-+	  http://qt.io
-diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
-index 079f056da7..0dd952a4ca 100644
---- a/package/qt5/qt5sensors/qt5sensors.mk
-+++ b/package/qt5/qt5sensors/qt5sensors.mk
-@@ -10,12 +10,12 @@ QT5SENSORS_SOURCE = qtsensors-opensource-src-$(QT5SENSORS_VERSION).tar.xz
- QT5SENSORS_DEPENDENCIES = qt5base
- QT5SENSORS_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
--QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5SENSORS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5SENSORS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+else
-+QT5SENSORS_LICENSE = Commercial license
-+QT5SENSORS_REDISTRIBUTE = NO
- endif
- 
- ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
-diff --git a/package/qt5/qt5serialbus/Config.in b/package/qt5/qt5serialbus/Config.in
-index 2882d50644..504141c63f 100644
---- a/package/qt5/qt5serialbus/Config.in
-+++ b/package/qt5/qt5serialbus/Config.in
-@@ -1,6 +1,5 @@
- config BR2_PACKAGE_QT5SERIALBUS
- 	bool "qt5serialbus"
--	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD
- 	select BR2_PACKAGE_QT5BASE
- 	select BR2_PACKAGE_QT5SERIALPORT
- 	help
-@@ -9,10 +8,4 @@ config BR2_PACKAGE_QT5SERIALBUS
- 
- 	  This package corresponds to the qt5serialbus module.
- 
--	  This module was in tech preview in Qt 5.6, and promoted
--	  to a core module in Qt 5.8.0.
--
--	  http://doc.qt.io/qt-5/qtserialbus-index.html
--
--comment "qt5serialbus needs headers >= 3.6"
--	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6
-+	  http://qt.io
-diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk
-index 24fe8b1506..b188f5d85d 100644
---- a/package/qt5/qt5serialbus/qt5serialbus.mk
-+++ b/package/qt5/qt5serialbus/qt5serialbus.mk
-@@ -10,8 +10,13 @@ QT5SERIALBUS_SOURCE = qtserialbus-opensource-src-$(QT5SERIALBUS_VERSION).tar.xz
- QT5SERIALBUS_DEPENDENCIES = qt5base qt5serialport
- QT5SERIALBUS_INSTALL_STAGING = YES
- 
--QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5SERIALBUS_LICENSE = GPLv2 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
- QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
-+else
-+QT5SERIALBUS_LICENSE = Commercial license
-+QT5SERIALBUS_REDISTRIBUTE = NO
-+endif
- 
- define QT5SERIALBUS_CONFIGURE_CMDS
- 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-diff --git a/package/qt5/qt5serialport/Config.in b/package/qt5/qt5serialport/Config.in
-index 3538c52556..c419d17dd0 100644
---- a/package/qt5/qt5serialport/Config.in
-+++ b/package/qt5/qt5serialport/Config.in
-@@ -5,8 +5,6 @@ config BR2_PACKAGE_QT5SERIALPORT
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  Qt Serial Port provides the basic functionality, which
--	  includes configuring, I/O operations, getting and setting
--	  the control signals of the RS-232 pinouts.
-+	  This package corresponds to the qt5serialport module.
- 
--	  http://doc.qt.io/qt-5/qtserialport-index.html
-+	  http://qt.io
-diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
-index cf41019a86..04df021b52 100644
---- a/package/qt5/qt5serialport/qt5serialport.mk
-+++ b/package/qt5/qt5serialport/qt5serialport.mk
-@@ -10,12 +10,12 @@ QT5SERIALPORT_SOURCE = qtserialport-opensource-src-$(QT5SERIALPORT_VERSION).tar.
- QT5SERIALPORT_DEPENDENCIES = qt5base
- QT5SERIALPORT_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
--QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5SERIALPORT_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5SERIALPORT_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+else
-+QT5SERIALPORT_LICENSE = Commercial license
-+QT5SERIALPORT_REDISTRIBUTE = NO
- endif
- 
- define QT5SERIALPORT_CONFIGURE_CMDS
-diff --git a/package/qt5/qt5svg/Config.in b/package/qt5/qt5svg/Config.in
-index bc80b62674..e1acafbfea 100644
---- a/package/qt5/qt5svg/Config.in
-+++ b/package/qt5/qt5svg/Config.in
-@@ -6,7 +6,6 @@ config BR2_PACKAGE_QT5SVG
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  Qt SVG provides classes for rendering and displaying SVG
--	  drawings in widgets and on other paint devices.
-+	  This package corresponds to the qt5svg module.
- 
--	  http://doc.qt.io/qt-5/qtsvg-index.html
-+	  http://qt.io
-diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
-index 43959615aa..ebd5cba802 100644
---- a/package/qt5/qt5svg/qt5svg.mk
-+++ b/package/qt5/qt5svg/qt5svg.mk
-@@ -10,12 +10,12 @@ QT5SVG_SOURCE = qtsvg-opensource-src-$(QT5SVG_VERSION).tar.xz
- QT5SVG_DEPENDENCIES = qt5base
- QT5SVG_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
--QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5SVG_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5SVG_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+else
-+QT5SVG_LICENSE = Commercial license
-+QT5SVG_REDISTRIBUTE = NO
- endif
- 
- define QT5SVG_CONFIGURE_CMDS
-diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in
-index 20f00f6b2f..453913b8ad 100644
---- a/package/qt5/qt5tools/Config.in
-+++ b/package/qt5/qt5tools/Config.in
-@@ -4,10 +4,9 @@ config BR2_PACKAGE_QT5TOOLS
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  Qt Tools provides tools facilitate the development
--	  and design of applications.
-+	  This package corresponds to the qt5tools module.
- 
--	  http://doc.qt.io/qt-5/qtmodules.html#qt-tools
-+	  http://qt.io
- 
- if BR2_PACKAGE_QT5TOOLS
- 
-diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
-index 7d5353a434..6befb8b2ce 100644
---- a/package/qt5/qt5tools/qt5tools.mk
-+++ b/package/qt5/qt5tools/qt5tools.mk
-@@ -19,12 +19,12 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
- QT5TOOLS_DEPENDENCIES += qt5declarative
- endif
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5TOOLS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
--QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5TOOLS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5TOOLS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+else
-+QT5TOOLS_LICENSE = Commercial license
-+QT5TOOLS_REDISTRIBUTE = NO
- endif
- 
- QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \
-diff --git a/package/qt5/qt5virtualkeyboard/Config.in b/package/qt5/qt5virtualkeyboard/Config.in
-index 62a7051877..803b9376ac 100644
---- a/package/qt5/qt5virtualkeyboard/Config.in
-+++ b/package/qt5/qt5virtualkeyboard/Config.in
-@@ -1,7 +1,6 @@
- config BR2_PACKAGE_QT5VIRTUALKEYBOARD
- 	bool "qt5virtualkeyboard"
- 	select BR2_PACKAGE_QT5BASE
--	depends on BR2_PACKAGE_QT5_VERSION_LATEST
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
-diff --git a/package/qt5/qt5webchannel/Config.in b/package/qt5/qt5webchannel/Config.in
-index e3d840584f..218629a7cc 100644
---- a/package/qt5/qt5webchannel/Config.in
-+++ b/package/qt5/qt5webchannel/Config.in
-@@ -6,8 +6,6 @@ config BR2_PACKAGE_QT5WEBCHANNEL
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  Qt WebChannel enables peer-to-peer communication between
--	  a server (QML/C++ application) and a client
--	  (HTML/JavaScript or QML application).
-+	  This package corresponds to the qt5webchannel module.
- 
--	  http://doc.qt.io/qt-5/qtwebchannel-index.html
-+	  http://qt.io
-diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
-index 791f4a92f4..3865ced340 100644
---- a/package/qt5/qt5webchannel/qt5webchannel.mk
-+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
-@@ -10,15 +10,12 @@ QT5WEBCHANNEL_SOURCE = qtwebchannel-opensource-src-$(QT5WEBCHANNEL_VERSION).tar.
- QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets
- QT5WEBCHANNEL_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
--QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5WEBCHANNEL_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
--endif
--ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--QT5WEBCHANNEL_LICENSE := $(QT5WEBCHANNEL_LICENSE), BSD-3-Clause (examples)
-+else
-+QT5WEBCHANNEL_LICENSE = Commercial license
-+QT5WEBCHANNEL_REDISTRIBUTE = NO
- endif
- 
- ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
-diff --git a/package/qt5/qt5webengine/5.6.2/001-allow-arm-compiler.__patch b/package/qt5/qt5webengine/5.6.2/001-allow-arm-compiler.__patch
-deleted file mode 100644
-index bb8aa69ed6..0000000000
---- a/package/qt5/qt5webengine/5.6.2/001-allow-arm-compiler.__patch
-+++ /dev/null
-@@ -1,26 +0,0 @@
--diff '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*ninja*' -Naur qt5_a/src/3rdparty/chromium/build/common.gypi qt5webengine-5.5.1/src/3rdparty/chromium/build/common.gypi
----- qt5_a/src/3rdparty/chromium/build/common.gypi	2015-10-13 06:36:43.000000000 +0200
--+++ qt5webengine-5.5.1/src/3rdparty/chromium/build/common.gypi	2016-02-09 16:37:54.729166157 +0100
--@@ -2294,7 +2294,7 @@
--           }],
--         ],
--         # Change the default to hard once the armhf transition is complete.
---        'arm_float_abi%': 'softfp',
--+        'arm_float_abi%': 'hard',
--         'arm_thumb%': 1,
--       }],
-- 
----- qt5webengine-5.5.1/tools/qmake/mkspecs/features/functions.prf	2015-10-13 06:36:55.000000000 +0200
--+++ qt5_we_b/tools/qmake/mkspecs/features/functions.prf	2016-02-09 21:44:30.829783885 +0100
--@@ -12,9 +12,9 @@
--     return(false)
--   }
-- 
---  linux-g++*:!isGCCVersionSupported(): return(false)
--+  linux*g++*:!isGCCVersionSupported(): return(false)
--   !isPythonVersionSupported(): return(false)
---  linux-g++*|win32-msvc2013|macx-clang: return(true)
--+  linux*g++*|win32-msvc2013|macx-clang: return(true)
--   boot2qt: return(true)
-- 
--   skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.")
-diff --git a/package/qt5/qt5webengine/5.6.2/001-delegate_frame_node_fence_sync.patch b/package/qt5/qt5webengine/5.6.2/001-delegate_frame_node_fence_sync.patch
-deleted file mode 100644
-index c7bdcffe71..0000000000
---- a/package/qt5/qt5webengine/5.6.2/001-delegate_frame_node_fence_sync.patch
-+++ /dev/null
-@@ -1,20 +0,0 @@
----- a/src/core/delegated_frame_node.cpp	2016-03-03 17:02:28.000000000 +0100
--+++ b/src/core/delegated_frame_node.cpp	2016-04-09 21:01:03.502390661 +0200
--@@ -194,7 +194,7 @@
--     case gfx::TransferableFence::NoSync:
--         break;
--     case gfx::TransferableFence::EglSync:
---#ifdef EGL_KHR_reusable_sync
--+#ifdef EGL_KHR_fence_sync
--     {
--         static bool resolved = false;
--         static PFNEGLCLIENTWAITSYNCKHRPROC eglClientWaitSyncKHR = 0;
--@@ -235,7 +235,7 @@
--     case gfx::TransferableFence::NoSync:
--         break;
--     case gfx::TransferableFence::EglSync:
---#ifdef EGL_KHR_reusable_sync
--+#ifdef EGL_KHR_fence_sync
--     {
--         static bool resolved = false;
--         static PFNEGLDESTROYSYNCKHRPROC eglDestroySyncKHR = 0;
-diff --git a/package/qt5/qt5webengine/5.6.2/002-buildroot-python-bz2.patch b/package/qt5/qt5webengine/5.6.2/002-buildroot-python-bz2.patch
-deleted file mode 100644
-index b780f49ec0..0000000000
---- a/package/qt5/qt5webengine/5.6.2/002-buildroot-python-bz2.patch
-+++ /dev/null
-@@ -1,11 +0,0 @@
----- a/src/3rdparty/chromium/v8/tools/js2c.py	2016-03-03 15:48:36.000000000 +0100
--+++ b/src/3rdparty/chromium/v8/tools/js2c.py	2016-04-28 15:56:42.219174252 +0200
--@@ -34,7 +34,7 @@
-- import os, re, sys, string
-- import optparse
-- import jsmin
---import bz2
--+##import bz2
-- import textwrap
-- 
-- 
-diff --git a/package/qt5/qt5webengine/5.6.2/002-move_icu_to_56_1.__patch b/package/qt5/qt5webengine/5.6.2/002-move_icu_to_56_1.__patch
-deleted file mode 100644
-index a917a9c140..0000000000
---- a/package/qt5/qt5webengine/5.6.2/002-move_icu_to_56_1.__patch
-+++ /dev/null
-@@ -1,43 +0,0 @@
----- qt5webengine-5.5.1/src/3rdparty/chromium/third_party/icu/source/common/unicode/uvernum.h	2015-10-13 06:36:26.000000000 +0200
--+++ qt5_b/src/3rdparty/chromium/third_party/icu/source/common/unicode/uvernum.h	2016-02-11 12:06:28.304679220 +0100
--@@ -57,7 +57,7 @@
--  *  This value will change in the subsequent releases of ICU
--  *  @stable ICU 2.4
--  */
---#define U_ICU_VERSION_MAJOR_NUM 52
--+#define U_ICU_VERSION_MAJOR_NUM 56
-- 
-- /** The current ICU minor version as an integer.
--  *  This value will change in the subsequent releases of ICU
--@@ -83,7 +83,7 @@
--  *  This value will change in the subsequent releases of ICU
--  *  @stable ICU 2.6
--  */
---#define U_ICU_VERSION_SUFFIX _52
--+#define U_ICU_VERSION_SUFFIX _56
-- 
-- /**
--  * \def U_DEF2_ICU_ENTRY_POINT_RENAME
--@@ -118,19 +118,19 @@
--  *  This value will change in the subsequent releases of ICU
--  *  @stable ICU 2.4
--  */
---#define U_ICU_VERSION "52.1"
--+#define U_ICU_VERSION "56.1"
-- 
-- /** The current ICU library major/minor version as a string without dots, for library name suffixes.
--  *  This value will change in the subsequent releases of ICU
--  *  @stable ICU 2.6
--  */
---#define U_ICU_VERSION_SHORT "52"
--+#define U_ICU_VERSION_SHORT "56"
-- 
-- #ifndef U_HIDE_INTERNAL_API
-- /** Data version in ICU4C.
--  * @internal ICU 4.4 Internal Use Only
--  **/
---#define U_ICU_DATA_VERSION "52.1"
--+#define U_ICU_DATA_VERSION "56.1"
-- #endif  /* U_HIDE_INTERNAL_API */
-- 
-- /*===========================================================================
-diff --git a/package/qt5/qt5webengine/5.6.2/003-egl_khr_reusable_sync.patch b/package/qt5/qt5webengine/5.6.2/003-egl_khr_reusable_sync.patch
-deleted file mode 100644
-index 8d633d965c..0000000000
---- a/package/qt5/qt5webengine/5.6.2/003-egl_khr_reusable_sync.patch
-+++ /dev/null
-@@ -1,14 +0,0 @@
----- qt5webengine-5.5.1/src/core/delegated_frame_node.cpp	2015-10-13 06:36:54.000000000 +0200
--+++ qt5_b/src/core/delegated_frame_node.cpp	2016-02-11 13:27:42.142167151 +0100
--@@ -76,6 +76,11 @@
-- #include <EGL/eglext.h>
-- #endif
-- 
--+#ifdef EGL_KHR_reusable_sync
--+#undef EGL_KHR_reusable_sync
--+#endif
--+
--+
-- namespace QtWebEngineCore {
-- 
-- class MailboxTexture : public QSGTexture, protected QOpenGLFunctions {
-diff --git a/package/qt5/qt5webengine/5.6.2/003-jpeg-codec-external-lib.patch b/package/qt5/qt5webengine/5.6.2/003-jpeg-codec-external-lib.patch
-deleted file mode 100644
-index 4ace97f647..0000000000
---- a/package/qt5/qt5webengine/5.6.2/003-jpeg-codec-external-lib.patch
-+++ /dev/null
-@@ -1,49 +0,0 @@
--diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
--index 6d92637..d34ae33 100644
----- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
--+++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
--@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
--   // tell libjpeg where to write the next data
--   cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
--   cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
---  return 1;
--+  return (boolean)(1);
-- }
-- 
-- // Cleans up the JpegEncoderState to prepare for returning in the final form.
--@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
--   cinfo.data_precision = 8;
-- 
--   jpeg_set_defaults(&cinfo);
---  jpeg_set_quality(&cinfo, quality, 1);  // quality here is 0-100
--+  jpeg_set_quality(&cinfo, quality, (boolean)true);  // quality here is 0-100
-- 
--   // set up the destination manager
--   jpeg_destination_mgr destmgr;
--@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
--   JpegEncoderState state(output);
--   cinfo.client_data = &state;
-- 
---  jpeg_start_compress(&cinfo, 1);
--+  jpeg_start_compress(&cinfo, (boolean)true);
-- 
--   // feed it the rows, doing necessary conversions for the color format
-- #ifdef JCS_EXTENSIONS
--@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) {
-- //   set to a positive value if TRUE is returned. A FALSE return should only
-- //   be used when I/O suspension is desired."
-- boolean FillInputBuffer(j_decompress_ptr cinfo) {
---  return false;
--+  return (boolean)false;
-- }
-- 
-- // Skip data in the buffer. Since we have all the data at once, this operation
--@@ -488,7 +488,7 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size,
--   cinfo.client_data = &state;
-- 
--   // fill the file metadata into our buffer
---  if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
--+  if (jpeg_read_header(&cinfo, (boolean)true) != JPEG_HEADER_OK)
--     return false;
-- 
--   // we want to always get RGB data out
-diff --git a/package/qt5/qt5webengine/5.6.2/004-allow-egl-surface.__patch b/package/qt5/qt5webengine/5.6.2/004-allow-egl-surface.__patch
-deleted file mode 100644
-index 604cb88f36..0000000000
---- a/package/qt5/qt5webengine/5.6.2/004-allow-egl-surface.__patch
-+++ /dev/null
-@@ -1,166 +0,0 @@
--diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/base/files/file_proxy_unittest.cc qt5_b/src/3rdparty/chromium/base/files/file_proxy_unittest.cc
----- qt5webengine-5.5.1/src/3rdparty/chromium/base/files/file_proxy_unittest.cc	2015-10-13 06:36:48.000000000 +0200
--+++ qt5_b/src/3rdparty/chromium/base/files/file_proxy_unittest.cc	2016-02-12 17:58:52.694043375 +0100
--@@ -142,7 +142,7 @@
-- }
-- 
-- TEST_F(FileProxyTest, CreateOrOpen_AbandonedCreate) {
---  bool prev = ThreadRestrictions::SetIOAllowed(false);
--+  bool prev = ThreadRestrictions::SetIOAllowed(true);
--   {
--     FileProxy proxy(file_task_runner());
--     proxy.CreateOrOpen(
--diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/content/browser/browser_main_loop.cc qt5_b/src/3rdparty/chromium/content/browser/browser_main_loop.cc
----- qt5webengine-5.5.1/src/3rdparty/chromium/content/browser/browser_main_loop.cc	2015-10-13 06:36:47.000000000 +0200
--+++ qt5_b/src/3rdparty/chromium/content/browser/browser_main_loop.cc	2016-02-12 17:53:52.118534482 +0100
--@@ -745,7 +745,7 @@
-- 
--   // If the UI thread blocks, the whole UI is unresponsive.
--   // Do not allow disk IO from the UI thread.
---  base::ThreadRestrictions::SetIOAllowed(false);
--+  base::ThreadRestrictions::SetIOAllowed(true);
--   base::ThreadRestrictions::DisallowWaiting();
--   return result_code_;
-- }
--diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/content/browser/browser_process_sub_thread.cc qt5_b/src/3rdparty/chromium/content/browser/browser_process_sub_thread.cc
----- qt5webengine-5.5.1/src/3rdparty/chromium/content/browser/browser_process_sub_thread.cc	2015-10-13 06:36:46.000000000 +0200
--+++ qt5_b/src/3rdparty/chromium/content/browser/browser_process_sub_thread.cc	2016-02-12 17:52:40.717701092 +0100
--@@ -39,7 +39,7 @@
--     // Though this thread is called the "IO" thread, it actually just routes
--     // messages around; it shouldn't be allowed to perform any blocking disk
--     // I/O.
---    base::ThreadRestrictions::SetIOAllowed(false);
--+    base::ThreadRestrictions::SetIOAllowed(true);
--     base::ThreadRestrictions::DisallowWaiting();
--   }
-- }
--diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/dbus/end_to_end_async_unittest.cc qt5_b/src/3rdparty/chromium/dbus/end_to_end_async_unittest.cc
----- qt5webengine-5.5.1/src/3rdparty/chromium/dbus/end_to_end_async_unittest.cc	2015-10-13 06:36:51.000000000 +0200
--+++ qt5_b/src/3rdparty/chromium/dbus/end_to_end_async_unittest.cc	2016-02-12 17:57:04.280777854 +0100
--@@ -39,7 +39,7 @@
-- 
--   virtual void SetUp() {
--     // Make the main thread not to allow IO.
---    base::ThreadRestrictions::SetIOAllowed(false);
--+    base::ThreadRestrictions::SetIOAllowed(true);
-- 
--     // Start the D-Bus thread.
--     dbus_thread_.reset(new base::Thread("D-Bus Thread"));
--diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/dbus/object_manager_unittest.cc qt5_b/src/3rdparty/chromium/dbus/object_manager_unittest.cc
----- qt5webengine-5.5.1/src/3rdparty/chromium/dbus/object_manager_unittest.cc	2015-10-13 06:36:51.000000000 +0200
--+++ qt5_b/src/3rdparty/chromium/dbus/object_manager_unittest.cc	2016-02-12 17:54:33.659019384 +0100
--@@ -61,7 +61,7 @@
-- 
--   virtual void SetUp() {
--     // Make the main thread not to allow IO.
---    base::ThreadRestrictions::SetIOAllowed(false);
--+    base::ThreadRestrictions::SetIOAllowed(true);
-- 
--     // Start the D-Bus thread.
--     dbus_thread_.reset(new base::Thread("D-Bus Thread"));
--diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/dbus/property_unittest.cc qt5_b/src/3rdparty/chromium/dbus/property_unittest.cc
----- qt5webengine-5.5.1/src/3rdparty/chromium/dbus/property_unittest.cc	2015-10-13 06:36:51.000000000 +0200
--+++ qt5_b/src/3rdparty/chromium/dbus/property_unittest.cc	2016-02-12 17:57:54.025358691 +0100
--@@ -51,7 +51,7 @@
-- 
--   virtual void SetUp() {
--     // Make the main thread not to allow IO.
---    base::ThreadRestrictions::SetIOAllowed(false);
--+    base::ThreadRestrictions::SetIOAllowed(true);
-- 
--     // Start the D-Bus thread.
--     dbus_thread_.reset(new base::Thread("D-Bus Thread"));
--diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/dbus/signal_sender_verification_unittest.cc qt5_b/src/3rdparty/chromium/dbus/signal_sender_verification_unittest.cc
----- qt5webengine-5.5.1/src/3rdparty/chromium/dbus/signal_sender_verification_unittest.cc	2015-10-13 06:36:51.000000000 +0200
--+++ qt5_b/src/3rdparty/chromium/dbus/signal_sender_verification_unittest.cc	2016-02-12 17:55:57.519998395 +0100
--@@ -32,7 +32,7 @@
--     base::StatisticsRecorder::Initialize();
-- 
--     // Make the main thread not to allow IO.
---    base::ThreadRestrictions::SetIOAllowed(false);
--+    base::ThreadRestrictions::SetIOAllowed(true);
-- 
--     // Start the D-Bus thread.
--     dbus_thread_.reset(new base::Thread("D-Bus Thread"));
--@@ -161,7 +161,7 @@
--   void SafeServiceStop(TestService* test_service) {
--     base::ThreadRestrictions::SetIOAllowed(true);
--     test_service->Stop();
---    base::ThreadRestrictions::SetIOAllowed(false);
--+    base::ThreadRestrictions::SetIOAllowed(true);
--   }
-- 
--   base::MessageLoop message_loop_;
--diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/net/base/file_stream_unittest.cc qt5_b/src/3rdparty/chromium/net/base/file_stream_unittest.cc
----- qt5webengine-5.5.1/src/3rdparty/chromium/net/base/file_stream_unittest.cc	2015-10-13 06:36:53.000000000 +0200
--+++ qt5_b/src/3rdparty/chromium/net/base/file_stream_unittest.cc	2016-02-12 18:00:05.358889970 +0100
--@@ -758,7 +758,7 @@
--   scoped_refptr<base::SequencedWorkerPool> pool(
--       new base::SequencedWorkerPool(1, "StreamTest"));
-- 
---  bool prev = base::ThreadRestrictions::SetIOAllowed(false);
--+  bool prev = base::ThreadRestrictions::SetIOAllowed(true);
--   scoped_ptr<FileStream> stream(new FileStream(pool.get()));
--   int flags = base::File::FLAG_OPEN | base::File::FLAG_WRITE |
--               base::File::FLAG_ASYNC;
--diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/net/base/network_config_watcher_mac.cc qt5_b/src/3rdparty/chromium/net/base/network_config_watcher_mac.cc
----- qt5webengine-5.5.1/src/3rdparty/chromium/net/base/network_config_watcher_mac.cc	2015-10-13 06:36:53.000000000 +0200
--+++ qt5_b/src/3rdparty/chromium/net/base/network_config_watcher_mac.cc	2016-02-12 18:00:56.359484236 +0100
--@@ -67,7 +67,7 @@
-- void NetworkConfigWatcherMacThread::Init() {
--   // Disallow IO to make sure NetworkConfigWatcherMacThread's helper thread does
--   // not perform blocking operations.
---  base::ThreadRestrictions::SetIOAllowed(false);
--+  base::ThreadRestrictions::SetIOAllowed(true);
-- 
--   delegate_->Init();
-- 
--diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/net/disk_cache/backend_unittest.cc qt5_b/src/3rdparty/chromium/net/disk_cache/backend_unittest.cc
----- qt5webengine-5.5.1/src/3rdparty/chromium/net/disk_cache/backend_unittest.cc	2015-10-13 06:36:53.000000000 +0200
--+++ qt5_b/src/3rdparty/chromium/net/disk_cache/backend_unittest.cc	2016-02-12 18:02:24.724514006 +0100
--@@ -463,7 +463,7 @@
--       base::Thread::Options(base::MessageLoop::TYPE_IO, 0)));
--   net::TestCompletionCallback cb;
-- 
---  bool prev = base::ThreadRestrictions::SetIOAllowed(false);
--+  bool prev = base::ThreadRestrictions::SetIOAllowed(true);
--   scoped_ptr<disk_cache::BackendImpl> cache(new disk_cache::BackendImpl(
--       cache_path_, cache_thread.task_runner(), NULL));
--   int rv = cache->Init(cb.callback());
--@@ -1972,7 +1972,7 @@
--       base::Thread::Options(base::MessageLoop::TYPE_IO, 0)));
-- 
--   net::TestCompletionCallback cb;
---  bool prev = base::ThreadRestrictions::SetIOAllowed(false);
--+  bool prev = base::ThreadRestrictions::SetIOAllowed(true);
--   base::FilePath path(cache_path_);
--   int rv = disk_cache::CreateCacheBackend(net::DISK_CACHE,
--                                           net::CACHE_BACKEND_BLOCKFILE,
--diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/core/gl_surface_qt.cpp qt5_b/src/core/gl_surface_qt.cpp
----- qt5webengine-5.5.1/src/core/gl_surface_qt.cpp	2015-10-13 06:36:54.000000000 +0200
--+++ qt5_b/src/core/gl_surface_qt.cpp	2016-02-14 11:38:43.661776602 +0100
--@@ -513,15 +513,20 @@
--         return NULL;
-- #endif
--     }
---    case kGLImplementationEGLGLES2: {
--+   case kGLImplementationEGLGLES2: {
--         scoped_refptr<GLSurface> surface = new GLSurfaceQtEGL(size);
--         if (!surface->Initialize())
--             return NULL;
--         return surface;
--     }
---    default:
---        Q_UNREACHABLE();
---        return NULL;
--+    default: {
--+        scoped_refptr<GLSurface> surface = new GLSurfaceQtEGL(size);
--+        if (!surface->Initialize())
--+            return NULL;
--+        return surface;
--+    }
--+//        Q_UNREACHABLE();
--+//        return NULL;
--     }
-- }
-- 
-diff --git a/package/qt5/qt5webengine/5.8.0/001-use-neon-per-default.patch b/package/qt5/qt5webengine/5.8.0/001-use-neon-per-default.patch
-deleted file mode 100644
-index 9e865d3d9e..0000000000
---- a/package/qt5/qt5webengine/5.8.0/001-use-neon-per-default.patch
-+++ /dev/null
-@@ -1,13 +0,0 @@
--diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
--index dc22d14..161ca9e 100644
----- a/src/core/gyp_run.pro
--+++ b/src/core/gyp_run.pro
--@@ -82,7 +82,7 @@ contains(QT_ARCH, "arm") {
--         else: GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=0 arm_neon_optional=0
--     } else {
--         # Chromium defaults to arm_neon=1, Qt does not.
---        GYP_CONFIG += arm_neon=0
--+        GYP_CONFIG += arm_neon=1
--         !lessThan(MARMV, 7): GYP_CONFIG += arm_neon_optional=1
--     }
-- 
-diff --git a/package/qt5/qt5webengine/5.8.0/002-EGL_KHR_reusable_sync-disa.patch b/package/qt5/qt5webengine/5.8.0/002-EGL_KHR_reusable_sync-disa.patch
-deleted file mode 100644
-index 2b4b5aad51..0000000000
---- a/package/qt5/qt5webengine/5.8.0/002-EGL_KHR_reusable_sync-disa.patch
-+++ /dev/null
-@@ -1,15 +0,0 @@
--diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp
--index baf0640..0c77eb2 100644
----- a/src/core/delegated_frame_node.cpp
--+++ b/src/core/delegated_frame_node.cpp
--@@ -91,6 +91,10 @@
-- #include <EGL/eglext.h>
-- #endif
-- 
--+#ifdef EGL_KHR_reusable_sync
--+#undef EGL_KHR_reusable_sync
--+#endif
--+
-- #ifndef GL_TIMEOUT_IGNORED
-- #define GL_TIMEOUT_IGNORED                0xFFFFFFFFFFFFFFFFull
-- #endif
-diff --git a/package/qt5/qt5webengine/5.8.0/003-jpeg-codec-external-lib.patch b/package/qt5/qt5webengine/5.8.0/003-jpeg-codec-external-lib.patch
-deleted file mode 100644
-index 4ace97f647..0000000000
---- a/package/qt5/qt5webengine/5.8.0/003-jpeg-codec-external-lib.patch
-+++ /dev/null
-@@ -1,49 +0,0 @@
--diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
--index 6d92637..d34ae33 100644
----- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
--+++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
--@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
--   // tell libjpeg where to write the next data
--   cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
--   cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
---  return 1;
--+  return (boolean)(1);
-- }
-- 
-- // Cleans up the JpegEncoderState to prepare for returning in the final form.
--@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
--   cinfo.data_precision = 8;
-- 
--   jpeg_set_defaults(&cinfo);
---  jpeg_set_quality(&cinfo, quality, 1);  // quality here is 0-100
--+  jpeg_set_quality(&cinfo, quality, (boolean)true);  // quality here is 0-100
-- 
--   // set up the destination manager
--   jpeg_destination_mgr destmgr;
--@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
--   JpegEncoderState state(output);
--   cinfo.client_data = &state;
-- 
---  jpeg_start_compress(&cinfo, 1);
--+  jpeg_start_compress(&cinfo, (boolean)true);
-- 
--   // feed it the rows, doing necessary conversions for the color format
-- #ifdef JCS_EXTENSIONS
--@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) {
-- //   set to a positive value if TRUE is returned. A FALSE return should only
-- //   be used when I/O suspension is desired."
-- boolean FillInputBuffer(j_decompress_ptr cinfo) {
---  return false;
--+  return (boolean)false;
-- }
-- 
-- // Skip data in the buffer. Since we have all the data at once, this operation
--@@ -488,7 +488,7 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size,
--   cinfo.client_data = &state;
-- 
--   // fill the file metadata into our buffer
---  if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
--+  if (jpeg_read_header(&cinfo, (boolean)true) != JPEG_HEADER_OK)
--     return false;
-- 
--   // we want to always get RGB data out
-diff --git a/package/qt5/qt5webengine/5.8.0/004-on-arm8-set-armv7-type.patch b/package/qt5/qt5webengine/5.8.0/004-on-arm8-set-armv7-type.patch
-deleted file mode 100644
-index 862cb95611..0000000000
---- a/package/qt5/qt5webengine/5.8.0/004-on-arm8-set-armv7-type.patch
-+++ /dev/null
-@@ -1,13 +0,0 @@
--diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
--index 161ca9e..6a0eacd 100644
----- a/src/core/gyp_run.pro
--+++ b/src/core/gyp_run.pro
--@@ -69,6 +69,8 @@ contains(QT_ARCH, "arm") {
--         MARMV = $$split(MARMV,)
--         MARMV = $$member(MARMV, 0)
--         lessThan(MARMV, 6): error("$$MARCH architecture is not supported")
--+	else: equals(MARMV, 7): GYP_CONFIG += arm_version=\"$MARMV\"
--+	else: GYP_CONFIG += arm_version=\"7\"
--         GYP_CONFIG += arm_version=\"$$MARMV\"
--     }
-- 
-diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in
-index dd65983722..b630a852a0 100644
---- a/package/qt5/qt5webengine/Config.in
-+++ b/package/qt5/qt5webengine/Config.in
-@@ -10,7 +10,6 @@ config BR2_PACKAGE_QT5WEBENGINE
- 	select BR2_PACKAGE_LIBCAP
- 	select BR2_PACKAGE_QT5DECLARATIVE
- 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
--	select BR2_PACKAGE_WEBP
- 	help
- 	Qt is a cross-platform application and UI framework for
- 	developers using C++.
-diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
-index 46cf6853c9..98c67a63be 100644
---- a/package/qt5/qt5webengine/qt5webengine.mk
-+++ b/package/qt5/qt5webengine/qt5webengine.mk
-@@ -20,25 +20,12 @@ QT5WEBENGINE_LICENSE = Commercial license
- QT5WEBENGINE_REDISTRIBUTE = NO
- endif
- 
--ifneq ($(BR2_GCC_TARGET_CPU),)
--QT5WEBENGINE_QMAKE_CFLAGS += -mtune=$(BR2_GCC_TARGET_CPU)
--endif
--
--ifneq ($(BR2_GCC_TARGET_FLOAT_ABI),)
--QT5WEBENGINE_QMAKE_CFLAGS += -mfloat-abi=$(BR2_GCC_TARGET_FLOAT_ABI)
--endif
--
--ifneq ($(BR2_GCC_TARGET_FPU),)
--QT5WEBENGINE_QMAKE_CFLAGS += -mfpu=$(BR2_GCC_TARGET_FPU)
--endif
--
- ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
- QT5WEBENGINE_DEPENDENCIES += qt5declarative
- endif
- 
- define QT5WEBENGINE_CONFIGURE_CMDS
--# (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake WEBENGINE_CONFIG+=use_proprietary_codecs)
-- (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-+ (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake WEBENGINE_CONFIG+=use_proprietary_codecs)
- endef
- 
- define QT5WEBENGINE_BUILD_CMDS
-diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in
-index 637996a0de..7add5f95a9 100644
---- a/package/qt5/qt5webkit/Config.in
-+++ b/package/qt5/qt5webkit/Config.in
-@@ -1,33 +1,28 @@
- config BR2_PACKAGE_QT5WEBKIT
- 	bool "qt5webkit"
--	depends on !BR2_STATIC_LIBS
--	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
--	depends on !BR2_BINFMT_FLAT # icu
--	# assumes a FPU is available on MIPS
--	depends on !BR2_MIPS_SOFT_FLOAT
- 	select BR2_PACKAGE_QT5BASE
- 	select BR2_PACKAGE_QT5BASE_ICU
- 	select BR2_PACKAGE_QT5BASE_GUI
- 	select BR2_PACKAGE_SQLITE
- 	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB
- 	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB
-+	depends on !BR2_STATIC_LIBS
-+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-+	depends on !BR2_BINFMT_FLAT # icu
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  The Qt WebKit module provides the WebView API, which
--	  allows QML applications to render regions of dynamic
--	  web content.
-+	  This package corresponds to the qt5webkit module.
- 
- 	  This package has been removed from the official release packages
- 	  since Qt5.6.0, but it is still available for users to build it
- 	  from source. This is useful for platforms without GPU since the
- 	  successor (QtWebEngine) requires OpenGL support.
- 
--	  http://doc.qt.io/archives/qt-5.5/qtwebkit-index.html
-+	  http://qt.io
- 
- comment "qt5webkit needs a toolchain w/ dynamic library"
--	depends on BR2_STATIC_LIBS
--	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
--	depends on !BR2_BINFMT_FLAT
--	depends on !BR2_MIPS_SOFT_FLOAT
-+        depends on BR2_STATIC_LIBS
-+        depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-+        depends on !BR2_BINFMT_FLAT
-diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
-index d435192994..629e40a3ec 100644
---- a/package/qt5/qt5webkit/qt5webkit.mk
-+++ b/package/qt5/qt5webkit/qt5webkit.mk
-@@ -4,20 +4,24 @@
- #
- ################################################################################
- 
--QT5WEBKIT_VERSION = $(QT5_VERSION)
--QT5WEBKIT_SITE = $(QT5_SNAPSHOTS_SITE)
--QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
--QT5WEBKIT_DEPENDENCIES = \
--	host-bison host-flex host-gperf host-python host-ruby \
--	qt5base sqlite
-+QT5WEBKIT_VERSION = d2ff5a085572b1ee24dcb42ae107063f3142d14e
-+# Using GitHub since it supports downloading tarballs from random commits.
-+# The http://code.qt.io/cgit/qt/qtwebkit.git/ repo doesn't allow to do so.
-+QT5WEBKIT_SITE = $(call github,qtproject,qtwebkit,$(QT5WEBKIT_VERSION))
-+QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf host-bison host-flex
- QT5WEBKIT_INSTALL_STAGING = YES
- 
- QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1
- 
--QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5WEBKIT_LICENSE = LGPLv2.1+, BSD-3c, BSD-2c
- # Source files contain references to LGPL_EXCEPTION.txt but it is not included
- # in the archive.
- QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21
-+else
-+QT5WEBKIT_LICENSE = LGPLv2.1+ (WebCore), Commercial license
-+QT5WEBKIT_REDISTRIBUTE = NO
-+endif
- 
- ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
- QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender
-@@ -27,26 +31,23 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
- QT5WEBKIT_DEPENDENCIES += qt5declarative
- endif
- 
--# QtWebkit's build system uses python, but only supports python2. We work
--# around this by forcing python2 early in the PATH, via a python->python2
--# symlink.
--QT5WEBKIT_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
--define QT5WEBKIT_PYTHON2_SYMLINK
--	mkdir -p $(@D)/host-bin
--	ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/host-bin/python
--endef
--QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
--
-+# Since we get the source from git, generated header files are not included.
-+# qmake detects that header file generation (using the syncqt tool) must be
-+# done based on the existence of a .git directory (cfr. the git_build config
-+# option which is set in qt_build_paths.prf).
-+# So, to make sure that qmake detects that header files must be generated,
-+# create an empty .git directory.
- define QT5WEBKIT_CONFIGURE_CMDS
--	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/usr/bin/qmake)
-+	mkdir -p $(@D)/.git
-+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
- endef
- 
- define QT5WEBKIT_BUILD_CMDS
--	$(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D)
-+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
- endef
- 
- define QT5WEBKIT_INSTALL_STAGING_CMDS
--	$(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D) install
-+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
- 	$(QT5_LA_PRL_FILES_FIXUP)
- endef
- 
-diff --git a/package/qt5/qt5websockets/Config.in b/package/qt5/qt5websockets/Config.in
-index 0cfde91c8b..385a07c9fa 100644
---- a/package/qt5/qt5websockets/Config.in
-+++ b/package/qt5/qt5websockets/Config.in
-@@ -6,9 +6,6 @@ config BR2_PACKAGE_QT5WEBSOCKETS
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  The Qt WebSockets module provides C++ and QML interfaces
--	  that enable Qt applications to act as a server that can
--	  process WebSocket requests, or a client that can
--	  consume data received from the server, or both.
-+	  This package corresponds to the qt5websockets module.
- 
--	  http://doc.qt.io/qt-5/qtwebsockets-index.html
-+	  http://qt.io
-diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
-index af87435d6d..609b68e4e7 100644
---- a/package/qt5/qt5websockets/qt5websockets.mk
-+++ b/package/qt5/qt5websockets/qt5websockets.mk
-@@ -10,15 +10,12 @@ QT5WEBSOCKETS_SOURCE = qtwebsockets-opensource-src-$(QT5WEBSOCKETS_VERSION).tar.
- QT5WEBSOCKETS_DEPENDENCIES = qt5base
- QT5WEBSOCKETS_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools)
--QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3
--else
--QT5WEBSOCKETS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5WEBSOCKETS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3
- QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
--endif
--ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--QT5WEBSOCKETS_LICENSE := $(QT5WEBSOCKETS_LICENSE), BSD-3-Clause (examples)
-+else
-+QT5WEBSOCKETS_LICENSE = Commercial license
-+QT5WEBSOCKETS_REDISTRIBUTE = NO
- endif
- 
- ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
-diff --git a/package/qt5/qt5x11extras/Config.in b/package/qt5/qt5x11extras/Config.in
-index ff4cc11531..6fc2c0ade6 100644
---- a/package/qt5/qt5x11extras/Config.in
-+++ b/package/qt5/qt5x11extras/Config.in
-@@ -1,12 +1,11 @@
- config BR2_PACKAGE_QT5X11EXTRAS
- 	bool "qt5x11extras"
--	depends on BR2_PACKAGE_QT5BASE_XCB
- 	select BR2_PACKAGE_QT5BASE_WIDGETS
-+	depends on BR2_PACKAGE_QT5BASE_XCB
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  Qt X11 Extras enables the Qt programmer to write
--	  applications for the Linux/X11 platform.
-+	  This package corresponds to the qt5x11extras module.
- 
--	  http://doc.qt.io/qt-5/qtx11extras-index.html
-+	  http://qt.io
-diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
-index 00667c72f3..a0e1209868 100644
---- a/package/qt5/qt5x11extras/qt5x11extras.mk
-+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
-@@ -10,12 +10,12 @@ QT5X11EXTRAS_SOURCE = qtx11extras-opensource-src-$(QT5X11EXTRAS_VERSION).tar.xz
- QT5X11EXTRAS_DEPENDENCIES = qt5base
- QT5X11EXTRAS_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
--QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5X11EXTRAS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+else
-+QT5X11EXTRAS_LICENSE = Commercial license
-+QT5X11EXTRAS_REDISTRIBUTE = NO
- endif
- 
- define QT5X11EXTRAS_CONFIGURE_CMDS
-diff --git a/package/qt5/qt5xmlpatterns/Config.in b/package/qt5/qt5xmlpatterns/Config.in
-index dd8b54eba1..8c82656c5d 100644
---- a/package/qt5/qt5xmlpatterns/Config.in
-+++ b/package/qt5/qt5xmlpatterns/Config.in
-@@ -5,7 +5,6 @@ config BR2_PACKAGE_QT5XMLPATTERNS
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  The Qt XML Patterns module provides support for XPath,
--	  XQuery, XSLT, and XML Schema validation.
-+	  This package corresponds to the qt5xmlpatterns module.
- 
--	  http://doc.qt.io/qt-5/qtxmlpatterns-index.html
-+	  http://qt.io
-diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
-index fabca21261..31477a7c0b 100644
---- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
-+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
-@@ -10,15 +10,12 @@ QT5XMLPATTERNS_SOURCE = qtxmlpatterns-opensource-src-$(QT5XMLPATTERNS_VERSION).t
- QT5XMLPATTERNS_DEPENDENCIES = qt5base
- QT5XMLPATTERNS_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
--QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
--QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5XMLPATTERNS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5XMLPATTERNS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
- QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
--endif
--ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--QT5XMLPATTERNS_LICENSE := $(QT5XMLPATTERNS_LICENSE), BSD-3-Clause (examples)
-+else
-+QT5XMLPATTERNS_LICENSE = Commercial license
-+QT5XMLPATTERNS_REDISTRIBUTE = NO
- endif
- 
- define QT5XMLPATTERNS_CONFIGURE_CMDS
-@@ -35,20 +32,9 @@ define QT5XMLPATTERNS_INSTALL_STAGING_CMDS
- endef
- 
- ifeq ($(BR2_STATIC_LIBS),)
--define QT5XMLPATTERNS_INSTALL_TARGET_LIBS
-+define QT5XMLPATTERNS_INSTALL_TARGET_CMDS
- 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5XmlPatterns*.so.* $(TARGET_DIR)/usr/lib
- endef
- endif
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--define QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES
--	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/xmlpatterns $(TARGET_DIR)/usr/lib/qt/examples/
--endef
--endif
--
--define QT5XMLPATTERNS_INSTALL_TARGET_CMDS
--	$(QT5XMLPATTERNS_INSTALL_TARGET_LIBS)
--	$(QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES)
--endef
--
- $(eval $(generic-package))

GfA-buildroot-qt57_on_Kernel_4_4_104_part2.patch

@@ -1,514 +0,0 @@
-diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash
-new file mode 100644
-index 0000000000..f59a671437
---- /dev/null
-+++ b/package/qt5/qt53d/qt53d.hash
-@@ -0,0 +1 @@
-+sha256	a8248a1779b561ea450e92345e8187bacac359df0e92ad61a1ad7652bb233e29	qt3d-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5base/0001-Disable-c-standard-compiler-flags-for-the-host-build.__patch b/package/qt5/qt5base/0001-Disable-c-standard-compiler-flags-for-the-host-build.__patch
-new file mode 100644
-index 0000000000..54e4db8e67
---- /dev/null
-+++ b/package/qt5/qt5base/0001-Disable-c-standard-compiler-flags-for-the-host-build.__patch
-@@ -0,0 +1,44 @@
-+From e69e69519661954716d59bfa5bbd0626515cfda9 Mon Sep 17 00:00:00 2001
-+From: Peter Seiderer <ps.report@gmx.net>
-+Date: Thu, 3 Mar 2016 15:17:31 +0100
-+Subject: [PATCH] Disable c++ standard compiler flags for the host build
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+There is no test for c++ standard support for the host build
-+(only for the target compiler/build) which leads to trouble
-+in some cross compiling environments (old host compiler, new
-+cross compiler):
-+
-+  g++: error: unrecognized command line option ‘-std=c++1z’
-+
-+So disable c++ standard compiler flags unconditionally for host builds.
-+
-+Task-number: QTBUG-51644
-+Change-Id: Ifb3042e125fe199a7e081740d1171d26ccacf0c5
-+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
-+---
-+ mkspecs/features/default_post.prf | 5 ++++-
-+ 1 file changed, 4 insertions(+), 1 deletion(-)
-+
-+diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
-+index cd8d885..561c8f4 100644
-+--- a/mkspecs/features/default_post.prf
-++++ b/mkspecs/features/default_post.prf
-+@@ -95,7 +95,10 @@ breakpad {
-+     !isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote($$QMAKE_STRIP $$DEBUGFILENAME)
-+ }
-+ 
-+-c++11|c++14|c++1z {
-++# Disable special compiler flags for host builds (needs to be changed for 5.7
-++# to fall back to c++11 because since 5.7 c++11 is required everywhere,
-++# including host builds).
-++if(!host_build|!cross_compile):if(c++11|c++14|c++1z) {
-+     c++1z:       cxxstd = CXX1Z
-+     else: c++14: cxxstd = CXX14
-+     else:        cxxstd = CXX11
-+-- 
-+2.1.4
-+
-diff --git a/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch b/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
-new file mode 100644
-index 0000000000..f1f6d9b0b7
---- /dev/null
-+++ b/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
-@@ -0,0 +1,45 @@
-+From 91c3b111e45dd476aba057836b1b618eacf90f3f Mon Sep 17 00:00:00 2001
-+From: Julien Corjon <corjon.j@ecagroup.com>
-+Date: Tue, 21 Jul 2015 09:58:14 +0200
-+Subject: [PATCH] eglfs - fix rasp-pi header inclusion
-+
-+eglplateform.h include headers for low level instruction and fail on brcm
-+headers inclusion
-+  For the brcm presence test we use egl pkg-config file
-+  For the eglfs-plugin compilation we use the egl configuration
-+
-+Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47339
-+Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
-+---
-+ config.tests/qpa/eglfs-brcm/eglfs-brcm.pro   | 2 ++
-+ src/plugins/platforms/eglfs/eglfs-plugin.pro | 1 +
-+ 2 files changed, 3 insertions(+)
-+
-+diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
-+index ce16a3a..192a8ad 100644
-+--- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
-++++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
-+@@ -1,6 +1,8 @@
-+ SOURCES = eglfs-brcm.cpp
-+ 
-+ CONFIG -= qt
-++CONFIG += link_pkgconfig
-++PKGCONFIG += egl
-+ 
-+ INCLUDEPATH += $$QMAKE_INCDIR_EGL
-+ 
-+diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro
-+index 0f493fd..8479496 100644
-+--- a/src/plugins/platforms/eglfs/eglfs-plugin.pro
-++++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro
-+@@ -6,6 +6,7 @@ PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin
-+ load(qt_plugin)
-+ 
-+ QT += platformsupport-private eglfs_device_lib-private
-++CONFIG += egl
-+ 
-+ SOURCES += $$PWD/qeglfsmain.cpp
-+ 
-+-- 
-+2.1.0
-+
-diff --git a/package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch b/package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch
-new file mode 100644
-index 0000000000..cbafb397bb
---- /dev/null
-+++ b/package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch
-@@ -0,0 +1,53 @@
-+From b6c602e4264021f98ec2c72316e2a2000bf35e82 Mon Sep 17 00:00:00 2001
-+From: Peter Seiderer <ps.report@gmx.net>
-+Date: Mon, 14 Nov 2016 23:42:25 +0100
-+Subject: [PATCH] eglfs: fix eglfs_mali compile for odroid-mali
-+
-+Avoid duplicated struct fbdev_window definition (introduced by [1]) by
-+renaming struct fbdev_window to shadow_fbdev_window.
-+
-+Fixes the following buildroot compile failure ([2]):
-+
-+qeglfsmaliintegration.cpp:45:8: error: redefinition of 'struct fbdev_window'
-+ struct fbdev_window {
-+        ^
-+In file included from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:28:0,
-+                 from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/egl.h:36,
-+                 from ../../../eglfs/qeglfsglobal.h:45,
-+                 from ../../../eglfs/qeglfsdeviceintegration.h:48,
-+                 from qeglfsmaliintegration.h:37,
-+                 from qeglfsmaliintegration.cpp:34:
-+
-+[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?h=dev&id=58bed4cda98e8e25db8adc61c7db73b6853077dc
-+[2] http://autobuild.buildroot.net/results/48c/48c458c035162169e8ca7c34ae65e9064822f25a
-+
-+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-+---
-+ .../eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp      | 4 ++--
-+ 1 file changed, 2 insertions(+), 2 deletions(-)
-+
-+diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp
-+index 43decdf..aeba83f 100644
-+--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp
-++++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp
-+@@ -42,7 +42,7 @@
-+ 
-+ QT_BEGIN_NAMESPACE
-+ 
-+-struct fbdev_window {
-++struct shadow_fbdev_window {
-+     unsigned short width;
-+     unsigned short height;
-+ };
-+@@ -85,7 +85,7 @@ EGLNativeWindowType QEglFSMaliIntegration::createNativeWindow(QPlatformWindow *w
-+     Q_UNUSED(window);
-+     Q_UNUSED(format);
-+ 
-+-    fbdev_window *fbwin = reinterpret_cast<fbdev_window *>(malloc(sizeof(fbdev_window)));
-++    shadow_fbdev_window *fbwin = reinterpret_cast<shadow_fbdev_window *>(malloc(sizeof(shadow_fbdev_window)));
-+     if (NULL == fbwin)
-+         return 0;
-+ 
-+-- 
-+2.8.1
-+
-diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash
-new file mode 100644
-index 0000000000..6795b60308
---- /dev/null
-+++ b/package/qt5/qt5base/qt5base.hash
-@@ -0,0 +1 @@
-+sha256	3e7b6d123cab23a587ccbc45173296b33786faa409dba0494e4658fda3ede646	qtbase-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash
-new file mode 100644
-index 0000000000..2d13e400f2
---- /dev/null
-+++ b/package/qt5/qt5canvas3d/qt5canvas3d.hash
-@@ -0,0 +1 @@
-+sha256	7871b3fd4c1a561c5b3eb57746e8504bc5d8fa626f9df578e619f9e823e3bd97	qtcanvas3d-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash
-new file mode 100644
-index 0000000000..00b7c2086c
---- /dev/null
-+++ b/package/qt5/qt5connectivity/qt5connectivity.hash
-@@ -0,0 +1 @@
-+sha256	9844ca7ec5be187a77dfd7e95051fb267006f6c77157ecb0b8ceeac103a32703	qtconnectivity-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5datavis3d/Config.in b/package/qt5/qt5datavis3d/Config.in
-new file mode 100644
-index 0000000000..c7aca95281
---- /dev/null
-+++ b/package/qt5/qt5datavis3d/Config.in
-@@ -0,0 +1,17 @@
-+config BR2_PACKAGE_QT5DATAVIS3D
-+	bool "qt5datavis3d"
-+	select BR2_PACKAGE_QT5DECLARATIVE
-+	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
-+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
-+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-+	help
-+	  Qt is a cross-platform application and UI framework for
-+	  developers using C++.
-+
-+	  This package corresponds to the qt5datavis3d module.
-+
-+	  http://qt.io
-+
-+comment "qt5canvas3d needs an OpenGL-capable backend"
-+	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
-+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-diff --git a/package/qt5/qt5datavis3d/qt5datavis3d.mk b/package/qt5/qt5datavis3d/qt5datavis3d.mk
-new file mode 100644
-index 0000000000..9101148c80
---- /dev/null
-+++ b/package/qt5/qt5datavis3d/qt5datavis3d.mk
-@@ -0,0 +1,39 @@
-+################################################################################
-+#
-+# qt5datavis3d
-+#
-+################################################################################
-+
-+QT5DATAVIS3D_VERSION = $(QT5_VERSION)
-+QT5DATAVIS3D_SITE = $(QT5_SITE)
-+QT5DATAVIS3D_SOURCE = qtdatavis3d-opensource-src-$(QT5DATAVIS3D_VERSION).tar.xz
-+QT5DATAVIS3D_DEPENDENCIES = qt5base qt5declarative
-+QT5DATAVIS3D_INSTALL_STAGING = YES
-+
-+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-+QT5DATAVIS3D_LICENSE = GPLv3
-+QT5DATAVIS3D_LICENSE_FILES = LICENSE.GPL3
-+else
-+QT5DATAVIS3D_LICENSE = Commercial license
-+QT5DATAVIS3D_REDISTRIBUTE = NO
-+endif
-+
-+define QT5DATAVIS3D_CONFIGURE_CMDS
-+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-+endef
-+
-+define QT5DATAVIS3D_BUILD_CMDS
-+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
-+endef
-+
-+define QT5DATAVIS3D_INSTALL_STAGING_CMDS
-+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
-+	$(QT5_LA_PRL_FILES_FIXUP)
-+endef
-+
-+define QT5DATAVIS3D_INSTALL_TARGET_CMDS
-+	cp -dpfr $(STAGING_DIR)/usr/lib/libQt5DataVisualization.so.* $(TARGET_DIR)/usr/lib
-+        cp -dpfr $(STAGING_DIR)/usr/qml/QtDataVisualization $(TARGET_DIR)/usr/qml/
-+endef
-+
-+$(eval $(generic-package))
-diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash
-new file mode 100644
-index 0000000000..677966967e
---- /dev/null
-+++ b/package/qt5/qt5declarative/qt5declarative.hash
-@@ -0,0 +1 @@
-+sha256	86de6239f3aee2e5f561c16ad7b6e47d8f341c293d4ed11c85acbc21888cf9f4	qtdeclarative-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5enginio/qt5enginio.hash b/package/qt5/qt5enginio/qt5enginio.hash
-new file mode 100644
-index 0000000000..95f507cf58
---- /dev/null
-+++ b/package/qt5/qt5enginio/qt5enginio.hash
-@@ -0,0 +1 @@
-+sha256	627ddcfbbfc3ec1a83c9dbb5f24287b5cd6cb5d3b9d09af4d1c444c6ac147f0c	qtenginio-opensource-src-1.6.0.tar.xz
-diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
-new file mode 100644
-index 0000000000..7c79a99845
---- /dev/null
-+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
-@@ -0,0 +1 @@
-+sha256	c816539ce345e502425a94c624332df78f53aeebc460d76b53b79b59cb938de7	qtgraphicaleffects-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash
-new file mode 100644
-index 0000000000..b65be404bb
---- /dev/null
-+++ b/package/qt5/qt5imageformats/qt5imageformats.hash
-@@ -0,0 +1 @@
-+sha256	ef3344a44194d1414be585f8c8a652ffe217c663a22b6e26d3bb5e114f3f62e5	qtimageformats-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash
-new file mode 100644
-index 0000000000..074168e03a
---- /dev/null
-+++ b/package/qt5/qt5location/qt5location.hash
-@@ -0,0 +1 @@
-+sha256	70273367342493a77c050f033a92d96e79925aa70308746e9681d8661f4aa865	qtlocation-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash
-new file mode 100644
-index 0000000000..1a85f9500b
---- /dev/null
-+++ b/package/qt5/qt5multimedia/qt5multimedia.hash
-@@ -0,0 +1 @@
-+sha256	05ae705bda224a600b06e390aa7b1448c4a6a52d2d37842d2121fb4a5d84b559	qtmultimedia-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
-new file mode 100644
-index 0000000000..cf438f84ac
---- /dev/null
-+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
-@@ -0,0 +1 @@
-+sha256	d8e19a77100fff109585ccc62116e63dd11ce9486056a8eb5b64159b7ecdec32	qtquickcontrols-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
-new file mode 100644
-index 0000000000..c43afd7fbd
---- /dev/null
-+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
-@@ -0,0 +1 @@
-+sha256	63f5b0777992c32bd602b88de657e202cd6d5e8ba0371c6d5da16fb8c7481045	qtquickcontrols2-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash
-new file mode 100644
-index 0000000000..c8ecb75eb0
---- /dev/null
-+++ b/package/qt5/qt5script/qt5script.hash
-@@ -0,0 +1,2 @@
-+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtscript-opensource-src-5.6.2.tar.xz.mirrorlist
-+sha256 e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e qtscript-opensource-src-5.6.2.tar.xz
-diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash
-new file mode 100644
-index 0000000000..ec62e3ba86
---- /dev/null
-+++ b/package/qt5/qt5sensors/qt5sensors.hash
-@@ -0,0 +1 @@
-+sha256	283dcc66a24c4367e865fa8301b6ea04d0cb78bd0f166fd09a6bb42e1e3731be	qtsensors-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash
-new file mode 100644
-index 0000000000..05972195bb
---- /dev/null
-+++ b/package/qt5/qt5serialbus/qt5serialbus.hash
-@@ -0,0 +1 @@
-+sha256	2c437ace393e9dcf170990b519cec59c5cbcfc3c830e46116abb52549dc15d38	qtserialbus-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash
-new file mode 100644
-index 0000000000..7751d64118
---- /dev/null
-+++ b/package/qt5/qt5serialport/qt5serialport.hash
-@@ -0,0 +1 @@
-+sha256	5ce150d843a243854736489d4a71205a8ca8dc8f93626ec29d1aa7a249a08265	qtserialport-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash
-new file mode 100644
-index 0000000000..0c3a9ffaea
---- /dev/null
-+++ b/package/qt5/qt5svg/qt5svg.hash
-@@ -0,0 +1 @@
-+sha256	a1f89f035aed48bf8843ff1880c4b54dc2e3a5160dbd743aec03e13831cdd881	qtsvg-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch b/package/qt5/qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch
-new file mode 100644
-index 0000000000..61cbdfe6a1
---- /dev/null
-+++ b/package/qt5/qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch
-@@ -0,0 +1,30 @@
-+From acdb24783322bb6e69df61cf04df2b2e47a06ad2 Mon Sep 17 00:00:00 2001
-+From: Peter Seiderer <ps.report@gmx.net>
-+Date: Tue, 29 Mar 2016 13:37:09 +0200
-+Subject: [PATCH] Disable qdoc (needs qtdeclarative).
-+
-+Fixes:
-+
-+  Project ERROR: Unknown module(s) in QT: qmldevtools-private
-+  Makefile:63: recipe for target 'sub-qdoc-qmake_all' failed
-+
-+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-+---
-+ src/src.pro | 1 -
-+ 1 file changed, 1 deletion(-)
-+
-+diff --git a/src/src.pro b/src/src.pro
-+index 387d54f..494898f 100644
-+--- a/src/src.pro
-++++ b/src/src.pro
-+@@ -14,7 +14,6 @@ qtHaveModule(widgets) {
-+ }
-+ 
-+ SUBDIRS += linguist \
-+-    qdoc \
-+     qtplugininfo
-+ if(!android|android_app):!ios: SUBDIRS += qtpaths
-+ 
-+-- 
-+2.1.4
-+
-diff --git a/package/qt5/qt5tools/qt5tools.hash__ b/package/qt5/qt5tools/qt5tools.hash__
-new file mode 100644
-index 0000000000..cc11b2845f
---- /dev/null
-+++ b/package/qt5/qt5tools/qt5tools.hash__
-@@ -0,0 +1,2 @@
-+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qttools-opensource-src-5.6.2.tar.xz.mirrorlist
-+sha256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 qttools-opensource-src-5.6.2.tar.xz
-diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash
-new file mode 100644
-index 0000000000..c4fc230815
---- /dev/null
-+++ b/package/qt5/qt5webchannel/qt5webchannel.hash
-@@ -0,0 +1 @@
-+sha256	3ab4cd177cc742ee5015f2b7f943c16ce13380b840f824436b5005485b749816	qtwebchannel-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5webengine/001-chromium-glibc-2.24-issue.patch b/package/qt5/qt5webengine/001-chromium-glibc-2.24-issue.patch
-new file mode 100644
-index 0000000000..f3d5bdaf7d
---- /dev/null
-+++ b/package/qt5/qt5webengine/001-chromium-glibc-2.24-issue.patch
-@@ -0,0 +1,14 @@
-+--- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp	2016-05-26 15:53:47.000000000 +0200
-++++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp	2016-11-19 00:19:49.894527354 +0100
-+@@ -39,6 +39,11 @@
-+ 
-+ #include <sys/mman.h>
-+ 
-++#if OS(LINUX) && defined(MADV_FREE)
-++// glibc 2.24 issues in qtwebengine
-++#undef MADV_FREE
-++#endif
-++
-+ #ifndef MADV_FREE
-+ #define MADV_FREE MADV_DONTNEED
-+ #endif
-diff --git a/package/qt5/qt5webengine/001-delegate_frame_node_fence_sync.patch b/package/qt5/qt5webengine/001-delegate_frame_node_fence_sync.patch
-new file mode 100644
-index 0000000000..c7bdcffe71
---- /dev/null
-+++ b/package/qt5/qt5webengine/001-delegate_frame_node_fence_sync.patch
-@@ -0,0 +1,20 @@
-+--- a/src/core/delegated_frame_node.cpp	2016-03-03 17:02:28.000000000 +0100
-++++ b/src/core/delegated_frame_node.cpp	2016-04-09 21:01:03.502390661 +0200
-+@@ -194,7 +194,7 @@
-+     case gfx::TransferableFence::NoSync:
-+         break;
-+     case gfx::TransferableFence::EglSync:
-+-#ifdef EGL_KHR_reusable_sync
-++#ifdef EGL_KHR_fence_sync
-+     {
-+         static bool resolved = false;
-+         static PFNEGLCLIENTWAITSYNCKHRPROC eglClientWaitSyncKHR = 0;
-+@@ -235,7 +235,7 @@
-+     case gfx::TransferableFence::NoSync:
-+         break;
-+     case gfx::TransferableFence::EglSync:
-+-#ifdef EGL_KHR_reusable_sync
-++#ifdef EGL_KHR_fence_sync
-+     {
-+         static bool resolved = false;
-+         static PFNEGLDESTROYSYNCKHRPROC eglDestroySyncKHR = 0;
-diff --git a/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch b/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch
-new file mode 100644
-index 0000000000..b7b6791ab7
---- /dev/null
-+++ b/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch
-@@ -0,0 +1,34 @@
-+From 5dd4bb67cfce812fd7686e43616e2069f354a7df Mon Sep 17 00:00:00 2001
-+From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-+Date: Mon, 22 Feb 2016 10:57:32 +0100
-+Subject: [PATCH] Fix linking with libpthread
-+
-+WebKit use libpthread directly but is depending on other qt modules
-+causing it to be linked against, which might break unless -lpthread
-+is last. Instead just add it explicitly after the static libraries.
-+
-+Upstream-Status: Backport from 5.7 branch
-+
-+Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33
-+Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-+Signed-off-by: Jonathan Liu <net147@gmail.com>
-+Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
-+---
-+ Tools/qmake/mkspecs/features/default_post.prf | 1 +
-+ 1 file changed, 1 insertion(+)
-+
-+diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
-+index 67276b7..39bb3f7 100644
-+--- a/Tools/qmake/mkspecs/features/default_post.prf
-++++ b/Tools/qmake/mkspecs/features/default_post.prf
-+@@ -201,6 +201,7 @@ needToLink() {
-+         linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
-+         LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
-+     }
-++    posix:!darwin: LIBS += -lpthread
-+ }
-+ 
-+ creating_module {
-+-- 
-+2.7.1
-+
-diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash
-new file mode 100644
-index 0000000000..47e93c0d1a
---- /dev/null
-+++ b/package/qt5/qt5webkit/qt5webkit.hash
-@@ -0,0 +1 @@
-+sha256	1c79843ef32313312290d4fe0b87256a9129dc44d62b01789a692981edf4d8ab	qt5webkit-d2ff5a085572b1ee24dcb42ae107063f3142d14e.tar.gz
-diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash
-new file mode 100644
-index 0000000000..067bd6ffd3
---- /dev/null
-+++ b/package/qt5/qt5websockets/qt5websockets.hash
-@@ -0,0 +1 @@
-+sha256	741be11a907f82807a786e6a53ae7316c0b3864491b692e8719c381e0f158b43	qtwebsockets-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash
-new file mode 100644
-index 0000000000..297c578b87
---- /dev/null
-+++ b/package/qt5/qt5x11extras/qt5x11extras.hash
-@@ -0,0 +1,2 @@
-+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtx11extras-opensource-src-5.6.2.tar.xz.mirrorlist
-+sha256 71ffde1cfaeec310677b69ecd16cb5992e8885cf3e73b4cec7d6e7a115b40ced qtx11extras-opensource-src-5.6.2.tar.xz
-diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
-new file mode 100644
-index 0000000000..f0f369d6ce
---- /dev/null
-+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
-@@ -0,0 +1 @@
-+sha256	38882a4ea5d711be07d10695759359045f7f9d64727a65e1d5e6515d55c7e20b	qtxmlpatterns-opensource-src-5.7.0.tar.xz

GfA-buildroot-update-add-fullhd.patch

@@ -1,17 +0,0 @@
-diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
-index cfc9797f0f..e53210dbdb 100644
---- a/UpdateRootfs.sh.in
-+++ b/UpdateRootfs.sh.in
-@@ -149,6 +149,12 @@ if [ "$XRES" == "1280" -a "$YRES" == "800" ]; then
-   DONE=1
- fi
- 
-+if [ "$XRES" == "1920" -a "$YRES" == "1080" ]; then
-+  echo "10 Inch"
-+  sh /root/DisplayTo_15inch.sh
-+  DONE=1
-+fi
-+
- if [ "$DONE" == "0" ]; then
-   echo "Unknown Display Resolution"
- fi

GfA-buildroot-update-change-excludes.patch

@@ -1,27 +0,0 @@
-diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
-index 76a75fb9b8..42b1ddc8f1 100644
---- a/UpdateRootfs.sh.in
-+++ b/UpdateRootfs.sh.in
-@@ -53,7 +53,7 @@ cp $TMP_PATH/uImage /mnt
- cp $TMP_PATH/*.dtb /mnt
- 
- #rootfs auspacken
--tar -C / --exclude=./tmp \
-+tar -C / --exclude=./opt --exclude=./tmp --exclude=./etc/inittab \
- 	--exclude=./etc/network/interfaces \
- 	--exclude=./etc/hosts --exclude=./etc/hostname \
- 	--exclude=./etc/passwd --exclude=./etc/shadow \
-@@ -170,11 +170,11 @@ fi
- 
- if [ "$XRES" == "1920" -a "$YRES" == "1080" ]; then
- if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
--  echo "10 Inch Display 2"
-+  echo "15 Inch Display 2"
-   sh /root/Display2To_15inch.sh
-   DONE=1
- else
--  echo "10 Inch"
-+  echo "15 Inch"
-   sh /root/DisplayTo_15inch.sh
-   DONE=1
- fi

GfA-buildroot_MapImage_build_path.patch

@@ -1,13 +0,0 @@
-diff --git a/MapImage.sh b/MapImage.sh
-index 4905205..8e87247 100755
---- a/MapImage.sh
-+++ b/MapImage.sh
-@@ -3,7 +3,7 @@
- SAVE_LC=$LC_ALL
- export LC_ALL=C
- 
--BUILD=`cat board/GfA/Display001/BUILD`
-+BUILD=`cat ../GfA/board/GfA/Display001/BUILD`
- IMAGEFILE=../Display001_Build_$BUILD-img
- echo ">>> $IMAGEFILE <<<"
- #-- map partitions

GfA-buildroot_SetRightDisplayResolution_OnUpdate.patch

@@ -1,45 +0,0 @@
-diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
-index d80c399..8832933 100644
---- a/UpdateRootfs.sh.in
-+++ b/UpdateRootfs.sh.in
-@@ -123,6 +123,40 @@ fi
- chown -Rv mysql:nogroup /var/mysql
- chown -Rv postgres:postgres /var/lib/pgsql
- #==============================================================================
-+# Get Graphics resolution and set dtb to the right resolution
-+
-+DONE=0
-+YRES="$(fbset | awk '/geom/ {print $3}')"
-+XRES="$(fbset | awk '/geom/ {print $2}')"
-+
-+echo "XRES $XRES, YRES $YRES"
-+
-+if [ "$XRES" == "480" -a "$YRES" == "272" ]; then
-+  echo "4.3 Inch"
-+  sh /root/DisplayTo_4_3inch.sh
-+  DONE=1
-+fi
-+
-+if [ "$XRES" == "800" -a "$YRES" == "480" ]; then
-+  echo "7 Inch"
-+  sh /root/DisplayTo_7inch.sh
-+  DONE=1
-+fi
-+
-+if [ "$XRES" == "1280" -a "$YRES" == "800" ]; then
-+  echo "10 Inch"
-+  sh /root/DisplayTo_10inch.sh
-+  DONE=1
-+fi
-+
-+if [ "$DONE" == "0" ]; then
-+  echo "Unknown Display Resolution"
-+fi
-+
-+
-+
-+
-+#=================
- echo "Update Done, pls. reboot System"
- umount /mnt
- echo "."

GfA-buildroot_SetRightDisplayResolution_OnUpdate_include_opt.patch

@@ -1,13 +0,0 @@
-diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
-index 8832933..17b0761 100644
---- a/UpdateRootfs.sh.in
-+++ b/UpdateRootfs.sh.in
-@@ -53,7 +53,7 @@ cp $TMP_PATH/uImage /mnt
- cp $TMP_PATH/*.dtb /mnt
- 
- #rootfs auspacken
--tar -C / --exclude=./opt --exclude=./tmp --exclude=./etc/inittab \
-+tar -C / --exclude=./tmp --exclude=./etc/inittab \
- 	--exclude=./etc/network/interfaces \
- 	--exclude=./etc/hosts --exclude=./etc/hostname \
- 	--exclude=./etc/passwd --exclude=./etc/shadow \

GfA-buildroot_bump_tinc_to_v_1_0_31.patch

@@ -1,21 +0,0 @@
-diff --git a/package/tinc/tinc.hash b/package/tinc/tinc.hash
-index 0cccbbf..ca0ff41 100644
---- a/package/tinc/tinc.hash
-+++ b/package/tinc/tinc.hash
-@@ -1,2 +1,2 @@
- # Locally calculated after checking pgp signature
--sha256	0b502699360f09ce2128a39cf02abca07bfc699fc02ce829b3a90cf5e1e8b344	tinc-1.0.28.tar.gz
-+sha256	d3cbc82e6e07975a2ccc0b369d07e30fc3324e71e240dca8781ce9a4f629519b	tinc-1.0.31.tar.gz
-diff --git a/package/tinc/tinc.mk b/package/tinc/tinc.mk
-index fb15c34..3cc05fa 100644
---- a/package/tinc/tinc.mk
-+++ b/package/tinc/tinc.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
- 
--TINC_VERSION = 1.0.28
-+TINC_VERSION = 1.0.31
- TINC_SITE = http://www.tinc-vpn.org/packages
- TINC_DEPENDENCIES = lzo openssl zlib
- TINC_LICENSE = GPLv2+ with OpenSSL exception

GfA-buildroot_fontconfig_mtime_always_ok.patch

@@ -1,31 +0,0 @@
-diff --git a/package/fontconfig/001-mtime-always-ok.patch b/package/fontconfig/001-mtime-always-ok.patch
-new file mode 100644
-index 0000000..671c1f1
---- /dev/null
-+++ b/package/fontconfig/001-mtime-always-ok.patch
-@@ -0,0 +1,12 @@
-+diff -Naurp a/src/fccache.c b/src/fccache.c
-+--- a/src/fccache.c	2016-08-05 07:35:05.000000000 +0200
-++++ b/src/fccache.c	2017-11-26 00:51:18.800927077 +0100
-+@@ -585,7 +585,7 @@ FcCacheTimeValid (FcConfig *config, FcCa
-+ 		FcCacheDir (cache), cache->checksum, (int) dir_stat->st_mtime);
-+ #endif
-+ 
-+-    return cache->checksum == (int) dir_stat->st_mtime && fnano;
-++    return FcTrue;
-+ }
-+ 
-+ static FcBool
-diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
-index 93f2a15..a470d1f 100644
---- a/package/fontconfig/fontconfig.mk
-+++ b/package/fontconfig/fontconfig.mk
-@@ -15,7 +15,7 @@ FONTCONFIG_LICENSE_FILES = COPYING
- 
- FONTCONFIG_CONF_OPTS = \
- 	--with-arch=$(GNU_TARGET_NAME) \
--	--with-cache-dir=/var/cache/fontconfig \
-+	--with-cache-dir=/fontconfig_cache \
- 	--disable-docs
- 
- HOST_FONTCONFIG_CONF_OPTS = \

GfA-buildroot_force_mutt_to_bind_openssl.patch

@@ -1,40 +0,0 @@
-diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
-index cd44ca1..dab73cf 100644
---- a/package/mutt/mutt.mk
-+++ b/package/mutt/mutt.mk
-@@ -9,7 +9,8 @@ MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads
- MUTT_LICENSE = GPLv2+
- MUTT_LICENSE_FILES = GPL
- MUTT_DEPENDENCIES = ncurses
--MUTT_CONF_OPTS = --disable-smtp
-+#MUTT_CONF_OPTS = --disable-smtp
-+MUTT_CONF_OPTS = --enable-smtp
- MUTT_AUTORECONF = YES
- 
- ifeq ($(BR2_PACKAGE_LIBICONV),y)
-@@ -37,16 +38,17 @@ MUTT_CONF_OPTS += --disable-pop
- endif
- 
- # SSL support is only used by imap or pop3 module
--ifneq ($(BR2_PACKAGET_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),)
--ifeq ($(BR2_PACKAGE_OPENSSL),y)
-+#ifneq ($(BR2_PACKAGET_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),)
-+#ifeq ($(BR2_PACKAGE_OPENSSL),y)
- MUTT_DEPENDENCIES += openssl
- MUTT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
--else
--MUTT_CONF_OPTS += --without-ssl
--endif
--else
--MUTT_CONF_OPTS += --without-ssl
--endif
-+MUTT_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr
-+#else
-+#MUTT_CONF_OPTS += --without-ssl
-+#endif
-+#else
-+#MUTT_CONF_OPTS += --without-ssl
-+#endif
- 
- # Avoid running tests to check for:
- #  - target system is *BSD

GfA-buildroot_include_inittab_on_update.patch

@@ -1,13 +0,0 @@
-diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
-index 17b0761..cfc9797 100644
---- a/UpdateRootfs.sh.in
-+++ b/UpdateRootfs.sh.in
-@@ -53,7 +53,7 @@ cp $TMP_PATH/uImage /mnt
- cp $TMP_PATH/*.dtb /mnt
- 
- #rootfs auspacken
--tar -C / --exclude=./tmp --exclude=./etc/inittab \
-+tar -C / --exclude=./tmp \
- 	--exclude=./etc/network/interfaces \
- 	--exclude=./etc/hosts --exclude=./etc/hostname \
- 	--exclude=./etc/passwd --exclude=./etc/shadow \

GfA-buildroot_linux_headers_for_rs485.patch

@@ -1,18 +0,0 @@
-diff --git a/package/linux-headers/linux-017-omap_serial_for_rs485.patch b/package/linux-headers/linux-017-omap_serial_for_rs485.patch
-new file mode 100644
-index 0000000..38b7ffa
---- /dev/null
-+++ b/package/linux-headers/linux-017-omap_serial_for_rs485.patch
-@@ -0,0 +1,12 @@
-+--- a/include/uapi/linux/serial.h	2016-11-08 16:38:32.000000000 +0100
-++++ b/include/uapi/linux/serial.h	2017-02-18 14:27:23.569732653 +0100
-+@@ -119,7 +119,8 @@ struct serial_rs485 {
-+ #define SER_RS485_RX_DURING_TX		(1 << 4)
-+ 	__u32	delay_rts_before_send;	/* Delay before send (milliseconds) */
-+ 	__u32	delay_rts_after_send;	/* Delay after send (milliseconds) */
-+-	__u32	padding[5];		/* Memory is cheap, new structs
-++	__u32   udelay_before_enable_tx;/* Delay before switching to tx direction */
-++	__u32	padding[4];		/* Memory is cheap, new structs
-+ 					   are a royal PITA .. */
-+ };
-+ 

GfA-buildroot_make_image_update.patch

@@ -1,84 +0,0 @@
-diff --git a/MakeIMAGE.sh b/MakeIMAGE.sh
-index 1f919e2..4935386 100755
---- a/MakeIMAGE.sh
-+++ b/MakeIMAGE.sh
-@@ -6,6 +6,8 @@ export LC_ALL=C
- BUILD=`cat ../GfA/board/GfA/Display001/BUILD`
- IMAGEFILE=../Display001_Build_$BUILD-img
- 
-+ROOTFSMNT=/tmp/XXXRootFs
-+
- echo "Image: $IMAGEFILE"
- #-- build imagefile
- dd if=/dev/zero ibs=1M count=1 > $IMAGEFILE
-@@ -63,7 +65,6 @@ cp ./output/images/*.dtb /tmp/boot
- cp ./output/images/uImage /tmp/boot
- cp ./output/images/MLO /tmp/boot
- cp ./output/images/u-boot.img /tmp/boot   
--#cp ./output/images/rootfs.tar.gz /tmp/boot
-                                         
- ls -alh /tmp/boot
- 
-@@ -72,8 +73,22 @@ mkfs.ext3 -L "rootfs" ${DRIVE2}
- mount ${DRIVE2} /tmp/rootfs
- 
- du -h ${DRIVE2}
--sleep 10
--tar -C /tmp/rootfs  --checkpoint --checkpoint-action=dot -xzf ./output/images/rootfs.tar.gz
-+sleep 5
-+
-+umount ${ROOTFSMNT}
-+rm -rf ${ROOTFSMNT}
-+mkdir -p ${ROOTFSMNT}
-+echo "Mount ====>> " ${ROOTFSMNT}
-+mount -o loop ./output/images/rootfs.ext2 ${ROOTFSMNT}
-+
-+WRKDIR=`pwd`
-+cd  ${ROOTFSMNT}
-+tar cf - . | (cd /tmp/rootfs && tar xBf -)
-+
-+cd ${WRKDIR}
-+umount ${ROOTFSMNT}
-+#tar -C /tmp/rootfs  --checkpoint --checkpoint-action=dot -xzf ./output/images/rootfs.tar.gz
-+
- echo ""
- 
- sync
-@@ -88,4 +103,4 @@ rm $IMAGEFILE.zip
- zip -j $IMAGEFILE.zip $IMAGEFILE
- 
- export LC_ALL=$SAVE_LC
--                                                                                                                
-\ No newline at end of file
-+                                                                                                                
-diff --git a/MakeRootfsUpdate.sh b/MakeRootfsUpdate.sh
-index df6e200..99b77c9 100755
---- a/MakeRootfsUpdate.sh
-+++ b/MakeRootfsUpdate.sh
-@@ -5,6 +5,14 @@ UPDATE_BINARY=$WRKDIR/dest/UpdateRootfs.tar.Z
- UPDATE_FILENAME="../UpdateDisplay001_$BUILD.sh"
- UPDATE_IN_SCRIPT="UpdateRootfs.sh.in"
- 
-+ROOTFSMNT=/tmp/XXXRootFs
-+
-+sudo umount $ROOTFSMNT
-+sudo rm -rf $ROOTFSMNT
-+sudo mkdir -p $ROOTFSMNT
-+
-+sudo mount -o loop ./output/images/rootfs.ext2 $ROOTFSMNT
-+
- rm -rf $WRKDIR
- mkdir -p $WRKDIR/dest
- 
-@@ -12,7 +20,10 @@ cp ./output/images/*.dtb $WRKDIR
- cp ./output/images/uImage $WRKDIR
- cp ./output/images/MLO $WRKDIR
- cp ./output/images/u-boot.img $WRKDIR
--cp ./output/images/rootfs.tar.gz $WRKDIR
-+
-+sudo tar -C $ROOTFSMNT -czvf $WRKDIR/rootfs.tar.gz ./
-+sudo umount $ROOTFSMNT
-+#cp ./output/images/rootfs.tar.gz $WRKDIR
- 
- tar -C $WRKDIR --exclude=./dest -czvf $WRKDIR/dest/UpdateRootfs.tar.Z ./
- 

GfA-buildroot_mysql_posgres_update_fixes.patch

@@ -1,48 +0,0 @@
-diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
-index e5fe800..b2ede0c 100644
---- a/UpdateRootfs.sh.in
-+++ b/UpdateRootfs.sh.in
-@@ -71,6 +71,43 @@ fi
- #echo ".."
- #echo "Update Firmware Done"
- #/root/gfa_spi -v
-+#================================
-+#--create mountable run folder insted of link
-+RUNDIR=/run
-+if [ -L $RUNDIR ]; then
-+  mv $RUNDIR $RUNDIR'_WRK'
-+  mkdir $RUNDIR
-+  mount -t tmpfs tmpfs $RUNDIR
-+  WRKDIR=`pwd`
-+  cd $RUNDIR'_WRK'
-+  cp -a ./* $RUNDIR
-+  cd $WRKDIR
-+  rm $RUNDIR'_WRK' 
-+fi
-+#--- craete missing nogroup group
-+GID_NOGROUP=`awk -F\: '/nogroup/ {print $3}' /etc/group`
-+if [ -z "$GID_NOGROUP" ]; then
-+  addgroup -S -g 65534 nogroup
-+fi
-+#--create missing users for mysql,
-+if [ -z `awk -F\: '/mysql/ {print $3}' /etc/passwd` ]; then
-+  UID_MY=`awk -F: '{uid[$3]=1}END{for(x=1000; x<=1500; x++) {if(uid[x] != ""){}else{print x; exit;}}}' /etc/passwd`
-+  echo "mysql:x:$UID_MY:65534:MySQL daemon:/var/mysql:/bin/false" >> /etc/passwd
-+fi
-+#--create missing users for postgresql,
-+if [ -z `awk -F\: '/postgres/ {print $3}' /etc/passwd` ]; then
-+  UID_PG=`awk -F: '{uid[$3]=1}END{for(x=1000; x<=1500; x++) {if(uid[x] != ""){}else{print x; exit;}}}' /etc/passwd`
-+  GID_PG=`awk -F\: '/postgres/ {print $3}' /etc/group`
-+  if [ -z "$GID_PG" ]; then
-+    GID_PG=`awk -F: '{uid[$3]=1}END{for(x=1000; x<=1500; x++) {if(uid[x] != ""){}else{print x; exit;}}}' /etc/group`
-+    echo "postgres:x:$GID_PG:" >> /etc/group
-+    fi
-+  echo "postgres:x:$UID_PG:$GID_PG:PostgreSQL Server:/var/lib/pgsql:/bin/sh" >> /etc/passwd
-+fi
-+#------------------
-+chown -Rv mysql:nogroup /var/mysql
-+chown -Rv postgres:postgres /var/lib/pgsql
-+#==============================================================================
- echo "Update Done, pls. reboot System"
- umount /mnt
- echo "."

GfA-buildroot_qt-latest_qt-LTS-5.6.2.patch

@@ -1,2902 +0,0 @@
-commit b42c9b76dcc623d263737b6e8010a0d5f6ec1540
-Author: Reinhard Russinger <reinhard@russinger.at>
-Date:   Tue May 23 09:45:40 2017 +0200
-
-    qt latest and qt lts 5.6.2 enable
-
-diff --git a/MakeIMAGE.sh b/MakeIMAGE.sh
-index c64a09d36..1f919e25a 100755
---- a/MakeIMAGE.sh
-+++ b/MakeIMAGE.sh
-@@ -63,7 +63,7 @@ cp ./output/images/*.dtb /tmp/boot
- cp ./output/images/uImage /tmp/boot
- cp ./output/images/MLO /tmp/boot
- cp ./output/images/u-boot.img /tmp/boot   
--cp ./output/images/rootfs.tar.gz /tmp/boot
-+#cp ./output/images/rootfs.tar.gz /tmp/boot
-                                         
- ls -alh /tmp/boot
- 
-diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
-index 47f556623..d80c3999d 100644
---- a/UpdateRootfs.sh.in
-+++ b/UpdateRootfs.sh.in
-@@ -73,6 +73,12 @@ then
- 	cp /etc/init.d/S98usb_g_ether /etc/init.d/M98usb_g_ether
- 	rm /etc/init.d/S98usb_g_ether
- fi
-+
-+
-+if [ -e /etc/init.d/S80ti-sgx ]
-+then
-+	rm /etc/init.d/S80ti-sgx
-+fi
-         
- #echo "Update Firmware"
- #echo "."
-diff --git a/package/qt5/Config.in b/package/qt5/Config.in
-index fb57d2574..aeec18814 100644
---- a/package/qt5/Config.in
-+++ b/package/qt5/Config.in
-@@ -1,15 +1,15 @@
- config BR2_PACKAGE_QT5_GL_AVAILABLE
- 	bool
--	depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES
- 	default y
-+	depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES
- 
- config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	bool
-+	default y
- 	# Javascript engine is only available on certain architectures
- 	depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
- 	# ARM needs BLX, so v5t+
- 	depends on !BR2_ARM_CPU_ARMV4
--	default y
- 
- comment "Qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library"
- 	depends on !BR2_PACKAGE_QT
-@@ -30,8 +30,36 @@ menuconfig BR2_PACKAGE_QT5
- 	  http://qt.io
- 
- if BR2_PACKAGE_QT5
--source "package/qt5/qt5base/Config.in"
-+
-+choice
-+	prompt "Qt5 version"
-+
-+config BR2_PACKAGE_QT5_VERSION_LATEST
-+	bool "Latest (5.8)"
-+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
-+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11
-+	depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+
-+	# no built-in double-conversion support
-+	depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa
-+	help
-+	  This option builds Qt 5.8, which is licensed under
-+	  (L)GPL-3.0+.
-+
-+comment "Latest Qt version needs host/toolchain w/ gcc >= 4.8"
-+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_HOST_GCC_AT_LEAST_4_8
-+	depends on !BR2_ARM_CPU_ARMV4
-+	depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa
-+
-+config BR2_PACKAGE_QT5_VERSION_5_6
-+	bool "LTS (5.6)"
-+	help
-+	  This option builds Qt 5.6, which is licensed under
-+	  (L)GPL-2.0+.
-+
-+endchoice
-+
- source "package/qt5/qt53d/Config.in"
-+source "package/qt5/qt5base/Config.in"
- source "package/qt5/qt5canvas3d/Config.in"
- source "package/qt5/qt5connectivity/Config.in"
- source "package/qt5/qt5declarative/Config.in"
-@@ -41,22 +69,20 @@ source "package/qt5/qt5imageformats/Config.in"
- source "package/qt5/qt5location/Config.in"
- source "package/qt5/qt5multimedia/Config.in"
- source "package/qt5/qt5quickcontrols/Config.in"
-+source "package/qt5/qt5quickcontrols2/Config.in"
-+source "package/qt5/qt5script/Config.in"
- source "package/qt5/qt5sensors/Config.in"
-+source "package/qt5/qt5charts/Config.in"
-+source "package/qt5/qt5virtualkeyboard/Config.in"
-+source "package/qt5/qt5wayland/Config.in"
- source "package/qt5/qt5serialbus/Config.in"
- source "package/qt5/qt5serialport/Config.in"
--source "package/qt5/qt5wayland/Config.in"
- source "package/qt5/qt5svg/Config.in"
- source "package/qt5/qt5tools/Config.in"
- source "package/qt5/qt5webchannel/Config.in"
-+source "package/qt5/qt5webkit/Config.in"
-+source "package/qt5/qt5webengine/Config.in"
- source "package/qt5/qt5websockets/Config.in"
- source "package/qt5/qt5x11extras/Config.in"
--source "package/qt5/qt5webengine/Config.in"
- source "package/qt5/qt5xmlpatterns/Config.in"
--source "package/qt5/qt5virtualkeyboard/Config.in"
--source "package/qt5/qt5charts/Config.in"
--source "package/qt5/qt5datavis3d/Config.in"
--source "package/qt5/qt5quickcontrols2/Config.in"
--comment "legacy compatibility"
--source "package/qt5/qt5script/Config.in"
--source "package/qt5/qt5webkit/Config.in"
- endif
-diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
-index 0710ef432..5c7af3926 100644
---- a/package/qt5/qt5.mk
-+++ b/package/qt5/qt5.mk
-@@ -1,8 +1,21 @@
--QT5_VERSION_MAJOR = 5.7
-+################################################################################
-+#
-+# qt5
-+#
-+################################################################################
-+
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5_VERSION_MAJOR = 5.8
- QT5_VERSION = $(QT5_VERSION_MAJOR).0
- QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
--##QT5_VERSION = $(QT5_VERSION_MAJOR).1
--##QT5_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules
-+QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules
-+else
-+QT5_VERSION_MAJOR = 5.6
-+QT5_VERSION = $(QT5_VERSION_MAJOR).2
-+QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
-+QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules
-+endif
-+
- include $(sort $(wildcard package/qt5/*/*.mk))
- 
- define QT5_LA_PRL_FILES_FIXUP
-diff --git a/package/qt5/qt53d/Config.in b/package/qt5/qt53d/Config.in
-index ff50204fc..f776da2c8 100644
---- a/package/qt5/qt53d/Config.in
-+++ b/package/qt5/qt53d/Config.in
-@@ -1,17 +1,21 @@
- config BR2_PACKAGE_QT53D
- 	bool "qt53d"
-+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
-+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative_quick
- 	select BR2_PACKAGE_QT5BASE
- 	select BR2_PACKAGE_QT5BASE_GUI
- 	select BR2_PACKAGE_QT5DECLARATIVE
- 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
--	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
--	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative_quick
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
- 	  This package corresponds to the qt53d module.
- 
-+
-+	  This module was in tech preview in Qt 5.6, and promoted
-+	  to a core module in Qt 5.7.0.
-+
- 	  Enable the assimp package to gain the assimp sceneparser plugin.
- 
- 	  http://doc.qt.io/qt-5/qt3d-index.html
-diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash
-deleted file mode 100644
-index f59a67143..000000000
---- a/package/qt5/qt53d/qt53d.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	a8248a1779b561ea450e92345e8187bacac359df0e92ad61a1ad7652bb233e29	qt3d-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk
-index 5dac5b0b6..d66923677 100644
---- a/package/qt5/qt53d/qt53d.mk
-+++ b/package/qt5/qt53d/qt53d.mk
-@@ -14,13 +14,8 @@ ifeq ($(BR2_PACKAGE_ASSIMP),y)
- QT53D_DEPENDENCIES += assimp
- endif
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT53D_LICENSE = GPLv2 or GPLv3 or LGPLv3
-+QT53D_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0
- QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.GPLv3 LICENSE.LGPLv3
--else
--QT53D_LICENSE = Commercial license
--QT53D_REDISTRIBUTE = NO
--endif
- 
- define QT53D_CONFIGURE_CMDS
- 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-diff --git a/package/qt5/qt5base/0001-Disable-c-standard-compiler-flags-for-the-host-build.__patch b/package/qt5/qt5base/0001-Disable-c-standard-compiler-flags-for-the-host-build.__patch
-deleted file mode 100644
-index 54e4db8e6..000000000
---- a/package/qt5/qt5base/0001-Disable-c-standard-compiler-flags-for-the-host-build.__patch
-+++ /dev/null
-@@ -1,44 +0,0 @@
--From e69e69519661954716d59bfa5bbd0626515cfda9 Mon Sep 17 00:00:00 2001
--From: Peter Seiderer <ps.report@gmx.net>
--Date: Thu, 3 Mar 2016 15:17:31 +0100
--Subject: [PATCH] Disable c++ standard compiler flags for the host build
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--There is no test for c++ standard support for the host build
--(only for the target compiler/build) which leads to trouble
--in some cross compiling environments (old host compiler, new
--cross compiler):
--
--  g++: error: unrecognized command line option ‘-std=c++1z’
--
--So disable c++ standard compiler flags unconditionally for host builds.
--
--Task-number: QTBUG-51644
--Change-Id: Ifb3042e125fe199a7e081740d1171d26ccacf0c5
--Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
--Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
-----
-- mkspecs/features/default_post.prf | 5 ++++-
-- 1 file changed, 4 insertions(+), 1 deletion(-)
--
--diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
--index cd8d885..561c8f4 100644
----- a/mkspecs/features/default_post.prf
--+++ b/mkspecs/features/default_post.prf
--@@ -95,7 +95,10 @@ breakpad {
--     !isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote($$QMAKE_STRIP $$DEBUGFILENAME)
-- }
-- 
---c++11|c++14|c++1z {
--+# Disable special compiler flags for host builds (needs to be changed for 5.7
--+# to fall back to c++11 because since 5.7 c++11 is required everywhere,
--+# including host builds).
--+if(!host_build|!cross_compile):if(c++11|c++14|c++1z) {
--     c++1z:       cxxstd = CXX1Z
--     else: c++14: cxxstd = CXX14
--     else:        cxxstd = CXX11
---- 
--2.1.4
--
-diff --git a/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch b/package/qt5/qt5base/5.6.2/0001-eglfs-rasp-pi-header-inclusion.patch
-similarity index 100%
-rename from package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
-rename to package/qt5/qt5base/5.6.2/0001-eglfs-rasp-pi-header-inclusion.patch
-diff --git a/package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch b/package/qt5/qt5base/5.6.2/0002-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch
-similarity index 100%
-rename from package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch
-rename to package/qt5/qt5base/5.6.2/0002-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch
-diff --git a/package/qt5/qt5base/5.8.0/0001-fix-parallel-builds-with-qt-freetype-system-libpng.patch b/package/qt5/qt5base/5.8.0/0001-fix-parallel-builds-with-qt-freetype-system-libpng.patch
-new file mode 100644
-index 000000000..8548ef0e2
---- /dev/null
-+++ b/package/qt5/qt5base/5.8.0/0001-fix-parallel-builds-with-qt-freetype-system-libpng.patch
-@@ -0,0 +1,34 @@
-+From 74af93f5298b54bc2327843f390bf202776f2f48 Mon Sep 17 00:00:00 2001
-+From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-+Date: Tue, 10 Jan 2017 14:18:02 +0100
-+Subject: [PATCH] fix parallel builds with -qt-freetype -system-libpng
-+
-+freetype has no dependency on gui, so it needs to pull in gui's
-+configuration manually, as that's where the system libpng is found.
-+
-+Task-number: QTBUG-58038
-+Change-Id: I881495f7d2a8f7c1a45d7d4c9e7698ff1d30f2a9
-+Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-+Reviewed-by: Joni Poikelin <joni.poikelin@qt.io>
-+
-+Upstream: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4dcfd90e4fd7d4c49138038dbbcbda8794a9fbff
-+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-+---
-+ src/3rdparty/freetype/freetype.pro | 1 +
-+ 1 file changed, 1 insertion(+)
-+
-+diff --git a/src/3rdparty/freetype/freetype.pro b/src/3rdparty/freetype/freetype.pro
-+index 5b1eb92e..390a6da7 100644
-+--- a/src/3rdparty/freetype/freetype.pro
-++++ b/src/3rdparty/freetype/freetype.pro
-+@@ -69,6 +69,7 @@ DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB
-+ include(../zlib_dependency.pri)
-+ 
-+ DEFINES += FT_CONFIG_OPTION_USE_PNG
-++include($$OUT_PWD/../../gui/qtgui-config.pri)
-+ QMAKE_USE_PRIVATE += libpng
-+ 
-+ DEFINES += TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+-- 
-+2.11.0
-+
-diff --git a/package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch b/package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch
-new file mode 100644
-index 000000000..e7d7ee360
---- /dev/null
-+++ b/package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch
-@@ -0,0 +1,97 @@
-+From 35ee8b53549fab6ebffe289417e1d94298447af7 Mon Sep 17 00:00:00 2001
-+From: Shawn Rutledge <shawn.rutledge@digia.com>
-+Date: Fri, 10 Feb 2017 13:56:58 +0100
-+Subject: [PATCH] fix VNC platform plugin build on big-endian machines
-+
-+Task-number: QTBUG-58734
-+Change-Id: I3e44ee4be5003acaba2f1b8ed2658a3ff1bd700e
-+Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-+Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
-+
-+Upstream: http://code.qt.io/cgit/qt/qtbase.git/patch/?id=6f64bfa654fb7e20bb75ec3b0544b81482babb44
-+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-+---
-+ src/plugins/platforms/vnc/qvncclient.cpp | 6 +++---
-+ src/plugins/platforms/vnc/qvncscreen.cpp | 7 ++++++-
-+ src/plugins/platforms/vnc/qvncscreen.h   | 2 +-
-+ 3 files changed, 10 insertions(+), 5 deletions(-)
-+
-+diff --git a/src/plugins/platforms/vnc/qvncclient.cpp b/src/plugins/platforms/vnc/qvncclient.cpp
-+index dae3e83f..58dcfc9b 100644
-+--- a/src/plugins/platforms/vnc/qvncclient.cpp
-++++ b/src/plugins/platforms/vnc/qvncclient.cpp
-+@@ -142,7 +142,7 @@ void QVncClient::convertPixels(char *dst, const char *src, int count) const
-+         case 16: {
-+             quint16 p = *reinterpret_cast<const quint16*>(src);
-+ #if Q_BYTE_ORDER == Q_BIG_ENDIAN
-+-            if (swapBytes)
-++            if (m_swapBytes)
-+                 p = ((p & 0xff) << 8) | ((p & 0xff00) >> 8);
-+ #endif
-+             r = (p >> 11) & 0x1f;
-+@@ -484,7 +484,7 @@ void QVncClient::setPixelFormat()
-+         m_sameEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian) == !!m_pixelFormat.bigEndian;
-+         m_needConversion = pixelConversionNeeded();
-+ #if Q_BYTE_ORDER == Q_BIG_ENDIAN
-+-        m_swapBytes = qvnc_screen->swapBytes();
-++        m_swapBytes = server()->screen()->swapBytes();
-+ #endif
-+     }
-+ }
-+@@ -639,7 +639,7 @@ bool QVncClient::pixelConversionNeeded() const
-+         return true;
-+ 
-+ #if Q_BYTE_ORDER == Q_BIG_ENDIAN
-+-    if (qvnc_screen->swapBytes())
-++    if (server()->screen()->swapBytes())
-+         return true;
-+ #endif
-+ 
-+diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp
-+index 34def457..64f1bc0b 100644
-+--- a/src/plugins/platforms/vnc/qvncscreen.cpp
-++++ b/src/plugins/platforms/vnc/qvncscreen.cpp
-+@@ -43,6 +43,7 @@
-+ #include <QtFbSupport/private/qfbcursor_p.h>
-+ 
-+ #include <QtGui/QPainter>
-++#include <QtGui/QScreen>
-+ #include <QtCore/QRegularExpression>
-+ 
-+ 
-+@@ -172,14 +173,18 @@ QPixmap QVncScreen::grabWindow(WId wid, int x, int y, int width, int height) con
-+ }
-+ 
-+ #if Q_BYTE_ORDER == Q_BIG_ENDIAN
-+-bool QVNCScreen::swapBytes() const
-++bool QVncScreen::swapBytes() const
-+ {
-++    return false;
-++
-++    /* TODO
-+     if (depth() != 16)
-+         return false;
-+ 
-+     if (screen())
-+         return screen()->frameBufferLittleEndian();
-+     return frameBufferLittleEndian();
-++    */
-+ }
-+ #endif
-+ 
-+diff --git a/src/plugins/platforms/vnc/qvncscreen.h b/src/plugins/platforms/vnc/qvncscreen.h
-+index 785abd6d..0b42c3c7 100644
-+--- a/src/plugins/platforms/vnc/qvncscreen.h
-++++ b/src/plugins/platforms/vnc/qvncscreen.h
-+@@ -73,7 +73,7 @@ public:
-+     void clearDirty() { dirtyRegion = QRegion(); }
-+ 
-+ #if Q_BYTE_ORDER == Q_BIG_ENDIAN
-+-    bool swapBytes() const
-++    bool swapBytes() const;
-+ #endif
-+ 
-+     QStringList mArgs;
-+-- 
-+2.11.0
-+
-diff --git a/package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch b/package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch
-new file mode 100644
-index 000000000..3a43584ee
---- /dev/null
-+++ b/package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch
-@@ -0,0 +1,65 @@
-+From c5d7425f8ad391112758db161e3e08f18dc9d299 Mon Sep 17 00:00:00 2001
-+From: Marc Mutz <marc.mutz@kdab.com>
-+Date: Thu, 26 May 2016 08:30:26 +0200
-+Subject: [PATCH] QAtomic: pass explicit failure mode to
-+ std::atomic::compare_exchange_strong
-+
-+... in an attempt to avoid GCC 4.8 errors such as
-+
-+  bits/atomic_base.h:577:70: error: failure memory model cannot be stronger than success memory model for '__atomic_compare_exchange'
-+  return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 0, __m1, __m2);
-+                                                                      ^
-+
-+as seen on Android.
-+
-+Change-Id: If046e735888cf331d2d6506d8d5ca9aa7402f9ad
-+[Bug report: https://bugreports.qt.io/browse/QTBUG-59399
-+ Patch sent upstream: https://codereview.qt-project.org/#/c/187980/]
-+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.org>
-+---
-+ src/corelib/arch/qatomic_cxx11.h |    8 ++++----
-+ 1 file changed, 4 insertions(+), 4 deletions(-)
-+
-+diff --git a/src/corelib/arch/qatomic_cxx11.h b/src/corelib/arch/qatomic_cxx11.h
-+index bb49aae..d6731ec 100644
-+--- a/src/corelib/arch/qatomic_cxx11.h
-++++ b/src/corelib/arch/qatomic_cxx11.h
-+@@ -153,7 +153,7 @@ template <typename X> struct QAtomicOps
-+     template <typename T>
-+     static bool testAndSetRelaxed(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW
-+     {
-+-        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_relaxed);
-++        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_relaxed, std::memory_order_relaxed);
-+         if (currentValue)
-+             *currentValue = expectedValue;
-+         return tmp;
-+@@ -162,7 +162,7 @@ template <typename X> struct QAtomicOps
-+     template <typename T>
-+     static bool testAndSetAcquire(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW
-+     {
-+-        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acquire);
-++        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acquire, std::memory_order_acquire);
-+         if (currentValue)
-+             *currentValue = expectedValue;
-+         return tmp;
-+@@ -171,7 +171,7 @@ template <typename X> struct QAtomicOps
-+     template <typename T>
-+     static bool testAndSetRelease(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW
-+     {
-+-        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_release);
-++        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_release, std::memory_order_relaxed);
-+         if (currentValue)
-+             *currentValue = expectedValue;
-+         return tmp;
-+@@ -180,7 +180,7 @@ template <typename X> struct QAtomicOps
-+     template <typename T>
-+     static bool testAndSetOrdered(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW
-+     {
-+-        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acq_rel);
-++        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acq_rel, std::memory_order_acquire);
-+         if (currentValue)
-+             *currentValue = expectedValue;
-+         return tmp;
-+-- 
-+1.7.10.4
-+
-diff --git a/package/qt5/qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch b/package/qt5/qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch
-new file mode 100644
-index 000000000..0e8bcffa2
---- /dev/null
-+++ b/package/qt5/qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch
-@@ -0,0 +1,36 @@
-+From 8902f4d7b7c532592d1a34ad117698d3e380e9e1 Mon Sep 17 00:00:00 2001
-+From: Peter Seiderer <ps.report@gmx.net>
-+Date: Fri, 10 Mar 2017 22:23:06 +0100
-+Subject: [PATCH] eglfs: fix x11 header related compile failure
-+
-+Add egl config and QT_EGL_NO_X11 define (as all other eglfs project
-+files do).
-+
-+Task-number: QTBUG-59427
-+Change-Id: Ifbb11eae0fdf0e58c0b7feecb9a7914a889c8f77
-+
-+Upstream: https://codereview.qt-project.org/188158
-+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-+---
-+ src/plugins/platforms/eglfs/eglfs-plugin.pro | 5 +++++
-+ 1 file changed, 5 insertions(+)
-+
-+diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro
-+index cf4863975a..ec229796e5 100644
-+--- a/src/plugins/platforms/eglfs/eglfs-plugin.pro
-++++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro
-+@@ -2,6 +2,11 @@ TARGET = qeglfs
-+ 
-+ QT += eglfsdeviceintegration-private
-+ 
-++CONFIG += egl
-++
-++# Avoid X11 header collision, use generic EGL native types
-++DEFINES += QT_EGL_NO_X11
-++
-+ SOURCES += $$PWD/qeglfsmain.cpp
-+ 
-+ OTHER_FILES += $$PWD/eglfs.json
-+-- 
-+2.11.0
-+
-diff --git a/package/qt5/qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch b/package/qt5/qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch
-new file mode 100644
-index 000000000..148ced800
---- /dev/null
-+++ b/package/qt5/qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch
-@@ -0,0 +1,42 @@
-+From fe8a9bacf781fcf290e04a08f2b8e37d881d58bb Mon Sep 17 00:00:00 2001
-+From: Peter Seiderer <ps.report@gmx.net>
-+Date: Thu, 27 Apr 2017 22:41:28 +0200
-+Subject: [PATCH] examples: fix compile without gui module
-+
-+Fixes:
-+
-+  Project ERROR: Could not find feature opengl.
-+
-+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-+---
-+ examples/gui/gui.pro         | 2 +-
-+ examples/widgets/widgets.pro | 2 +-
-+ 2 files changed, 2 insertions(+), 2 deletions(-)
-+
-+diff --git a/examples/gui/gui.pro b/examples/gui/gui.pro
-+index a4d960d3f5..b8080c2075 100644
-+--- a/examples/gui/gui.pro
-++++ b/examples/gui/gui.pro
-+@@ -6,5 +6,5 @@ CONFIG += no_docs_target
-+ 
-+ SUBDIRS += analogclock
-+ SUBDIRS += rasterwindow
-+-qtConfig(opengl): \
-++qtHaveModule(gui):qtConfig(opengl): \
-+     SUBDIRS += openglwindow
-+diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro
-+index 513ddc91f2..cef4936d32 100644
-+--- a/examples/widgets/widgets.pro
-++++ b/examples/widgets/widgets.pro
-+@@ -22,7 +22,7 @@ SUBDIRS       = \
-+                 tutorials \
-+                 widgets
-+ 
-+-qtConfig(opengl): \
-++qtHaveModule(gui):qtConfig(opengl): \
-+     SUBDIRS += windowcontainer
-+ 
-+ contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
-+-- 
-+2.11.0
-+
-diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
-index 64a7f6538..5d1ff1339 100644
---- a/package/qt5/qt5base/Config.in
-+++ b/package/qt5/qt5base/Config.in
-@@ -16,17 +16,16 @@ config BR2_PACKAGE_QT5BASE
- 
- if BR2_PACKAGE_QT5BASE
- 
--config BR2_PACKAGE_QT5BASE_LICENSE_APPROVED
--	bool "Approve free license"
-+config BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS
-+	string "Custom configuration options"
- 	help
--	  Select this if you approve one of the available free licenses for the
--	  Qt5 library.
--	  By doing this you will not be asked while the library is compiled.
--	  Please read and understand the license terms before approving this.
-+	  Define custom qt5 configuration options which can be used to
-+	  enable or disable options not managed by buildroot. These
-+	  options are appended to the ones generated by buildroot and
-+	  passed to qt5base during configuration.
- 
--	  LGPL: http://doc.qt.io/qt-5/lgpl.html
--
--	  See also http://doc.qt.io/qt-5/licensing.html
-+	  E.g. to remove the Windows Vista style option, add the option
-+	  -no-feature-style_windowsvista.
- 
- config BR2_PACKAGE_QT5BASE_CONFIG_FILE
- 	string "Config file"
-@@ -62,19 +61,19 @@ config BR2_PACKAGE_QT5BASE_SQL
- if BR2_PACKAGE_QT5BASE_SQL
- config BR2_PACKAGE_QT5BASE_MYSQL
- 	bool "MySQL Plugin"
-+	depends on BR2_USE_MMU # mysql
- 	select BR2_PACKAGE_MYSQL
- 	select BR2_PACKAGE_NCURSES
- 	select BR2_PACKAGE_READLINE
--	depends on BR2_USE_MMU # mysql
- 	help
- 	  Build MySQL plugin
- 	  If unsure, say n.
- 
- config BR2_PACKAGE_QT5BASE_PSQL
- 	bool "PostgreSQL Plugin"
--	select BR2_PACKAGE_POSTGRESQL
- 	depends on BR2_USE_MMU # postgresql
- 	depends on !BR2_STATIC_LIBS
-+	select BR2_PACKAGE_POSTGRESQL
- 	help
- 	  Build PostgreSQL plugin
- 	  If unsure, say n.
-@@ -117,6 +116,7 @@ config BR2_PACKAGE_QT5BASE_XML
- 
- config BR2_PACKAGE_QT5BASE_GUI
- 	bool "gui module"
-+	select BR2_PACKAGE_FREETYPE
- 	# At least one graphic backend must be enabled, so enable
- 	# linuxfb if nothing is enabled.
- 	select BR2_PACKAGE_QT5BASE_LINUXFB if \
-@@ -180,7 +180,7 @@ config BR2_PACKAGE_QT5BASE_DIRECTFB
- 	bool "directfb support"
- 	depends on BR2_PACKAGE_DIRECTFB
- 
--comment "directfb backend if directb is enabled"
-+comment "directfb backend available if directfb is enabled"
- 	depends on !BR2_PACKAGE_DIRECTFB
- 
- config BR2_PACKAGE_QT5BASE_XCB
-@@ -198,9 +198,9 @@ comment "X.org XCB backend available if X.org is enabled"
- 
- config BR2_PACKAGE_QT5BASE_EGLFS
- 	bool "eglfs support"
--	select BR2_PACKAGE_QT5BASE_OPENGL
- 	depends on BR2_PACKAGE_HAS_LIBEGL
- 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
-+	select BR2_PACKAGE_QT5BASE_OPENGL
- 
- comment "eglfs backend available if OpenGL and EGL are enabled"
- 	depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_QT5_GL_AVAILABLE
-@@ -250,16 +250,16 @@ endif
- 
- config BR2_PACKAGE_QT5BASE_DBUS
- 	bool "DBus module"
--	select BR2_PACKAGE_DBUS
- 	depends on BR2_TOOLCHAIN_HAS_THREADS
- 	depends on BR2_USE_MMU
-+	select BR2_PACKAGE_DBUS
- 	help
- 	  This option enables the D-Bus module.
- 
- config BR2_PACKAGE_QT5BASE_ICU
- 	bool "Enable ICU support"
--	select BR2_PACKAGE_ICU
- 	depends on !BR2_BINFMT_FLAT # icu
-+	select BR2_PACKAGE_ICU
- 	help
- 	  This option enables ICU support in Qt5. This is for example
- 	  needed for Qt5Webkit.
-diff --git a/package/qt5/qt5base/qmake.conf b/package/qt5/qt5base/qmake.conf
-index 2152d3c7a..49cf89831 100644
---- a/package/qt5/qt5base/qmake.conf
-+++ b/package/qt5/qt5base/qmake.conf
-@@ -19,6 +19,7 @@ QMAKE_CXXFLAGS_RELEASE += -O3
- CONFIG                 += nostrip
- 
- QMAKE_LIBS             += -lrt -lpthread -ldl
-+QMAKE_CFLAGS_ISYSTEM   =
- 
- include(../common/linux_device_post.conf)
- load(qt_config)
-diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash
-deleted file mode 100644
-index 6795b6030..000000000
---- a/package/qt5/qt5base/qt5base.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	3e7b6d123cab23a587ccbc45173296b33786faa409dba0494e4658fda3ede646	qtbase-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
-index 81666d699..0c088350e 100644
---- a/package/qt5/qt5base/qt5base.mk
-+++ b/package/qt5/qt5base/qt5base.mk
-@@ -20,31 +20,44 @@ QT5BASE_INSTALL_STAGING = YES
- #    want to use the one packaged in Buildroot
- QT5BASE_CONFIGURE_OPTS += \
- 	-optimized-qmake \
--	-no-kms \
- 	-no-cups \
--	-no-nis \
- 	-no-iconv \
- 	-system-zlib \
- 	-system-pcre \
--	-system-harfbuzz \
- 	-no-pch \
- 	-shared
- 
-+QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
-+
-+# Uses libgbm from mesa3d
-+ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
-+QT5BASE_CONFIGURE_OPTS += -kms -gbm
-+QT5BASE_DEPENDENCIES += mesa3d
-+else
-+QT5BASE_CONFIGURE_OPTS += -no-kms
-+endif
-+
- ifeq ($(BR2_ENABLE_DEBUG),y)
- QT5BASE_CONFIGURE_OPTS += -debug
- else
- QT5BASE_CONFIGURE_OPTS += -release
- endif
- 
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
- QT5BASE_CONFIGURE_OPTS += -largefile
-+endif
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
- QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
--QT5BASE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
--QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
-+QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
- else
--QT5BASE_LICENSE = Commercial license
--QT5BASE_REDISTRIBUTE = NO
-+QT5BASE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+endif
-+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-+QT5BASE_LICENSE := $(QT5BASE_LICENSE), BSD-3-Clause (examples)
-+QT5BASE_LICENSE_FILES += header.BSD
- endif
- 
- QT5BASE_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_QT5BASE_CONFIG_FILE))
-@@ -53,6 +66,10 @@ ifneq ($(QT5BASE_CONFIG_FILE),)
- QT5BASE_CONFIGURE_OPTS += -qconfig buildroot
- endif
- 
-+ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-+QT5BASE_DEPENDENCIES += udev
-+endif
-+
- # Qt5 SQL Plugins
- ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
- ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y)
-@@ -75,10 +92,16 @@ QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite)
- QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite)
- endif
- 
-+ifeq ($(BR2_PACKAGE_QT5BASE_GUI),y)
-+QT5BASE_CONFIGURE_OPTS += -gui -system-freetype
-+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5_VERSION_5_6),-I$(STAGING_DIR)/usr/include/freetype2)
-+QT5BASE_DEPENDENCIES += freetype
-+else
-+QT5BASE_CONFIGURE_OPTS += -no-gui -no-freetype
-+endif
-+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
- # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
- # is to add a link against the "inuxfb" library.
--QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui)
--QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
- QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb)
- QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb)
- QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
-@@ -144,6 +167,7 @@ QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu)
- 
- QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples
- 
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
- # gstreamer 0.10 support is broken in qt5multimedia
- ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
- QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0
-@@ -151,6 +175,14 @@ QT5BASE_DEPENDENCIES   += gst1-plugins-base
- else
- QT5BASE_CONFIGURE_OPTS += -no-gstreamer
- endif
-+endif
-+
-+ifeq ($(BR2_PACKAGE_LIBINPUT),y)
-+QT5BASE_CONFIGURE_OPTS += -libinput
-+QT5BASE_DEPENDENCIES += libinput
-+else
-+QT5BASE_CONFIGURE_OPTS += -no-libinput
-+endif
- 
- # Build the list of libraries to be installed on the target
- QT5BASE_INSTALL_LIBS_y                                 += Qt5Core
-@@ -161,7 +193,14 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL)        += Qt5Sql
- QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST)       += Qt5Test
- QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML)        += Qt5Xml
- QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglFSDeviceIntegration
-+ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
-+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglFsKmsSupport
-+endif
-+else
- QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglDeviceIntegration
-+endif
- 
- QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI)          += Qt5Gui
- QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS)      += Qt5Widgets
-@@ -227,12 +266,14 @@ define QT5BASE_INSTALL_TARGET_PLUGINS
- 	fi
- endef
- 
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
- define QT5BASE_INSTALL_TARGET_FONTS
- 	if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \
- 		mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \
- 		cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \
- 	fi
- endef
-+endif
- 
- define QT5BASE_INSTALL_TARGET_EXAMPLES
- 	if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \
-diff --git a/package/qt5/qt5canvas3d/Config.in b/package/qt5/qt5canvas3d/Config.in
-index 3ae519284..04c04730b 100644
---- a/package/qt5/qt5canvas3d/Config.in
-+++ b/package/qt5/qt5canvas3d/Config.in
-@@ -1,16 +1,17 @@
- config BR2_PACKAGE_QT5CANVAS3D
- 	bool "qt5canvas3d"
--	select BR2_PACKAGE_QT5DECLARATIVE
--	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
- 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
- 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-+	select BR2_PACKAGE_QT5DECLARATIVE
-+	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5canvas3d module.
-+	  Qt Canvas 3D module provides a way to make WebGL-like
-+	  3D drawing calls from Qt Quick JavaScript.
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtcanvas3d-index.html
- 
- comment "qt5canvas3d needs an OpenGL-capable backend"
- 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
-diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash
-deleted file mode 100644
-index 2d13e400f..000000000
---- a/package/qt5/qt5canvas3d/qt5canvas3d.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	7871b3fd4c1a561c5b3eb57746e8504bc5d8fa626f9df578e619f9e823e3bd97	qtcanvas3d-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.mk b/package/qt5/qt5canvas3d/qt5canvas3d.mk
-index 3f605ab03..c0448cfd5 100644
---- a/package/qt5/qt5canvas3d/qt5canvas3d.mk
-+++ b/package/qt5/qt5canvas3d/qt5canvas3d.mk
-@@ -10,13 +10,8 @@ QT5CANVAS3D_SOURCE = qtcanvas3d-opensource-src-$(QT5CANVAS3D_VERSION).tar.xz
- QT5CANVAS3D_DEPENDENCIES = qt5base qt5declarative
- QT5CANVAS3D_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5CANVAS3D_LICENSE = GPLv2 or GPLv3 or LGPLv3
-+QT5CANVAS3D_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0
- QT5CANVAS3D_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3
--else
--QT5CANVAS3D_LICENSE = Commercial license
--QT5CANVAS3D_REDISTRIBUTE = NO
--endif
- 
- define QT5CANVAS3D_CONFIGURE_CMDS
- 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-diff --git a/package/qt5/qt5charts/Config.in b/package/qt5/qt5charts/Config.in
-index d354bb2fc..bd659878f 100644
---- a/package/qt5/qt5charts/Config.in
-+++ b/package/qt5/qt5charts/Config.in
-@@ -3,6 +3,7 @@ config BR2_PACKAGE_QT5CHARTS
- 	select BR2_PACKAGE_QT5DECLARATIVE
- 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
- 	select BR2_PACKAGE_QT5BASE_WIDGETS
-+	depends on BR2_PACKAGE_QT5_VERSION_LATEST
- 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
- 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	help
-diff --git a/package/qt5/qt5connectivity/Config.in b/package/qt5/qt5connectivity/Config.in
-index d529ea7f8..8bda8de66 100644
---- a/package/qt5/qt5connectivity/Config.in
-+++ b/package/qt5/qt5connectivity/Config.in
-@@ -1,21 +1,19 @@
- config BR2_PACKAGE_QT5CONNECTIVITY
- 	bool "qt5connectivity"
--	select BR2_PACKAGE_BLUEZ_UTILS
-+	depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS
- 	select BR2_PACKAGE_QT5BASE
- 	select BR2_PACKAGE_QT5BASE_CONCURRENT
- 	select BR2_PACKAGE_QT5BASE_DBUS
--	depends on !BR2_STATIC_LIBS # bluez_utils
--	depends on BR2_USE_WCHAR # bluez_utils
--	depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils
--	depends on BR2_USE_MMU # bluez_utils
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5connectivity module.
-+	  Qt Connectivity module provides support for Bluetooth/NFC
-+	  peripherials.
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtbluetooth-index.html
-+	  http://doc.qt.io/qt-5/qtnfc-index.html
- 
--comment "qt5connectivity needs a toolchain w/ wchar, threads, dynamic library"
--	depends on BR2_USE_MMU
--	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-+comment "qt5connectivity needs neard and/or bluez(5)_utils"
-+	depends on !BR2_PACKAGE_NEARD && !BR2_PACKAGE_BLUEZ_UTILS && \
-+		!BR2_PACKAGE_BLUEZ5_UTILS
-diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash
-deleted file mode 100644
-index 00b7c2086..000000000
---- a/package/qt5/qt5connectivity/qt5connectivity.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	9844ca7ec5be187a77dfd7e95051fb267006f6c77157ecb0b8ceeac103a32703	qtconnectivity-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
-index 936bc6f63..d53aa91f2 100644
---- a/package/qt5/qt5connectivity/qt5connectivity.mk
-+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
-@@ -7,21 +7,25 @@
- QT5CONNECTIVITY_VERSION = $(QT5_VERSION)
- QT5CONNECTIVITY_SITE = $(QT5_SITE)
- QT5CONNECTIVITY_SOURCE = qtconnectivity-opensource-src-$(QT5CONNECTIVITY_VERSION).tar.xz
--QT5CONNECTIVITY_DEPENDENCIES = bluez_utils qt5base
-+QT5CONNECTIVITY_DEPENDENCIES = qt5base
- QT5CONNECTIVITY_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5CONNECTIVITY_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
--QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
-+QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
- else
--QT5CONNECTIVITY_LICENSE = Commercial license
--QT5CONNECTIVITY_REDISTRIBUTE = NO
-+QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
- endif
--
--ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
--QT5CONNECTIVITY_DEPENDENCIES += qt5declarative
-+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-+QT5CONNECTIVITY_LICENSE := $(QT5CONNECTIVITY_LICENSE), BSD-3-Clause (examples)
- endif
- 
-+QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5DECLARATIVE),qt5declarative)
-+QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils)
-+QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ5_UTILS),bluez5_utils)
-+QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_NEARD),neard)
-+
- define QT5CONNECTIVITY_CONFIGURE_CMDS
- 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
- endef
-@@ -36,15 +40,48 @@ define QT5CONNECTIVITY_INSTALL_STAGING_CMDS
- endef
- 
- ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
--define QT5CONNECTIVITY_INSTALL_TARGET_QMLS
-+ifneq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_BLUEZ5_UTILS),)
-+define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS
- 	cp -dpfr $(STAGING_DIR)/usr/qml/QtBluetooth $(TARGET_DIR)/usr/qml/
- endef
- endif
-+ifeq ($(BR2_PACKAGE_NEARD),y)
-+define QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS
-+	cp -dpfr $(STAGING_DIR)/usr/qml/QtNfc $(TARGET_DIR)/usr/qml/
-+endef
-+endif
-+endif
- 
--define QT5CONNECTIVITY_INSTALL_TARGET_CMDS
-+ifneq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_BLUEZ5_UTILS),)
-+define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH
- 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Bluetooth.so.* $(TARGET_DIR)/usr/lib
- 	cp -dpf $(STAGING_DIR)/usr/bin/sdpscanner $(TARGET_DIR)/usr/bin
--	$(QT5CONNECTIVITY_INSTALL_TARGET_QMLS)
-+endef
-+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-+define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_EXAMPLES
-+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/bluetooth $(TARGET_DIR)/usr/lib/qt/examples/
-+endef
-+endif
-+endif
-+
-+ifeq ($(BR2_PACKAGE_NEARD),y)
-+define QT5CONNECTIVITY_INSTALL_TARGET_NFC
-+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Nfc.so.* $(TARGET_DIR)/usr/lib
-+endef
-+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-+define QT5CONNECTIVITY_INSTALL_TARGET_NFC_EXAMPLES
-+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/nfc $(TARGET_DIR)/usr/lib/qt/examples/
-+endef
-+endif
-+endif
-+
-+define QT5CONNECTIVITY_INSTALL_TARGET_CMDS
-+	$(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH)
-+	$(QT5CONNECTIVITY_INSTALL_TARGET_NFC)
-+	$(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS)
-+	$(QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS)
-+	$(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_EXAMPLES)
-+	$(QT5CONNECTIVITY_INSTALL_TARGET_NFC_EXAMPLES)
- endef
- 
- $(eval $(generic-package))
-diff --git a/package/qt5/qt5datavis3d/Config.in b/package/qt5/qt5datavis3d/Config.in
-deleted file mode 100644
-index c7aca9528..000000000
---- a/package/qt5/qt5datavis3d/Config.in
-+++ /dev/null
-@@ -1,17 +0,0 @@
--config BR2_PACKAGE_QT5DATAVIS3D
--	bool "qt5datavis3d"
--	select BR2_PACKAGE_QT5DECLARATIVE
--	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
--	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
--	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
--	help
--	  Qt is a cross-platform application and UI framework for
--	  developers using C++.
--
--	  This package corresponds to the qt5datavis3d module.
--
--	  http://qt.io
--
--comment "qt5canvas3d needs an OpenGL-capable backend"
--	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
--	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-diff --git a/package/qt5/qt5datavis3d/qt5datavis3d.mk b/package/qt5/qt5datavis3d/qt5datavis3d.mk
-deleted file mode 100644
-index 9101148c8..000000000
---- a/package/qt5/qt5datavis3d/qt5datavis3d.mk
-+++ /dev/null
-@@ -1,39 +0,0 @@
--################################################################################
--#
--# qt5datavis3d
--#
--################################################################################
--
--QT5DATAVIS3D_VERSION = $(QT5_VERSION)
--QT5DATAVIS3D_SITE = $(QT5_SITE)
--QT5DATAVIS3D_SOURCE = qtdatavis3d-opensource-src-$(QT5DATAVIS3D_VERSION).tar.xz
--QT5DATAVIS3D_DEPENDENCIES = qt5base qt5declarative
--QT5DATAVIS3D_INSTALL_STAGING = YES
--
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5DATAVIS3D_LICENSE = GPLv3
--QT5DATAVIS3D_LICENSE_FILES = LICENSE.GPL3
--else
--QT5DATAVIS3D_LICENSE = Commercial license
--QT5DATAVIS3D_REDISTRIBUTE = NO
--endif
--
--define QT5DATAVIS3D_CONFIGURE_CMDS
--	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
--endef
--
--define QT5DATAVIS3D_BUILD_CMDS
--	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
--endef
--
--define QT5DATAVIS3D_INSTALL_STAGING_CMDS
--	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
--	$(QT5_LA_PRL_FILES_FIXUP)
--endef
--
--define QT5DATAVIS3D_INSTALL_TARGET_CMDS
--	cp -dpfr $(STAGING_DIR)/usr/lib/libQt5DataVisualization.so.* $(TARGET_DIR)/usr/lib
--        cp -dpfr $(STAGING_DIR)/usr/qml/QtDataVisualization $(TARGET_DIR)/usr/qml/
--endef
--
--$(eval $(generic-package))
-diff --git a/package/qt5/qt5declarative/0001-examples-photoviewer-needs-widgets-support.patch b/package/qt5/qt5declarative/0001-examples-photoviewer-needs-widgets-support.patch
-new file mode 100644
-index 000000000..aeaaa9177
---- /dev/null
-+++ b/package/qt5/qt5declarative/0001-examples-photoviewer-needs-widgets-support.patch
-@@ -0,0 +1,32 @@
-+From b616a7e2a7e03e2eb189dca3dc428c0e19e1652b Mon Sep 17 00:00:00 2001
-+From: Peter Seiderer <ps.report@gmx.net>
-+Date: Thu, 6 Apr 2017 21:53:40 +0200
-+Subject: [PATCH] examples: photoviewer needs widgets support
-+
-+Fixes:
-+
-+  .../qt5declarative-5.8.0/examples/quick/demos/photoviewer/photoviewer.pro
-+  Project ERROR: Unknown module(s) in QT: widgets
-+
-+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-+---
-+ examples/quick/demos/demos.pro | 6 ++++--
-+ 1 file changed, 4 insertions(+), 2 deletions(-)
-+
-+diff --git a/examples/quick/demos/demos.pro b/examples/quick/demos/demos.pro
-+index 0644b81a2..5a6fd52ba 100644
-+--- a/examples/quick/demos/demos.pro
-++++ b/examples/quick/demos/demos.pro
-+@@ -7,5 +7,7 @@ SUBDIRS = samegame \
-+             photosurface \
-+             stocqt
-+ 
-+-qtHaveModule(xmlpatterns): SUBDIRS += rssnews photoviewer
-+-
-++qtHaveModule(xmlpatterns) {
-++    SUBDIRS += rssnews
-++    qtHaveModule(widgets): SUBDIRS += photoviewer
-++}
-+-- 
-+2.11.0
-+
-diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
-index eba4c8d61..5384b5f18 100644
---- a/package/qt5/qt5declarative/Config.in
-+++ b/package/qt5/qt5declarative/Config.in
-@@ -1,16 +1,18 @@
- config BR2_PACKAGE_QT5DECLARATIVE
- 	bool "qt5declarative"
-+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	select BR2_PACKAGE_QT5XMLPATTERNS
- 	select BR2_PACKAGE_QT5BASE
- 	select BR2_PACKAGE_QT5BASE_GUI
--	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5declarative module.
-+	  Qt Declarative module provides the Qt QML and Qt Quick
-+	  modules for developing UIs with the QML language
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtqml-index.html
-+	  http://doc.qt.io/qt-5/qtquick-index.html
- 
- if BR2_PACKAGE_QT5DECLARATIVE
- 
-@@ -19,7 +21,7 @@ comment "quick module needs an OpenGL-capable backend"
- 
- config BR2_PACKAGE_QT5DECLARATIVE_QUICK
- 	bool "quick module"
--	select BR2_PACKAGE_QT5BASE_OPENGL
- 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
-+	select BR2_PACKAGE_QT5BASE_OPENGL
- 
- endif
-diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash
-deleted file mode 100644
-index 677966967..000000000
---- a/package/qt5/qt5declarative/qt5declarative.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	86de6239f3aee2e5f561c16ad7b6e47d8f341c293d4ed11c85acbc21888cf9f4	qtdeclarative-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
-index be3a7b7d7..f9ed8c751 100644
---- a/package/qt5/qt5declarative/qt5declarative.mk
-+++ b/package/qt5/qt5declarative/qt5declarative.mk
-@@ -10,12 +10,12 @@ QT5DECLARATIVE_SOURCE = qtdeclarative-opensource-src-$(QT5DECLARATIVE_VERSION).t
- QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns
- QT5DECLARATIVE_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5DECLARATIVE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
--QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
-+QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
- else
--QT5DECLARATIVE_LICENSE = Commercial license
--QT5DECLARATIVE_REDISTRIBUTE = NO
-+QT5DECLARATIVE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
- endif
- 
- define QT5DECLARATIVE_CONFIGURE_CMDS
-@@ -23,14 +23,11 @@ define QT5DECLARATIVE_CONFIGURE_CMDS
- endef
- 
- define QT5DECLARATIVE_BUILD_CMDS
--	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
--		sub-src-all sub-tools-all
-+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
- endef
- 
- define QT5DECLARATIVE_INSTALL_STAGING_CMDS
--	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
--		sub-src-install_subtargets \
--		sub-tools-install_subtargets
-+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
- 	$(QT5_LA_PRL_FILES_FIXUP)
- endef
- 
-@@ -40,6 +37,9 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
- define QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS
- 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
- endef
-+define QT5DECLARATIVE_INSTALL_TARGET_QUICK_EXAMPLES
-+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/quick/ $(TARGET_DIR)/usr/lib/qt/examples/
-+endef
- endif
- 
- define QT5DECLARATIVE_INSTALL_TARGET_LIBS
-@@ -50,9 +50,17 @@ endef
- 
- endif
- 
-+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-+define QT5DECLARATIVE_INSTALL_TARGET_EXAMPLES
-+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/qml* $(TARGET_DIR)/usr/lib/qt/examples/
-+	$(QT5DECLARATIVE_INSTALL_TARGET_QUICK_EXAMPLES)
-+endef
-+endif
-+
- define QT5DECLARATIVE_INSTALL_TARGET_CMDS
- 	cp -dpf $(STAGING_DIR)/usr/bin/qml* $(TARGET_DIR)/usr/bin
- 	cp -dpfr $(STAGING_DIR)/usr/qml $(TARGET_DIR)/usr
-+	$(QT5DECLARATIVE_INSTALL_TARGET_EXAMPLES)
- 	$(QT5DECLARATIVE_INSTALL_TARGET_LIBS)
- endef
- 
-diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in
-index fcb866cd6..102058e7c 100644
---- a/package/qt5/qt5enginio/Config.in
-+++ b/package/qt5/qt5enginio/Config.in
-@@ -8,6 +8,10 @@ config BR2_PACKAGE_QT5ENGINIO
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5enginio module.
-+	  Enginio is a Backend-as-a-Service solution for simplifying
-+	  backend development of connected and data-driven applications.
- 
--	  http://qt.io
-+	  This package has been tagged as deprecated since version
-+	  5.6 and not recommended for new design.
-+
-+	  http://doc.qt.io/archives/qt-5.5/enginio-index.html
-diff --git a/package/qt5/qt5enginio/qt5enginio.hash b/package/qt5/qt5enginio/qt5enginio.hash
-deleted file mode 100644
-index 95f507cf5..000000000
---- a/package/qt5/qt5enginio/qt5enginio.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	627ddcfbbfc3ec1a83c9dbb5f24287b5cd6cb5d3b9d09af4d1c444c6ac147f0c	qtenginio-opensource-src-1.6.0.tar.xz
-diff --git a/package/qt5/qt5enginio/qt5enginio.mk b/package/qt5/qt5enginio/qt5enginio.mk
-index b858d1cbb..bffd1f627 100644
---- a/package/qt5/qt5enginio/qt5enginio.mk
-+++ b/package/qt5/qt5enginio/qt5enginio.mk
-@@ -6,18 +6,16 @@
- 
- # Qt5Enginio does not follow Qt versionning
- # see https://bugreports.qt.io/browse/QTBUG-50111
--QT5ENGINIO_VERSION = 1.6.0
-+QT5ENGINIO_VERSION = 1.6.2
- QT5ENGINIO_SITE = $(QT5_SITE)
- QT5ENGINIO_SOURCE = qtenginio-opensource-src-$(QT5ENGINIO_VERSION).tar.xz
- QT5ENGINIO_DEPENDENCIES = openssl qt5base
- QT5ENGINIO_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5ENGINIO_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-+QT5ENGINIO_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
- QT5ENGINIO_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5ENGINIO_LICENSE = Commercial license
--QT5ENGINIO_REDISTRIBUTE = NO
-+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-+QT5ENGINIO_LICENSE := $(QT5ENGINIO_LICENSE), BSD-3-Clause (examples)
- endif
- 
- ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
-diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in
-index a42e1f8f2..69b7fca41 100644
---- a/package/qt5/qt5graphicaleffects/Config.in
-+++ b/package/qt5/qt5graphicaleffects/Config.in
-@@ -1,16 +1,18 @@
- config BR2_PACKAGE_QT5GRAPHICALEFFECTS
- 	bool "qt5graphicaleffects"
--	select BR2_PACKAGE_QT5DECLARATIVE
--	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
- 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
- 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-+	select BR2_PACKAGE_QT5DECLARATIVE
-+	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5graphicaleffects module.
-+	  The Qt Graphical Effects module provides a set of QML types
-+	  for adding visually impressive and configurable effects to
-+	  user interfaces.
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtgraphicaleffects-index.html
- 
- comment "qt5graphicaleffects needs an OpenGL-capable backend"
- 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
-diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
-deleted file mode 100644
-index 7c79a9984..000000000
---- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	c816539ce345e502425a94c624332df78f53aeebc460d76b53b79b59cb938de7	qtgraphicaleffects-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
-index 223374a27..929a62e2d 100644
---- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
-+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
-@@ -10,12 +10,12 @@ QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-opensource-src-$(QT5GRAPHICALEFF
- QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative
- QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5GRAPHICALEFFECTS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
--QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
-+QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
- else
--QT5GRAPHICALEFFECTS_LICENSE = Commercial license
--QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO
-+QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
- endif
- 
- define QT5GRAPHICALEFFECTS_CONFIGURE_CMDS
-diff --git a/package/qt5/qt5imageformats/Config.in b/package/qt5/qt5imageformats/Config.in
-index 4dd848e41..44c85c9b3 100644
---- a/package/qt5/qt5imageformats/Config.in
-+++ b/package/qt5/qt5imageformats/Config.in
-@@ -6,6 +6,7 @@ config BR2_PACKAGE_QT5IMAGEFORMATS
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5imageformats module.
-+	  The Qt Image Formats module provides plugins for
-+	  additional image formats: TIFF, MNG, TGA, WBMP
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtimageformats-index.html
-diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash
-deleted file mode 100644
-index b65be404b..000000000
---- a/package/qt5/qt5imageformats/qt5imageformats.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	ef3344a44194d1414be585f8c8a652ffe217c663a22b6e26d3bb5e114f3f62e5	qtimageformats-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
-index 921656d0a..f3d9d7427 100644
---- a/package/qt5/qt5imageformats/qt5imageformats.mk
-+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
-@@ -10,12 +10,12 @@ QT5IMAGEFORMATS_SOURCE = qtimageformats-opensource-src-$(QT5IMAGEFORMATS_VERSION
- QT5IMAGEFORMATS_DEPENDENCIES = qt5base
- QT5IMAGEFORMATS_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5IMAGEFORMATS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
--QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
-+QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
- else
--QT5IMAGEFORMATS_LICENSE = Commercial license
--QT5IMAGEFORMATS_REDISTRIBUTE = NO
-+QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
- endif
- 
- define QT5IMAGEFORMATS_CONFIGURE_CMDS
-diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in
-index 209d13421..e1778182a 100644
---- a/package/qt5/qt5location/Config.in
-+++ b/package/qt5/qt5location/Config.in
-@@ -5,6 +5,8 @@ config BR2_PACKAGE_QT5LOCATION
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5location module.
-+	  The Qt Location API helps you create viable mapping
-+	  solutions using the data available from some of the
-+	  popular location services.
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtlocation-index.html
-diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash
-deleted file mode 100644
-index 074168e03..000000000
---- a/package/qt5/qt5location/qt5location.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	70273367342493a77c050f033a92d96e79925aa70308746e9681d8661f4aa865	qtlocation-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk
-index 358b1621c..b31bee7d1 100644
---- a/package/qt5/qt5location/qt5location.mk
-+++ b/package/qt5/qt5location/qt5location.mk
-@@ -10,12 +10,12 @@ QT5LOCATION_SOURCE = qtlocation-opensource-src-$(QT5LOCATION_VERSION).tar.xz
- QT5LOCATION_DEPENDENCIES = qt5base
- QT5LOCATION_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5LOCATION_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
--QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
-+QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
- else
--QT5LOCATION_LICENSE = Commercial license
--QT5LOCATION_REDISTRIBUTE = NO
-+QT5LOCATION_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
- endif
- 
- ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
-@@ -57,5 +57,4 @@ define QT5LOCATION_INSTALL_TARGET_CMDS
- 	$(QT5LOCATION_INSTALL_TARGET_QMLS)
- endef
- 
--
- $(eval $(generic-package))
-diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in
-index 59c398478..5b14ac57f 100644
---- a/package/qt5/qt5multimedia/Config.in
-+++ b/package/qt5/qt5multimedia/Config.in
-@@ -3,10 +3,14 @@ config BR2_PACKAGE_QT5MULTIMEDIA
- 	select BR2_PACKAGE_QT5BASE
- 	select BR2_PACKAGE_QT5BASE_GUI
- 	select BR2_PACKAGE_QT5BASE_NETWORK
-+	select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5BASE_OPENGL
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5multimedia module.
-+	  The Qt Multimedia module provides a rich feature set that
-+	  enables you to easily take advantage of a platform's multimedia
-+	  capabilities such as media playback and the use of camera and
-+	  radio devices.
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/multimediaoverview.html
-diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash
-deleted file mode 100644
-index 1a85f9500..000000000
---- a/package/qt5/qt5multimedia/qt5multimedia.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	05ae705bda224a600b06e390aa7b1448c4a6a52d2d37842d2121fb4a5d84b559	qtmultimedia-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
-index 67e79686c..133536e1a 100644
---- a/package/qt5/qt5multimedia/qt5multimedia.mk
-+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
-@@ -10,12 +10,12 @@ QT5MULTIMEDIA_SOURCE = qtmultimedia-opensource-src-$(QT5MULTIMEDIA_VERSION).tar.
- QT5MULTIMEDIA_DEPENDENCIES = qt5base
- QT5MULTIMEDIA_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5MULTIMEDIA_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
--QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
-+QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
- else
--QT5MULTIMEDIA_LICENSE = Commercial license
--QT5MULTIMEDIA_REDISTRIBUTE = NO
-+QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
- endif
- 
- ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
-@@ -59,9 +59,16 @@ define QT5MULTIMEDIA_INSTALL_TARGET_QMLS
- endef
- endif
- 
-+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-+define QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES
-+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/multimedia* $(TARGET_DIR)/usr/lib/qt/examples/
-+endef
-+endif
-+
- define QT5MULTIMEDIA_INSTALL_TARGET_CMDS
- 	$(QT5MULTIMEDIA_INSTALL_TARGET_LIBS)
- 	$(QT5MULTIMEDIA_INSTALL_TARGET_QMLS)
-+	$(QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES)
- endef
- 
- $(eval $(generic-package))
-diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in
-index 0fe8465e2..3cc5821b1 100644
---- a/package/qt5/qt5quickcontrols/Config.in
-+++ b/package/qt5/qt5quickcontrols/Config.in
-@@ -1,16 +1,17 @@
- config BR2_PACKAGE_QT5QUICKCONTROLS
- 	bool "qt5quickcontrols"
--	select BR2_PACKAGE_QT5DECLARATIVE
--	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
- 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
- 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-+	select BR2_PACKAGE_QT5DECLARATIVE
-+	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5quickcontrols module.
-+	  The Qt Quick Controls module provides a set of controls
-+	  that can be used to build complete interfaces in Qt Quick.
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtquickcontrols-index.html
- 
- comment "qt5quickcontrols needs an OpenGL-capable backend"
- 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
-diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
-deleted file mode 100644
-index cf438f84a..000000000
---- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	d8e19a77100fff109585ccc62116e63dd11ce9486056a8eb5b64159b7ecdec32	qtquickcontrols-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
-index b33ff1575..5fee6ff42 100644
---- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
-+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
-@@ -10,13 +10,8 @@ QT5QUICKCONTROLS_SOURCE = qtquickcontrols-opensource-src-$(QT5QUICKCONTROLS_VERS
- QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
- QT5QUICKCONTROLS_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5QUICKCONTROLS_LICENSE = GPLv2 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
-+QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
- QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5QUICKCONTROLS_LICENSE = Commercial license
--QT5QUICKCONTROLS_REDISTRIBUTE = NO
--endif
- 
- define QT5QUICKCONTROLS_CONFIGURE_CMDS
- 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-@@ -30,8 +25,24 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
- 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
- endef
- 
-+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy)
-+define QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS
-+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick
-+endef
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
-+define QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS
-+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick
-+endef
-+endif
-+
- define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
--	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml
-+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
-+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
-+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
-+	$(QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS)
-+	$(QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS)
- endef
- 
- $(eval $(generic-package))
-diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in
-index 1e57674dc..1066b173b 100644
---- a/package/qt5/qt5quickcontrols2/Config.in
-+++ b/package/qt5/qt5quickcontrols2/Config.in
-@@ -1,16 +1,19 @@
- config BR2_PACKAGE_QT5QUICKCONTROLS2
- 	bool "qt5quickcontrols2"
--	select BR2_PACKAGE_QT5DECLARATIVE
--	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
- 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick
- 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick
-+	select BR2_PACKAGE_QT5DECLARATIVE
-+	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
- 	  This package corresponds to the qt5quickcontrols2 module.
- 
--	  http://qt.io
-+	  This module was in tech preview in Qt 5.6, and promoted
-+	  to a core module in Qt 5.7.0.
-+
-+	  https://doc.qt.io/qt-5/qtquickcontrols2-index.html
- 
- comment "qt5quickcontrols2 needs an OpenGL-capable backend"
- 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
-diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
-deleted file mode 100644
-index c43afd7fb..000000000
---- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	63f5b0777992c32bd602b88de657e202cd6d5e8ba0371c6d5da16fb8c7481045	qtquickcontrols2-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
-index 23bbb2cc0..23bcbad73 100644
---- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
-+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
-@@ -10,13 +10,8 @@ QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-opensource-src-$(QT5QUICKCONTROLS2_V
- QT5QUICKCONTROLS2_DEPENDENCIES = qt5base qt5declarative
- QT5QUICKCONTROLS2_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5QUICKCONTROLS2_LICENSE = GPLv3 or LGPLv3, GFDLv1.3 (docs)
-+QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
- QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5QUICKCONTROLS2_LICENSE = Commercial license
--QT5QUICKCONTROLS2_REDISTRIBUTE = NO
--endif
- 
- define QT5QUICKCONTROLS2_CONFIGURE_CMDS
- 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-@@ -30,16 +25,30 @@ define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS
- 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
- endef
- 
-+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-+define QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES
-+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/quickcontrols2 $(TARGET_DIR)/usr/lib/qt/examples/
-+endef
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
- define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
- 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib
- 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib
- 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
--#	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs
--	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/folderlistmodel $(TARGET_DIR)/usr/qml/Qt/labs
--	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/settings $(TARGET_DIR)/usr/qml/Qt/labs
-+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs
- 	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick
- 	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick
- 	$(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES)
- endef
-+else
-+define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
-+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib
-+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs
-+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
-+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs
-+	$(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES)
-+endef
-+endif
- 
- $(eval $(generic-package))
-diff --git a/package/qt5/qt5script/Config.in b/package/qt5/qt5script/Config.in
-index 0d15ef265..034b7d2fc 100644
---- a/package/qt5/qt5script/Config.in
-+++ b/package/qt5/qt5script/Config.in
-@@ -1,15 +1,16 @@
- config BR2_PACKAGE_QT5SCRIPT
- 	bool "qt5script"
--	select BR2_PACKAGE_QT5BASE
- 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-+	select BR2_PACKAGE_QT5BASE
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5script module.
-+	  Qt Script provides support for making Qt applications
-+	  scriptable. Provided for Qt 4.x compatibility.
- 
- 	  This package has been tagged as deprecated since version
- 	  5.5.0 and should be replaced by Qt QML module in new
- 	  design.
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtscript-index.html
-diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash
-deleted file mode 100644
-index c8ecb75eb..000000000
---- a/package/qt5/qt5script/qt5script.hash
-+++ /dev/null
-@@ -1,2 +0,0 @@
--# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtscript-opensource-src-5.6.2.tar.xz.mirrorlist
--sha256 e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e qtscript-opensource-src-5.6.2.tar.xz
-diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
-index 57ba6f007..50ee52ad0 100644
---- a/package/qt5/qt5script/qt5script.mk
-+++ b/package/qt5/qt5script/qt5script.mk
-@@ -10,13 +10,8 @@ QT5SCRIPT_SOURCE = qtscript-opensource-src-$(QT5SCRIPT_VERSION).tar.xz
- QT5SCRIPT_DEPENDENCIES = qt5base
- QT5SCRIPT_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5SCRIPT_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-+QT5SCRIPT_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
- QT5SCRIPT_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5SCRIPT_LICENSE = Commercial license
--QT5SCRIPT_REDISTRIBUTE = NO
--endif
- 
- define QT5SCRIPT_CONFIGURE_CMDS
- 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-diff --git a/package/qt5/qt5sensors/Config.in b/package/qt5/qt5sensors/Config.in
-index 741ebba14..4846a3f95 100644
---- a/package/qt5/qt5sensors/Config.in
-+++ b/package/qt5/qt5sensors/Config.in
-@@ -5,6 +5,7 @@ config BR2_PACKAGE_QT5SENSORS
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5sensors module.
-+	  The Qt Sensors API provides access to sensor hardware
-+	  via QML and C++ interfaces.
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtsensors-index.html
-diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash
-deleted file mode 100644
-index ec62e3ba8..000000000
---- a/package/qt5/qt5sensors/qt5sensors.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	283dcc66a24c4367e865fa8301b6ea04d0cb78bd0f166fd09a6bb42e1e3731be	qtsensors-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
-index 0dd952a4c..079f056da 100644
---- a/package/qt5/qt5sensors/qt5sensors.mk
-+++ b/package/qt5/qt5sensors/qt5sensors.mk
-@@ -10,12 +10,12 @@ QT5SENSORS_SOURCE = qtsensors-opensource-src-$(QT5SENSORS_VERSION).tar.xz
- QT5SENSORS_DEPENDENCIES = qt5base
- QT5SENSORS_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5SENSORS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
--QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
-+QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
- else
--QT5SENSORS_LICENSE = Commercial license
--QT5SENSORS_REDISTRIBUTE = NO
-+QT5SENSORS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
- endif
- 
- ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
-diff --git a/package/qt5/qt5serialbus/Config.in b/package/qt5/qt5serialbus/Config.in
-index 504141c63..2882d5064 100644
---- a/package/qt5/qt5serialbus/Config.in
-+++ b/package/qt5/qt5serialbus/Config.in
-@@ -1,5 +1,6 @@
- config BR2_PACKAGE_QT5SERIALBUS
- 	bool "qt5serialbus"
-+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD
- 	select BR2_PACKAGE_QT5BASE
- 	select BR2_PACKAGE_QT5SERIALPORT
- 	help
-@@ -8,4 +9,10 @@ config BR2_PACKAGE_QT5SERIALBUS
- 
- 	  This package corresponds to the qt5serialbus module.
- 
--	  http://qt.io
-+	  This module was in tech preview in Qt 5.6, and promoted
-+	  to a core module in Qt 5.8.0.
-+
-+	  http://doc.qt.io/qt-5/qtserialbus-index.html
-+
-+comment "qt5serialbus needs headers >= 3.6"
-+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6
-diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash
-deleted file mode 100644
-index 05972195b..000000000
---- a/package/qt5/qt5serialbus/qt5serialbus.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	2c437ace393e9dcf170990b519cec59c5cbcfc3c830e46116abb52549dc15d38	qtserialbus-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk
-index b188f5d85..24fe8b150 100644
---- a/package/qt5/qt5serialbus/qt5serialbus.mk
-+++ b/package/qt5/qt5serialbus/qt5serialbus.mk
-@@ -10,13 +10,8 @@ QT5SERIALBUS_SOURCE = qtserialbus-opensource-src-$(QT5SERIALBUS_VERSION).tar.xz
- QT5SERIALBUS_DEPENDENCIES = qt5base qt5serialport
- QT5SERIALBUS_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5SERIALBUS_LICENSE = GPLv2 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
-+QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
- QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
--else
--QT5SERIALBUS_LICENSE = Commercial license
--QT5SERIALBUS_REDISTRIBUTE = NO
--endif
- 
- define QT5SERIALBUS_CONFIGURE_CMDS
- 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-diff --git a/package/qt5/qt5serialport/Config.in b/package/qt5/qt5serialport/Config.in
-index c419d17dd..3538c5255 100644
---- a/package/qt5/qt5serialport/Config.in
-+++ b/package/qt5/qt5serialport/Config.in
-@@ -5,6 +5,8 @@ config BR2_PACKAGE_QT5SERIALPORT
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5serialport module.
-+	  Qt Serial Port provides the basic functionality, which
-+	  includes configuring, I/O operations, getting and setting
-+	  the control signals of the RS-232 pinouts.
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtserialport-index.html
-diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash
-deleted file mode 100644
-index 7751d6411..000000000
---- a/package/qt5/qt5serialport/qt5serialport.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	5ce150d843a243854736489d4a71205a8ca8dc8f93626ec29d1aa7a249a08265	qtserialport-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
-index 04df021b5..cf41019a8 100644
---- a/package/qt5/qt5serialport/qt5serialport.mk
-+++ b/package/qt5/qt5serialport/qt5serialport.mk
-@@ -10,12 +10,12 @@ QT5SERIALPORT_SOURCE = qtserialport-opensource-src-$(QT5SERIALPORT_VERSION).tar.
- QT5SERIALPORT_DEPENDENCIES = qt5base
- QT5SERIALPORT_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5SERIALPORT_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
--QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
-+QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
- else
--QT5SERIALPORT_LICENSE = Commercial license
--QT5SERIALPORT_REDISTRIBUTE = NO
-+QT5SERIALPORT_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
- endif
- 
- define QT5SERIALPORT_CONFIGURE_CMDS
-diff --git a/package/qt5/qt5svg/Config.in b/package/qt5/qt5svg/Config.in
-index e1acafbfe..bc80b6267 100644
---- a/package/qt5/qt5svg/Config.in
-+++ b/package/qt5/qt5svg/Config.in
-@@ -6,6 +6,7 @@ config BR2_PACKAGE_QT5SVG
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5svg module.
-+	  Qt SVG provides classes for rendering and displaying SVG
-+	  drawings in widgets and on other paint devices.
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtsvg-index.html
-diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash
-deleted file mode 100644
-index 0c3a9ffae..000000000
---- a/package/qt5/qt5svg/qt5svg.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	a1f89f035aed48bf8843ff1880c4b54dc2e3a5160dbd743aec03e13831cdd881	qtsvg-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
-index ebd5cba80..43959615a 100644
---- a/package/qt5/qt5svg/qt5svg.mk
-+++ b/package/qt5/qt5svg/qt5svg.mk
-@@ -10,12 +10,12 @@ QT5SVG_SOURCE = qtsvg-opensource-src-$(QT5SVG_VERSION).tar.xz
- QT5SVG_DEPENDENCIES = qt5base
- QT5SVG_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5SVG_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
--QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
-+QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
- else
--QT5SVG_LICENSE = Commercial license
--QT5SVG_REDISTRIBUTE = NO
-+QT5SVG_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
- endif
- 
- define QT5SVG_CONFIGURE_CMDS
-diff --git a/package/qt5/qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch b/package/qt5/qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch
-deleted file mode 100644
-index 61cbdfe6a..000000000
---- a/package/qt5/qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch
-+++ /dev/null
-@@ -1,30 +0,0 @@
--From acdb24783322bb6e69df61cf04df2b2e47a06ad2 Mon Sep 17 00:00:00 2001
--From: Peter Seiderer <ps.report@gmx.net>
--Date: Tue, 29 Mar 2016 13:37:09 +0200
--Subject: [PATCH] Disable qdoc (needs qtdeclarative).
--
--Fixes:
--
--  Project ERROR: Unknown module(s) in QT: qmldevtools-private
--  Makefile:63: recipe for target 'sub-qdoc-qmake_all' failed
--
--Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-----
-- src/src.pro | 1 -
-- 1 file changed, 1 deletion(-)
--
--diff --git a/src/src.pro b/src/src.pro
--index 387d54f..494898f 100644
----- a/src/src.pro
--+++ b/src/src.pro
--@@ -14,7 +14,6 @@ qtHaveModule(widgets) {
-- }
-- 
-- SUBDIRS += linguist \
---    qdoc \
--     qtplugininfo
-- if(!android|android_app):!ios: SUBDIRS += qtpaths
-- 
---- 
--2.1.4
--
-diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in
-index 453913b8a..20f00f6b2 100644
---- a/package/qt5/qt5tools/Config.in
-+++ b/package/qt5/qt5tools/Config.in
-@@ -4,9 +4,10 @@ config BR2_PACKAGE_QT5TOOLS
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5tools module.
-+	  Qt Tools provides tools facilitate the development
-+	  and design of applications.
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtmodules.html#qt-tools
- 
- if BR2_PACKAGE_QT5TOOLS
- 
-diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash
-deleted file mode 100644
-index cc11b2845..000000000
---- a/package/qt5/qt5tools/qt5tools.hash
-+++ /dev/null
-@@ -1,2 +0,0 @@
--# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qttools-opensource-src-5.6.2.tar.xz.mirrorlist
--sha256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 qttools-opensource-src-5.6.2.tar.xz
-diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
-index 6befb8b2c..7d5353a43 100644
---- a/package/qt5/qt5tools/qt5tools.mk
-+++ b/package/qt5/qt5tools/qt5tools.mk
-@@ -19,12 +19,12 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
- QT5TOOLS_DEPENDENCIES += qt5declarative
- endif
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5TOOLS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
--QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5TOOLS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
-+QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
- else
--QT5TOOLS_LICENSE = Commercial license
--QT5TOOLS_REDISTRIBUTE = NO
-+QT5TOOLS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
- endif
- 
- QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \
-diff --git a/package/qt5/qt5virtualkeyboard/Config.in b/package/qt5/qt5virtualkeyboard/Config.in
-index 803b9376a..62a705187 100644
---- a/package/qt5/qt5virtualkeyboard/Config.in
-+++ b/package/qt5/qt5virtualkeyboard/Config.in
-@@ -1,6 +1,7 @@
- config BR2_PACKAGE_QT5VIRTUALKEYBOARD
- 	bool "qt5virtualkeyboard"
- 	select BR2_PACKAGE_QT5BASE
-+	depends on BR2_PACKAGE_QT5_VERSION_LATEST
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
-diff --git a/package/qt5/qt5webchannel/Config.in b/package/qt5/qt5webchannel/Config.in
-index 218629a7c..e3d840584 100644
---- a/package/qt5/qt5webchannel/Config.in
-+++ b/package/qt5/qt5webchannel/Config.in
-@@ -6,6 +6,8 @@ config BR2_PACKAGE_QT5WEBCHANNEL
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5webchannel module.
-+	  Qt WebChannel enables peer-to-peer communication between
-+	  a server (QML/C++ application) and a client
-+	  (HTML/JavaScript or QML application).
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtwebchannel-index.html
-diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash
-deleted file mode 100644
-index c4fc23081..000000000
---- a/package/qt5/qt5webchannel/qt5webchannel.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	3ab4cd177cc742ee5015f2b7f943c16ce13380b840f824436b5005485b749816	qtwebchannel-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
-index 3865ced34..791f4a92f 100644
---- a/package/qt5/qt5webchannel/qt5webchannel.mk
-+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
-@@ -10,12 +10,15 @@ QT5WEBCHANNEL_SOURCE = qtwebchannel-opensource-src-$(QT5WEBCHANNEL_VERSION).tar.
- QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets
- QT5WEBCHANNEL_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5WEBCHANNEL_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
--QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
-+QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
- else
--QT5WEBCHANNEL_LICENSE = Commercial license
--QT5WEBCHANNEL_REDISTRIBUTE = NO
-+QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+endif
-+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-+QT5WEBCHANNEL_LICENSE := $(QT5WEBCHANNEL_LICENSE), BSD-3-Clause (examples)
- endif
- 
- ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
-diff --git a/package/qt5/qt5webengine/001-chromium-glibc-2.24-issue.patch b/package/qt5/qt5webengine/001-chromium-glibc-2.24-issue.patch
-deleted file mode 100644
-index f3d5bdaf7..000000000
---- a/package/qt5/qt5webengine/001-chromium-glibc-2.24-issue.patch
-+++ /dev/null
-@@ -1,14 +0,0 @@
----- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp	2016-05-26 15:53:47.000000000 +0200
--+++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp	2016-11-19 00:19:49.894527354 +0100
--@@ -39,6 +39,11 @@
-- 
-- #include <sys/mman.h>
-- 
--+#if OS(LINUX) && defined(MADV_FREE)
--+// glibc 2.24 issues in qtwebengine
--+#undef MADV_FREE
--+#endif
--+
-- #ifndef MADV_FREE
-- #define MADV_FREE MADV_DONTNEED
-- #endif
-diff --git a/package/qt5/qt5webengine/5.6.2/001-allow-arm-compiler.__patch b/package/qt5/qt5webengine/5.6.2/001-allow-arm-compiler.__patch
-new file mode 100644
-index 000000000..bb8aa69ed
---- /dev/null
-+++ b/package/qt5/qt5webengine/5.6.2/001-allow-arm-compiler.__patch
-@@ -0,0 +1,26 @@
-+diff '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*ninja*' -Naur qt5_a/src/3rdparty/chromium/build/common.gypi qt5webengine-5.5.1/src/3rdparty/chromium/build/common.gypi
-+--- qt5_a/src/3rdparty/chromium/build/common.gypi	2015-10-13 06:36:43.000000000 +0200
-++++ qt5webengine-5.5.1/src/3rdparty/chromium/build/common.gypi	2016-02-09 16:37:54.729166157 +0100
-+@@ -2294,7 +2294,7 @@
-+           }],
-+         ],
-+         # Change the default to hard once the armhf transition is complete.
-+-        'arm_float_abi%': 'softfp',
-++        'arm_float_abi%': 'hard',
-+         'arm_thumb%': 1,
-+       }],
-+ 
-+--- qt5webengine-5.5.1/tools/qmake/mkspecs/features/functions.prf	2015-10-13 06:36:55.000000000 +0200
-++++ qt5_we_b/tools/qmake/mkspecs/features/functions.prf	2016-02-09 21:44:30.829783885 +0100
-+@@ -12,9 +12,9 @@
-+     return(false)
-+   }
-+ 
-+-  linux-g++*:!isGCCVersionSupported(): return(false)
-++  linux*g++*:!isGCCVersionSupported(): return(false)
-+   !isPythonVersionSupported(): return(false)
-+-  linux-g++*|win32-msvc2013|macx-clang: return(true)
-++  linux*g++*|win32-msvc2013|macx-clang: return(true)
-+   boot2qt: return(true)
-+ 
-+   skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.")
-diff --git a/package/qt5/qt5webengine/001-delegate_frame_node_fence_sync.patch b/package/qt5/qt5webengine/5.6.2/001-delegate_frame_node_fence_sync.patch
-similarity index 100%
-rename from package/qt5/qt5webengine/001-delegate_frame_node_fence_sync.patch
-rename to package/qt5/qt5webengine/5.6.2/001-delegate_frame_node_fence_sync.patch
-diff --git a/package/qt5/qt5webengine/5.6.2/002-buildroot-python-bz2.patch b/package/qt5/qt5webengine/5.6.2/002-buildroot-python-bz2.patch
-new file mode 100644
-index 000000000..b780f49ec
---- /dev/null
-+++ b/package/qt5/qt5webengine/5.6.2/002-buildroot-python-bz2.patch
-@@ -0,0 +1,11 @@
-+--- a/src/3rdparty/chromium/v8/tools/js2c.py	2016-03-03 15:48:36.000000000 +0100
-++++ b/src/3rdparty/chromium/v8/tools/js2c.py	2016-04-28 15:56:42.219174252 +0200
-+@@ -34,7 +34,7 @@
-+ import os, re, sys, string
-+ import optparse
-+ import jsmin
-+-import bz2
-++##import bz2
-+ import textwrap
-+ 
-+ 
-diff --git a/package/qt5/qt5webengine/5.6.2/002-move_icu_to_56_1.__patch b/package/qt5/qt5webengine/5.6.2/002-move_icu_to_56_1.__patch
-new file mode 100644
-index 000000000..a917a9c14
---- /dev/null
-+++ b/package/qt5/qt5webengine/5.6.2/002-move_icu_to_56_1.__patch
-@@ -0,0 +1,43 @@
-+--- qt5webengine-5.5.1/src/3rdparty/chromium/third_party/icu/source/common/unicode/uvernum.h	2015-10-13 06:36:26.000000000 +0200
-++++ qt5_b/src/3rdparty/chromium/third_party/icu/source/common/unicode/uvernum.h	2016-02-11 12:06:28.304679220 +0100
-+@@ -57,7 +57,7 @@
-+  *  This value will change in the subsequent releases of ICU
-+  *  @stable ICU 2.4
-+  */
-+-#define U_ICU_VERSION_MAJOR_NUM 52
-++#define U_ICU_VERSION_MAJOR_NUM 56
-+ 
-+ /** The current ICU minor version as an integer.
-+  *  This value will change in the subsequent releases of ICU
-+@@ -83,7 +83,7 @@
-+  *  This value will change in the subsequent releases of ICU
-+  *  @stable ICU 2.6
-+  */
-+-#define U_ICU_VERSION_SUFFIX _52
-++#define U_ICU_VERSION_SUFFIX _56
-+ 
-+ /**
-+  * \def U_DEF2_ICU_ENTRY_POINT_RENAME
-+@@ -118,19 +118,19 @@
-+  *  This value will change in the subsequent releases of ICU
-+  *  @stable ICU 2.4
-+  */
-+-#define U_ICU_VERSION "52.1"
-++#define U_ICU_VERSION "56.1"
-+ 
-+ /** The current ICU library major/minor version as a string without dots, for library name suffixes.
-+  *  This value will change in the subsequent releases of ICU
-+  *  @stable ICU 2.6
-+  */
-+-#define U_ICU_VERSION_SHORT "52"
-++#define U_ICU_VERSION_SHORT "56"
-+ 
-+ #ifndef U_HIDE_INTERNAL_API
-+ /** Data version in ICU4C.
-+  * @internal ICU 4.4 Internal Use Only
-+  **/
-+-#define U_ICU_DATA_VERSION "52.1"
-++#define U_ICU_DATA_VERSION "56.1"
-+ #endif  /* U_HIDE_INTERNAL_API */
-+ 
-+ /*===========================================================================
-diff --git a/package/qt5/qt5webengine/5.6.2/003-egl_khr_reusable_sync.patch b/package/qt5/qt5webengine/5.6.2/003-egl_khr_reusable_sync.patch
-new file mode 100644
-index 000000000..8d633d965
---- /dev/null
-+++ b/package/qt5/qt5webengine/5.6.2/003-egl_khr_reusable_sync.patch
-@@ -0,0 +1,14 @@
-+--- qt5webengine-5.5.1/src/core/delegated_frame_node.cpp	2015-10-13 06:36:54.000000000 +0200
-++++ qt5_b/src/core/delegated_frame_node.cpp	2016-02-11 13:27:42.142167151 +0100
-+@@ -76,6 +76,11 @@
-+ #include <EGL/eglext.h>
-+ #endif
-+ 
-++#ifdef EGL_KHR_reusable_sync
-++#undef EGL_KHR_reusable_sync
-++#endif
-++
-++
-+ namespace QtWebEngineCore {
-+ 
-+ class MailboxTexture : public QSGTexture, protected QOpenGLFunctions {
-diff --git a/package/qt5/qt5webengine/5.6.2/003-jpeg-codec-external-lib.patch b/package/qt5/qt5webengine/5.6.2/003-jpeg-codec-external-lib.patch
-new file mode 100644
-index 000000000..4ace97f64
---- /dev/null
-+++ b/package/qt5/qt5webengine/5.6.2/003-jpeg-codec-external-lib.patch
-@@ -0,0 +1,49 @@
-+diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
-+index 6d92637..d34ae33 100644
-+--- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
-++++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
-+@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
-+   // tell libjpeg where to write the next data
-+   cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
-+   cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
-+-  return 1;
-++  return (boolean)(1);
-+ }
-+ 
-+ // Cleans up the JpegEncoderState to prepare for returning in the final form.
-+@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
-+   cinfo.data_precision = 8;
-+ 
-+   jpeg_set_defaults(&cinfo);
-+-  jpeg_set_quality(&cinfo, quality, 1);  // quality here is 0-100
-++  jpeg_set_quality(&cinfo, quality, (boolean)true);  // quality here is 0-100
-+ 
-+   // set up the destination manager
-+   jpeg_destination_mgr destmgr;
-+@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
-+   JpegEncoderState state(output);
-+   cinfo.client_data = &state;
-+ 
-+-  jpeg_start_compress(&cinfo, 1);
-++  jpeg_start_compress(&cinfo, (boolean)true);
-+ 
-+   // feed it the rows, doing necessary conversions for the color format
-+ #ifdef JCS_EXTENSIONS
-+@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) {
-+ //   set to a positive value if TRUE is returned. A FALSE return should only
-+ //   be used when I/O suspension is desired."
-+ boolean FillInputBuffer(j_decompress_ptr cinfo) {
-+-  return false;
-++  return (boolean)false;
-+ }
-+ 
-+ // Skip data in the buffer. Since we have all the data at once, this operation
-+@@ -488,7 +488,7 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size,
-+   cinfo.client_data = &state;
-+ 
-+   // fill the file metadata into our buffer
-+-  if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
-++  if (jpeg_read_header(&cinfo, (boolean)true) != JPEG_HEADER_OK)
-+     return false;
-+ 
-+   // we want to always get RGB data out
-diff --git a/package/qt5/qt5webengine/5.6.2/004-allow-egl-surface.__patch b/package/qt5/qt5webengine/5.6.2/004-allow-egl-surface.__patch
-new file mode 100644
-index 000000000..604cb88f3
---- /dev/null
-+++ b/package/qt5/qt5webengine/5.6.2/004-allow-egl-surface.__patch
-@@ -0,0 +1,166 @@
-+diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/base/files/file_proxy_unittest.cc qt5_b/src/3rdparty/chromium/base/files/file_proxy_unittest.cc
-+--- qt5webengine-5.5.1/src/3rdparty/chromium/base/files/file_proxy_unittest.cc	2015-10-13 06:36:48.000000000 +0200
-++++ qt5_b/src/3rdparty/chromium/base/files/file_proxy_unittest.cc	2016-02-12 17:58:52.694043375 +0100
-+@@ -142,7 +142,7 @@
-+ }
-+ 
-+ TEST_F(FileProxyTest, CreateOrOpen_AbandonedCreate) {
-+-  bool prev = ThreadRestrictions::SetIOAllowed(false);
-++  bool prev = ThreadRestrictions::SetIOAllowed(true);
-+   {
-+     FileProxy proxy(file_task_runner());
-+     proxy.CreateOrOpen(
-+diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/content/browser/browser_main_loop.cc qt5_b/src/3rdparty/chromium/content/browser/browser_main_loop.cc
-+--- qt5webengine-5.5.1/src/3rdparty/chromium/content/browser/browser_main_loop.cc	2015-10-13 06:36:47.000000000 +0200
-++++ qt5_b/src/3rdparty/chromium/content/browser/browser_main_loop.cc	2016-02-12 17:53:52.118534482 +0100
-+@@ -745,7 +745,7 @@
-+ 
-+   // If the UI thread blocks, the whole UI is unresponsive.
-+   // Do not allow disk IO from the UI thread.
-+-  base::ThreadRestrictions::SetIOAllowed(false);
-++  base::ThreadRestrictions::SetIOAllowed(true);
-+   base::ThreadRestrictions::DisallowWaiting();
-+   return result_code_;
-+ }
-+diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/content/browser/browser_process_sub_thread.cc qt5_b/src/3rdparty/chromium/content/browser/browser_process_sub_thread.cc
-+--- qt5webengine-5.5.1/src/3rdparty/chromium/content/browser/browser_process_sub_thread.cc	2015-10-13 06:36:46.000000000 +0200
-++++ qt5_b/src/3rdparty/chromium/content/browser/browser_process_sub_thread.cc	2016-02-12 17:52:40.717701092 +0100
-+@@ -39,7 +39,7 @@
-+     // Though this thread is called the "IO" thread, it actually just routes
-+     // messages around; it shouldn't be allowed to perform any blocking disk
-+     // I/O.
-+-    base::ThreadRestrictions::SetIOAllowed(false);
-++    base::ThreadRestrictions::SetIOAllowed(true);
-+     base::ThreadRestrictions::DisallowWaiting();
-+   }
-+ }
-+diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/dbus/end_to_end_async_unittest.cc qt5_b/src/3rdparty/chromium/dbus/end_to_end_async_unittest.cc
-+--- qt5webengine-5.5.1/src/3rdparty/chromium/dbus/end_to_end_async_unittest.cc	2015-10-13 06:36:51.000000000 +0200
-++++ qt5_b/src/3rdparty/chromium/dbus/end_to_end_async_unittest.cc	2016-02-12 17:57:04.280777854 +0100
-+@@ -39,7 +39,7 @@
-+ 
-+   virtual void SetUp() {
-+     // Make the main thread not to allow IO.
-+-    base::ThreadRestrictions::SetIOAllowed(false);
-++    base::ThreadRestrictions::SetIOAllowed(true);
-+ 
-+     // Start the D-Bus thread.
-+     dbus_thread_.reset(new base::Thread("D-Bus Thread"));
-+diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/dbus/object_manager_unittest.cc qt5_b/src/3rdparty/chromium/dbus/object_manager_unittest.cc
-+--- qt5webengine-5.5.1/src/3rdparty/chromium/dbus/object_manager_unittest.cc	2015-10-13 06:36:51.000000000 +0200
-++++ qt5_b/src/3rdparty/chromium/dbus/object_manager_unittest.cc	2016-02-12 17:54:33.659019384 +0100
-+@@ -61,7 +61,7 @@
-+ 
-+   virtual void SetUp() {
-+     // Make the main thread not to allow IO.
-+-    base::ThreadRestrictions::SetIOAllowed(false);
-++    base::ThreadRestrictions::SetIOAllowed(true);
-+ 
-+     // Start the D-Bus thread.
-+     dbus_thread_.reset(new base::Thread("D-Bus Thread"));
-+diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/dbus/property_unittest.cc qt5_b/src/3rdparty/chromium/dbus/property_unittest.cc
-+--- qt5webengine-5.5.1/src/3rdparty/chromium/dbus/property_unittest.cc	2015-10-13 06:36:51.000000000 +0200
-++++ qt5_b/src/3rdparty/chromium/dbus/property_unittest.cc	2016-02-12 17:57:54.025358691 +0100
-+@@ -51,7 +51,7 @@
-+ 
-+   virtual void SetUp() {
-+     // Make the main thread not to allow IO.
-+-    base::ThreadRestrictions::SetIOAllowed(false);
-++    base::ThreadRestrictions::SetIOAllowed(true);
-+ 
-+     // Start the D-Bus thread.
-+     dbus_thread_.reset(new base::Thread("D-Bus Thread"));
-+diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/dbus/signal_sender_verification_unittest.cc qt5_b/src/3rdparty/chromium/dbus/signal_sender_verification_unittest.cc
-+--- qt5webengine-5.5.1/src/3rdparty/chromium/dbus/signal_sender_verification_unittest.cc	2015-10-13 06:36:51.000000000 +0200
-++++ qt5_b/src/3rdparty/chromium/dbus/signal_sender_verification_unittest.cc	2016-02-12 17:55:57.519998395 +0100
-+@@ -32,7 +32,7 @@
-+     base::StatisticsRecorder::Initialize();
-+ 
-+     // Make the main thread not to allow IO.
-+-    base::ThreadRestrictions::SetIOAllowed(false);
-++    base::ThreadRestrictions::SetIOAllowed(true);
-+ 
-+     // Start the D-Bus thread.
-+     dbus_thread_.reset(new base::Thread("D-Bus Thread"));
-+@@ -161,7 +161,7 @@
-+   void SafeServiceStop(TestService* test_service) {
-+     base::ThreadRestrictions::SetIOAllowed(true);
-+     test_service->Stop();
-+-    base::ThreadRestrictions::SetIOAllowed(false);
-++    base::ThreadRestrictions::SetIOAllowed(true);
-+   }
-+ 
-+   base::MessageLoop message_loop_;
-+diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/net/base/file_stream_unittest.cc qt5_b/src/3rdparty/chromium/net/base/file_stream_unittest.cc
-+--- qt5webengine-5.5.1/src/3rdparty/chromium/net/base/file_stream_unittest.cc	2015-10-13 06:36:53.000000000 +0200
-++++ qt5_b/src/3rdparty/chromium/net/base/file_stream_unittest.cc	2016-02-12 18:00:05.358889970 +0100
-+@@ -758,7 +758,7 @@
-+   scoped_refptr<base::SequencedWorkerPool> pool(
-+       new base::SequencedWorkerPool(1, "StreamTest"));
-+ 
-+-  bool prev = base::ThreadRestrictions::SetIOAllowed(false);
-++  bool prev = base::ThreadRestrictions::SetIOAllowed(true);
-+   scoped_ptr<FileStream> stream(new FileStream(pool.get()));
-+   int flags = base::File::FLAG_OPEN | base::File::FLAG_WRITE |
-+               base::File::FLAG_ASYNC;
-+diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/net/base/network_config_watcher_mac.cc qt5_b/src/3rdparty/chromium/net/base/network_config_watcher_mac.cc
-+--- qt5webengine-5.5.1/src/3rdparty/chromium/net/base/network_config_watcher_mac.cc	2015-10-13 06:36:53.000000000 +0200
-++++ qt5_b/src/3rdparty/chromium/net/base/network_config_watcher_mac.cc	2016-02-12 18:00:56.359484236 +0100
-+@@ -67,7 +67,7 @@
-+ void NetworkConfigWatcherMacThread::Init() {
-+   // Disallow IO to make sure NetworkConfigWatcherMacThread's helper thread does
-+   // not perform blocking operations.
-+-  base::ThreadRestrictions::SetIOAllowed(false);
-++  base::ThreadRestrictions::SetIOAllowed(true);
-+ 
-+   delegate_->Init();
-+ 
-+diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/3rdparty/chromium/net/disk_cache/backend_unittest.cc qt5_b/src/3rdparty/chromium/net/disk_cache/backend_unittest.cc
-+--- qt5webengine-5.5.1/src/3rdparty/chromium/net/disk_cache/backend_unittest.cc	2015-10-13 06:36:53.000000000 +0200
-++++ qt5_b/src/3rdparty/chromium/net/disk_cache/backend_unittest.cc	2016-02-12 18:02:24.724514006 +0100
-+@@ -463,7 +463,7 @@
-+       base::Thread::Options(base::MessageLoop::TYPE_IO, 0)));
-+   net::TestCompletionCallback cb;
-+ 
-+-  bool prev = base::ThreadRestrictions::SetIOAllowed(false);
-++  bool prev = base::ThreadRestrictions::SetIOAllowed(true);
-+   scoped_ptr<disk_cache::BackendImpl> cache(new disk_cache::BackendImpl(
-+       cache_path_, cache_thread.task_runner(), NULL));
-+   int rv = cache->Init(cb.callback());
-+@@ -1972,7 +1972,7 @@
-+       base::Thread::Options(base::MessageLoop::TYPE_IO, 0)));
-+ 
-+   net::TestCompletionCallback cb;
-+-  bool prev = base::ThreadRestrictions::SetIOAllowed(false);
-++  bool prev = base::ThreadRestrictions::SetIOAllowed(true);
-+   base::FilePath path(cache_path_);
-+   int rv = disk_cache::CreateCacheBackend(net::DISK_CACHE,
-+                                           net::CACHE_BACKEND_BLOCKFILE,
-+diff -aur '--exclude=*.pyc' '--exclude=*.o' '--exclude=*.h' '--exclude=*.a' '--exclude=*deps' '--exclude=*log*' '--exclude=*ninja*' '--exclude=*.gyp' '--exclude=*.pak' '--exclude=*.pickle' '--exclude=*.cache' '--exclude=*.py' '--exclude=*.idl' '--exclude=*.gypi' '--exclude=*.tmp' '--exclude=*.in' '--exclude=*.rc' qt5webengine-5.5.1/src/core/gl_surface_qt.cpp qt5_b/src/core/gl_surface_qt.cpp
-+--- qt5webengine-5.5.1/src/core/gl_surface_qt.cpp	2015-10-13 06:36:54.000000000 +0200
-++++ qt5_b/src/core/gl_surface_qt.cpp	2016-02-14 11:38:43.661776602 +0100
-+@@ -513,15 +513,20 @@
-+         return NULL;
-+ #endif
-+     }
-+-    case kGLImplementationEGLGLES2: {
-++   case kGLImplementationEGLGLES2: {
-+         scoped_refptr<GLSurface> surface = new GLSurfaceQtEGL(size);
-+         if (!surface->Initialize())
-+             return NULL;
-+         return surface;
-+     }
-+-    default:
-+-        Q_UNREACHABLE();
-+-        return NULL;
-++    default: {
-++        scoped_refptr<GLSurface> surface = new GLSurfaceQtEGL(size);
-++        if (!surface->Initialize())
-++            return NULL;
-++        return surface;
-++    }
-++//        Q_UNREACHABLE();
-++//        return NULL;
-+     }
-+ }
-+ 
-diff --git a/package/qt5/qt5webengine/5.8.0/001-use-neon-per-default.patch b/package/qt5/qt5webengine/5.8.0/001-use-neon-per-default.patch
-new file mode 100644
-index 000000000..9e865d3d9
---- /dev/null
-+++ b/package/qt5/qt5webengine/5.8.0/001-use-neon-per-default.patch
-@@ -0,0 +1,13 @@
-+diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
-+index dc22d14..161ca9e 100644
-+--- a/src/core/gyp_run.pro
-++++ b/src/core/gyp_run.pro
-+@@ -82,7 +82,7 @@ contains(QT_ARCH, "arm") {
-+         else: GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=0 arm_neon_optional=0
-+     } else {
-+         # Chromium defaults to arm_neon=1, Qt does not.
-+-        GYP_CONFIG += arm_neon=0
-++        GYP_CONFIG += arm_neon=1
-+         !lessThan(MARMV, 7): GYP_CONFIG += arm_neon_optional=1
-+     }
-+ 
-diff --git a/package/qt5/qt5webengine/5.8.0/002-EGL_KHR_reusable_sync-disa.patch b/package/qt5/qt5webengine/5.8.0/002-EGL_KHR_reusable_sync-disa.patch
-new file mode 100644
-index 000000000..2b4b5aad5
---- /dev/null
-+++ b/package/qt5/qt5webengine/5.8.0/002-EGL_KHR_reusable_sync-disa.patch
-@@ -0,0 +1,15 @@
-+diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp
-+index baf0640..0c77eb2 100644
-+--- a/src/core/delegated_frame_node.cpp
-++++ b/src/core/delegated_frame_node.cpp
-+@@ -91,6 +91,10 @@
-+ #include <EGL/eglext.h>
-+ #endif
-+ 
-++#ifdef EGL_KHR_reusable_sync
-++#undef EGL_KHR_reusable_sync
-++#endif
-++
-+ #ifndef GL_TIMEOUT_IGNORED
-+ #define GL_TIMEOUT_IGNORED                0xFFFFFFFFFFFFFFFFull
-+ #endif
-diff --git a/package/qt5/qt5webengine/5.8.0/003-jpeg-codec-external-lib.patch b/package/qt5/qt5webengine/5.8.0/003-jpeg-codec-external-lib.patch
-new file mode 100644
-index 000000000..4ace97f64
---- /dev/null
-+++ b/package/qt5/qt5webengine/5.8.0/003-jpeg-codec-external-lib.patch
-@@ -0,0 +1,49 @@
-+diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
-+index 6d92637..d34ae33 100644
-+--- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
-++++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
-+@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
-+   // tell libjpeg where to write the next data
-+   cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
-+   cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
-+-  return 1;
-++  return (boolean)(1);
-+ }
-+ 
-+ // Cleans up the JpegEncoderState to prepare for returning in the final form.
-+@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
-+   cinfo.data_precision = 8;
-+ 
-+   jpeg_set_defaults(&cinfo);
-+-  jpeg_set_quality(&cinfo, quality, 1);  // quality here is 0-100
-++  jpeg_set_quality(&cinfo, quality, (boolean)true);  // quality here is 0-100
-+ 
-+   // set up the destination manager
-+   jpeg_destination_mgr destmgr;
-+@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
-+   JpegEncoderState state(output);
-+   cinfo.client_data = &state;
-+ 
-+-  jpeg_start_compress(&cinfo, 1);
-++  jpeg_start_compress(&cinfo, (boolean)true);
-+ 
-+   // feed it the rows, doing necessary conversions for the color format
-+ #ifdef JCS_EXTENSIONS
-+@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) {
-+ //   set to a positive value if TRUE is returned. A FALSE return should only
-+ //   be used when I/O suspension is desired."
-+ boolean FillInputBuffer(j_decompress_ptr cinfo) {
-+-  return false;
-++  return (boolean)false;
-+ }
-+ 
-+ // Skip data in the buffer. Since we have all the data at once, this operation
-+@@ -488,7 +488,7 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size,
-+   cinfo.client_data = &state;
-+ 
-+   // fill the file metadata into our buffer
-+-  if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
-++  if (jpeg_read_header(&cinfo, (boolean)true) != JPEG_HEADER_OK)
-+     return false;
-+ 
-+   // we want to always get RGB data out
-diff --git a/package/qt5/qt5webengine/5.8.0/004-on-arm8-set-armv7-type.patch b/package/qt5/qt5webengine/5.8.0/004-on-arm8-set-armv7-type.patch
-new file mode 100644
-index 000000000..862cb9561
---- /dev/null
-+++ b/package/qt5/qt5webengine/5.8.0/004-on-arm8-set-armv7-type.patch
-@@ -0,0 +1,13 @@
-+diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
-+index 161ca9e..6a0eacd 100644
-+--- a/src/core/gyp_run.pro
-++++ b/src/core/gyp_run.pro
-+@@ -69,6 +69,8 @@ contains(QT_ARCH, "arm") {
-+         MARMV = $$split(MARMV,)
-+         MARMV = $$member(MARMV, 0)
-+         lessThan(MARMV, 6): error("$$MARCH architecture is not supported")
-++	else: equals(MARMV, 7): GYP_CONFIG += arm_version=\"$MARMV\"
-++	else: GYP_CONFIG += arm_version=\"7\"
-+         GYP_CONFIG += arm_version=\"$$MARMV\"
-+     }
-+ 
-diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in
-index b630a852a..dd6598372 100644
---- a/package/qt5/qt5webengine/Config.in
-+++ b/package/qt5/qt5webengine/Config.in
-@@ -10,6 +10,7 @@ config BR2_PACKAGE_QT5WEBENGINE
- 	select BR2_PACKAGE_LIBCAP
- 	select BR2_PACKAGE_QT5DECLARATIVE
- 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
-+	select BR2_PACKAGE_WEBP
- 	help
- 	Qt is a cross-platform application and UI framework for
- 	developers using C++.
-diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
-index 98c67a63b..46cf6853c 100644
---- a/package/qt5/qt5webengine/qt5webengine.mk
-+++ b/package/qt5/qt5webengine/qt5webengine.mk
-@@ -20,12 +20,25 @@ QT5WEBENGINE_LICENSE = Commercial license
- QT5WEBENGINE_REDISTRIBUTE = NO
- endif
- 
-+ifneq ($(BR2_GCC_TARGET_CPU),)
-+QT5WEBENGINE_QMAKE_CFLAGS += -mtune=$(BR2_GCC_TARGET_CPU)
-+endif
-+
-+ifneq ($(BR2_GCC_TARGET_FLOAT_ABI),)
-+QT5WEBENGINE_QMAKE_CFLAGS += -mfloat-abi=$(BR2_GCC_TARGET_FLOAT_ABI)
-+endif
-+
-+ifneq ($(BR2_GCC_TARGET_FPU),)
-+QT5WEBENGINE_QMAKE_CFLAGS += -mfpu=$(BR2_GCC_TARGET_FPU)
-+endif
-+
- ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
- QT5WEBENGINE_DEPENDENCIES += qt5declarative
- endif
- 
- define QT5WEBENGINE_CONFIGURE_CMDS
-- (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake WEBENGINE_CONFIG+=use_proprietary_codecs)
-+# (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake WEBENGINE_CONFIG+=use_proprietary_codecs)
-+ (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
- endef
- 
- define QT5WEBENGINE_BUILD_CMDS
-diff --git a/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch b/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch
-deleted file mode 100644
-index b7b6791ab..000000000
---- a/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch
-+++ /dev/null
-@@ -1,34 +0,0 @@
--From 5dd4bb67cfce812fd7686e43616e2069f354a7df Mon Sep 17 00:00:00 2001
--From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
--Date: Mon, 22 Feb 2016 10:57:32 +0100
--Subject: [PATCH] Fix linking with libpthread
--
--WebKit use libpthread directly but is depending on other qt modules
--causing it to be linked against, which might break unless -lpthread
--is last. Instead just add it explicitly after the static libraries.
--
--Upstream-Status: Backport from 5.7 branch
--
--Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33
--Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
--Signed-off-by: Jonathan Liu <net147@gmail.com>
--Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
-----
-- Tools/qmake/mkspecs/features/default_post.prf | 1 +
-- 1 file changed, 1 insertion(+)
--
--diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
--index 67276b7..39bb3f7 100644
----- a/Tools/qmake/mkspecs/features/default_post.prf
--+++ b/Tools/qmake/mkspecs/features/default_post.prf
--@@ -201,6 +201,7 @@ needToLink() {
--         linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
--         LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
--     }
--+    posix:!darwin: LIBS += -lpthread
-- }
-- 
-- creating_module {
---- 
--2.7.1
--
-diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in
-index 7add5f95a..637996a0d 100644
---- a/package/qt5/qt5webkit/Config.in
-+++ b/package/qt5/qt5webkit/Config.in
-@@ -1,28 +1,33 @@
- config BR2_PACKAGE_QT5WEBKIT
- 	bool "qt5webkit"
-+	depends on !BR2_STATIC_LIBS
-+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-+	depends on !BR2_BINFMT_FLAT # icu
-+	# assumes a FPU is available on MIPS
-+	depends on !BR2_MIPS_SOFT_FLOAT
- 	select BR2_PACKAGE_QT5BASE
- 	select BR2_PACKAGE_QT5BASE_ICU
- 	select BR2_PACKAGE_QT5BASE_GUI
- 	select BR2_PACKAGE_SQLITE
- 	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB
- 	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB
--	depends on !BR2_STATIC_LIBS
--	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
--	depends on !BR2_BINFMT_FLAT # icu
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5webkit module.
-+	  The Qt WebKit module provides the WebView API, which
-+	  allows QML applications to render regions of dynamic
-+	  web content.
- 
- 	  This package has been removed from the official release packages
- 	  since Qt5.6.0, but it is still available for users to build it
- 	  from source. This is useful for platforms without GPU since the
- 	  successor (QtWebEngine) requires OpenGL support.
- 
--	  http://qt.io
-+	  http://doc.qt.io/archives/qt-5.5/qtwebkit-index.html
- 
- comment "qt5webkit needs a toolchain w/ dynamic library"
--        depends on BR2_STATIC_LIBS
--        depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
--        depends on !BR2_BINFMT_FLAT
-+	depends on BR2_STATIC_LIBS
-+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-+	depends on !BR2_BINFMT_FLAT
-+	depends on !BR2_MIPS_SOFT_FLOAT
-diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash
-deleted file mode 100644
-index 47e93c0d1..000000000
---- a/package/qt5/qt5webkit/qt5webkit.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	1c79843ef32313312290d4fe0b87256a9129dc44d62b01789a692981edf4d8ab	qt5webkit-d2ff5a085572b1ee24dcb42ae107063f3142d14e.tar.gz
-diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
-index 629e40a3e..d43519299 100644
---- a/package/qt5/qt5webkit/qt5webkit.mk
-+++ b/package/qt5/qt5webkit/qt5webkit.mk
-@@ -4,24 +4,20 @@
- #
- ################################################################################
- 
--QT5WEBKIT_VERSION = d2ff5a085572b1ee24dcb42ae107063f3142d14e
--# Using GitHub since it supports downloading tarballs from random commits.
--# The http://code.qt.io/cgit/qt/qtwebkit.git/ repo doesn't allow to do so.
--QT5WEBKIT_SITE = $(call github,qtproject,qtwebkit,$(QT5WEBKIT_VERSION))
--QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf host-bison host-flex
-+QT5WEBKIT_VERSION = $(QT5_VERSION)
-+QT5WEBKIT_SITE = $(QT5_SNAPSHOTS_SITE)
-+QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
-+QT5WEBKIT_DEPENDENCIES = \
-+	host-bison host-flex host-gperf host-python host-ruby \
-+	qt5base sqlite
- QT5WEBKIT_INSTALL_STAGING = YES
- 
- QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5WEBKIT_LICENSE = LGPLv2.1+, BSD-3c, BSD-2c
-+QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause
- # Source files contain references to LGPL_EXCEPTION.txt but it is not included
- # in the archive.
- QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21
--else
--QT5WEBKIT_LICENSE = LGPLv2.1+ (WebCore), Commercial license
--QT5WEBKIT_REDISTRIBUTE = NO
--endif
- 
- ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
- QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender
-@@ -31,23 +27,26 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
- QT5WEBKIT_DEPENDENCIES += qt5declarative
- endif
- 
--# Since we get the source from git, generated header files are not included.
--# qmake detects that header file generation (using the syncqt tool) must be
--# done based on the existence of a .git directory (cfr. the git_build config
--# option which is set in qt_build_paths.prf).
--# So, to make sure that qmake detects that header files must be generated,
--# create an empty .git directory.
-+# QtWebkit's build system uses python, but only supports python2. We work
-+# around this by forcing python2 early in the PATH, via a python->python2
-+# symlink.
-+QT5WEBKIT_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
-+define QT5WEBKIT_PYTHON2_SYMLINK
-+	mkdir -p $(@D)/host-bin
-+	ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/host-bin/python
-+endef
-+QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
-+
- define QT5WEBKIT_CONFIGURE_CMDS
--	mkdir -p $(@D)/.git
--	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-+	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/usr/bin/qmake)
- endef
- 
- define QT5WEBKIT_BUILD_CMDS
--	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
-+	$(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D)
- endef
- 
- define QT5WEBKIT_INSTALL_STAGING_CMDS
--	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
-+	$(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D) install
- 	$(QT5_LA_PRL_FILES_FIXUP)
- endef
- 
-diff --git a/package/qt5/qt5websockets/Config.in b/package/qt5/qt5websockets/Config.in
-index 385a07c9f..0cfde91c8 100644
---- a/package/qt5/qt5websockets/Config.in
-+++ b/package/qt5/qt5websockets/Config.in
-@@ -6,6 +6,9 @@ config BR2_PACKAGE_QT5WEBSOCKETS
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5websockets module.
-+	  The Qt WebSockets module provides C++ and QML interfaces
-+	  that enable Qt applications to act as a server that can
-+	  process WebSocket requests, or a client that can
-+	  consume data received from the server, or both.
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtwebsockets-index.html
-diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash
-deleted file mode 100644
-index 067bd6ffd..000000000
---- a/package/qt5/qt5websockets/qt5websockets.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	741be11a907f82807a786e6a53ae7316c0b3864491b692e8719c381e0f158b43	qtwebsockets-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
-index 609b68e4e..af87435d6 100644
---- a/package/qt5/qt5websockets/qt5websockets.mk
-+++ b/package/qt5/qt5websockets/qt5websockets.mk
-@@ -10,12 +10,15 @@ QT5WEBSOCKETS_SOURCE = qtwebsockets-opensource-src-$(QT5WEBSOCKETS_VERSION).tar.
- QT5WEBSOCKETS_DEPENDENCIES = qt5base
- QT5WEBSOCKETS_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5WEBSOCKETS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3
--QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools)
-+QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3
- else
--QT5WEBSOCKETS_LICENSE = Commercial license
--QT5WEBSOCKETS_REDISTRIBUTE = NO
-+QT5WEBSOCKETS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0
-+QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
-+endif
-+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-+QT5WEBSOCKETS_LICENSE := $(QT5WEBSOCKETS_LICENSE), BSD-3-Clause (examples)
- endif
- 
- ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
-diff --git a/package/qt5/qt5x11extras/Config.in b/package/qt5/qt5x11extras/Config.in
-index 6fc2c0ade..ff4cc1153 100644
---- a/package/qt5/qt5x11extras/Config.in
-+++ b/package/qt5/qt5x11extras/Config.in
-@@ -1,11 +1,12 @@
- config BR2_PACKAGE_QT5X11EXTRAS
- 	bool "qt5x11extras"
--	select BR2_PACKAGE_QT5BASE_WIDGETS
- 	depends on BR2_PACKAGE_QT5BASE_XCB
-+	select BR2_PACKAGE_QT5BASE_WIDGETS
- 	help
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5x11extras module.
-+	  Qt X11 Extras enables the Qt programmer to write
-+	  applications for the Linux/X11 platform.
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtx11extras-index.html
-diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash
-deleted file mode 100644
-index 297c578b8..000000000
---- a/package/qt5/qt5x11extras/qt5x11extras.hash
-+++ /dev/null
-@@ -1,2 +0,0 @@
--# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtx11extras-opensource-src-5.6.2.tar.xz.mirrorlist
--sha256 71ffde1cfaeec310677b69ecd16cb5992e8885cf3e73b4cec7d6e7a115b40ced qtx11extras-opensource-src-5.6.2.tar.xz
-diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
-index a0e120986..00667c72f 100644
---- a/package/qt5/qt5x11extras/qt5x11extras.mk
-+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
-@@ -10,12 +10,12 @@ QT5X11EXTRAS_SOURCE = qtx11extras-opensource-src-$(QT5X11EXTRAS_VERSION).tar.xz
- QT5X11EXTRAS_DEPENDENCIES = qt5base
- QT5X11EXTRAS_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5X11EXTRAS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
--QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
-+QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
- else
--QT5X11EXTRAS_LICENSE = Commercial license
--QT5X11EXTRAS_REDISTRIBUTE = NO
-+QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
- endif
- 
- define QT5X11EXTRAS_CONFIGURE_CMDS
-diff --git a/package/qt5/qt5xmlpatterns/Config.in b/package/qt5/qt5xmlpatterns/Config.in
-index 8c82656c5..dd8b54eba 100644
---- a/package/qt5/qt5xmlpatterns/Config.in
-+++ b/package/qt5/qt5xmlpatterns/Config.in
-@@ -5,6 +5,7 @@ config BR2_PACKAGE_QT5XMLPATTERNS
- 	  Qt is a cross-platform application and UI framework for
- 	  developers using C++.
- 
--	  This package corresponds to the qt5xmlpatterns module.
-+	  The Qt XML Patterns module provides support for XPath,
-+	  XQuery, XSLT, and XML Schema validation.
- 
--	  http://qt.io
-+	  http://doc.qt.io/qt-5/qtxmlpatterns-index.html
-diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
-deleted file mode 100644
-index f0f369d6c..000000000
---- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
-+++ /dev/null
-@@ -1 +0,0 @@
--sha256	38882a4ea5d711be07d10695759359045f7f9d64727a65e1d5e6515d55c7e20b	qtxmlpatterns-opensource-src-5.7.0.tar.xz
-diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
-index 31477a7c0..fabca2126 100644
---- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
-+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
-@@ -10,12 +10,15 @@ QT5XMLPATTERNS_SOURCE = qtxmlpatterns-opensource-src-$(QT5XMLPATTERNS_VERSION).t
- QT5XMLPATTERNS_DEPENDENCIES = qt5base
- QT5XMLPATTERNS_INSTALL_STAGING = YES
- 
--ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
--QT5XMLPATTERNS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
--QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-+QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
-+QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
- else
--QT5XMLPATTERNS_LICENSE = Commercial license
--QT5XMLPATTERNS_REDISTRIBUTE = NO
-+QT5XMLPATTERNS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-+QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-+endif
-+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-+QT5XMLPATTERNS_LICENSE := $(QT5XMLPATTERNS_LICENSE), BSD-3-Clause (examples)
- endif
- 
- define QT5XMLPATTERNS_CONFIGURE_CMDS
-@@ -32,9 +35,20 @@ define QT5XMLPATTERNS_INSTALL_STAGING_CMDS
- endef
- 
- ifeq ($(BR2_STATIC_LIBS),)
--define QT5XMLPATTERNS_INSTALL_TARGET_CMDS
-+define QT5XMLPATTERNS_INSTALL_TARGET_LIBS
- 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5XmlPatterns*.so.* $(TARGET_DIR)/usr/lib
- endef
- endif
- 
-+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-+define QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES
-+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/xmlpatterns $(TARGET_DIR)/usr/lib/qt/examples/
-+endef
-+endif
-+
-+define QT5XMLPATTERNS_INSTALL_TARGET_CMDS
-+	$(QT5XMLPATTERNS_INSTALL_TARGET_LIBS)
-+	$(QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES)
-+endef
-+
- $(eval $(generic-package))

GfA-buildroot_qt57-qt5quickcontrols2_mk.patch

@@ -1,21 +0,0 @@
-diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
-index d629fd7..23bbb2c 100644
---- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
-+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
-@@ -31,10 +31,15 @@ define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS
- endef
- 
- define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
--	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
-+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib
-+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib
- 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
-+#	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs
- 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/folderlistmodel $(TARGET_DIR)/usr/qml/Qt/labs
- 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/settings $(TARGET_DIR)/usr/qml/Qt/labs
-+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick
-+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick
-+	$(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES)
- endef
- 
- $(eval $(generic-package))

GfA-buildroot_qt57-qt5quickcontrols_mk.patch

@@ -1,17 +0,0 @@
-diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
-index 622e61f..d629fd7 100644
---- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
-+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
-@@ -32,9 +32,9 @@ endef
- 
- define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
- 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
--#	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs
--#	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
--#	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs
-+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
-+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/folderlistmodel $(TARGET_DIR)/usr/qml/Qt/labs
-+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/settings $(TARGET_DIR)/usr/qml/Qt/labs
- endef
- 
- $(eval $(generic-package))

GfA-buildroot_remove_crontab_root_entry_from_update.patch

@@ -1,21 +0,0 @@
-diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
-index b2ede0c20..edd5cb2a1 100644
---- a/UpdateRootfs.sh.in
-+++ b/UpdateRootfs.sh.in
-@@ -53,7 +53,15 @@ cp $TMP_PATH/uImage /mnt
- cp $TMP_PATH/*.dtb /mnt
- 
- #rootfs auspacken
--tar -C / --exclude=./opt --exclude=./tmp --exclude=./etc/inittab --exclude=./etc/network/interfaces --exclude=./etc/hosts --exclude=./etc/hostname --exclude=./etc/passwd --exclude=./etc/shadow --exclude=./etc/vncpwd --exclude=./etc/init.d/S99tincd --exclude=./etc/init.d/M99tincd --exclude=./var/GfA/Display_GSM.ini -xzvf $TMP_PATH/rootfs.tar.gz
-+tar -C / --exclude=./opt --exclude=./tmp --exclude=./etc/inittab \
-+	--exclude=./etc/network/interfaces \
-+	--exclude=./etc/hosts --exclude=./etc/hostname \
-+	--exclude=./etc/passwd --exclude=./etc/shadow \
-+	--exclude=./etc/vncpwd --exclude=./etc/init.d/S99tincd \
-+	--exclude=./etc/init.d/M99tincd \
-+	--exclude=./var/GfA/Display_GSM.ini \
-+	--exclude=./var/cron/crontabs/root \
-+	-xzvf $TMP_PATH/rootfs.tar.gz
- 
- echo "sync mmc be patient ...."
- sync

GfA-buildroot_remove_hostapd_and_wpa_supplicant_from_update.patch

@@ -1,12 +0,0 @@
-diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
-index edd5cb2..47f5566 100644
---- a/UpdateRootfs.sh.in
-+++ b/UpdateRootfs.sh.in
-@@ -58,6 +58,7 @@ tar -C / --exclude=./opt --exclude=./tmp --exclude=./etc/inittab \
- 	--exclude=./etc/hosts --exclude=./etc/hostname \
- 	--exclude=./etc/passwd --exclude=./etc/shadow \
- 	--exclude=./etc/vncpwd --exclude=./etc/init.d/S99tincd \
-+	--exclude=./etc/hostapd.conf --exclude=./etc/wpa_supplicant.conf \
- 	--exclude=./etc/init.d/M99tincd \
- 	--exclude=./var/GfA/Display_GSM.ini \
- 	--exclude=./var/cron/crontabs/root \

GfA-buildroot_revert_S80ti-gfx_frambuffersettings.patch

@@ -1,20 +0,0 @@
-diff --git a/package/ti-gfx/S80ti-gfx b/package/ti-gfx/S80ti-gfx
-index 00f8394..a204815 100644
---- a/package/ti-gfx/S80ti-gfx
-+++ b/package/ti-gfx/S80ti-gfx
-@@ -8,11 +8,11 @@ start() {
- 	BITSPERPIXEL="$(fbset | awk '/geom/ {print $6}')"
- 	YRES="$(fbset | awk '/geom/ {print $3}')"
- 	# Set RGBA ordering to something the drivers like
--	#if [ "$BITSPERPIXEL" = "32" ] ; then
--	#	fbset -rgba 8/16,8/8,8/0,8/24
--	#fi
-+	if [ "$BITSPERPIXEL" = "32" ] ; then
-+		fbset -rgba 8/16,8/8,8/0,8/24
-+	fi
- 	# Try to enable triple buffering when there's enough VRAM
--	#fbset -vyres $(( YRES*3 ))
-+	fbset -vyres $(( YRES*3 ))
- 
- 	modprobe pvrsrvkm
- 	modprobe omaplfb

Make-bb-kernel_Qt5.7.sh

@@ -24,32 +24,7 @@ rm -rf buildroot57
 git clone git://git.buildroot.net/buildroot ./buildroot57
 cd buildroot57
 git checkout 63a20d5dfebe83e2b2bd683dc78ebdf787dff100 -b gfawrk
-patch -p1 < ../GfA/GfA-buildroot-changes.patch
-patch -p1 < ../GfA/GfA-buildroot_revert_S80ti-gfx_frambuffersettings.patch
-patch -p1 < ../GfA/GfA-buildroot_MapImage_build_path.patch
-patch -p1 < ../GfA/GfA-buildroot-LegalInfo_zip_in_separate_script.patch
-patch -p1 < ../GfA/GfA-buildroot_mysql_posgres_update_fixes.patch
-patch -p1 < ../GfA/GfA-buildroot_remove_crontab_root_entry_from_update.patch
-patch -p1 < ../GfA/GfA-buildroot_bump_tinc_to_v_1_0_31.patch
-patch -p1 < ../GfA/GfA-buildroot_linux_headers_for_rs485.patch
-patch -p1 < ../GfA/GfA-buildroot_force_mutt_to_bind_openssl.patch
-patch -p1 < ../GfA/GfA-buildroot_remove_hostapd_and_wpa_supplicant_from_update.patch
-patch -p1 < ../GfA/GfA-buildroot_qt57-qt5quickcontrols_mk.patch
-patch -p1 < ../GfA/GfA-buildroot_qt57-qt5quickcontrols2_mk.patch
-patch -p1 < ../GfA/GfA-buildroot_qt-latest_qt-LTS-5.6.2.patch
-patch -p1 < ../GfA/GfA-buildroot_SetRightDisplayResolution_OnUpdate.patch
-patch -p1 < ../GfA/GfA-buildroot_SetRightDisplayResolution_OnUpdate_include_opt.patch
-patch -p1 < ../GfA/GfA-buildroot_include_inittab_on_update.patch
-patch -p1 < ../GfA/GfA-buildroot-libmodbus-GfA.patch
-patch -p1 < ../GfA/GfA-buildroot-update-add-fullhd.patch
-patch -p1 < ../GfA/GfA-buildroot-MakeDTSupdate.patch
-patch -p1 < ../GfA/GfA-buildroot_fontconfig_mtime_always_ok.patch
-patch -p1 < ../GfA/GfA-buildroot_make_image_update.patch
-patch -p1 < ../GfA/GfA-buildroot-qt57_on_Kernel_4_4_104.patch
-patch -p1 < ../GfA/GfA-buildroot-qt57_on_Kernel_4_4_104_part2.patch
-patch -p1 < ../GfA/GfA-buildroot-update-change-excludes.patch
-patch -p1 < ../GfA/GfA-buildroot-add-5-7-inch-to-update.patch
-patch -p1 < ../GfA/GfA-buildroot-add-7inch_rs485-dts.patch
+patch -p1 < ../GfA/patches/0001-GfA-wrk-changes-and-setup.patch
 #
 chmod a+x *.sh
 cp ../GfA/configs/* ./configs

GfA-buildroot-changes.patch → patches/0001-GfA-wrk-changes-and-setup.patch

@@ -1,3 +1,222 @@
+From c551f18b3e88ab555b24376240d09e10da767311 Mon Sep 17 00:00:00 2001
+From: Reinhard Russinger <reinhard@russinger.at>
+Date: Sun, 18 Feb 2018 21:06:05 +0100
+Subject: [PATCH] GfA wrk changes and setup
+
+---
+ CrossCompile.sh                                    |  41 ++
+ MakeDTSUpdate.sh                                   |  58 ++
+ MakeIMAGE.sh                                       | 106 ++++
+ MakeLegalInfo.sh                                   |  17 +
+ MakeRootfsUpdate.sh                                |  73 +++
+ MapImage.sh                                        |  41 ++
+ UpdateDTS.sh.in                                    | 126 ++++
+ UpdateRootfs.sh.in                                 | 209 +++++++
+ ...cache-flush-management-symbols-when-MULTI.patch |  34 +
+ configs/Display001_4.4.104_rt21_Qt5.6.2_defconfig  | 447 +++++++++++++
+ configs/Display001_4.4.104_rt21_Qt5.7_defconfig    | 460 ++++++++++++++
+ configs/Display001_4.4.94_rt19_Qt5.6.2_defconfig   | 449 +++++++++++++
+ package/fontconfig/001-mtime-always-ok.patch       |  12 +
+ package/fontconfig/fontconfig.mk                   |   2 +-
+ package/gcc/4.9.1/100-uclibc-conf.patch            |  15 +
+ package/gcc/4.9.1/301-missing-execinfo_h.patch     |  13 +
+ package/gcc/4.9.1/302-c99-snprintf.patch           |  13 +
+ package/gcc/4.9.1/810-arm-softfloat-libgcc.patch   |  30 +
+ package/gcc/4.9.1/830-arm_unbreak_armv4t.patch     |  13 +
+ .../840-microblaze-enable-dwarf-eh-support.patch   | 169 +++++
+ package/gcc/4.9.1/841-PR60102.patch                | 388 ++++++++++++
+ package/gcc/4.9.1/900-musl-support.patch           | 696 +++++++++++++++++++++
+ .../powerpc-link-with-math-lib.patch.conditional   | 122 ++++
+ package/gcc/4.9.3/100-uclibc-conf.patch            |  15 +
+ ...00-powerpc-link-with-math-lib.patch.conditional | 122 ++++
+ package/gcc/4.9.3/111-pr65730.patch                |  37 ++
+ ...gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch |  29 +
+ package/gcc/4.9.3/130-pr43538.patch                |  25 +
+ ...tizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch |  37 ++
+ package/gcc/4.9.3/301-missing-execinfo_h.patch     |  13 +
+ package/gcc/4.9.3/810-arm-softfloat-libgcc.patch   |  30 +
+ package/gcc/4.9.3/830-arm_unbreak_armv4t.patch     |  13 +
+ .../840-microblaze-enable-dwarf-eh-support.patch   | 169 +++++
+ package/gcc/4.9.3/850-libstdcxx-uclibc-c99.patch   | 255 ++++++++
+ package/gcc/4.9.3/860-cilk-wchar.patch             |  56 ++
+ .../870-xtensa-add-mauto-litpools-option.patch     | 290 +++++++++
+ .../871-xtensa-reimplement-register-spilling.patch |  76 +++
+ ...unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch |  33 +
+ .../gcc/4.9.3/873-xtensa-fix-_Unwind_GetCFA.patch  |  40 ++
+ .../gcc/4.9.3/874-xtensa-add-uclinux-support.patch | 174 ++++++
+ .../gcc/4.9.3/880-nios2_legitimize_address.patch   |  49 ++
+ package/gcc/4.9.3/890-fix-m68k-compile.patch       |  15 +
+ package/gcc/4.9.3/900-musl-support.patch           | 640 +++++++++++++++++++
+ .../4.9.3/920-libgcc-remove-unistd-header.patch    |  12 +
+ .../930-libgcc-disable-split-stack-nothreads.patch |  14 +
+ package/gcc/Config.in.host                         |  28 +
+ package/gcc/gcc.hash                               |   4 +
+ .../2.18-svnr23787/0001-CVE-2014-7817-eglibc.patch | 174 ++++++
+ .../glibc/2.18-svnr23787/0002-accept-make4.patch   |  33 +
+ .../glibc/2.18-svnr23787/0003-CVE-2014-6040.patch  | 141 +++++
+ .../glibc/2.18-svnr23787/0004-CVE-2014-9402.patch  |  20 +
+ .../glibc/2.18-svnr23787/0005-CVE-2015-1472.patch  |  88 +++
+ .../2.19-svnr25243/0001-CVE-2014-7817-eglibc.patch | 174 ++++++
+ .../glibc/2.19-svnr25243/0002-CVE-2014-6040.patch  | 141 +++++
+ .../glibc/2.19-svnr25243/0003-CVE-2014-9402.patch  |  20 +
+ .../glibc/2.19-svnr25243/0004-CVE-2015-1472.patch  |  88 +++
+ .../glibc/glibc/2.22/0001-fix-CVE-2015-7547.patch  | 236 +++++++
+ .../0002-microblaze-include-unix-sysdep.h.patch    |  43 ++
+ package/glibc/glibc/Config.in                      |  56 ++
+ package/glibc/glibc/glibc.hash                     |   8 +
+ package/glibc/glibc/glibc.mk                       | 155 +++++
+ package/glibc/glibc/nsswitch.conf                  |  13 +
+ package/libmodbus/001-GfA-echo-rtu.patch           | 105 ++++
+ .../linux-017-omap_serial_for_rs485.patch          |  12 +
+ package/mutt/mutt.mk                               |  20 +-
+ package/qt5/Config.in                              |  10 +-
+ package/qt5/qt5.mk                                 |   6 +-
+ package/qt5/qt53d/qt53d.hash                       |   3 +-
+ ...ndard-compiler-flags-for-the-host-build.__patch |  44 ++
+ package/qt5/qt5base/Config.in                      |   2 +-
+ package/qt5/qt5base/qmake.conf                     |   1 -
+ package/qt5/qt5base/qt5base.hash                   |   3 +-
+ package/qt5/qt5base/qt5base.mk                     |  15 +-
+ package/qt5/qt5canvas3d/qt5canvas3d.hash           |   3 +-
+ package/qt5/qt5charts/Config.in                    |  18 +
+ package/qt5/qt5charts/qt5charts.mk                 |  39 ++
+ package/qt5/qt5connectivity/Config.in              |  12 +-
+ package/qt5/qt5connectivity/qt5connectivity.hash   |   3 +-
+ package/qt5/qt5connectivity/qt5connectivity.mk     |  36 +-
+ package/qt5/qt5datavis3d/Config.in                 |  17 +
+ package/qt5/qt5datavis3d/qt5datavis3d.mk           |  39 ++
+ package/qt5/qt5declarative/qt5declarative.hash     |   3 +-
+ package/qt5/qt5enginio/qt5enginio.hash             |   3 +-
+ package/qt5/qt5enginio/qt5enginio.mk               |   2 +-
+ .../qt5graphicaleffects/qt5graphicaleffects.hash   |   3 +-
+ package/qt5/qt5imageformats/qt5imageformats.hash   |   3 +-
+ package/qt5/qt5location/qt5location.hash           |   3 +-
+ package/qt5/qt5multimedia/Config.in                |   1 -
+ package/qt5/qt5multimedia/qt5multimedia.hash       |   3 +-
+ package/qt5/qt5quickcontrols/qt5quickcontrols.hash |   3 +-
+ .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash   |   3 +-
+ package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk |  11 +-
+ package/qt5/qt5sensors/qt5sensors.hash             |   3 +-
+ package/qt5/qt5serialbus/Config.in                 |   4 -
+ package/qt5/qt5serialbus/qt5serialbus.hash         |   3 +-
+ package/qt5/qt5serialport/qt5serialport.hash       |   3 +-
+ package/qt5/qt5svg/qt5svg.hash                     |   3 +-
+ .../0001-Disable-qdoc-needs-qtdeclarative.patch    |  30 +
+ package/qt5/qt5tools/qt5tools.hash                 |   2 -
+ package/qt5/qt5tools/qt5tools.hash__               |   2 +
+ package/qt5/qt5virtualkeyboard/Config.in           |  10 +
+ .../qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk   |  39 ++
+ package/qt5/qt5wayland/Config.in                   |  14 +
+ package/qt5/qt5wayland/qt5wayland.mk               |  35 ++
+ package/qt5/qt5webchannel/qt5webchannel.hash       |   3 +-
+ .../001-chromium-glibc-2.24-issue.patch            |  14 +
+ .../001-delegate_frame_node_fence_sync.patch       |  20 +
+ package/qt5/qt5webengine/Config.in                 |  17 +
+ .../patches_save/001-allow-arm-compiler.patch      |  26 +
+ .../patches_save/002-buildroot-python-bz2.patch    |  11 +
+ .../patches_save/002-move_icu_to_56_1.patch        |  43 ++
+ .../patches_save/003-egl_khr_reusable_sync.patch   |  14 +
+ .../patches_save/004-allow-egl-surface.patch       | 166 +++++
+ package/qt5/qt5webengine/qt5webengine.__hash       |   2 +
+ package/qt5/qt5webengine/qt5webengine.mk           |  70 +++
+ .../0004-Fix-linking-with-libpthread.patch         |  34 +
+ package/qt5/qt5webkit/Config.in                    |   6 +-
+ package/qt5/qt5webkit/qt5webkit.hash               |   3 +-
+ package/qt5/qt5webkit/qt5webkit.mk                 |  22 +-
+ package/qt5/qt5websockets/qt5websockets.hash       |   3 +-
+ package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash     |   3 +-
+ package/ti-gfx/S80ti-gfx                           |  10 +
+ package/ti-gfx/powervr.ini                         |   4 +-
+ package/ti-sgx-km/ti-sgx-km.mk                     |   7 +-
+ package/ti-sgx-um/ti-sgx-um.mk                     |   1 +
+ package/tinc/tinc.hash                             |   2 +-
+ package/tinc/tinc.mk                               |   2 +-
+ 127 files changed, 8019 insertions(+), 138 deletions(-)
+ create mode 100755 CrossCompile.sh
+ create mode 100755 MakeDTSUpdate.sh
+ create mode 100755 MakeIMAGE.sh
+ create mode 100755 MakeLegalInfo.sh
+ create mode 100755 MakeRootfsUpdate.sh
+ create mode 100755 MapImage.sh
+ create mode 100644 UpdateDTS.sh.in
+ create mode 100644 UpdateRootfs.sh.in
+ create mode 100644 board/beaglebone/patches/linux/0002-arm-Export-cache-flush-management-symbols-when-MULTI.patch
+ create mode 100644 configs/Display001_4.4.104_rt21_Qt5.6.2_defconfig
+ create mode 100644 configs/Display001_4.4.104_rt21_Qt5.7_defconfig
+ create mode 100644 configs/Display001_4.4.94_rt19_Qt5.6.2_defconfig
+ create mode 100644 package/fontconfig/001-mtime-always-ok.patch
+ create mode 100644 package/gcc/4.9.1/100-uclibc-conf.patch
+ create mode 100644 package/gcc/4.9.1/301-missing-execinfo_h.patch
+ create mode 100644 package/gcc/4.9.1/302-c99-snprintf.patch
+ create mode 100644 package/gcc/4.9.1/810-arm-softfloat-libgcc.patch
+ create mode 100644 package/gcc/4.9.1/830-arm_unbreak_armv4t.patch
+ create mode 100644 package/gcc/4.9.1/840-microblaze-enable-dwarf-eh-support.patch
+ create mode 100644 package/gcc/4.9.1/841-PR60102.patch
+ create mode 100644 package/gcc/4.9.1/900-musl-support.patch
+ create mode 100644 package/gcc/4.9.1/powerpc-link-with-math-lib.patch.conditional
+ create mode 100644 package/gcc/4.9.3/100-uclibc-conf.patch
+ create mode 100644 package/gcc/4.9.3/1000-powerpc-link-with-math-lib.patch.conditional
+ create mode 100644 package/gcc/4.9.3/111-pr65730.patch
+ create mode 100644 package/gcc/4.9.3/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
+ create mode 100644 package/gcc/4.9.3/130-pr43538.patch
+ create mode 100644 package/gcc/4.9.3/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
+ create mode 100644 package/gcc/4.9.3/301-missing-execinfo_h.patch
+ create mode 100644 package/gcc/4.9.3/810-arm-softfloat-libgcc.patch
+ create mode 100644 package/gcc/4.9.3/830-arm_unbreak_armv4t.patch
+ create mode 100644 package/gcc/4.9.3/840-microblaze-enable-dwarf-eh-support.patch
+ create mode 100644 package/gcc/4.9.3/850-libstdcxx-uclibc-c99.patch
+ create mode 100644 package/gcc/4.9.3/860-cilk-wchar.patch
+ create mode 100644 package/gcc/4.9.3/870-xtensa-add-mauto-litpools-option.patch
+ create mode 100644 package/gcc/4.9.3/871-xtensa-reimplement-register-spilling.patch
+ create mode 100644 package/gcc/4.9.3/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+ create mode 100644 package/gcc/4.9.3/873-xtensa-fix-_Unwind_GetCFA.patch
+ create mode 100644 package/gcc/4.9.3/874-xtensa-add-uclinux-support.patch
+ create mode 100644 package/gcc/4.9.3/880-nios2_legitimize_address.patch
+ create mode 100644 package/gcc/4.9.3/890-fix-m68k-compile.patch
+ create mode 100644 package/gcc/4.9.3/900-musl-support.patch
+ create mode 100644 package/gcc/4.9.3/920-libgcc-remove-unistd-header.patch
+ create mode 100644 package/gcc/4.9.3/930-libgcc-disable-split-stack-nothreads.patch
+ create mode 100644 package/glibc/glibc/2.18-svnr23787/0001-CVE-2014-7817-eglibc.patch
+ create mode 100644 package/glibc/glibc/2.18-svnr23787/0002-accept-make4.patch
+ create mode 100644 package/glibc/glibc/2.18-svnr23787/0003-CVE-2014-6040.patch
+ create mode 100644 package/glibc/glibc/2.18-svnr23787/0004-CVE-2014-9402.patch
+ create mode 100644 package/glibc/glibc/2.18-svnr23787/0005-CVE-2015-1472.patch
+ create mode 100644 package/glibc/glibc/2.19-svnr25243/0001-CVE-2014-7817-eglibc.patch
+ create mode 100644 package/glibc/glibc/2.19-svnr25243/0002-CVE-2014-6040.patch
+ create mode 100644 package/glibc/glibc/2.19-svnr25243/0003-CVE-2014-9402.patch
+ create mode 100644 package/glibc/glibc/2.19-svnr25243/0004-CVE-2015-1472.patch
+ create mode 100644 package/glibc/glibc/2.22/0001-fix-CVE-2015-7547.patch
+ create mode 100644 package/glibc/glibc/2.22/0002-microblaze-include-unix-sysdep.h.patch
+ create mode 100644 package/glibc/glibc/Config.in
+ create mode 100644 package/glibc/glibc/glibc.hash
+ create mode 100644 package/glibc/glibc/glibc.mk
+ create mode 100644 package/glibc/glibc/nsswitch.conf
+ create mode 100644 package/libmodbus/001-GfA-echo-rtu.patch
+ create mode 100644 package/linux-headers/linux-017-omap_serial_for_rs485.patch
+ create mode 100644 package/qt5/qt5base/0001-Disable-c-standard-compiler-flags-for-the-host-build.__patch
+ create mode 100644 package/qt5/qt5charts/Config.in
+ create mode 100644 package/qt5/qt5charts/qt5charts.mk
+ create mode 100644 package/qt5/qt5datavis3d/Config.in
+ create mode 100644 package/qt5/qt5datavis3d/qt5datavis3d.mk
+ create mode 100644 package/qt5/qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch
+ delete mode 100644 package/qt5/qt5tools/qt5tools.hash
+ create mode 100644 package/qt5/qt5tools/qt5tools.hash__
+ create mode 100644 package/qt5/qt5virtualkeyboard/Config.in
+ create mode 100644 package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
+ create mode 100644 package/qt5/qt5wayland/Config.in
+ create mode 100644 package/qt5/qt5wayland/qt5wayland.mk
+ create mode 100644 package/qt5/qt5webengine/001-chromium-glibc-2.24-issue.patch
+ create mode 100644 package/qt5/qt5webengine/001-delegate_frame_node_fence_sync.patch
+ create mode 100644 package/qt5/qt5webengine/Config.in
+ create mode 100644 package/qt5/qt5webengine/patches_save/001-allow-arm-compiler.patch
+ create mode 100644 package/qt5/qt5webengine/patches_save/002-buildroot-python-bz2.patch
+ create mode 100644 package/qt5/qt5webengine/patches_save/002-move_icu_to_56_1.patch
+ create mode 100644 package/qt5/qt5webengine/patches_save/003-egl_khr_reusable_sync.patch
+ create mode 100644 package/qt5/qt5webengine/patches_save/004-allow-egl-surface.patch
+ create mode 100644 package/qt5/qt5webengine/qt5webengine.__hash
+ create mode 100644 package/qt5/qt5webengine/qt5webengine.mk
+ create mode 100644 package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch
+
 diff --git a/CrossCompile.sh b/CrossCompile.sh
 new file mode 100755
 index 0000000..a2feabc
@@ -45,12 +264,76 @@ index 0000000..a2feabc
 +else
 +$1
 +fi
+diff --git a/MakeDTSUpdate.sh b/MakeDTSUpdate.sh
+new file mode 100755
+index 0000000..f25b04b
+--- /dev/null
++++ b/MakeDTSUpdate.sh
+@@ -0,0 +1,58 @@
++#!/bin/bash
++WRKDIR=/tmp/XXXUpdateDTS
++BUILD=`cat ../GfA/board/GfA/Display001/BUILD`
++UPDATE_BINARY=$WRKDIR/dest/UpdateDTS.tar.Z
++UPDATE_FILENAME="../UpdateDTS_$BUILD.sh"
++UPDATE_IN_SCRIPT="UpdateDTS.sh.in"
++
++rm -rf $WRKDIR
++mkdir -p $WRKDIR/dest
++
++cp ./output/images/*.dtb $WRKDIR
++
++tar -C $WRKDIR --exclude=./dest -czvf $UPDATE_BINARY ./
++
++# Check for payload format option (default is binary).
++binary=1
++uuencode=0
++
++if [[ "$1" == '--binary' ]]; then
++	binary=1
++	uuencode=0
++	shift
++fi
++if [[ "$1" == '--uuencode' ]]; then
++	binary=0
++	uuencode=1
++	shift
++fi
++
++if [[ ! -f $UPDATE_BINARY ]]; then
++	echo "       UPDATE_BINARY $UPDATE_BINARY doesn't exist!"
++	echo "Usage: $0 [--binary | --uuencode]"
++	exit 1
++fi
++
++
++if [[ $binary -ne 0 ]]; then
++	# Append binary data.
++	sed \
++		-e 's/uuencode=./uuencode=0/' \
++		-e 's/binary=./binary=1/' \
++			 $UPDATE_IN_SCRIPT > $UPDATE_FILENAME
++	echo "PAYLOAD:" >> $UPDATE_FILENAME
++
++	cat $UPDATE_BINARY >> $UPDATE_FILENAME
++fi
++if [[ $uuencode -ne 0 ]]; then
++	# Append uuencoded data.
++	sed \
++		-e 's/uuencode=./uuencode=1/' \
++		-e 's/binary=./binary=0/' \
++			 $UPDATE_IN_SCRIPT > $UPDATE_FILENAME
++	echo "PAYLOAD:" >> $UPDATE_FILENAME
++
++	cat $UPDATE_BINARY | uuencode - >> $UPDATE_FILENAME
++fi
++
++chmod a+x $UPDATE_FILENAME
 diff --git a/MakeIMAGE.sh b/MakeIMAGE.sh
 new file mode 100755
-index 0000000..02271d3
+index 0000000..4935386
 --- /dev/null
 +++ b/MakeIMAGE.sh
-@@ -0,0 +1,97 @@
+@@ -0,0 +1,106 @@
 +#!/bin/sh
 +
 +SAVE_LC=$LC_ALL
@@ -59,6 +342,8 @@ index 0000000..02271d3
 +BUILD=`cat ../GfA/board/GfA/Display001/BUILD`
 +IMAGEFILE=../Display001_Build_$BUILD-img
 +
++ROOTFSMNT=/tmp/XXXRootFs
++
 +echo "Image: $IMAGEFILE"
 +#-- build imagefile
 +dd if=/dev/zero ibs=1M count=1 > $IMAGEFILE
@@ -116,7 +401,6 @@ index 0000000..02271d3
 +cp ./output/images/uImage /tmp/boot
 +cp ./output/images/MLO /tmp/boot
 +cp ./output/images/u-boot.img /tmp/boot   
-+cp ./output/images/rootfs.tar.gz /tmp/boot
 +                                        
 +ls -alh /tmp/boot
 +
@@ -125,8 +409,22 @@ index 0000000..02271d3
 +mount ${DRIVE2} /tmp/rootfs
 +
 +du -h ${DRIVE2}
-+sleep 10
-+tar -C /tmp/rootfs  --checkpoint --checkpoint-action=dot -xzf ./output/images/rootfs.tar.gz
++sleep 5
++
++umount ${ROOTFSMNT}
++rm -rf ${ROOTFSMNT}
++mkdir -p ${ROOTFSMNT}
++echo "Mount ====>> " ${ROOTFSMNT}
++mount -o loop ./output/images/rootfs.ext2 ${ROOTFSMNT}
++
++WRKDIR=`pwd`
++cd  ${ROOTFSMNT}
++tar cf - . | (cd /tmp/rootfs && tar xBf -)
++
++cd ${WRKDIR}
++umount ${ROOTFSMNT}
++#tar -C /tmp/rootfs  --checkpoint --checkpoint-action=dot -xzf ./output/images/rootfs.tar.gz
++
 +echo ""
 +
 +sync
@@ -139,6 +437,23 @@ index 0000000..02271d3
 +#-- packen des Imagefiles
 +rm $IMAGEFILE.zip
 +zip -j $IMAGEFILE.zip $IMAGEFILE
++
++export LC_ALL=$SAVE_LC
++                                                                                                                
+diff --git a/MakeLegalInfo.sh b/MakeLegalInfo.sh
+new file mode 100755
+index 0000000..429486f
+--- /dev/null
++++ b/MakeLegalInfo.sh
+@@ -0,0 +1,17 @@
++#!/bin/sh
++
++SAVE_LC=$LC_ALL
++export LC_ALL=C
++
++BUILD=`cat ../GfA/board/GfA/Display001/BUILD`
++IMAGEFILE=../Display001_Build_$BUILD-img
++
 +#-- legalinfo erstellen
 +TMPWRKDIR=`pwd`
 +cd output
@@ -151,10 +466,10 @@ index 0000000..02271d3
 \ No newline at end of file
 diff --git a/MakeRootfsUpdate.sh b/MakeRootfsUpdate.sh
 new file mode 100755
-index 0000000..df6e200
+index 0000000..99b77c9
 --- /dev/null
 +++ b/MakeRootfsUpdate.sh
-@@ -0,0 +1,62 @@
+@@ -0,0 +1,73 @@
 +#!/bin/bash
 +WRKDIR=/tmp/XXXUpdateRootfs
 +BUILD=`cat ../GfA/board/GfA/Display001/BUILD`
@@ -162,6 +477,14 @@ index 0000000..df6e200
 +UPDATE_FILENAME="../UpdateDisplay001_$BUILD.sh"
 +UPDATE_IN_SCRIPT="UpdateRootfs.sh.in"
 +
++ROOTFSMNT=/tmp/XXXRootFs
++
++sudo umount $ROOTFSMNT
++sudo rm -rf $ROOTFSMNT
++sudo mkdir -p $ROOTFSMNT
++
++sudo mount -o loop ./output/images/rootfs.ext2 $ROOTFSMNT
++
 +rm -rf $WRKDIR
 +mkdir -p $WRKDIR/dest
 +
@@ -169,7 +492,10 @@ index 0000000..df6e200
 +cp ./output/images/uImage $WRKDIR
 +cp ./output/images/MLO $WRKDIR
 +cp ./output/images/u-boot.img $WRKDIR
-+cp ./output/images/rootfs.tar.gz $WRKDIR
++
++sudo tar -C $ROOTFSMNT -czvf $WRKDIR/rootfs.tar.gz ./
++sudo umount $ROOTFSMNT
++#cp ./output/images/rootfs.tar.gz $WRKDIR
 +
 +tar -C $WRKDIR --exclude=./dest -czvf $WRKDIR/dest/UpdateRootfs.tar.Z ./
 +
@@ -219,7 +545,7 @@ index 0000000..df6e200
 +chmod a+x $UPDATE_FILENAME
 diff --git a/MapImage.sh b/MapImage.sh
 new file mode 100755
-index 0000000..4905205
+index 0000000..8e87247
 --- /dev/null
 +++ b/MapImage.sh
 @@ -0,0 +1,41 @@
@@ -228,7 +554,7 @@ index 0000000..4905205
 +SAVE_LC=$LC_ALL
 +export LC_ALL=C
 +
-+BUILD=`cat board/GfA/Display001/BUILD`
++BUILD=`cat ../GfA/board/GfA/Display001/BUILD`
 +IMAGEFILE=../Display001_Build_$BUILD-img
 +echo ">>> $IMAGEFILE <<<"
 +#-- map partitions
@@ -265,12 +591,144 @@ index 0000000..4905205
 +export LC_ALL=$SAVE_LC
 +                                                                                                                
 \ No newline at end of file
+diff --git a/UpdateDTS.sh.in b/UpdateDTS.sh.in
+new file mode 100644
+index 0000000..3a5cb18
+--- /dev/null
++++ b/UpdateDTS.sh.in
+@@ -0,0 +1,126 @@
++#!/bin/sh
++
++uuencode=0
++binary=1
++
++##TAR_PARAMETERS="-C / --exclude=./opt --exclude=./etc/inittab -xzvf -"
++TMP_PATH="/__GfA_UpdateDTS"
++TAR_PARAMETERS="-C $TMP_PATH -xzvf -"
++
++untar_payload ()
++{
++
++	echo "remove $TMP_PATH : "
++	rm -rf $TMP_PATH
++	echo ">> $? "
++	mkdir -p $TMP_PATH
++
++	match=$(grep -n -m 1 '^PAYLOAD:$' $0 | cut -d ':' -f 1)
++	payload_start=$((match + 1))
++	if [[ $binary -ne 0 ]]; then
++		tail -n +$payload_start $0 | tar $TAR_PARAMETERS
++	fi
++	if [[ $uuencode -ne 0 ]]; then
++		tail -n +$payload_start $0 | uudecode | tar $TAR_PARAMETERS
++	fi
++}
++
++## --- Kommandos zum Installieren
++## -- get bootpartition
++such="root=/dev/mmcblk1"
++grep -q $such /proc/cmdline
++if [ $? == 0 ]
++then
++	bootpart="/dev/mmcblk1p1"
++else
++	bootpart="/dev/mmcblk0p1"
++fi	
++
++umount /mnt
++mount $bootpart /mnt
++
++#--- Kernel MLO und Rootfs-Tarball entpacken
++untar_payload
++# --- 
++
++cp $TMP_PATH/*.dtb /mnt
++
++echo "sync mmc be patient ...."
++sync
++sync
++
++# Get Graphics resolution and set dtb to the right resolution
++BASEBOARD=`cat /tmp/BASEBOARD`
++
++DONE=0
++YRES="$(fbset | awk '/geom/ {print $3}')"
++XRES="$(fbset | awk '/geom/ {print $2}')"
++
++echo "XRES $XRES, YRES $YRES"
++
++if [ "$XRES" == "480" -a "$YRES" == "272" ]; then
++if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
++  echo "4.3 Inch Display 2"
++  sh /root/Display2To_4_3inch.sh
++  DONE=1
++else
++  echo "4.3 Inch"
++  sh /root/DisplayTo_4_3inch.sh
++  DONE=1
++fi
++fi
++
++if [ "$XRES" == "800" -a "$YRES" == "480" ]; then
++if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
++  echo "7 Inch Display 2"
++  sh /root/Display2To_7inch.sh
++  DONE=1
++else
++if [ "$BASEBOARD" == "DISPLAY002_RS485" ]; then
++  echo "7 Inch Display 2 rs485"
++  sh /root/Display2To_7inch_rs485.sh
++  DONE=1
++else
++  echo "7 Inch"
++  sh /root/DisplayTo_7inch.sh
++  DONE=1
++fi
++fi
++fi
++
++if [ "$XRES" == "1280" -a "$YRES" == "800" ]; then
++if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
++  echo "10 Inch Display 2"
++  sh /root/Display2To_10inch.sh
++  DONE=1
++else
++  echo "10 Inch"
++  sh /root/DisplayTo_10inch.sh
++  DONE=1
++fi
++fi
++
++if [ "$XRES" == "1920" -a "$YRES" == "1080" ]; then
++if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
++  echo "10 Inch Display 2"
++  sh /root/Display2To_15inch.sh
++  DONE=1
++else
++  echo "10 Inch"
++  sh /root/DisplayTo_15inch.sh
++  DONE=1
++fi
++fi
++
++if [ "$DONE" == "0" ]; then
++  echo "Unknown Display Resolution"
++fi
++
++
++
++
++#=================
++echo "Update Done, pls. reboot System"
++umount /mnt
++echo "."
++exit 0
 diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
 new file mode 100644
-index 0000000..4706719
+index 0000000..2ee5587
 --- /dev/null
 +++ b/UpdateRootfs.sh.in
-@@ -0,0 +1,77 @@
+@@ -0,0 +1,209 @@
 +#!/bin/sh
 +
 +uuencode=0
@@ -326,7 +784,16 @@ index 0000000..4706719
 +cp $TMP_PATH/*.dtb /mnt
 +
 +#rootfs auspacken
-+tar -C / --exclude=./opt --exclude=./tmp --exclude=./etc/inittab --exclude=./etc/network/interfaces --exclude=./etc/hosts --exclude=./etc/hostname --exclude=./etc/passwd --exclude=./etc/shadow --exclude=./etc/vncpwd --exclude=./etc/init.d/S99tincd --exclude=./etc/init.d/M99tincd --exclude=./var/GfA/Display_GSM.ini -xzvf $TMP_PATH/rootfs.tar.gz
++tar -C / --exclude=./tmp --exclude=./etc/inittab \
++	--exclude=./etc/network/interfaces \
++	--exclude=./etc/hosts --exclude=./etc/hostname \
++	--exclude=./etc/passwd --exclude=./etc/shadow \
++	--exclude=./etc/vncpwd --exclude=./etc/init.d/S99tincd \
++	--exclude=./etc/hostapd.conf --exclude=./etc/wpa_supplicant.conf \
++	--exclude=./etc/init.d/M99tincd \
++	--exclude=./var/GfA/Display_GSM.ini \
++	--exclude=./var/cron/crontabs/root \
++	-xzvf $TMP_PATH/rootfs.tar.gz
 +
 +echo "sync mmc be patient ...."
 +sync
@@ -337,6 +804,12 @@ index 0000000..4706719
 +	cp /etc/init.d/S98usb_g_ether /etc/init.d/M98usb_g_ether
 +	rm /etc/init.d/S98usb_g_ether
 +fi
++
++
++if [ -e /etc/init.d/S80ti-sgx ]
++then
++	rm /etc/init.d/S80ti-sgx
++fi
 +        
 +#echo "Update Firmware"
 +#echo "."
@@ -344,6 +817,123 @@ index 0000000..4706719
 +#echo ".."
 +#echo "Update Firmware Done"
 +#/root/gfa_spi -v
++#================================
++#--create mountable run folder insted of link
++RUNDIR=/run
++if [ -L $RUNDIR ]; then
++  mv $RUNDIR $RUNDIR'_WRK'
++  mkdir $RUNDIR
++  mount -t tmpfs tmpfs $RUNDIR
++  WRKDIR=`pwd`
++  cd $RUNDIR'_WRK'
++  cp -a ./* $RUNDIR
++  cd $WRKDIR
++  rm $RUNDIR'_WRK' 
++fi
++#--- craete missing nogroup group
++GID_NOGROUP=`awk -F\: '/nogroup/ {print $3}' /etc/group`
++if [ -z "$GID_NOGROUP" ]; then
++  addgroup -S -g 65534 nogroup
++fi
++#--create missing users for mysql,
++if [ -z `awk -F\: '/mysql/ {print $3}' /etc/passwd` ]; then
++  UID_MY=`awk -F: '{uid[$3]=1}END{for(x=1000; x<=1500; x++) {if(uid[x] != ""){}else{print x; exit;}}}' /etc/passwd`
++  echo "mysql:x:$UID_MY:65534:MySQL daemon:/var/mysql:/bin/false" >> /etc/passwd
++fi
++#--create missing users for postgresql,
++if [ -z `awk -F\: '/postgres/ {print $3}' /etc/passwd` ]; then
++  UID_PG=`awk -F: '{uid[$3]=1}END{for(x=1000; x<=1500; x++) {if(uid[x] != ""){}else{print x; exit;}}}' /etc/passwd`
++  GID_PG=`awk -F\: '/postgres/ {print $3}' /etc/group`
++  if [ -z "$GID_PG" ]; then
++    GID_PG=`awk -F: '{uid[$3]=1}END{for(x=1000; x<=1500; x++) {if(uid[x] != ""){}else{print x; exit;}}}' /etc/group`
++    echo "postgres:x:$GID_PG:" >> /etc/group
++    fi
++  echo "postgres:x:$UID_PG:$GID_PG:PostgreSQL Server:/var/lib/pgsql:/bin/sh" >> /etc/passwd
++fi
++#------------------
++chown -Rv mysql:nogroup /var/mysql
++chown -Rv postgres:postgres /var/lib/pgsql
++#==============================================================================
++# Get Graphics resolution and set dtb to the right resolution
++BASEBOARD=`cat /tmp/BASEBOARD`
++
++DONE=0
++YRES="$(fbset | awk '/geom/ {print $3}')"
++XRES="$(fbset | awk '/geom/ {print $2}')"
++
++echo "XRES $XRES, YRES $YRES"
++
++if [ "$XRES" == "480" -a "$YRES" == "272" ]; then
++if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
++  echo "4.3 Inch Display 2"
++  sh /root/Display2To_4_3inch.sh
++  DONE=1
++else
++  echo "4.3 Inch"
++  sh /root/DisplayTo_4_3inch.sh
++  DONE=1
++fi
++fi
++
++if [ "$XRES" == "800" -a "$YRES" == "480" ]; then
++if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
++  echo "7 Inch Display 2"
++  sh /root/Display2To_7inch.sh
++  DONE=1
++else
++if [ "$BASEBOARD" == "DISPLAY002_RS485" ]; then
++  echo "7 Inch Display 2 rs485"
++  sh /root/Display2To_7inch_rs485.sh
++  DONE=1
++else
++  echo "7 Inch"
++  sh /root/DisplayTo_7inch.sh
++  DONE=1
++fi
++fi
++fi
++
++if [ "$XRES" == "640" -a "$YRES" == "480" ]; then
++if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
++  echo "5.7 Inch Display 2"
++  sh /root/Display2To_5_7inch.sh
++  DONE=1
++else
++  echo "5.7 Inch"
++  sh /root/DisplayTo_5_7inch.sh
++  DONE=1
++fi
++fi
++
++if [ "$XRES" == "1280" -a "$YRES" == "800" ]; then
++if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
++  echo "10 Inch Display 2"
++  sh /root/Display2To_10inch.sh
++  DONE=1
++else
++  echo "10 Inch"
++  sh /root/DisplayTo_10inch.sh
++  DONE=1
++fi
++fi
++
++if [ "$XRES" == "1920" -a "$YRES" == "1080" ]; then
++if [ "$BASEBOARD" == "DISPLAY002_DI4" ]; then
++  echo "15 Inch Display 2"
++  sh /root/Display2To_15inch.sh
++  DONE=1
++else
++  echo "15 Inch"
++  sh /root/DisplayTo_15inch.sh
++  DONE=1
++fi
++fi
++
++if [ "$DONE" == "0" ]; then
++  echo "Unknown Display Resolution"
++fi
++
++#=================
 +echo "Update Done, pls. reboot System"
 +umount /mnt
 +echo "."
@@ -388,6 +978,1411 @@ index 0000000..1ca1e70
 +-- 
 +1.7.10.4
 +
+diff --git a/configs/Display001_4.4.104_rt21_Qt5.6.2_defconfig b/configs/Display001_4.4.104_rt21_Qt5.6.2_defconfig
+new file mode 100644
+index 0000000..3bd295f
+--- /dev/null
++++ b/configs/Display001_4.4.104_rt21_Qt5.6.2_defconfig
+@@ -0,0 +1,447 @@
++BR2_arm=y
++BR2_cortex_a8=y
++BR2_ARM_INSTRUCTIONS_THUMB2=y
++BR2_DL_DIR="~/buildroot_dl"
++BR2_HOST_DIR="/opt/GfA/TC_L44104_C493_QT562"
++# BR2_COMPILER_PARANOID_UNSAFE_PATH is not set
++BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
++BR2_KERNEL_HEADERS_4_4=y
++BR2_GLIBC_VERSION_2_24=y
++BR2_BINUTILS_VERSION_2_27_X=y
++BR2_GCC_VERSION_4_9_3=y
++BR2_TOOLCHAIN_BUILDROOT_CXX=y
++BR2_PACKAGE_HOST_GDB=y
++BR2_PACKAGE_HOST_GDB_TUI=y
++BR2_PACKAGE_HOST_GDB_PYTHON=y
++BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y
++BR2_TARGET_OPTIMIZATION="-pipe"
++BR2_TARGET_GENERIC_HOSTNAME="GfA"
++BR2_TARGET_GENERIC_ISSUE="Welcome to GfA Display001"
++BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
++BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt ../GfA/board/GfA/Display001/device_table.txt"
++BR2_TARGET_GENERIC_ROOT_PASSWD="root"
++BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
++BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
++# BR2_ENABLE_LOCALE_PURGE is not set
++BR2_GENERATE_LOCALE="en_US en_GB de_DE de_AT de_CH fr_FR it_IT es_ES sv_FI sv_SE nb_NO nn_NO se_NO da_DK zh_CN"
++BR2_TARGET_LOCALTIME="Europe/Vienna"
++BR2_ROOTFS_POST_BUILD_SCRIPT="../GfA/board/GfA/Display001/post-build_4.4.sh"
++BR2_LINUX_KERNEL=y
++BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
++BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="file://$(TOPDIR)/../GfA/GfAkernel.tar.gz  "
++BR2_LINUX_KERNEL_PATCH="../GfA/board/GfA/Display001/linux_4.4.104_rt21"
++BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
++BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="../GfA/board/GfA/Display001/Display001_4.4.104_rt_defconfig"
++BR2_LINUX_KERNEL_UIMAGE=y
++BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000"
++BR2_LINUX_KERNEL_DTS_SUPPORT=y
++BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
++BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="../GfA/board/GfA/Display001/DTS_4.4/Display001.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_4.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_7.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_10.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_15.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_rru.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_4_nopruss.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_7_gain1.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_5.dts ../GfA/board/GfA/Display001/DTS_4.4/Display002_7.dts ../GfA/board/GfA/Display001/DTS_4.4/Display002_10.dts ../GfA/board/GfA/Display001/DTS_4.4/Display002_4.dts"
++BR2_PACKAGE_BUSYBOX_CONFIG="../GfA/board/GfA/Display001/busybox.config"
++BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
++BR2_PACKAGE_FFMPEG_GPL=y
++BR2_PACKAGE_FFMPEG_NONFREE=y
++BR2_PACKAGE_FFMPEG_FFPLAY=y
++BR2_PACKAGE_FFMPEG_FFSERVER=y
++BR2_PACKAGE_FFMPEG_FFPROBE=y
++BR2_PACKAGE_FFMPEG_AVRESAMPLE=y
++BR2_PACKAGE_FFMPEG_POSTPROC=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SMPTE=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
++BR2_PACKAGE_GST1_PLUGINS_BAD=y
++BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL=y
++BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264=y
++BR2_PACKAGE_MPD=y
++BR2_PACKAGE_MPLAYER=y
++BR2_PACKAGE_MPV=y
++BR2_PACKAGE_VLC=y
++BR2_PACKAGE_WAVPACK=y
++BR2_PACKAGE_GZIP=y
++BR2_PACKAGE_LZ4=y
++BR2_PACKAGE_LZIP=y
++BR2_PACKAGE_LZOP=y
++BR2_PACKAGE_P7ZIP=y
++BR2_PACKAGE_UNRAR=y
++BR2_PACKAGE_UNZIP=y
++BR2_PACKAGE_ZIP=y
++BR2_PACKAGE_GDB=y
++BR2_PACKAGE_GDB_DEBUGGER=y
++BR2_PACKAGE_STRACE=y
++BR2_PACKAGE_BINUTILS=y
++BR2_PACKAGE_BINUTILS_TARGET=y
++BR2_PACKAGE_CMAKE_CTEST=y
++BR2_PACKAGE_GETTEXT=y
++BR2_PACKAGE_MAKE=y
++BR2_PACKAGE_SED=y
++BR2_PACKAGE_CIFS_UTILS=y
++BR2_PACKAGE_DOSFSTOOLS=y
++BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
++BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
++BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
++BR2_PACKAGE_E2FSPROGS=y
++BR2_PACKAGE_E2FSPROGS_DEBUGFS=y
++BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
++BR2_PACKAGE_F2FS_TOOLS=y
++BR2_PACKAGE_FLASHBENCH=y
++BR2_PACKAGE_MAKEDEVS=y
++BR2_PACKAGE_MMC_UTILS=y
++BR2_PACKAGE_DEJAVU=y
++BR2_PACKAGE_DIRECTFB=y
++BR2_PACKAGE_DIRECTFB_DIVINE=y
++BR2_PACKAGE_DIRECTFB_SAWMAN=y
++BR2_PACKAGE_DIRECTFB_DITHER_RGB16=y
++BR2_PACKAGE_EFL=y
++BR2_PACKAGE_EFL_FB=y
++BR2_PACKAGE_EFL_WEBP=y
++BR2_PACKAGE_FB_TEST_APP=y
++BR2_PACKAGE_FBTERM=y
++BR2_PACKAGE_FBV=y
++BR2_PACKAGE_LINUX_FUSION=y
++BR2_PACKAGE_PSPLASH=y
++BR2_PACKAGE_SDL_DIRECTFB=y
++BR2_PACKAGE_SDL_GFX=y
++BR2_PACKAGE_SDL_IMAGE=y
++BR2_PACKAGE_SDL_IMAGE_GIF=y
++BR2_PACKAGE_SDL_IMAGE_JPEG=y
++BR2_PACKAGE_SDL_IMAGE_LBM=y
++BR2_PACKAGE_SDL_IMAGE_PCX=y
++BR2_PACKAGE_SDL_IMAGE_PNG=y
++BR2_PACKAGE_SDL_IMAGE_PNM=y
++BR2_PACKAGE_SDL_IMAGE_TARGA=y
++BR2_PACKAGE_SDL_IMAGE_TIFF=y
++BR2_PACKAGE_SDL_IMAGE_WEBP=y
++BR2_PACKAGE_SDL_IMAGE_XCF=y
++BR2_PACKAGE_SDL_IMAGE_XPM=y
++BR2_PACKAGE_SDL_IMAGE_XV=y
++BR2_PACKAGE_SDL_MIXER=y
++BR2_PACKAGE_SDL_NET=y
++BR2_PACKAGE_SDL_SOUND=y
++BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
++BR2_PACKAGE_SDL_TTF=y
++BR2_PACKAGE_SDL2=y
++BR2_PACKAGE_SDL2_DIRECTFB=y
++BR2_PACKAGE_SDL2_GFX=y
++BR2_PACKAGE_SDL2_IMAGE=y
++BR2_PACKAGE_SDL2_TTF=y
++BR2_PACKAGE_QT5=y
++BR2_PACKAGE_QT5_VERSION_5_6=y
++BR2_PACKAGE_QT53D=y
++BR2_PACKAGE_QT5BASE_MYSQL=y
++BR2_PACKAGE_QT5BASE_PSQL=y
++BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM=y
++BR2_PACKAGE_QT5BASE_LINUXFB=y
++BR2_PACKAGE_QT5BASE_EGLFS=y
++BR2_PACKAGE_QT5BASE_FONTCONFIG=y
++BR2_PACKAGE_QT5BASE_GIF=y
++BR2_PACKAGE_QT5BASE_JPEG=y
++BR2_PACKAGE_QT5BASE_PNG=y
++BR2_PACKAGE_QT5CANVAS3D=y
++BR2_PACKAGE_QT5CONNECTIVITY=y
++BR2_PACKAGE_QT5ENGINIO=y
++BR2_PACKAGE_QT5GRAPHICALEFFECTS=y
++BR2_PACKAGE_QT5IMAGEFORMATS=y
++BR2_PACKAGE_QT5LOCATION=y
++BR2_PACKAGE_QT5MULTIMEDIA=y
++BR2_PACKAGE_QT5QUICKCONTROLS=y
++BR2_PACKAGE_QT5QUICKCONTROLS2=y
++BR2_PACKAGE_QT5SENSORS=y
++BR2_PACKAGE_QT5WAYLAND=y
++BR2_PACKAGE_QT5SERIALBUS=y
++BR2_PACKAGE_QT5SVG=y
++BR2_PACKAGE_QT5WEBENGINE=y
++BR2_PACKAGE_TEKUI=y
++BR2_PACKAGE_WESTON=y
++BR2_PACKAGE_AM33X_CM3=y
++BR2_PACKAGE_LINUX_FIRMWARE=y
++BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6002=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6003=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6004=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y
++BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y
++BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8=y
++BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y
++BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8801=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897=y
++BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
++BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61=y
++BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
++BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
++BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X=y
++BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
++BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
++BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5=y
++BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
++BR2_PACKAGE_AM335X_PRU_PACKAGE=y
++BR2_PACKAGE_DEVMEM2=y
++BR2_PACKAGE_EVTEST=y
++BR2_PACKAGE_I2C_TOOLS=y
++BR2_PACKAGE_INPUT_TOOLS=y
++BR2_PACKAGE_KBD=y
++BR2_PACKAGE_LIBUIO=y
++BR2_PACKAGE_LSUIO=y
++BR2_PACKAGE_PARTED=y
++BR2_PACKAGE_RS485CONF=y
++BR2_PACKAGE_SISPMCTL=y
++BR2_PACKAGE_SPI_TOOLS=y
++BR2_PACKAGE_TI_GFX=y
++BR2_PACKAGE_TI_GFX_EGLIMAGE=y
++BR2_PACKAGE_TI_GFX_ES8=y
++BR2_PACKAGE_TI_UTILS=y
++BR2_PACKAGE_USB_MODESWITCH_DATA=y
++BR2_PACKAGE_USBMOUNT=y
++BR2_PACKAGE_USBUTILS=y
++BR2_PACKAGE_NODEJS=y
++BR2_PACKAGE_NODEJS_NPM=y
++BR2_PACKAGE_NODEJS_MODULES_EXPRESS=y
++BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT=y
++BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="node-red"
++BR2_PACKAGE_PYTHON=y
++BR2_PACKAGE_PYTHON_BZIP2=y
++BR2_PACKAGE_PYTHON_BSDDB=y
++BR2_PACKAGE_PYTHON_CODECSCJK=y
++BR2_PACKAGE_PYTHON_CURSES=y
++BR2_PACKAGE_PYTHON_READLINE=y
++BR2_PACKAGE_PYTHON_SSL=y
++BR2_PACKAGE_PYTHON_SQLITE=y
++BR2_PACKAGE_PYTHON_PYEXPAT=y
++BR2_PACKAGE_PYTHON_HASHLIB=y
++BR2_PACKAGE_PYTHON_PYUDEV=y
++BR2_PACKAGE_TCL=y
++BR2_PACKAGE_EXPECT=y
++BR2_PACKAGE_TCLLIB=y
++BR2_PACKAGE_LIBMPD=y
++BR2_PACKAGE_OPUS=y
++BR2_PACKAGE_TAGLIB=y
++BR2_PACKAGE_LIBZIP=y
++BR2_PACKAGE_SNAPPY=y
++BR2_PACKAGE_SZIP=y
++BR2_PACKAGE_GNUTLS=y
++BR2_PACKAGE_GNUTLS_TOOLS=y
++BR2_PACKAGE_LIBNSS=y
++BR2_PACKAGE_LIBSHA1=y
++BR2_PACKAGE_LIBSSH2=y
++BR2_PACKAGE_OPENSSL_BIN=y
++BR2_PACKAGE_OPENSSL_ENGINES=y
++BR2_PACKAGE_MYSQL_SERVER=y
++BR2_PACKAGE_SQLITE_NO_SYNC=y
++BR2_PACKAGE_LIBCONFIG=y
++BR2_PACKAGE_CAIRO_TEE=y
++BR2_PACKAGE_GD=y
++BR2_PACKAGE_GD_ANNOTATE=y
++BR2_PACKAGE_GD_GD2COPYPAL=y
++BR2_PACKAGE_GD_GD2TOGIF=y
++BR2_PACKAGE_GD_GD2TOPNG=y
++BR2_PACKAGE_GD_GDCMPGIF=y
++BR2_PACKAGE_GD_GDPARTTOPNG=y
++BR2_PACKAGE_GD_GDTOPNG=y
++BR2_PACKAGE_GD_GIFTOGD2=y
++BR2_PACKAGE_GD_PNGTOGD=y
++BR2_PACKAGE_GD_PNGTOGD2=y
++BR2_PACKAGE_GD_WEBPNG=y
++BR2_PACKAGE_GDK_PIXBUF=y
++BR2_PACKAGE_HARFBUZZ=y
++BR2_PACKAGE_LIBJPEG=y
++BR2_PACKAGE_LIBDRM=y
++BR2_PACKAGE_LIBDRM_OMAP=y
++BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
++BR2_PACKAGE_WEBP_DEMUX=y
++BR2_PACKAGE_DTC=y
++BR2_PACKAGE_DTC_PROGRAMS=y
++BR2_PACKAGE_LIBGUDEV=y
++BR2_PACKAGE_LIBHID=y
++BR2_PACKAGE_LIBIIO=y
++BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON=y
++BR2_PACKAGE_LIBV4L=y
++BR2_PACKAGE_LIBXSLT=y
++BR2_PACKAGE_LIBMPEG2=y
++BR2_PACKAGE_LIBVPX=y
++BR2_PACKAGE_LIBYUV=y
++BR2_PACKAGE_CANFESTIVAL=y
++BR2_PACKAGE_CANFESTIVAL_INSTALL_EXAMPLES=y
++BR2_PACKAGE_CURL=y
++BR2_PACKAGE_LIBGSASL=y
++BR2_PACKAGE_LIBIDN=y
++BR2_PACKAGE_LIBIDN_BINARY=y
++BR2_PACKAGE_LIBMBUS=y
++BR2_PACKAGE_LIBMODBUS=y
++BR2_PACKAGE_LIBPJSIP=y
++BR2_PACKAGE_LIBRSYNC=y
++BR2_PACKAGE_LIBSOUP=y
++BR2_PACKAGE_LIBVNCSERVER=y
++BR2_PACKAGE_LIBVNCSERVER_TIGHTPNG=y
++BR2_PACKAGE_NEON=y
++BR2_PACKAGE_NEON_ZLIB=y
++BR2_PACKAGE_NEON_SSL=y
++BR2_PACKAGE_NEON_LIBXML2=y
++BR2_PACKAGE_NSS_PAM_LDAPD=y
++BR2_PACKAGE_NSS_PAM_LDAPD_UTILITIES=y
++BR2_PACKAGE_BOOST_ATOMIC=y
++BR2_PACKAGE_BOOST_CHRONO=y
++BR2_PACKAGE_BOOST_CONTAINER=y
++BR2_PACKAGE_BOOST_CONTEXT=y
++BR2_PACKAGE_BOOST_COROUTINE=y
++BR2_PACKAGE_BOOST_COROUTINE2=y
++BR2_PACKAGE_BOOST_DATE_TIME=y
++BR2_PACKAGE_BOOST_EXCEPTION=y
++BR2_PACKAGE_BOOST_FILESYSTEM=y
++BR2_PACKAGE_BOOST_GRAPH=y
++BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y
++BR2_PACKAGE_BOOST_IOSTREAMS=y
++BR2_PACKAGE_BOOST_LOCALE=y
++BR2_PACKAGE_BOOST_LOG=y
++BR2_PACKAGE_BOOST_MATH=y
++BR2_PACKAGE_BOOST_METAPARSE=y
++BR2_PACKAGE_BOOST_MPI=y
++BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y
++BR2_PACKAGE_BOOST_PYTHON=y
++BR2_PACKAGE_BOOST_RANDOM=y
++BR2_PACKAGE_BOOST_REGEX=y
++BR2_PACKAGE_BOOST_SERIALIZATION=y
++BR2_PACKAGE_BOOST_SIGNALS=y
++BR2_PACKAGE_BOOST_SYSTEM=y
++BR2_PACKAGE_BOOST_THREAD=y
++BR2_PACKAGE_BOOST_TIMER=y
++BR2_PACKAGE_BOOST_TYPE_ERASURE=y
++BR2_PACKAGE_BOOST_WAVE=y
++BR2_PACKAGE_ELFUTILS=y
++BR2_PACKAGE_LIBCAP_TOOLS=y
++BR2_PACKAGE_LIBEVENT=y
++BR2_PACKAGE_POCO=y
++BR2_PACKAGE_POCO_NETSSL_OPENSSL=y
++BR2_PACKAGE_POCO_ZIP=y
++BR2_PACKAGE_POCO_DATA_SQLITE=y
++BR2_PACKAGE_POCO_DATA_MYSQL=y
++BR2_PACKAGE_PROTOBUF=y
++BR2_PACKAGE_PROTOBUF_C=y
++BR2_PACKAGE_NCURSES_WCHAR=y
++BR2_PACKAGE_NCURSES_TARGET_PANEL=y
++BR2_PACKAGE_NCURSES_TARGET_FORM=y
++BR2_PACKAGE_NCURSES_TARGET_MENU=y
++BR2_PACKAGE_NCURSES_TARGET_PROGS=y
++BR2_PACKAGE_FETCHMAIL=y
++BR2_PACKAGE_HEIRLOOM_MAILX=y
++BR2_PACKAGE_LIBESMTP=y
++BR2_PACKAGE_MSMTP=y
++BR2_PACKAGE_MUTT=y
++BR2_PACKAGE_MUTT_IMAP=y
++BR2_PACKAGE_MUTT_POP3=y
++BR2_PACKAGE_BLUEZ5_UTILS=y
++BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
++BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
++BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
++BR2_PACKAGE_BLUEZ5_UTILS_TEST=y
++BR2_PACKAGE_CAN_UTILS=y
++BR2_PACKAGE_CIVETWEB=y
++BR2_PACKAGE_CIVETWEB_WITH_LUA=y
++BR2_PACKAGE_CONNTRACK_TOOLS=y
++BR2_PACKAGE_CRDA=y
++BR2_PACKAGE_DHCP=y
++BR2_PACKAGE_DHCP_SERVER=y
++BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK=y
++BR2_PACKAGE_DHCP_CLIENT=y
++BR2_PACKAGE_ETHTOOL=y
++BR2_PACKAGE_GESFTPSERVER=y
++BR2_PACKAGE_HOSTAPD=y
++BR2_PACKAGE_HOSTAPD_EAP=y
++BR2_PACKAGE_HOSTAPD_WPS=y
++BR2_PACKAGE_HTTPING=y
++BR2_PACKAGE_HTTPING_TFO=y
++BR2_PACKAGE_IFTOP=y
++BR2_PACKAGE_IFUPDOWN=y
++BR2_PACKAGE_IPROUTE2=y
++BR2_PACKAGE_IPSEC_TOOLS=y
++BR2_PACKAGE_IPSEC_TOOLS_READLINE=y
++BR2_PACKAGE_IPTABLES=y
++BR2_PACKAGE_IW=y
++BR2_PACKAGE_MINIDLNA=y
++BR2_PACKAGE_NETPLUG=y
++BR2_PACKAGE_OPENSSH=y
++BR2_PACKAGE_OPENVPN=y
++BR2_PACKAGE_OPENVPN_SMALL=y
++BR2_PACKAGE_PPPD=y
++BR2_PACKAGE_PPPD_FILTER=y
++BR2_PACKAGE_PPPD_RADIUS=y
++BR2_PACKAGE_PPTP_LINUX=y
++BR2_PACKAGE_RSYNC=y
++BR2_PACKAGE_TINC=y
++BR2_PACKAGE_WGET=y
++BR2_PACKAGE_WIRELESS_TOOLS=y
++BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
++BR2_PACKAGE_WPA_SUPPLICANT=y
++BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
++BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY=y
++BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y
++BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
++BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT=y
++BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y
++BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
++BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
++BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y
++BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
++BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD=y
++BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW=y
++BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y
++BR2_PACKAGE_BASH=y
++BR2_PACKAGE_SCREEN=y
++BR2_PACKAGE_SUDO=y
++BR2_PACKAGE_ATTR=y
++BR2_PACKAGE_HTOP=y
++BR2_PACKAGE_KEYUTILS=y
++BR2_PACKAGE_POLKIT=y
++BR2_PACKAGE_UTIL_LINUX_SETTERM=y
++BR2_PACKAGE_JOE=y
++BR2_TARGET_ROOTFS_EXT2=y
++BR2_TARGET_ROOTFS_EXT2_4=y
++BR2_TARGET_ROOTFS_TAR_GZIP=y
++BR2_TARGET_UBOOT=y
++BR2_TARGET_UBOOT_BOARDNAME="am335x_boneblack"
++BR2_TARGET_UBOOT_CUSTOM_VERSION=y
++BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.10"
++BR2_TARGET_UBOOT_PATCH="../GfA/board/GfA/Display001/uboot_2013.10"
++# BR2_TARGET_UBOOT_FORMAT_BIN is not set
++BR2_TARGET_UBOOT_FORMAT_IMG=y
++BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
++BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin"
++BR2_TARGET_UBOOT_SPL=y
++BR2_TARGET_UBOOT_SPL_NAME="MLO"
++BR2_PACKAGE_HOST_DOSFSTOOLS=y
++BR2_PACKAGE_HOST_DTC=y
++BR2_PACKAGE_HOST_GENIMAGE=y
++BR2_PACKAGE_HOST_MTOOLS=y
++BR2_PACKAGE_WT=y
++BR2_PACKAGE_NETWORK_INTERFACES_SCRIPT=y
++BR2_PACKAGE_GFA_ADDONS=y
+diff --git a/configs/Display001_4.4.104_rt21_Qt5.7_defconfig b/configs/Display001_4.4.104_rt21_Qt5.7_defconfig
+new file mode 100644
+index 0000000..6dd9d9f
+--- /dev/null
++++ b/configs/Display001_4.4.104_rt21_Qt5.7_defconfig
+@@ -0,0 +1,460 @@
++BR2_arm=y
++BR2_cortex_a8=y
++BR2_ARM_INSTRUCTIONS_THUMB2=y
++BR2_DL_DIR="~/buildroot_dl"
++BR2_HOST_DIR="/opt/GfA/TC_L44104_C493_QT57"
++# BR2_COMPILER_PARANOID_UNSAFE_PATH is not set
++BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
++BR2_KERNEL_HEADERS_4_4=y
++BR2_GLIBC_VERSION_2_24=y
++BR2_BINUTILS_VERSION_2_27_X=y
++BR2_GCC_VERSION_4_9_3=y
++BR2_TOOLCHAIN_BUILDROOT_CXX=y
++BR2_PACKAGE_HOST_GDB=y
++BR2_PACKAGE_HOST_GDB_TUI=y
++BR2_PACKAGE_HOST_GDB_PYTHON=y
++BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y
++BR2_TARGET_OPTIMIZATION="-pipe"
++BR2_TARGET_GENERIC_HOSTNAME="GfA"
++BR2_TARGET_GENERIC_ISSUE="Welcome to GfA Display001"
++BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
++BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt ../GfA/board/GfA/Display001/device_table.txt"
++BR2_TARGET_GENERIC_ROOT_PASSWD="root"
++BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
++BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
++# BR2_ENABLE_LOCALE_PURGE is not set
++BR2_GENERATE_LOCALE="en_US en_GB de_DE de_AT de_CH fr_FR it_IT es_ES sv_FI sv_SE nb_NO nn_NO se_NO da_DK zh_CN"
++BR2_TARGET_LOCALTIME="Europe/Vienna"
++BR2_ROOTFS_POST_BUILD_SCRIPT="../GfA/board/GfA/Display001/post-build_4.4.sh"
++BR2_LINUX_KERNEL=y
++BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
++BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="file://$(TOPDIR)/../GfA/GfAkernel57.tar.gz  "
++BR2_LINUX_KERNEL_PATCH="../GfA/board/GfA/Display001/linux_4.4.104_rt21"
++BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
++BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="../GfA/board/GfA/Display001/Display001_4.4.104_rt_defconfig"
++BR2_LINUX_KERNEL_UIMAGE=y
++BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000"
++BR2_LINUX_KERNEL_DTS_SUPPORT=y
++BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
++BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="../GfA/board/GfA/Display001/DTS_4.4/Display001.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_4.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_7.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_10.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_15.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_rru.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_4_nopruss.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_7_gain1.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_5.dts ../GfA/board/GfA/Display001/DTS_4.4/Display002_7.dts ../GfA/board/GfA/Display001/DTS_4.4/Display002_10.dts ../GfA/board/GfA/Display001/DTS_4.4/Display002_4.dts ../GfA/board/GfA/Display001/DTS_4.4/Display002_7_rs485.dts"
++BR2_PACKAGE_BUSYBOX_CONFIG="../GfA/board/GfA/Display001/busybox.config"
++BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
++BR2_PACKAGE_FFMPEG_GPL=y
++BR2_PACKAGE_FFMPEG_NONFREE=y
++BR2_PACKAGE_FFMPEG_FFPLAY=y
++BR2_PACKAGE_FFMPEG_FFSERVER=y
++BR2_PACKAGE_FFMPEG_FFPROBE=y
++BR2_PACKAGE_FFMPEG_AVRESAMPLE=y
++BR2_PACKAGE_FFMPEG_POSTPROC=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SMPTE=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
++BR2_PACKAGE_GST1_PLUGINS_BAD=y
++BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL=y
++BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264=y
++BR2_PACKAGE_MPD=y
++BR2_PACKAGE_MPLAYER=y
++BR2_PACKAGE_MPV=y
++BR2_PACKAGE_VLC=y
++BR2_PACKAGE_WAVPACK=y
++BR2_PACKAGE_GZIP=y
++BR2_PACKAGE_LZ4=y
++BR2_PACKAGE_LZIP=y
++BR2_PACKAGE_LZOP=y
++BR2_PACKAGE_P7ZIP=y
++BR2_PACKAGE_UNRAR=y
++BR2_PACKAGE_UNZIP=y
++BR2_PACKAGE_ZIP=y
++BR2_PACKAGE_GDB=y
++BR2_PACKAGE_GDB_DEBUGGER=y
++BR2_PACKAGE_STRACE=y
++BR2_PACKAGE_BINUTILS=y
++BR2_PACKAGE_BINUTILS_TARGET=y
++BR2_PACKAGE_CMAKE_CTEST=y
++BR2_PACKAGE_GETTEXT=y
++BR2_PACKAGE_GIT=y
++BR2_PACKAGE_MAKE=y
++BR2_PACKAGE_PATCH=y
++BR2_PACKAGE_SED=y
++BR2_PACKAGE_TREE=y
++BR2_PACKAGE_CIFS_UTILS=y
++BR2_PACKAGE_DOSFSTOOLS=y
++BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
++BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
++BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
++BR2_PACKAGE_E2FSPROGS=y
++BR2_PACKAGE_E2FSPROGS_DEBUGFS=y
++BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
++BR2_PACKAGE_F2FS_TOOLS=y
++BR2_PACKAGE_FLASHBENCH=y
++BR2_PACKAGE_MAKEDEVS=y
++BR2_PACKAGE_MMC_UTILS=y
++BR2_PACKAGE_DEJAVU=y
++BR2_PACKAGE_FONT_AWESOME=y
++BR2_PACKAGE_DIRECTFB=y
++BR2_PACKAGE_DIRECTFB_DIVINE=y
++BR2_PACKAGE_DIRECTFB_SAWMAN=y
++BR2_PACKAGE_DIRECTFB_DITHER_RGB16=y
++BR2_PACKAGE_EFL=y
++BR2_PACKAGE_EFL_FB=y
++BR2_PACKAGE_EFL_WEBP=y
++BR2_PACKAGE_FB_TEST_APP=y
++BR2_PACKAGE_FBTERM=y
++BR2_PACKAGE_FBV=y
++BR2_PACKAGE_LINUX_FUSION=y
++BR2_PACKAGE_PSPLASH=y
++BR2_PACKAGE_SDL_DIRECTFB=y
++BR2_PACKAGE_SDL_GFX=y
++BR2_PACKAGE_SDL_IMAGE=y
++BR2_PACKAGE_SDL_IMAGE_GIF=y
++BR2_PACKAGE_SDL_IMAGE_JPEG=y
++BR2_PACKAGE_SDL_IMAGE_LBM=y
++BR2_PACKAGE_SDL_IMAGE_PCX=y
++BR2_PACKAGE_SDL_IMAGE_PNG=y
++BR2_PACKAGE_SDL_IMAGE_PNM=y
++BR2_PACKAGE_SDL_IMAGE_TARGA=y
++BR2_PACKAGE_SDL_IMAGE_TIFF=y
++BR2_PACKAGE_SDL_IMAGE_WEBP=y
++BR2_PACKAGE_SDL_IMAGE_XCF=y
++BR2_PACKAGE_SDL_IMAGE_XPM=y
++BR2_PACKAGE_SDL_IMAGE_XV=y
++BR2_PACKAGE_SDL_MIXER=y
++BR2_PACKAGE_SDL_NET=y
++BR2_PACKAGE_SDL_SOUND=y
++BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
++BR2_PACKAGE_SDL_TTF=y
++BR2_PACKAGE_SDL2=y
++BR2_PACKAGE_SDL2_DIRECTFB=y
++BR2_PACKAGE_SDL2_GFX=y
++BR2_PACKAGE_SDL2_IMAGE=y
++BR2_PACKAGE_SDL2_TTF=y
++BR2_PACKAGE_QT5=y
++BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
++BR2_PACKAGE_QT5BASE_MYSQL=y
++BR2_PACKAGE_QT5BASE_PSQL=y
++BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM=y
++BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
++BR2_PACKAGE_QT5BASE_EGLFS=y
++BR2_PACKAGE_QT5BASE_FONTCONFIG=y
++BR2_PACKAGE_QT5BASE_GIF=y
++BR2_PACKAGE_QT5BASE_JPEG=y
++BR2_PACKAGE_QT5BASE_PNG=y
++BR2_PACKAGE_QT53D=y
++BR2_PACKAGE_QT5CANVAS3D=y
++BR2_PACKAGE_QT5CONNECTIVITY=y
++BR2_PACKAGE_QT5ENGINIO=y
++BR2_PACKAGE_QT5GRAPHICALEFFECTS=y
++BR2_PACKAGE_QT5IMAGEFORMATS=y
++BR2_PACKAGE_QT5LOCATION=y
++BR2_PACKAGE_QT5MULTIMEDIA=y
++BR2_PACKAGE_QT5QUICKCONTROLS=y
++BR2_PACKAGE_QT5SENSORS=y
++BR2_PACKAGE_QT5SERIALBUS=y
++BR2_PACKAGE_QT5WAYLAND=y
++BR2_PACKAGE_QT5SVG=y
++BR2_PACKAGE_QT5TOOLS=y
++BR2_PACKAGE_QT5TOOLS_QTPATHS=y
++BR2_PACKAGE_QT5TOOLS_QTPLUGININFO=y
++BR2_PACKAGE_QT5WEBENGINE=y
++BR2_PACKAGE_QT5VIRTUALKEYBOARD=y
++BR2_PACKAGE_QT5CHARTS=y
++BR2_PACKAGE_QT5DATAVIS3D=y
++BR2_PACKAGE_QT5QUICKCONTROLS2=y
++BR2_PACKAGE_TEKUI=y
++BR2_PACKAGE_WESTON=y
++BR2_PACKAGE_AM33X_CM3=y
++BR2_PACKAGE_LINUX_FIRMWARE=y
++BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6002=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6003=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6004=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y
++BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y
++BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8=y
++BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y
++BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8801=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897=y
++BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
++BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61=y
++BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
++BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
++BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X=y
++BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
++BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
++BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5=y
++BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
++BR2_PACKAGE_AM335X_PRU_PACKAGE=y
++BR2_PACKAGE_DEVMEM2=y
++BR2_PACKAGE_EVTEST=y
++BR2_PACKAGE_I2C_TOOLS=y
++BR2_PACKAGE_INPUT_TOOLS=y
++BR2_PACKAGE_KBD=y
++BR2_PACKAGE_LIBUIO=y
++BR2_PACKAGE_LSUIO=y
++BR2_PACKAGE_PARTED=y
++BR2_PACKAGE_RS485CONF=y
++BR2_PACKAGE_SISPMCTL=y
++BR2_PACKAGE_SPI_TOOLS=y
++BR2_PACKAGE_TI_GFX=y
++BR2_PACKAGE_TI_GFX_EGLIMAGE=y
++BR2_PACKAGE_TI_GFX_ES8=y
++BR2_PACKAGE_TI_UTILS=y
++BR2_PACKAGE_USB_MODESWITCH_DATA=y
++BR2_PACKAGE_USBMOUNT=y
++BR2_PACKAGE_USBUTILS=y
++BR2_PACKAGE_NODEJS=y
++BR2_PACKAGE_NODEJS_NPM=y
++BR2_PACKAGE_NODEJS_MODULES_EXPRESS=y
++BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT=y
++BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="node-red"
++BR2_PACKAGE_PYTHON=y
++BR2_PACKAGE_PYTHON_BZIP2=y
++BR2_PACKAGE_PYTHON_BSDDB=y
++BR2_PACKAGE_PYTHON_CODECSCJK=y
++BR2_PACKAGE_PYTHON_CURSES=y
++BR2_PACKAGE_PYTHON_READLINE=y
++BR2_PACKAGE_PYTHON_SSL=y
++BR2_PACKAGE_PYTHON_SQLITE=y
++BR2_PACKAGE_PYTHON_PYEXPAT=y
++BR2_PACKAGE_PYTHON_HASHLIB=y
++BR2_PACKAGE_PYTHON_PAHO_MQTT=y
++BR2_PACKAGE_PYTHON_PYUDEV=y
++BR2_PACKAGE_TCL=y
++BR2_PACKAGE_EXPECT=y
++BR2_PACKAGE_TCLLIB=y
++BR2_PACKAGE_LIBMPD=y
++BR2_PACKAGE_OPUS=y
++BR2_PACKAGE_TAGLIB=y
++BR2_PACKAGE_LIBZIP=y
++BR2_PACKAGE_SNAPPY=y
++BR2_PACKAGE_SZIP=y
++BR2_PACKAGE_GNUTLS_TOOLS=y
++BR2_PACKAGE_LIBNSS=y
++BR2_PACKAGE_LIBSHA1=y
++BR2_PACKAGE_LIBSSH2=y
++BR2_PACKAGE_OPENSSL_BIN=y
++BR2_PACKAGE_OPENSSL_ENGINES=y
++BR2_PACKAGE_MYSQL_SERVER=y
++BR2_PACKAGE_SQLITE_NO_SYNC=y
++BR2_PACKAGE_LIBCONFIG=y
++BR2_PACKAGE_CAIRO_TEE=y
++BR2_PACKAGE_GD=y
++BR2_PACKAGE_GD_ANNOTATE=y
++BR2_PACKAGE_GD_GD2COPYPAL=y
++BR2_PACKAGE_GD_GD2TOGIF=y
++BR2_PACKAGE_GD_GD2TOPNG=y
++BR2_PACKAGE_GD_GDCMPGIF=y
++BR2_PACKAGE_GD_GDPARTTOPNG=y
++BR2_PACKAGE_GD_GDTOPNG=y
++BR2_PACKAGE_GD_GIFTOGD2=y
++BR2_PACKAGE_GD_PNGTOGD=y
++BR2_PACKAGE_GD_PNGTOGD2=y
++BR2_PACKAGE_GD_WEBPNG=y
++BR2_PACKAGE_GDK_PIXBUF=y
++BR2_PACKAGE_HARFBUZZ=y
++BR2_PACKAGE_LIBDRM=y
++BR2_PACKAGE_LIBDRM_OMAP=y
++BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
++BR2_PACKAGE_WEBP_DEMUX=y
++BR2_PACKAGE_DTC=y
++BR2_PACKAGE_DTC_PROGRAMS=y
++BR2_PACKAGE_LIBGUDEV=y
++BR2_PACKAGE_LIBHID=y
++BR2_PACKAGE_LIBIIO=y
++BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON=y
++BR2_PACKAGE_LIBV4L=y
++BR2_PACKAGE_JANSSON=y
++BR2_PACKAGE_LIBXSLT=y
++BR2_PACKAGE_LIBMPEG2=y
++BR2_PACKAGE_LIBVPX=y
++BR2_PACKAGE_LIBYUV=y
++BR2_PACKAGE_CANFESTIVAL=y
++BR2_PACKAGE_CANFESTIVAL_INSTALL_EXAMPLES=y
++BR2_PACKAGE_CURL=y
++BR2_PACKAGE_LIBGSASL=y
++BR2_PACKAGE_LIBIDN=y
++BR2_PACKAGE_LIBIDN_BINARY=y
++BR2_PACKAGE_LIBMBUS=y
++BR2_PACKAGE_LIBMICROHTTPD=y
++BR2_PACKAGE_LIBMICROHTTPD_SSL=y
++BR2_PACKAGE_LIBMODBUS=y
++BR2_PACKAGE_LIBPJSIP=y
++BR2_PACKAGE_LIBRSYNC=y
++BR2_PACKAGE_LIBSOUP=y
++BR2_PACKAGE_LIBVNCSERVER=y
++BR2_PACKAGE_LIBVNCSERVER_TIGHTPNG=y
++BR2_PACKAGE_NEON=y
++BR2_PACKAGE_NEON_ZLIB=y
++BR2_PACKAGE_NEON_SSL=y
++BR2_PACKAGE_NEON_LIBXML2=y
++BR2_PACKAGE_NSS_PAM_LDAPD=y
++BR2_PACKAGE_NSS_PAM_LDAPD_UTILITIES=y
++BR2_PACKAGE_PAHO_MQTT_C=y
++BR2_PACKAGE_BOOST_ATOMIC=y
++BR2_PACKAGE_BOOST_CHRONO=y
++BR2_PACKAGE_BOOST_CONTAINER=y
++BR2_PACKAGE_BOOST_CONTEXT=y
++BR2_PACKAGE_BOOST_COROUTINE=y
++BR2_PACKAGE_BOOST_COROUTINE2=y
++BR2_PACKAGE_BOOST_DATE_TIME=y
++BR2_PACKAGE_BOOST_EXCEPTION=y
++BR2_PACKAGE_BOOST_FILESYSTEM=y
++BR2_PACKAGE_BOOST_GRAPH=y
++BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y
++BR2_PACKAGE_BOOST_IOSTREAMS=y
++BR2_PACKAGE_BOOST_LOCALE=y
++BR2_PACKAGE_BOOST_LOG=y
++BR2_PACKAGE_BOOST_MATH=y
++BR2_PACKAGE_BOOST_METAPARSE=y
++BR2_PACKAGE_BOOST_MPI=y
++BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y
++BR2_PACKAGE_BOOST_PYTHON=y
++BR2_PACKAGE_BOOST_RANDOM=y
++BR2_PACKAGE_BOOST_REGEX=y
++BR2_PACKAGE_BOOST_SERIALIZATION=y
++BR2_PACKAGE_BOOST_SIGNALS=y
++BR2_PACKAGE_BOOST_SYSTEM=y
++BR2_PACKAGE_BOOST_THREAD=y
++BR2_PACKAGE_BOOST_TIMER=y
++BR2_PACKAGE_BOOST_TYPE_ERASURE=y
++BR2_PACKAGE_BOOST_WAVE=y
++BR2_PACKAGE_ELFUTILS=y
++BR2_PACKAGE_LIBCAP_TOOLS=y
++BR2_PACKAGE_LIBEVENT=y
++BR2_PACKAGE_LIBICAL=y
++BR2_PACKAGE_POCO=y
++BR2_PACKAGE_POCO_NETSSL_OPENSSL=y
++BR2_PACKAGE_POCO_ZIP=y
++BR2_PACKAGE_POCO_DATA_SQLITE=y
++BR2_PACKAGE_POCO_DATA_MYSQL=y
++BR2_PACKAGE_PROTOBUF=y
++BR2_PACKAGE_PROTOBUF_C=y
++BR2_PACKAGE_NCURSES_WCHAR=y
++BR2_PACKAGE_NCURSES_TARGET_PANEL=y
++BR2_PACKAGE_NCURSES_TARGET_FORM=y
++BR2_PACKAGE_NCURSES_TARGET_MENU=y
++BR2_PACKAGE_NCURSES_TARGET_PROGS=y
++BR2_PACKAGE_FETCHMAIL=y
++BR2_PACKAGE_HEIRLOOM_MAILX=y
++BR2_PACKAGE_LIBESMTP=y
++BR2_PACKAGE_MSMTP=y
++BR2_PACKAGE_MUTT=y
++BR2_PACKAGE_MUTT_IMAP=y
++BR2_PACKAGE_MUTT_POP3=y
++BR2_PACKAGE_CAN_UTILS=y
++BR2_PACKAGE_CIVETWEB=y
++BR2_PACKAGE_CIVETWEB_WITH_LUA=y
++BR2_PACKAGE_CONNTRACK_TOOLS=y
++BR2_PACKAGE_CRDA=y
++BR2_PACKAGE_DHCP=y
++BR2_PACKAGE_DHCP_SERVER=y
++BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK=y
++BR2_PACKAGE_DHCP_CLIENT=y
++BR2_PACKAGE_ETHTOOL=y
++BR2_PACKAGE_GESFTPSERVER=y
++BR2_PACKAGE_HOSTAPD=y
++BR2_PACKAGE_HOSTAPD_EAP=y
++BR2_PACKAGE_HOSTAPD_WPS=y
++BR2_PACKAGE_HTTPING=y
++BR2_PACKAGE_HTTPING_TFO=y
++BR2_PACKAGE_IFTOP=y
++BR2_PACKAGE_IFUPDOWN=y
++BR2_PACKAGE_IPROUTE2=y
++BR2_PACKAGE_IPSEC_TOOLS=y
++BR2_PACKAGE_IPSEC_TOOLS_READLINE=y
++BR2_PACKAGE_IPTABLES=y
++BR2_PACKAGE_IW=y
++BR2_PACKAGE_MINIDLNA=y
++BR2_PACKAGE_MOSQUITTO=y
++BR2_PACKAGE_NETPLUG=y
++BR2_PACKAGE_OPENSSH=y
++BR2_PACKAGE_OPENVPN=y
++BR2_PACKAGE_OPENVPN_SMALL=y
++BR2_PACKAGE_PPPD=y
++BR2_PACKAGE_PPPD_FILTER=y
++BR2_PACKAGE_PPPD_RADIUS=y
++BR2_PACKAGE_PPTP_LINUX=y
++BR2_PACKAGE_RSYNC=y
++BR2_PACKAGE_TINC=y
++BR2_PACKAGE_WGET=y
++BR2_PACKAGE_WIRELESS_TOOLS=y
++BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
++BR2_PACKAGE_WPA_SUPPLICANT=y
++BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
++BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY=y
++BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y
++BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
++BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT=y
++BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y
++BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
++BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
++BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y
++BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
++BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD=y
++BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW=y
++BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y
++BR2_PACKAGE_BASH=y
++BR2_PACKAGE_SCREEN=y
++BR2_PACKAGE_SUDO=y
++BR2_PACKAGE_ATTR=y
++BR2_PACKAGE_HTOP=y
++BR2_PACKAGE_KEYUTILS=y
++BR2_PACKAGE_POLKIT=y
++BR2_PACKAGE_UTIL_LINUX_SETTERM=y
++BR2_PACKAGE_JOE=y
++BR2_TARGET_ROOTFS_EXT2=y
++BR2_TARGET_ROOTFS_EXT2_4=y
++BR2_TARGET_ROOTFS_TAR_GZIP=y
++BR2_TARGET_UBOOT=y
++BR2_TARGET_UBOOT_BOARDNAME="am335x_boneblack"
++BR2_TARGET_UBOOT_CUSTOM_VERSION=y
++BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.10"
++BR2_TARGET_UBOOT_PATCH="../GfA/board/GfA/Display001/uboot_2013.10"
++# BR2_TARGET_UBOOT_FORMAT_BIN is not set
++BR2_TARGET_UBOOT_FORMAT_IMG=y
++BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
++BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin"
++BR2_TARGET_UBOOT_SPL=y
++BR2_TARGET_UBOOT_SPL_NAME="MLO"
++BR2_PACKAGE_HOST_DOSFSTOOLS=y
++BR2_PACKAGE_HOST_DTC=y
++BR2_PACKAGE_HOST_GENIMAGE=y
++BR2_PACKAGE_HOST_MTOOLS=y
++BR2_PACKAGE_WT=y
++BR2_PACKAGE_NETWORK_INTERFACES_SCRIPT=y
++BR2_PACKAGE_GFA_ADDONS=y
++BR2_PACKAGE_QMLPLUGINS=y
++BR2_PACKAGE_PYTHON_UFW=y
++BR2_PACKAGE_LIBULFIUS=y
+diff --git a/configs/Display001_4.4.94_rt19_Qt5.6.2_defconfig b/configs/Display001_4.4.94_rt19_Qt5.6.2_defconfig
+new file mode 100644
+index 0000000..0b2d311
+--- /dev/null
++++ b/configs/Display001_4.4.94_rt19_Qt5.6.2_defconfig
+@@ -0,0 +1,449 @@
++BR2_arm=y
++BR2_cortex_a8=y
++BR2_ARM_INSTRUCTIONS_THUMB2=y
++BR2_DL_DIR="~/buildroot_dl"
++BR2_HOST_DIR="/opt/GfA/TC_L4494_C493_QT562"
++# BR2_COMPILER_PARANOID_UNSAFE_PATH is not set
++BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
++BR2_KERNEL_HEADERS_4_4=y
++BR2_GLIBC_VERSION_2_24=y
++BR2_BINUTILS_VERSION_2_27_X=y
++BR2_GCC_VERSION_4_9_3=y
++BR2_TOOLCHAIN_BUILDROOT_CXX=y
++BR2_PACKAGE_HOST_GDB=y
++BR2_PACKAGE_HOST_GDB_TUI=y
++BR2_PACKAGE_HOST_GDB_PYTHON=y
++BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y
++BR2_TARGET_OPTIMIZATION="-pipe"
++BR2_TARGET_GENERIC_HOSTNAME="GfA"
++BR2_TARGET_GENERIC_ISSUE="Welcome to GfA Display001"
++BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
++BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt ../GfA/board/GfA/Display001/device_table.txt"
++BR2_TARGET_GENERIC_ROOT_PASSWD="root"
++BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
++BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
++# BR2_ENABLE_LOCALE_PURGE is not set
++BR2_GENERATE_LOCALE="en_US en_GB de_DE de_AT de_CH fr_FR it_IT es_ES sv_FI sv_SE nb_NO nn_NO se_NO da_DK zh_CN"
++BR2_TARGET_LOCALTIME="Europe/Vienna"
++BR2_ROOTFS_POST_BUILD_SCRIPT="../GfA/board/GfA/Display001/post-build_4.4.sh"
++BR2_LINUX_KERNEL=y
++BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
++BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="file://$(TOPDIR)/../GfA/GfAkernel.tar.gz  "
++BR2_LINUX_KERNEL_PATCH="../GfA/board/GfA/Display001/linux_4.4.94_rt19"
++BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
++BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="../GfA/board/GfA/Display001/Display001_4.4.94_rt_defconfig"
++BR2_LINUX_KERNEL_UIMAGE=y
++BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000"
++BR2_LINUX_KERNEL_DTS_SUPPORT=y
++BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
++BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="../GfA/board/GfA/Display001/DTS_4.4/Display001.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_4.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_7.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_10.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_15.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_rru.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_4_nopruss.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_7_gain1.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_5.dts ../GfA/board/GfA/Display001/DTS_4.4/Display002_7.dts ../GfA/board/GfA/Display001/DTS_4.4/Display002_10.dts ../GfA/board/GfA/Display001/DTS_4.4/Display002_4.dts"
++BR2_PACKAGE_BUSYBOX_CONFIG="../GfA/board/GfA/Display001/busybox.config"
++BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
++BR2_PACKAGE_FFMPEG_GPL=y
++BR2_PACKAGE_FFMPEG_NONFREE=y
++BR2_PACKAGE_FFMPEG_FFPLAY=y
++BR2_PACKAGE_FFMPEG_FFSERVER=y
++BR2_PACKAGE_FFMPEG_FFPROBE=y
++BR2_PACKAGE_FFMPEG_AVRESAMPLE=y
++BR2_PACKAGE_FFMPEG_POSTPROC=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SMPTE=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
++BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
++BR2_PACKAGE_GST1_PLUGINS_BAD=y
++BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL=y
++BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264=y
++BR2_PACKAGE_MPD=y
++BR2_PACKAGE_MPLAYER=y
++BR2_PACKAGE_MPV=y
++BR2_PACKAGE_VLC=y
++BR2_PACKAGE_WAVPACK=y
++BR2_PACKAGE_GZIP=y
++BR2_PACKAGE_LZ4=y
++BR2_PACKAGE_LZIP=y
++BR2_PACKAGE_LZOP=y
++BR2_PACKAGE_P7ZIP=y
++BR2_PACKAGE_UNRAR=y
++BR2_PACKAGE_UNZIP=y
++BR2_PACKAGE_ZIP=y
++BR2_PACKAGE_GDB=y
++BR2_PACKAGE_GDB_DEBUGGER=y
++BR2_PACKAGE_STRACE=y
++BR2_PACKAGE_BINUTILS=y
++BR2_PACKAGE_BINUTILS_TARGET=y
++BR2_PACKAGE_CMAKE_CTEST=y
++BR2_PACKAGE_GETTEXT=y
++BR2_PACKAGE_MAKE=y
++BR2_PACKAGE_SED=y
++BR2_PACKAGE_CIFS_UTILS=y
++BR2_PACKAGE_DOSFSTOOLS=y
++BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
++BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
++BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
++BR2_PACKAGE_E2FSPROGS=y
++BR2_PACKAGE_E2FSPROGS_DEBUGFS=y
++BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
++BR2_PACKAGE_F2FS_TOOLS=y
++BR2_PACKAGE_FLASHBENCH=y
++BR2_PACKAGE_MAKEDEVS=y
++BR2_PACKAGE_MMC_UTILS=y
++BR2_PACKAGE_DEJAVU=y
++BR2_PACKAGE_DIRECTFB=y
++BR2_PACKAGE_DIRECTFB_DIVINE=y
++BR2_PACKAGE_DIRECTFB_SAWMAN=y
++BR2_PACKAGE_DIRECTFB_DITHER_RGB16=y
++BR2_PACKAGE_EFL=y
++BR2_PACKAGE_EFL_FB=y
++BR2_PACKAGE_EFL_WEBP=y
++BR2_PACKAGE_FB_TEST_APP=y
++BR2_PACKAGE_FBTERM=y
++BR2_PACKAGE_FBV=y
++BR2_PACKAGE_LINUX_FUSION=y
++BR2_PACKAGE_PSPLASH=y
++BR2_PACKAGE_SDL_DIRECTFB=y
++BR2_PACKAGE_SDL_GFX=y
++BR2_PACKAGE_SDL_IMAGE=y
++BR2_PACKAGE_SDL_IMAGE_GIF=y
++BR2_PACKAGE_SDL_IMAGE_JPEG=y
++BR2_PACKAGE_SDL_IMAGE_LBM=y
++BR2_PACKAGE_SDL_IMAGE_PCX=y
++BR2_PACKAGE_SDL_IMAGE_PNG=y
++BR2_PACKAGE_SDL_IMAGE_PNM=y
++BR2_PACKAGE_SDL_IMAGE_TARGA=y
++BR2_PACKAGE_SDL_IMAGE_TIFF=y
++BR2_PACKAGE_SDL_IMAGE_WEBP=y
++BR2_PACKAGE_SDL_IMAGE_XCF=y
++BR2_PACKAGE_SDL_IMAGE_XPM=y
++BR2_PACKAGE_SDL_IMAGE_XV=y
++BR2_PACKAGE_SDL_MIXER=y
++BR2_PACKAGE_SDL_NET=y
++BR2_PACKAGE_SDL_SOUND=y
++BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
++BR2_PACKAGE_SDL_TTF=y
++BR2_PACKAGE_SDL2=y
++BR2_PACKAGE_SDL2_DIRECTFB=y
++BR2_PACKAGE_SDL2_GFX=y
++BR2_PACKAGE_SDL2_IMAGE=y
++BR2_PACKAGE_SDL2_TTF=y
++BR2_PACKAGE_QT5=y
++BR2_PACKAGE_QT5_VERSION_5_6=y
++BR2_PACKAGE_QT53D=y
++BR2_PACKAGE_QT5BASE_MYSQL=y
++BR2_PACKAGE_QT5BASE_PSQL=y
++BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM=y
++BR2_PACKAGE_QT5BASE_LINUXFB=y
++BR2_PACKAGE_QT5BASE_EGLFS=y
++BR2_PACKAGE_QT5BASE_FONTCONFIG=y
++BR2_PACKAGE_QT5BASE_GIF=y
++BR2_PACKAGE_QT5BASE_JPEG=y
++BR2_PACKAGE_QT5BASE_PNG=y
++BR2_PACKAGE_QT5CANVAS3D=y
++BR2_PACKAGE_QT5CONNECTIVITY=y
++BR2_PACKAGE_QT5ENGINIO=y
++BR2_PACKAGE_QT5GRAPHICALEFFECTS=y
++BR2_PACKAGE_QT5IMAGEFORMATS=y
++BR2_PACKAGE_QT5LOCATION=y
++BR2_PACKAGE_QT5MULTIMEDIA=y
++BR2_PACKAGE_QT5QUICKCONTROLS=y
++BR2_PACKAGE_QT5QUICKCONTROLS2=y
++BR2_PACKAGE_QT5SENSORS=y
++BR2_PACKAGE_QT5WAYLAND=y
++BR2_PACKAGE_QT5SERIALBUS=y
++BR2_PACKAGE_QT5SVG=y
++BR2_PACKAGE_QT5WEBENGINE=y
++BR2_PACKAGE_TEKUI=y
++BR2_PACKAGE_WESTON=y
++BR2_PACKAGE_AM33X_CM3=y
++BR2_PACKAGE_LINUX_FIRMWARE=y
++BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6002=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6003=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6004=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y
++BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y
++BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y
++BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y
++BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8=y
++BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y
++BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8801=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897=y
++BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897=y
++BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
++BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61=y
++BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
++BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
++BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X=y
++BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y
++BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
++BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
++BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5=y
++BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
++BR2_PACKAGE_AM335X_PRU_PACKAGE=y
++BR2_PACKAGE_DEVMEM2=y
++BR2_PACKAGE_EVTEST=y
++BR2_PACKAGE_I2C_TOOLS=y
++BR2_PACKAGE_INPUT_TOOLS=y
++BR2_PACKAGE_KBD=y
++BR2_PACKAGE_LIBUIO=y
++BR2_PACKAGE_LSUIO=y
++BR2_PACKAGE_PARTED=y
++BR2_PACKAGE_RS485CONF=y
++BR2_PACKAGE_SISPMCTL=y
++BR2_PACKAGE_SPI_TOOLS=y
++BR2_PACKAGE_TI_GFX=y
++BR2_PACKAGE_TI_GFX_EGLIMAGE=y
++BR2_PACKAGE_TI_GFX_ES8=y
++BR2_PACKAGE_TI_UTILS=y
++BR2_PACKAGE_USB_MODESWITCH_DATA=y
++BR2_PACKAGE_USBMOUNT=y
++BR2_PACKAGE_USBUTILS=y
++BR2_PACKAGE_NODEJS=y
++BR2_PACKAGE_NODEJS_NPM=y
++BR2_PACKAGE_NODEJS_MODULES_EXPRESS=y
++BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT=y
++BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="node-red"
++BR2_PACKAGE_PERL=y
++BR2_PACKAGE_PYTHON=y
++BR2_PACKAGE_PYTHON_BZIP2=y
++BR2_PACKAGE_PYTHON_BSDDB=y
++BR2_PACKAGE_PYTHON_CODECSCJK=y
++BR2_PACKAGE_PYTHON_CURSES=y
++BR2_PACKAGE_PYTHON_READLINE=y
++BR2_PACKAGE_PYTHON_SSL=y
++BR2_PACKAGE_PYTHON_SQLITE=y
++BR2_PACKAGE_PYTHON_PYEXPAT=y
++BR2_PACKAGE_PYTHON_HASHLIB=y
++BR2_PACKAGE_PYTHON_PYUDEV=y
++BR2_PACKAGE_TCL=y
++BR2_PACKAGE_EXPECT=y
++BR2_PACKAGE_TCLLIB=y
++BR2_PACKAGE_LIBMPD=y
++BR2_PACKAGE_OPUS=y
++BR2_PACKAGE_TAGLIB=y
++BR2_PACKAGE_LIBZIP=y
++BR2_PACKAGE_SNAPPY=y
++BR2_PACKAGE_SZIP=y
++BR2_PACKAGE_GNUTLS=y
++BR2_PACKAGE_GNUTLS_TOOLS=y
++BR2_PACKAGE_LIBNSS=y
++BR2_PACKAGE_LIBSHA1=y
++BR2_PACKAGE_LIBSSH2=y
++BR2_PACKAGE_OPENSSL_BIN=y
++BR2_PACKAGE_OPENSSL_ENGINES=y
++BR2_PACKAGE_MYSQL_SERVER=y
++BR2_PACKAGE_SQLITE_NO_SYNC=y
++BR2_PACKAGE_LIBCONFIG=y
++BR2_PACKAGE_CAIRO_TEE=y
++BR2_PACKAGE_GD=y
++BR2_PACKAGE_GD_ANNOTATE=y
++BR2_PACKAGE_GD_BDFTOGD=y
++BR2_PACKAGE_GD_GD2COPYPAL=y
++BR2_PACKAGE_GD_GD2TOGIF=y
++BR2_PACKAGE_GD_GD2TOPNG=y
++BR2_PACKAGE_GD_GDCMPGIF=y
++BR2_PACKAGE_GD_GDPARTTOPNG=y
++BR2_PACKAGE_GD_GDTOPNG=y
++BR2_PACKAGE_GD_GIFTOGD2=y
++BR2_PACKAGE_GD_PNGTOGD=y
++BR2_PACKAGE_GD_PNGTOGD2=y
++BR2_PACKAGE_GD_WEBPNG=y
++BR2_PACKAGE_GDK_PIXBUF=y
++BR2_PACKAGE_HARFBUZZ=y
++BR2_PACKAGE_LIBJPEG=y
++BR2_PACKAGE_LIBDRM=y
++BR2_PACKAGE_LIBDRM_OMAP=y
++BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
++BR2_PACKAGE_WEBP_DEMUX=y
++BR2_PACKAGE_DTC=y
++BR2_PACKAGE_DTC_PROGRAMS=y
++BR2_PACKAGE_LIBGUDEV=y
++BR2_PACKAGE_LIBHID=y
++BR2_PACKAGE_LIBIIO=y
++BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON=y
++BR2_PACKAGE_LIBV4L=y
++BR2_PACKAGE_LIBXSLT=y
++BR2_PACKAGE_LIBMPEG2=y
++BR2_PACKAGE_LIBVPX=y
++BR2_PACKAGE_LIBYUV=y
++BR2_PACKAGE_CANFESTIVAL=y
++BR2_PACKAGE_CANFESTIVAL_INSTALL_EXAMPLES=y
++BR2_PACKAGE_CURL=y
++BR2_PACKAGE_LIBGSASL=y
++BR2_PACKAGE_LIBIDN=y
++BR2_PACKAGE_LIBIDN_BINARY=y
++BR2_PACKAGE_LIBMBUS=y
++BR2_PACKAGE_LIBMODBUS=y
++BR2_PACKAGE_LIBPJSIP=y
++BR2_PACKAGE_LIBRSYNC=y
++BR2_PACKAGE_LIBSOUP=y
++BR2_PACKAGE_LIBVNCSERVER=y
++BR2_PACKAGE_LIBVNCSERVER_TIGHTPNG=y
++BR2_PACKAGE_NEON=y
++BR2_PACKAGE_NEON_ZLIB=y
++BR2_PACKAGE_NEON_SSL=y
++BR2_PACKAGE_NEON_LIBXML2=y
++BR2_PACKAGE_NSS_PAM_LDAPD=y
++BR2_PACKAGE_NSS_PAM_LDAPD_UTILITIES=y
++BR2_PACKAGE_BOOST_ATOMIC=y
++BR2_PACKAGE_BOOST_CHRONO=y
++BR2_PACKAGE_BOOST_CONTAINER=y
++BR2_PACKAGE_BOOST_CONTEXT=y
++BR2_PACKAGE_BOOST_COROUTINE=y
++BR2_PACKAGE_BOOST_COROUTINE2=y
++BR2_PACKAGE_BOOST_DATE_TIME=y
++BR2_PACKAGE_BOOST_EXCEPTION=y
++BR2_PACKAGE_BOOST_FILESYSTEM=y
++BR2_PACKAGE_BOOST_GRAPH=y
++BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y
++BR2_PACKAGE_BOOST_IOSTREAMS=y
++BR2_PACKAGE_BOOST_LOCALE=y
++BR2_PACKAGE_BOOST_LOG=y
++BR2_PACKAGE_BOOST_MATH=y
++BR2_PACKAGE_BOOST_METAPARSE=y
++BR2_PACKAGE_BOOST_MPI=y
++BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y
++BR2_PACKAGE_BOOST_PYTHON=y
++BR2_PACKAGE_BOOST_RANDOM=y
++BR2_PACKAGE_BOOST_REGEX=y
++BR2_PACKAGE_BOOST_SERIALIZATION=y
++BR2_PACKAGE_BOOST_SIGNALS=y
++BR2_PACKAGE_BOOST_SYSTEM=y
++BR2_PACKAGE_BOOST_THREAD=y
++BR2_PACKAGE_BOOST_TIMER=y
++BR2_PACKAGE_BOOST_TYPE_ERASURE=y
++BR2_PACKAGE_BOOST_WAVE=y
++BR2_PACKAGE_ELFUTILS=y
++BR2_PACKAGE_LIBCAP_TOOLS=y
++BR2_PACKAGE_LIBEVENT=y
++BR2_PACKAGE_POCO=y
++BR2_PACKAGE_POCO_NETSSL_OPENSSL=y
++BR2_PACKAGE_POCO_ZIP=y
++BR2_PACKAGE_POCO_DATA_SQLITE=y
++BR2_PACKAGE_POCO_DATA_MYSQL=y
++BR2_PACKAGE_PROTOBUF=y
++BR2_PACKAGE_PROTOBUF_C=y
++BR2_PACKAGE_NCURSES_WCHAR=y
++BR2_PACKAGE_NCURSES_TARGET_PANEL=y
++BR2_PACKAGE_NCURSES_TARGET_FORM=y
++BR2_PACKAGE_NCURSES_TARGET_MENU=y
++BR2_PACKAGE_NCURSES_TARGET_PROGS=y
++BR2_PACKAGE_FETCHMAIL=y
++BR2_PACKAGE_HEIRLOOM_MAILX=y
++BR2_PACKAGE_LIBESMTP=y
++BR2_PACKAGE_MSMTP=y
++BR2_PACKAGE_MUTT=y
++BR2_PACKAGE_MUTT_IMAP=y
++BR2_PACKAGE_MUTT_POP3=y
++BR2_PACKAGE_BLUEZ5_UTILS=y
++BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
++BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
++BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
++BR2_PACKAGE_BLUEZ5_UTILS_TEST=y
++BR2_PACKAGE_CAN_UTILS=y
++BR2_PACKAGE_CIVETWEB=y
++BR2_PACKAGE_CIVETWEB_WITH_LUA=y
++BR2_PACKAGE_CONNTRACK_TOOLS=y
++BR2_PACKAGE_CRDA=y
++BR2_PACKAGE_DHCP=y
++BR2_PACKAGE_DHCP_SERVER=y
++BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK=y
++BR2_PACKAGE_DHCP_CLIENT=y
++BR2_PACKAGE_ETHTOOL=y
++BR2_PACKAGE_GESFTPSERVER=y
++BR2_PACKAGE_HOSTAPD=y
++BR2_PACKAGE_HOSTAPD_EAP=y
++BR2_PACKAGE_HOSTAPD_WPS=y
++BR2_PACKAGE_HTTPING=y
++BR2_PACKAGE_HTTPING_TFO=y
++BR2_PACKAGE_IFTOP=y
++BR2_PACKAGE_IFUPDOWN=y
++BR2_PACKAGE_IPROUTE2=y
++BR2_PACKAGE_IPSEC_TOOLS=y
++BR2_PACKAGE_IPSEC_TOOLS_READLINE=y
++BR2_PACKAGE_IPTABLES=y
++BR2_PACKAGE_IW=y
++BR2_PACKAGE_MINIDLNA=y
++BR2_PACKAGE_NETPLUG=y
++BR2_PACKAGE_OPENSSH=y
++BR2_PACKAGE_OPENVPN=y
++BR2_PACKAGE_OPENVPN_SMALL=y
++BR2_PACKAGE_PPPD=y
++BR2_PACKAGE_PPPD_FILTER=y
++BR2_PACKAGE_PPPD_RADIUS=y
++BR2_PACKAGE_PPTP_LINUX=y
++BR2_PACKAGE_RSYNC=y
++BR2_PACKAGE_TINC=y
++BR2_PACKAGE_WGET=y
++BR2_PACKAGE_WIRELESS_TOOLS=y
++BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
++BR2_PACKAGE_WPA_SUPPLICANT=y
++BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
++BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY=y
++BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y
++BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
++BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT=y
++BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y
++BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
++BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
++BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y
++BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
++BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD=y
++BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW=y
++BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y
++BR2_PACKAGE_BASH=y
++BR2_PACKAGE_SCREEN=y
++BR2_PACKAGE_SUDO=y
++BR2_PACKAGE_ATTR=y
++BR2_PACKAGE_HTOP=y
++BR2_PACKAGE_KEYUTILS=y
++BR2_PACKAGE_POLKIT=y
++BR2_PACKAGE_UTIL_LINUX_SETTERM=y
++BR2_PACKAGE_JOE=y
++BR2_TARGET_ROOTFS_EXT2=y
++BR2_TARGET_ROOTFS_EXT2_4=y
++BR2_TARGET_ROOTFS_TAR_GZIP=y
++BR2_TARGET_UBOOT=y
++BR2_TARGET_UBOOT_BOARDNAME="am335x_boneblack"
++BR2_TARGET_UBOOT_CUSTOM_VERSION=y
++BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.10"
++BR2_TARGET_UBOOT_PATCH="../GfA/board/GfA/Display001/uboot_2013.10"
++# BR2_TARGET_UBOOT_FORMAT_BIN is not set
++BR2_TARGET_UBOOT_FORMAT_IMG=y
++BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
++BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin"
++BR2_TARGET_UBOOT_SPL=y
++BR2_TARGET_UBOOT_SPL_NAME="MLO"
++BR2_PACKAGE_HOST_DOSFSTOOLS=y
++BR2_PACKAGE_HOST_DTC=y
++BR2_PACKAGE_HOST_GENIMAGE=y
++BR2_PACKAGE_HOST_MTOOLS=y
++BR2_PACKAGE_WT=y
++BR2_PACKAGE_NETWORK_INTERFACES_SCRIPT=y
++BR2_PACKAGE_GFA_ADDONS=y
+diff --git a/package/fontconfig/001-mtime-always-ok.patch b/package/fontconfig/001-mtime-always-ok.patch
+new file mode 100644
+index 0000000..671c1f1
+--- /dev/null
++++ b/package/fontconfig/001-mtime-always-ok.patch
+@@ -0,0 +1,12 @@
++diff -Naurp a/src/fccache.c b/src/fccache.c
++--- a/src/fccache.c	2016-08-05 07:35:05.000000000 +0200
+++++ b/src/fccache.c	2017-11-26 00:51:18.800927077 +0100
++@@ -585,7 +585,7 @@ FcCacheTimeValid (FcConfig *config, FcCa
++ 		FcCacheDir (cache), cache->checksum, (int) dir_stat->st_mtime);
++ #endif
++ 
++-    return cache->checksum == (int) dir_stat->st_mtime && fnano;
+++    return FcTrue;
++ }
++ 
++ static FcBool
+diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
+index 93f2a15..a470d1f 100644
+--- a/package/fontconfig/fontconfig.mk
++++ b/package/fontconfig/fontconfig.mk
+@@ -15,7 +15,7 @@ FONTCONFIG_LICENSE_FILES = COPYING
+ 
+ FONTCONFIG_CONF_OPTS = \
+ 	--with-arch=$(GNU_TARGET_NAME) \
+-	--with-cache-dir=/var/cache/fontconfig \
++	--with-cache-dir=/fontconfig_cache \
+ 	--disable-docs
+ 
+ HOST_FONTCONFIG_CONF_OPTS = \
 diff --git a/package/gcc/4.9.1/100-uclibc-conf.patch b/package/gcc/4.9.1/100-uclibc-conf.patch
 new file mode 100644
 index 0000000..d56bf0a
@@ -4178,7 +6173,7 @@ index 0000000..670cf8d
 + LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
 ++endif
 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
-index d204bf7..08a7272 100644
+index d10798b..db0473e 100644
 --- a/package/gcc/Config.in.host
 +++ b/package/gcc/Config.in.host
 @@ -36,6 +36,32 @@ choice
@@ -4214,7 +6209,7 @@ index d204bf7..08a7272 100644
  	config BR2_GCC_VERSION_4_9_X
  		bool "gcc 4.9.x"
  		# Broken or unsupported architectures
-@@ -93,6 +119,8 @@ config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
+@@ -95,6 +121,8 @@ config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
  config BR2_GCC_VERSION
  	string
  	default "4.8.5"     if BR2_GCC_VERSION_4_8_X
@@ -4224,7 +6219,7 @@ index d204bf7..08a7272 100644
  	default "5.4.0"     if BR2_GCC_VERSION_5_X
  	default "6.2.0"     if BR2_GCC_VERSION_6_X
 diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash
-index ce738ef..581bceb 100644
+index e5d96f4..1b53e1b 100644
 --- a/package/gcc/gcc.hash
 +++ b/package/gcc/gcc.hash
 @@ -4,6 +4,10 @@ sha512  78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1
@@ -5718,6 +7713,175 @@ index 0000000..5c38491
 +services:       files
 +ethers:         files
 +rpc:            files
+diff --git a/package/libmodbus/001-GfA-echo-rtu.patch b/package/libmodbus/001-GfA-echo-rtu.patch
+new file mode 100644
+index 0000000..386172f
+--- /dev/null
++++ b/package/libmodbus/001-GfA-echo-rtu.patch
+@@ -0,0 +1,105 @@
++diff -Naur a/src/modbus-rtu.c b/src/modbus-rtu.c
++--- a/src/modbus-rtu.c	2017-10-11 23:07:11.623017506 +0200
+++++ b/src/modbus-rtu.c	2017-10-11 23:07:20.495035402 +0200
++@@ -257,6 +257,27 @@
++ }
++ #endif
++ 
+++
+++ssize_t _modbus_rtu_write_n_read(modbus_t *ctx, const uint8_t *req, int req_length) {
+++ ssize_t w, r, i;
+++ uint8_t rb[req_length];
+++
+++ // Transmit
+++ w = write(ctx->s, req, req_length);
+++
+++ // Read back written bytes if hw has echo
+++ r = 0;
+++ while (r < w)
+++  r += read(ctx->s, rb + r, w - r);
+++ if (ctx->debug) {
+++  for (i = 0; i < r; ++i)
+++  fprintf(stderr, "|%02X|", rb[i]);
+++  fprintf(stderr, "\n");
+++ }
+++
+++ return w;
+++}
+++
++ ssize_t _modbus_rtu_send(modbus_t *ctx, const uint8_t *req, int req_length)
++ {
++ #if defined(_WIN32)
++@@ -264,7 +285,14 @@
++     DWORD n_bytes = 0;
++     return (WriteFile(ctx_rtu->w_ser.fd, req, req_length, &n_bytes, NULL)) ? n_bytes : -1;
++ #else
++-    return write(ctx->s, req, req_length);
+++    modbus_rtu_t *ctx_rtu = ctx->backend_data;
+++    ssize_t w;
+++    
+++    if(!ctx_rtu->echohw)    
+++      w = write(ctx->s, req, req_length);
+++     else
+++      w = _modbus_rtu_write_n_read(ctx, req, req_length);
+++    return w;
++ #endif
++ }
++ 
++@@ -772,6 +800,30 @@
++     }
++ }
++ 
+++
+++int modbus_rtu_set_echohw_mode(modbus_t* ctx, uint8_t mode) {
+++ if (ctx->backend->backend_type == _MODBUS_BACKEND_TYPE_RTU) {
+++ modbus_rtu_t* rtu = (modbus_rtu_t*) ctx->backend_data;
+++ rtu->echohw= mode;
+++ return 0;
+++ }
+++ /* Wrong backend and invalid mode specified */
+++ errno = EINVAL;
+++ return -1;
+++
+++}
+++
+++int modbus_rtu_get_echohw_mode(modbus_t* ctx) {
+++ if (ctx->backend->backend_type == _MODBUS_BACKEND_TYPE_RTU) {
+++ modbus_rtu_t* rtu = (modbus_rtu_t*) ctx->backend_data;
+++ return rtu->echohw;
+++ }
+++ /* Wrong backend and invalid mode specified */
+++ errno = EINVAL;
+++ return -1;
+++
+++}
+++
++ void _modbus_rtu_close(modbus_t *ctx)
++ {
++     /* Closes the file descriptor in RTU mode */
++diff -Naur a/src/modbus-rtu.h b/src/modbus-rtu.h
++--- a/src/modbus-rtu.h	2017-10-11 23:07:11.623017506 +0200
+++++ b/src/modbus-rtu.h	2017-10-11 23:07:20.495035402 +0200
++@@ -37,6 +37,12 @@
++ int modbus_rtu_set_serial_mode(modbus_t *ctx, int mode);
++ int modbus_rtu_get_serial_mode(modbus_t *ctx);
++ 
+++#define MODBUS_RTU_HAS_ECHOHW 1
+++#define MODBUS_RTU_NO_ECHOHW 0
+++
+++int modbus_rtu_set_echohw_mode(modbus_t *ctx, uint8_t mode);
+++int modbus_rtu_get_echohw_mode(modbus_t *ctx);
+++
++ MODBUS_END_DECLS
++ 
++ #endif /* _MODBUS_RTU_H_ */
++diff -Naur a/src/modbus-rtu-private.h b/src/modbus-rtu-private.h
++--- a/src/modbus-rtu-private.h	2017-10-11 23:07:11.623017506 +0200
+++++ b/src/modbus-rtu-private.h	2017-10-11 23:07:20.495035402 +0200
++@@ -81,6 +81,7 @@
++ #if HAVE_DECL_TIOCSRS485
++     int serial_mode;
++ #endif
+++    uint8_t echohw;
++ } modbus_rtu_t;
++ 
++ #endif /* _MODBUS_RTU_PRIVATE_H_ */
+diff --git a/package/linux-headers/linux-017-omap_serial_for_rs485.patch b/package/linux-headers/linux-017-omap_serial_for_rs485.patch
+new file mode 100644
+index 0000000..38b7ffa
+--- /dev/null
++++ b/package/linux-headers/linux-017-omap_serial_for_rs485.patch
+@@ -0,0 +1,12 @@
++--- a/include/uapi/linux/serial.h	2016-11-08 16:38:32.000000000 +0100
+++++ b/include/uapi/linux/serial.h	2017-02-18 14:27:23.569732653 +0100
++@@ -119,7 +119,8 @@ struct serial_rs485 {
++ #define SER_RS485_RX_DURING_TX		(1 << 4)
++ 	__u32	delay_rts_before_send;	/* Delay before send (milliseconds) */
++ 	__u32	delay_rts_after_send;	/* Delay after send (milliseconds) */
++-	__u32	padding[5];		/* Memory is cheap, new structs
+++	__u32   udelay_before_enable_tx;/* Delay before switching to tx direction */
+++	__u32	padding[4];		/* Memory is cheap, new structs
++ 					   are a royal PITA .. */
++ };
++ 
+diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
+index cd44ca1..dab73cf 100644
+--- a/package/mutt/mutt.mk
++++ b/package/mutt/mutt.mk
+@@ -9,7 +9,8 @@ MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads
+ MUTT_LICENSE = GPLv2+
+ MUTT_LICENSE_FILES = GPL
+ MUTT_DEPENDENCIES = ncurses
+-MUTT_CONF_OPTS = --disable-smtp
++#MUTT_CONF_OPTS = --disable-smtp
++MUTT_CONF_OPTS = --enable-smtp
+ MUTT_AUTORECONF = YES
+ 
+ ifeq ($(BR2_PACKAGE_LIBICONV),y)
+@@ -37,16 +38,17 @@ MUTT_CONF_OPTS += --disable-pop
+ endif
+ 
+ # SSL support is only used by imap or pop3 module
+-ifneq ($(BR2_PACKAGET_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),)
+-ifeq ($(BR2_PACKAGE_OPENSSL),y)
++#ifneq ($(BR2_PACKAGET_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),)
++#ifeq ($(BR2_PACKAGE_OPENSSL),y)
+ MUTT_DEPENDENCIES += openssl
+ MUTT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
+-else
+-MUTT_CONF_OPTS += --without-ssl
+-endif
+-else
+-MUTT_CONF_OPTS += --without-ssl
+-endif
++MUTT_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr
++#else
++#MUTT_CONF_OPTS += --without-ssl
++#endif
++#else
++#MUTT_CONF_OPTS += --without-ssl
++#endif
+ 
+ # Avoid running tests to check for:
+ #  - target system is *BSD
 diff --git a/package/qt5/Config.in b/package/qt5/Config.in
 index 234dfdd..fb57d25 100644
 --- a/package/qt5/Config.in
@@ -6239,21 +8403,25 @@ index 0d85d48..c43afd7 100644
 -sha256 09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1 qtquickcontrols2-opensource-src-5.6.2.tar.xz
 +sha256	63f5b0777992c32bd602b88de657e202cd6d5e8ba0371c6d5da16fb8c7481045	qtquickcontrols2-opensource-src-5.7.0.tar.xz
 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
-index a5ad3f6..622e61f 100644
+index a5ad3f6..23bbb2c 100644
 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
 +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
-@@ -31,10 +31,10 @@ define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS
+@@ -31,10 +31,15 @@ define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS
  endef
  
  define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
 -	cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib
 -	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs
--	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
++	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib
++	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib
+ 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
 -	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs
-+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
-+#	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs
-+#	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
-+#	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs
++#	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs
++	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/folderlistmodel $(TARGET_DIR)/usr/qml/Qt/labs
++	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/settings $(TARGET_DIR)/usr/qml/Qt/labs
++	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick
++	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick
++	$(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES)
  endef
  
  $(eval $(generic-package))
@@ -6343,6 +8511,22 @@ index 0000000..61cbdfe
 +-- 
 +2.1.4
 +
+diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash
+deleted file mode 100644
+index cc11b28..0000000
+--- a/package/qt5/qt5tools/qt5tools.hash
++++ /dev/null
+@@ -1,2 +0,0 @@
+-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qttools-opensource-src-5.6.2.tar.xz.mirrorlist
+-sha256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 qttools-opensource-src-5.6.2.tar.xz
+diff --git a/package/qt5/qt5tools/qt5tools.hash__ b/package/qt5/qt5tools/qt5tools.hash__
+new file mode 100644
+index 0000000..cc11b28
+--- /dev/null
++++ b/package/qt5/qt5tools/qt5tools.hash__
+@@ -0,0 +1,2 @@
++# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qttools-opensource-src-5.6.2.tar.xz.mirrorlist
++sha256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 qttools-opensource-src-5.6.2.tar.xz
 diff --git a/package/qt5/qt5virtualkeyboard/Config.in b/package/qt5/qt5virtualkeyboard/Config.in
 new file mode 100644
 index 0000000..803b937
@@ -7053,10 +9237,10 @@ index fa4e97f..f0f369d 100644
 -sha256 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc qtxmlpatterns-opensource-src-5.6.2.tar.xz
 +sha256	38882a4ea5d711be07d10695759359045f7f9d64727a65e1d5e6515d55c7e20b	qtxmlpatterns-opensource-src-5.7.0.tar.xz
 diff --git a/package/ti-gfx/S80ti-gfx b/package/ti-gfx/S80ti-gfx
-index fc5999a..00f8394 100644
+index fc5999a..a204815 100644
 --- a/package/ti-gfx/S80ti-gfx
 +++ b/package/ti-gfx/S80ti-gfx
-@@ -3,14 +3,16 @@
+@@ -3,6 +3,8 @@
  start() {
  	echo "ti-gfx: starting pvr driver"
  
@@ -7065,18 +9249,6 @@ index fc5999a..00f8394 100644
  	BITSPERPIXEL="$(fbset | awk '/geom/ {print $6}')"
  	YRES="$(fbset | awk '/geom/ {print $3}')"
  	# Set RGBA ordering to something the drivers like
--	if [ "$BITSPERPIXEL" = "32" ] ; then
--		fbset -rgba 8/16,8/8,8/0,8/24
--	fi
-+	#if [ "$BITSPERPIXEL" = "32" ] ; then
-+	#	fbset -rgba 8/16,8/8,8/0,8/24
-+	#fi
- 	# Try to enable triple buffering when there's enough VRAM
--	fbset -vyres $(( YRES*3 ))
-+	#fbset -vyres $(( YRES*3 ))
- 
- 	modprobe pvrsrvkm
- 	modprobe omaplfb
 @@ -22,6 +24,14 @@ start() {
  	mknod /dev/pvrsrvkm c $pvr_maj 0
  	chmod 600 /dev/pvrsrvkm
@@ -7146,3 +9318,27 @@ index d5c50a0..76a7663 100644
  TI_SGX_UM_SITE = git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git
  TI_SGX_UM_LICENSE = TI TSPA License
  TI_SGX_UM_LICENSE_FILES = OMAP5-Linux-Graphics-DDK-UM-Manifest.doc
+diff --git a/package/tinc/tinc.hash b/package/tinc/tinc.hash
+index 0cccbbf..ca0ff41 100644
+--- a/package/tinc/tinc.hash
++++ b/package/tinc/tinc.hash
+@@ -1,2 +1,2 @@
+ # Locally calculated after checking pgp signature
+-sha256	0b502699360f09ce2128a39cf02abca07bfc699fc02ce829b3a90cf5e1e8b344	tinc-1.0.28.tar.gz
++sha256	d3cbc82e6e07975a2ccc0b369d07e30fc3324e71e240dca8781ce9a4f629519b	tinc-1.0.31.tar.gz
+diff --git a/package/tinc/tinc.mk b/package/tinc/tinc.mk
+index fb15c34..3cc05fa 100644
+--- a/package/tinc/tinc.mk
++++ b/package/tinc/tinc.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-TINC_VERSION = 1.0.28
++TINC_VERSION = 1.0.31
+ TINC_SITE = http://www.tinc-vpn.org/packages
+ TINC_DEPENDENCIES = lzo openssl zlib
+ TINC_LICENSE = GPLv2+ with OpenSSL exception
+-- 
+2.7.4
+