diff --git a/buildroot b/buildroot index 5e44e80e..9f64d89f 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 5e44e80e09bdbbb8861b770b09fe27d33a823086 +Subproject commit 9f64d89f7e7c1c6935a5b9756527b6bc1389fdd5 diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index 3d5126a0..dea441f4 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -200,19 +200,14 @@ BR2_PACKAGE_QT5BASE_SQLITE_QT=y BR2_PACKAGE_QT5BASE_OPENGL_ES2=y BR2_PACKAGE_QT5BASE_LINUXFB=y BR2_PACKAGE_QT5BASE_XCB=y -BR2_PACKAGE_QT5BASE_EGLFS=y BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs" -BR2_PACKAGE_QT5BASE_FONTCONFIG=y BR2_PACKAGE_QT5BASE_HARFBUZZ=y BR2_PACKAGE_QT5BASE_GIF=y BR2_PACKAGE_QT5BASE_JPEG=y -BR2_PACKAGE_QT5BASE_ICU=y BR2_PACKAGE_QT5BASE_TSLIB=y BR2_PACKAGE_QT5GRAPHICALEFFECTS=y BR2_PACKAGE_QT5IMAGEFORMATS=y BR2_PACKAGE_QT5MULTIMEDIA=y -BR2_PACKAGE_QT5QUICKCONTROLS=y -BR2_PACKAGE_QT5QUICKCONTROLS2=y BR2_PACKAGE_QT5SCRIPT=y BR2_PACKAGE_QT5SENSORS=y BR2_PACKAGE_QT5TOOLS_QDOC_TOOL=y @@ -224,21 +219,19 @@ BR2_PACKAGE_QT5VIRTUALKEYBOARD=y BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS="en_US" BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION=y BR2_PACKAGE_QT5WAYLAND=y -BR2_PACKAGE_QT5WEBCHANNEL=y +BR2_PACKAGE_QT5WEBENGINE=y +BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS=y +BR2_PACKAGE_QT5WEBVIEW=y BR2_PACKAGE_KF5=y BR2_PACKAGE_KF5_KCOREADDONS=y BR2_PACKAGE_KF5_NETWORKMANAGER_QT=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XCB_UTIL_CURSOR=y BR2_PACKAGE_XLIB_LIBSM=y -BR2_PACKAGE_XLIB_LIBXSCRNSAVER=y -BR2_PACKAGE_XLIB_LIBXCOMPOSITE=y -BR2_PACKAGE_XLIB_LIBXCURSOR=y BR2_PACKAGE_XLIB_LIBXFONT2=y BR2_PACKAGE_XLIB_LIBXFT=y BR2_PACKAGE_XLIB_LIBXINERAMA=y BR2_PACKAGE_XLIB_LIBXRES=y -BR2_PACKAGE_XLIB_LIBXTST=y BR2_PACKAGE_XLIB_LIBXSHMFENCE=y BR2_PACKAGE_XFONT_FONT_ALIAS=y BR2_PACKAGE_XFONT_FONT_CURSOR_MISC=y @@ -388,7 +381,6 @@ BR2_PACKAGE_LZ4=y BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_GNUTLS_OPENSSL=y BR2_PACKAGE_GNUTLS_TOOLS=y -BR2_PACKAGE_LIBNSS=y BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_LIBOPENSSL_BIN=y BR2_PACKAGE_LIBOPENSSL_ENGINES=y @@ -401,8 +393,6 @@ BR2_PACKAGE_LIBSVG_CAIRO=y BR2_PACKAGE_OPENJPEG=y BR2_PACKAGE_TIFF=y BR2_PACKAGE_WAFFLE=y -BR2_PACKAGE_WEBP=y -BR2_PACKAGE_WEBP_DEMUX=y BR2_PACKAGE_LIBCEC=y BR2_PACKAGE_LIBINPUT=y BR2_PACKAGE_LIBPCIACCESS=y diff --git a/buildroot-external/package/ncpamixer/ncpamixer.mk b/buildroot-external/package/ncpamixer/ncpamixer.mk index 5bc2b980..be280d65 100644 --- a/buildroot-external/package/ncpamixer/ncpamixer.mk +++ b/buildroot-external/package/ncpamixer/ncpamixer.mk @@ -4,7 +4,7 @@ # ################################################################################ -NCPAMIXER_VERSION = f2b18a48ce5dedcb24a3c8d39251eb7fbc2c1045 +NCPAMIXER_VERSION = 8cfb65955025b866cfc42215d1e4f51726944620 NCPAMIXER_SITE = $(call github,fulhax,ncpamixer,$(NCPAMIXER_VERSION)) NCPAMIXER_SUBDIR = src NCPAMIXER_LICENSE = MIT diff --git a/buildroot-external/package/spotifyd/spotifyd.mk b/buildroot-external/package/spotifyd/spotifyd.mk index dc1a1ad3..6b2ff2d1 100644 --- a/buildroot-external/package/spotifyd/spotifyd.mk +++ b/buildroot-external/package/spotifyd/spotifyd.mk @@ -9,7 +9,7 @@ SPOTIFYD_SITE = $(call github,Spotifyd,spotifyd,$(SPOTIFYD_VERSION)) SPOTIFYD_LICENSE = GPL-3.0 SPOTIFYD_LICENSE_FILES = LICENSE -SPOTIFYD_DEPENDENCIES = host-cargo +SPOTIFYD_DEPENDENCIES = host-rustc SPOTIFYD_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo \ CC=$(TARGET_CC) \ @@ -26,8 +26,8 @@ SPOTIFYD_CARGO_OPTS = --release \ --manifest-path=$(@D)/Cargo.toml define SPOTIFYD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(SPOTIFYD_CARGO_ENV) rustc -V - $(TARGET_MAKE_ENV) $(SPOTIFYD_CARGO_ENV) cargo build $(SPOTIFYD_CARGO_OPTS) + $(TARGET_MAKE_ENV) $(SPOTIFYD_CARGO_ENV) \ + cargo build $(SPOTIFYD_CARGO_OPTS) endef define SPOTIFYD_INSTALL_TARGET_CMDS diff --git a/buildroot-external/package/wifi-connect/wifi-connect.mk b/buildroot-external/package/wifi-connect/wifi-connect.mk index e05caf36..a6d2a61b 100644 --- a/buildroot-external/package/wifi-connect/wifi-connect.mk +++ b/buildroot-external/package/wifi-connect/wifi-connect.mk @@ -7,7 +7,7 @@ WIFI_CONNECT_VERSION = 258656bf9b531ff64438ba502166840e48125e33 WIFI_CONNECT_SITE = $(call github,balena-io,wifi-connect,$(WIFI_CONNECT_VERSION)) -WIFI_CONNECT_DEPENDENCIES = host-cargo +WIFI_CONNECT_DEPENDENCIES = host-rustc WIFI_CONNECT_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo \ CC=$(TARGET_CC) \ @@ -22,8 +22,8 @@ WIFI_CONNECT_CARGO_OPTS = --release \ --manifest-path=$(@D)/Cargo.toml define WIFI_CONNECT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(WIFI_CONNECT_CARGO_ENV) rustc -V - $(TARGET_MAKE_ENV) $(WIFI_CONNECT_CARGO_ENV) cargo build $(WIFI_CONNECT_CARGO_OPTS) + $(TARGET_MAKE_ENV) $(WIFI_CONNECT_CARGO_ENV) \ + cargo build $(WIFI_CONNECT_CARGO_OPTS) endef define WIFI_CONNECT_INSTALL_TARGET_CMDS