Merge branch 'next'

Conflicts:
	Makefile
	package/flac/0001-fix-altivec-logic.patch
	package/grantlee/Config.in

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --cc Makefile
Simple merge

diff --cc package/btrfs-progs/btrfs-progs.mk
Simple merge

diff --cc package/grantlee/Config.in
index 365209abf4eeb5ca7bac831efac9bbbddb002902,8f763f7ef0a0f426ddc5b0180117e7724079d614..900c39e1437f957a08f3cb7ada35f933f60d2bed
--- 1/package/grantlee/Config.in
--- 2/package/grantlee/Config.in
+++ b/package/grantlee/Config.in
@@@ -1,16 -1,13 +1,17 @@@
  config BR2_PACKAGE_GRANTLEE
        bool "grantlee"
-       depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
-       depends on BR2_PACKAGE_QT
-       select BR2_PACKAGE_QT_STL
-       select BR2_PACKAGE_QT_SCRIPT
-       select BR2_PACKAGE_QT_GUI_MODULE
 +      depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # Qt Script
+       depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT && BR2_PACKAGE_QT) || BR2_PACKAGE_QT5
+       select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT
+       select BR2_PACKAGE_QT_SCRIPT if BR2_PACKAGE_QT
+       select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
+       select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5
+       select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
        help
-         Qt implemantation of the Django template framework
+         Qt implementation of the Django template framework
  
          http://www.grantlee.org
  
-       depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
 +comment "grantlee needs a toolchain with NPTL"
 +      depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
++      depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT || BR2_PACKAGE_QT5

diff --cc package/omniorb/omniorb.mk
Simple merge

diff --cc package/shairport-sync/shairport-sync.mk
Simple merge

diff --cc package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
Simple merge