Merge branch 'master' into next

Conflicts:
	package/go/go.hash
	package/go/go.mk

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --cc DEVELOPERS
Simple merge

diff --cc boot/arm-trusted-firmware/Config.in
Simple merge

diff --cc boot/arm-trusted-firmware/arm-trusted-firmware.mk
index d1eb72e7ae97950bf8339fbeb5ecd8042f32873e,00b68a30afb78ee768df2e2d4b952124f7848c66..9d44a5df06e9ff1bdd5257a62bc85be9f588c9de
--- 1/boot/arm-trusted-firmware/arm-trusted-firmware.mk
--- 2/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@@ -162,14 -165,10 +165,15 @@@ endi
  ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += \
        $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS))
  
 +ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH))
 +
  define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
 +      $(if $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH),
 +              cp -f $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH) $(@D)/fdts/
 +      )
        $(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL)
-       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
+       $(ARM_TRUSTED_FIRMWARE_MAKE_ENV) $(MAKE) -C $(@D) \
+               $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
                $(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS)
        $(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_BUILD)
  endef

diff --cc package/Config.in
Simple merge

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

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

diff --cc package/osm2pgsql/Config.in
index 70d59e6c6fe2d745d1bbcac509c528186e3848ca,f9fafb857c1f80a245ca7ba52e6c3f1cec92bdd6..d31191b3a723257904f5fe821a26dce95f172deb
--- 1/package/osm2pgsql/Config.in
--- 2/package/osm2pgsql/Config.in
+++ b/package/osm2pgsql/Config.in
@@@ -3,8 -3,8 +3,9 @@@ config BR2_PACKAGE_OSM2PGSQ
        depends on BR2_INSTALL_LIBSTDCPP # boost, fmt, libosmium, protozero
        depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, libosmium, protozero
        depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium
 +      depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem
        depends on BR2_USE_WCHAR # boost, fmt, libosmium
+       depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future
        select BR2_PACKAGE_BOOST
        select BR2_PACKAGE_BOOST_SYSTEM
        select BR2_PACKAGE_BOOST_FILESYSTEM
@@@ -23,6 -23,8 +24,9 @@@
          https://osm2pgsql.org
  
  comment "osm2pgsql needs a toolchain w/ C++,  wchar, threads, gcc >= 4.7"
 +      depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
                !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS
+ 
+ comment "osm2pgsql needs a toolchain not affected by GCC bug 64735"
+       depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735

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