From c46e0bfce39eb902a642eec7a66e56efd2313cff Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 21 Dec 2020 21:23:33 +0100 Subject: [PATCH] Getting back into OVOS-GUI (Weston) shape + version bumps all over. --- buildroot | 2 +- .../board/raspberrypi/config.txt | 9 +- .../configs/rpi4_64-gui_defconfig | 101 ++++----------- .../kf5-plasma-framework.mk | 8 +- .../0001-Remove-KDoctools-requirement.patch | 32 +++++ .../package/respeaker/respeaker.hash | 2 +- .../package/respeaker/respeaker.mk | 4 +- .../0001-Downgrade-python-idna-to-2.7.patch | 16 +-- ...003-Downgrade-python-psutil-to-5.6.6.patch | 22 ++-- ...-Downgrade-python-requests-to-2.20.0.patch | 20 +-- ...2-Downgrade-python-urllib3-to-1.24.2.patch | 21 ++-- .../0106-Bump-RPI-Firmware-version.patch | 16 +-- .../0114-Just-build-all-qttools.patch | 115 ------------------ 13 files changed, 116 insertions(+), 252 deletions(-) create mode 100644 buildroot-external/package/kf5-plasma-pa/0001-Remove-KDoctools-requirement.patch delete mode 100644 buildroot-patches/0114-Just-build-all-qttools.patch diff --git a/buildroot b/buildroot index 5a90d87d..00cf600b 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 5a90d87d331aa440cd024c7269a0673d94792896 +Subproject commit 00cf600bbc9aa7240784f7f977c70a4e423ceb53 diff --git a/buildroot-external/board/raspberrypi/config.txt b/buildroot-external/board/raspberrypi/config.txt index ff22b816..a0cf932f 100644 --- a/buildroot-external/board/raspberrypi/config.txt +++ b/buildroot-external/board/raspberrypi/config.txt @@ -16,6 +16,7 @@ kernel=zImage # Disable overscan assuming the display supports displaying the full resolution # If the text shown on the screen disappears off the edge, comment this out # disable_overscan=1 +dtoverlay=vc4-fkms-v3d hdmi_drive=2 hdmi_group=2 hdmi_mode=14 @@ -46,8 +47,8 @@ dtparam=spi=on # Disable GPIO IRQ # dtoverlay=gpio-no-irq -[pi3] -dtoverlay=vc4-kms-v3d +#[pi3] +#dtoverlay=vc4-kms-v3d -[pi4] -dtoverlay=vc4-kms-v3d-pi4 +#[pi4] +#dtoverlay=vc4-kms-v3d-pi4 diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index dea441f4..f3a00b45 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -4,16 +4,12 @@ BR2_ARM_FPU_VFPV4=y BR2_DL_DIR="../downloads" BR2_CCACHE=y BR2_CCACHE_DIR="../ccache" -BR2_OPTIMIZE_3=y +BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="../buildroot-patches" # BR2_COMPILER_PARANOID_UNSAFE_PATH is not set BR2_FORCE_HOST_BUILD=y -BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_PACKAGE_GLIBC_UTILS=y -BR2_BINUTILS_VERSION_2_34_X=y -BR2_GCC_VERSION_10_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TOOLCHAIN_BUILDROOT_FORTRAN=y BR2_GCC_ENABLE_LTO=y @@ -21,9 +17,9 @@ BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y BR2_TARGET_GENERIC_HOSTNAME="OpenVoiceOS" BR2_TARGET_GENERIC_ISSUE="Welcome to OpenVoiceOS" BR2_INIT_SYSTEMD=y -BR2_TARGET_GENERIC_ROOT_PASSWD="mycroft" +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set BR2_SYSTEM_BIN_SH_BASH=y -BR2_TARGET_GENERIC_GETTY_PORT="tty1" +# BR2_TARGET_GENERIC_GETTY is not set BR2_SYSTEM_DHCP="eth0" # BR2_ENABLE_LOCALE_PURGE is not set BR2_GENERATE_LOCALE="en_US.UTF-8" @@ -35,7 +31,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/board/raspberrypi4-64/post-image.s BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/b0ee9e22249a75c012d575de8254c68648984339.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/8f37682fc1fb519610656d8111b161883573e1f8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -128,7 +124,6 @@ BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVENC=y BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M=y BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME=y BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123=y -BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL=y BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO=y BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC=y @@ -142,6 +137,7 @@ BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC=y @@ -183,62 +179,45 @@ BR2_PACKAGE_NFS_UTILS=y BR2_PACKAGE_NTFS_3G=y BR2_PACKAGE_DEJAVU=y BR2_PACKAGE_LIBERATION=y -BR2_PACKAGE_FREERDP=y -# BR2_PACKAGE_FREERDP_CLIENT_X11 is not set +BR2_PACKAGE_GLMARK2=y +BR2_PACKAGE_KMSCUBE=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y -BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_SDL2_KMSDRM=y -BR2_PACKAGE_SDL2_OPENGLES=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT53D=y BR2_PACKAGE_QT5BASE_CONCURRENT=y 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_DEFAULT_QPA="eglfs" BR2_PACKAGE_QT5BASE_HARFBUZZ=y BR2_PACKAGE_QT5BASE_GIF=y BR2_PACKAGE_QT5BASE_JPEG=y +BR2_PACKAGE_QT5BASE_PNG=y BR2_PACKAGE_QT5BASE_TSLIB=y BR2_PACKAGE_QT5GRAPHICALEFFECTS=y BR2_PACKAGE_QT5IMAGEFORMATS=y +BR2_PACKAGE_QT5LOTTIE=y BR2_PACKAGE_QT5MULTIMEDIA=y BR2_PACKAGE_QT5SCRIPT=y -BR2_PACKAGE_QT5SENSORS=y -BR2_PACKAGE_QT5TOOLS_QDOC_TOOL=y -BR2_PACKAGE_QT5TOOLS_PIXELTOOL=y -BR2_PACKAGE_QT5TOOLS_QTDIAG=y -BR2_PACKAGE_QT5TOOLS_QTPATHS=y -BR2_PACKAGE_QT5TOOLS_QTPLUGININFO=y BR2_PACKAGE_QT5VIRTUALKEYBOARD=y BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS="en_US" BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION=y BR2_PACKAGE_QT5WAYLAND=y +BR2_PACKAGE_QT5WAYLAND_COMPOSITOR=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_LIBXFONT2=y -BR2_PACKAGE_XLIB_LIBXFT=y -BR2_PACKAGE_XLIB_LIBXINERAMA=y -BR2_PACKAGE_XLIB_LIBXRES=y -BR2_PACKAGE_XLIB_LIBXSHMFENCE=y -BR2_PACKAGE_XFONT_FONT_ALIAS=y -BR2_PACKAGE_XFONT_FONT_CURSOR_MISC=y -BR2_PACKAGE_XFONT_FONT_MISC_MISC=y -BR2_PACKAGE_MCOOKIE=y -BR2_PACKAGE_XDATA_XBITMAPS=y -BR2_PACKAGE_XKEYBOARD_CONFIG=y +BR2_PACKAGE_WESTON=y +BR2_PACKAGE_WESTON_DEFAULT_DRM=y +BR2_PACKAGE_WESTON_FBDEV=y +BR2_PACKAGE_WESTON_RDP=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_IBT=y BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7650=y @@ -302,6 +281,7 @@ BR2_PACKAGE_WILC1000_FIRMWARE=y BR2_PACKAGE_WILINK_BT_FIRMWARE=y BR2_PACKAGE_ZD1211_FIRMWARE=y BR2_PACKAGE_DBUS_CPP=y +BR2_PACKAGE_KBD=y BR2_PACKAGE_PARTED=y BR2_PACKAGE_RASPI_GPIO=y BR2_PACKAGE_SPI_TOOLS=y @@ -388,14 +368,13 @@ BR2_PACKAGE_LIBNFS=y BR2_PACKAGE_GDK_PIXBUF=y BR2_PACKAGE_GIFLIB=y BR2_PACKAGE_LIBEPOXY=y -BR2_PACKAGE_LIBQRENCODE=y BR2_PACKAGE_LIBSVG_CAIRO=y BR2_PACKAGE_OPENJPEG=y BR2_PACKAGE_TIFF=y BR2_PACKAGE_WAFFLE=y +BR2_PACKAGE_DTC=y +BR2_PACKAGE_DTC_PROGRAMS=y BR2_PACKAGE_LIBCEC=y -BR2_PACKAGE_LIBINPUT=y -BR2_PACKAGE_LIBPCIACCESS=y BR2_PACKAGE_LIBV4L=y BR2_PACKAGE_LIBV4L_UTILS=y BR2_PACKAGE_LIBFASTJSON=y @@ -419,7 +398,6 @@ BR2_PACKAGE_CMOCKA=y BR2_PACKAGE_ELL=y BR2_PACKAGE_LIBCAP_NG=y BR2_PACKAGE_LINUX_PAM=y -BR2_PACKAGE_LLVM=y BR2_PACKAGE_PROTOBUF=y BR2_PACKAGE_LIBESTR=y BR2_PACKAGE_LIBUNISTRING=y @@ -485,11 +463,12 @@ BR2_PACKAGE_VIM=y # BR2_PACKAGE_VIM_RUNTIME is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="2560M" +BR2_TARGET_ROOTFS_EXT2_SIZE="2048M" # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_CMAKE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MKPASSWD=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_PKGCONF=y BR2_PACKAGE_HOST_PYTHON_CYTHON=y @@ -500,71 +479,32 @@ BR2_PACKAGE_HOST_PYTHON3=y BR2_PACKAGE_HOST_PYTHON3_SSL=y BR2_PACKAGE_FIRSTBOOT_SERVICE=y BR2_PACKAGE_PREPARE_SYSTEM_SERVICE=y -BR2_PACKAGE_PYTHON_MYCROFT=y -BR2_PACKAGE_MYCROFT_EMBEDDED_SHELL=y -BR2_PACKAGE_MYCROFT_GUI=y -BR2_PACKAGE_MYCROFT_SERVICE=y BR2_PACKAGE_OVOS_SPLASH=y BR2_PACKAGE_ALSA_PLUGINS=y BR2_PACKAGE_BARESIP=y BR2_PACKAGE_BTSPEAKER=y -BR2_PACKAGE_DOCBOOK_XML=y -BR2_PACKAGE_DOCBOOK_XSL=y BR2_PACKAGE_FANN=y BR2_PACKAGE_HOSTNAME_SERVICE=y -BR2_PACKAGE_KF5_ATTICA=y BR2_PACKAGE_KF5_BREEZE_ICONS=y BR2_PACKAGE_KF5_KACTIVITIES=y -BR2_PACKAGE_KF5_KACTIVITIES_STATS=y BR2_PACKAGE_KF5_KARCHIVE=y BR2_PACKAGE_KF5_KAUTH=y BR2_PACKAGE_KF5_KBOOKMARKS=y -BR2_PACKAGE_KF5_KCMUTILS=y BR2_PACKAGE_KF5_KCOMPLETION=y BR2_PACKAGE_KF5_KDECLARATIVE=y -BR2_PACKAGE_KF5_KDECORATION=y BR2_PACKAGE_KF5_KDED=y -BR2_PACKAGE_KF5_KDELIBS4SUPPORT=y -BR2_PACKAGE_KF5_KDESIGNERPLUGIN=y -BR2_PACKAGE_KF5_KDESU=y -BR2_PACKAGE_KF5_KDOCTOOLS=y -BR2_PACKAGE_KF5_KEMOTICONS=y -BR2_PACKAGE_KF5_KIDLETIME=y -BR2_PACKAGE_KF5_KINIT=y BR2_PACKAGE_KF5_KIRIGAMI2=y -BR2_PACKAGE_KF5_KITEMMODELS=y -BR2_PACKAGE_KF5_KNEWSTUFF=y BR2_PACKAGE_KF5_KNOTIFICATIONS=y -BR2_PACKAGE_KF5_KNOTIFYCONFIG=y BR2_PACKAGE_KF5_KPACKAGE=y -BR2_PACKAGE_KF5_KPARTS=y -BR2_PACKAGE_KF5_KPEOPLE=y -BR2_PACKAGE_KF5_KPTY=y -BR2_PACKAGE_KF5_KRUNNER=y -BR2_PACKAGE_KF5_KSCREEN=y -BR2_PACKAGE_KF5_KSCREENLOCKER=y -BR2_PACKAGE_KF5_KSYSGUARD=y -BR2_PACKAGE_KF5_KUNITCONVERSION=y BR2_PACKAGE_KF5_KWAYLAND=y -BR2_PACKAGE_KF5_KWAYLAND_SERVER=y -BR2_PACKAGE_KF5_KWALLET=y -BR2_PACKAGE_KF5_KWIN=y -BR2_PACKAGE_KF5_LIBKSCREEN=y -BR2_PACKAGE_KF5_LIBKSYSGUARD=y BR2_PACKAGE_KF5_PHONON=y BR2_PACKAGE_KF5_PLASMA_FRAMEWORK=y -BR2_PACKAGE_KF5_PLASMA_NANO=y BR2_PACKAGE_KF5_PLASMA_PA=y BR2_PACKAGE_KF5_PLASMA_WAYLAND_PROTOCOLS=y -BR2_PACKAGE_KF5_PLASMA_WORKSPACE=y -BR2_PACKAGE_KF5_PRISON=y -BR2_PACKAGE_KF5_THREADWEAVER=y BR2_PACKAGE_LIBCANBERRA=y BR2_PACKAGE_LIBRE=y BR2_PACKAGE_LIBREM=y -BR2_PACKAGE_LOTTIE_QML=y BR2_PACKAGE_NCPAMIXER=y -BR2_PACKAGE_RESPEAKER=y BR2_PACKAGE_SNAPCAST=y BR2_PACKAGE_SNAPCAST_SERVER=y BR2_PACKAGE_SPOTIFYD=y @@ -600,3 +540,6 @@ BR2_PACKAGE_PYTHON_SOURCE=y BR2_PACKAGE_PYTHON_SPEECHRECOGNITION=y BR2_PACKAGE_PYTHON_VLC=y BR2_PACKAGE_PYTHON_XMLRUNNER=y +BR2_PACKAGE_PYTHON_MYCROFT=y +BR2_PACKAGE_MYCROFT_GUI=y +BR2_PACKAGE_MYCROFT_SERVICE=y diff --git a/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk b/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk index ab0b995c..26f10f23 100644 --- a/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk +++ b/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk @@ -10,11 +10,13 @@ KF5_PLASMA_FRAMEWORK_SOURCE = plasma-framework-$(KF5_PLASMA_FRAMEWORK_VERSION).t KF5_PLASMA_FRAMEWORK_LICENSE = BSD-3-Clause KF5_PLASMA_FRAMEWORK_LICENSE_FILES = COPYING-CMAKE-SCRIPTS -KF5_PLASMA_FRAMEWORK_DEPENDENCIES = host-pkgconf kf5-kdoctools kf5-kirigami2 +KF5_PLASMA_FRAMEWORK_DEPENDENCIES = host-pkgconf kf5-kirigami2 KF5_PLASMA_FRAMEWORK_INSTALL_STAGING = YES +KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DKF5_HOST_TOOLING="$(HOST_DIR)/lib/x86_64-linux-gnu/cmake" KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DDISABLE_OPENGL=ON -#KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DEGL_INCLUDE_DIR="$(STAGING_DIR)/usr/include" -#KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DEGL_LIBRARY="$(STAGING_DIR)/usr/lib/libEGL.so" +KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DHAVE_EGL=1 +KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DEGL_INCLUDE_DIR="$(STAGING_DIR)/usr/include" +KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DEGL_LIBRARY="$(STAGING_DIR)/usr/lib/libEGL.so" $(eval $(cmake-package)) diff --git a/buildroot-external/package/kf5-plasma-pa/0001-Remove-KDoctools-requirement.patch b/buildroot-external/package/kf5-plasma-pa/0001-Remove-KDoctools-requirement.patch new file mode 100644 index 00000000..9e30e1c1 --- /dev/null +++ b/buildroot-external/package/kf5-plasma-pa/0001-Remove-KDoctools-requirement.patch @@ -0,0 +1,32 @@ +From 8ceb98d315404a1523974b7b2c2e1370b5ef61cd Mon Sep 17 00:00:00 2001 +From: j1nx +Date: Sat, 10 Oct 2020 19:49:51 +0200 +Subject: [PATCH 1/1] Remove KDoctools requirement + +--- + CMakeLists.txt | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eb6d5a8..8d81e02 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,7 +32,6 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS + CoreAddons + Declarative +- DocTools + GlobalAccel + Notifications + I18n +@@ -79,7 +78,6 @@ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) + add_subdirectory(applet) + add_subdirectory(src) + add_subdirectory(data) +-add_subdirectory(doc) + + # add clang-format target for all our real source files + file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) +-- +2.20.1 + diff --git a/buildroot-external/package/respeaker/respeaker.hash b/buildroot-external/package/respeaker/respeaker.hash index b44cbb8b..919d2d2e 100644 --- a/buildroot-external/package/respeaker/respeaker.hash +++ b/buildroot-external/package/respeaker/respeaker.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 52e7331536eca13f25add770489fe1f3c18db28fe8dd1c65c90ce2589db6a1db respeaker-8ea751c4e9dd9a9d1d52fa947791276a9da77772.tar.gz +sha256 d2e01910ac61f1f84599bd1b15ab9ce18ddd02c713f81418724ac7c8f584fb47 respeaker-8cce4e8ffa77e1e2b89812e5e2ccf6cfbc1086cf.tar.gz diff --git a/buildroot-external/package/respeaker/respeaker.mk b/buildroot-external/package/respeaker/respeaker.mk index d5cc506d..cf0400e7 100644 --- a/buildroot-external/package/respeaker/respeaker.mk +++ b/buildroot-external/package/respeaker/respeaker.mk @@ -4,8 +4,8 @@ # ################################################################################ -RESPEAKER_VERSION = 8ea751c4e9dd9a9d1d52fa947791276a9da77772 -RESPEAKER_SITE = $(call github,HinTak,seeed-voicecard,$(RESPEAKER_VERSION)) +RESPEAKER_VERSION = 8cce4e8ffa77e1e2b89812e5e2ccf6cfbc1086cf +RESPEAKER_SITE = $(call github,respeaker,seeed-voicecard,$(RESPEAKER_VERSION)) RESPEAKER_LICENSE = GNU General Public License v3.0 RESPEAKER_DEPENDENCIES = rpi-firmware dtc diff --git a/buildroot-patches/0001-Downgrade-python-idna-to-2.7.patch b/buildroot-patches/0001-Downgrade-python-idna-to-2.7.patch index 516a0b3a..46da7281 100644 --- a/buildroot-patches/0001-Downgrade-python-idna-to-2.7.patch +++ b/buildroot-patches/0001-Downgrade-python-idna-to-2.7.patch @@ -1,6 +1,6 @@ -From 972430b0e4a341fc6f90fae6d75ce18ea65e7690 Mon Sep 17 00:00:00 2001 +From e657b7bb989c40d4329f7fc69a23398d7c590706 Mon Sep 17 00:00:00 2001 From: j1nx -Date: Thu, 29 Oct 2020 19:25:47 +0100 +Date: Wed, 16 Dec 2020 14:18:49 +0100 Subject: [PATCH 1/1] Downgrade python-idna to 2.7 --- @@ -9,28 +9,28 @@ Subject: [PATCH 1/1] Downgrade python-idna to 2.7 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash -index 50897f045b..067dc15598 100644 +index c5f7378fda..d5a204b780 100644 --- a/package/python-idna/python-idna.hash +++ b/package/python-idna/python-idna.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/idna/json - md5 870b8b80267f00f0faf1b7ba4bdbf14e idna-2.9.tar.gz --sha256 7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb idna-2.9.tar.gz + md5 7a910c706db30d758f377db2762c0f9a idna-2.10.tar.gz +-sha256 b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6 idna-2.10.tar.gz +sha256 684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16 idna-2.7.tar.gz # Locally computed sha256 checksums sha256 412014420d2473dba06117c3d4d9e0eecaa6dde0ca30cd951f4ec2be39426f32 LICENSE.rst diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk -index eb4c1036cf..e6ee4c87ef 100644 +index b4d9839e29..e6ee4c87ef 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_IDNA_VERSION = 2.9 +-PYTHON_IDNA_VERSION = 2.10 +PYTHON_IDNA_VERSION = 2.7 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz --PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/cb/19/57503b5de719ee45e83472f339f617b0c01ad75cba44aba1e4c97c2b0abd +-PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/ea/b7/e0e3c1c467636186c39925827be42f16fee389dc404ac29e930e9136be70 +PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/65/c4/80f97e9c9628f3cac9b98bfca0402ede54e0563b56482e3e6e45c43c4935 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.rst diff --git a/buildroot-patches/0003-Downgrade-python-psutil-to-5.6.6.patch b/buildroot-patches/0003-Downgrade-python-psutil-to-5.6.6.patch index 590c6495..44ad9180 100644 --- a/buildroot-patches/0003-Downgrade-python-psutil-to-5.6.6.patch +++ b/buildroot-patches/0003-Downgrade-python-psutil-to-5.6.6.patch @@ -1,6 +1,6 @@ -From 55bbd8b116f02fb714558b82e16e5b190994219f Mon Sep 17 00:00:00 2001 +From 88f235b94b843df9f97d1d7011817e576dbc1ad8 Mon Sep 17 00:00:00 2001 From: j1nx -Date: Thu, 29 Oct 2020 19:47:27 +0100 +Date: Wed, 16 Dec 2020 15:24:58 +0100 Subject: [PATCH 1/1] Downgrade python-psutil to 5.6.6 --- @@ -10,44 +10,44 @@ Subject: [PATCH 1/1] Downgrade python-psutil to 5.6.6 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash -index 0000d6033c..e715e3f26f 100644 +index 1a053cc368..4d65173819 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json - md5 ed7b0f11ed214bcabbe76b7cf52f3ae3 psutil-5.7.0.tar.gz --sha256 685ec16ca14d079455892f25bd124df26ff9137664af445563c1bd36629b5e0e psutil-5.7.0.tar.gz + md5 50bf39b4faa268ba1da8a9730bb38bb6 psutil-5.7.2.tar.gz +-sha256 90990af1c3c67195c44c9a889184f84f5b2320dce3ee3acbd054e3ba0b4a7beb psutil-5.7.2.tar.gz +sha256 ad21281f7bd6c57578dd53913d2d44218e9e29fd25128d10ff7819ef16fa46e7 psutil-5.6.6.tar.gz # Locally computed sha256 checksums sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk -index 08bb2fd7bd..f1dbf84e20 100644 +index 19d97a6f97..f1dbf84e20 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-psutil/python3-psutil.mk --PYTHON_PSUTIL_VERSION = 5.7.0 +-PYTHON_PSUTIL_VERSION = 5.7.2 +PYTHON_PSUTIL_VERSION = 5.6.6 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz --PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/c4/b8/3512f0e93e0db23a71d82485ba256071ebef99b227351f0f5540f744af41 +-PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/aa/3e/d18f2c04cf2b528e18515999b0c8e698c136db78f62df34eee89cee205f1 +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/5f/dc/edf6758183afc7591a16bd4b8a44d8eea80aca1327ea60161dd3bad9ad22 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE diff --git a/package/python3-psutil/python3-psutil.mk b/package/python3-psutil/python3-psutil.mk -index ddd4b6b7d3..a368d643a1 100644 +index febf0d3edb..a368d643a1 100644 --- a/package/python3-psutil/python3-psutil.mk +++ b/package/python3-psutil/python3-psutil.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-psutil/python-psutil.mk --PYTHON3_PSUTIL_VERSION = 5.7.0 +-PYTHON3_PSUTIL_VERSION = 5.7.2 +PYTHON3_PSUTIL_VERSION = 5.6.6 PYTHON3_PSUTIL_SOURCE = psutil-$(PYTHON3_PSUTIL_VERSION).tar.gz --PYTHON3_PSUTIL_SITE = https://files.pythonhosted.org/packages/c4/b8/3512f0e93e0db23a71d82485ba256071ebef99b227351f0f5540f744af41 +-PYTHON3_PSUTIL_SITE = https://files.pythonhosted.org/packages/aa/3e/d18f2c04cf2b528e18515999b0c8e698c136db78f62df34eee89cee205f1 +PYTHON3_PSUTIL_SITE = https://files.pythonhosted.org/packages/5f/dc/edf6758183afc7591a16bd4b8a44d8eea80aca1327ea60161dd3bad9ad22 PYTHON3_PSUTIL_SETUP_TYPE = setuptools PYTHON3_PSUTIL_LICENSE = BSD-3-Clause diff --git a/buildroot-patches/0007-Downgrade-python-requests-to-2.20.0.patch b/buildroot-patches/0007-Downgrade-python-requests-to-2.20.0.patch index 4aee9726..d62fd904 100644 --- a/buildroot-patches/0007-Downgrade-python-requests-to-2.20.0.patch +++ b/buildroot-patches/0007-Downgrade-python-requests-to-2.20.0.patch @@ -1,6 +1,6 @@ -From 664c2f65454cf57848eafd133c72517af207e2fe Mon Sep 17 00:00:00 2001 +From f4f16da4d8b5101c217e585356ae7e1e0de32d00 Mon Sep 17 00:00:00 2001 From: j1nx -Date: Thu, 29 Oct 2020 19:59:59 +0100 +Date: Wed, 16 Dec 2020 15:32:38 +0100 Subject: [PATCH 1/1] Downgrade python-requests to 2.20.0 --- @@ -10,41 +10,41 @@ Subject: [PATCH 1/1] Downgrade python-requests to 2.20.0 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash -index b252e3a781..d4ef9e903a 100644 +index 84bf2a1aa0..e088ed8bef 100644 --- a/package/python-requests/python-requests.hash +++ b/package/python-requests/python-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json - md5 abfdc28db1065bbd0bc32592ac9d27a6 requests-2.23.0.tar.gz --sha256 b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6 requests-2.23.0.tar.gz + md5 b54bff26a389e5932e8b1c4983a99ce7 requests-2.24.0.tar.gz +-sha256 b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b requests-2.24.0.tar.gz +sha256 99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c requests-2.20.0.tar.gz # Locally computed sha256 checksums sha256 8837a2f33a61bcee175c028ff16d1c160aba48a3aebe1495ace709be4e62636b LICENSE diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk -index 9d36346b65..38dae8d8bf 100644 +index eb3997f108..38dae8d8bf 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-requests/python3-requests.mk --PYTHON_REQUESTS_VERSION = 2.23.0 +-PYTHON_REQUESTS_VERSION = 2.24.0 +PYTHON_REQUESTS_VERSION = 2.20.0 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz --PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/f5/4f/280162d4bd4d8aad241a21aecff7a6e46891b905a4341e7ab549ebaf7915 +-PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/da/67/672b422d9daf07365259958912ba533a0ecab839d4084c487a5fe9a5405f +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/97/10/92d25b93e9c266c94b76a5548f020f3f1dd0eb40649cb1993532c0af8f4c PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE diff --git a/package/python3-requests/python3-requests.mk b/package/python3-requests/python3-requests.mk -index e2bb00eab2..a1f2567115 100644 +index cd6a7e1260..a1f2567115 100644 --- a/package/python3-requests/python3-requests.mk +++ b/package/python3-requests/python3-requests.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-requests/python-requests.mk --PYTHON3_REQUESTS_VERSION = 2.23.0 +-PYTHON3_REQUESTS_VERSION = 2.24.0 +PYTHON3_REQUESTS_VERSION = 2.20.0 PYTHON3_REQUESTS_SOURCE = requests-$(PYTHON3_REQUESTS_VERSION).tar.gz -PYTHON3_REQUESTS_SITE = https://files.pythonhosted.org/packages/f5/4f/280162d4bd4d8aad241a21aecff7a6e46891b905a4341e7ab549ebaf7915 diff --git a/buildroot-patches/0012-Downgrade-python-urllib3-to-1.24.2.patch b/buildroot-patches/0012-Downgrade-python-urllib3-to-1.24.2.patch index a14bc5d0..cc685273 100644 --- a/buildroot-patches/0012-Downgrade-python-urllib3-to-1.24.2.patch +++ b/buildroot-patches/0012-Downgrade-python-urllib3-to-1.24.2.patch @@ -1,6 +1,6 @@ -From aeac8520080608825c7870af31b315b4130b137c Mon Sep 17 00:00:00 2001 +From b19a7fdda65749360076366b25f8751e1f6b71a5 Mon Sep 17 00:00:00 2001 From: j1nx -Date: Thu, 23 Jul 2020 23:41:44 +0200 +Date: Wed, 16 Dec 2020 19:12:49 +0100 Subject: [PATCH 1/1] Downgrade python-urllib3 to 1.24.2 --- @@ -9,27 +9,28 @@ Subject: [PATCH 1/1] Downgrade python-urllib3 to 1.24.2 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash -index b1602350bd..87a16f573e 100644 +index e29966672a..cb9b48d3e2 100644 --- a/package/python-urllib3/python-urllib3.hash +++ b/package/python-urllib3/python-urllib3.hash -@@ -1,4 +1,4 @@ - # sha256 from https://pypi.org/pypi/urllib3/json --sha256 3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527 urllib3-1.25.9.tar.gz -+sha256 9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3 urllib3-1.24.2.tar.gz +@@ -1,5 +1,5 @@ + # md5, sha256 from https://pypi.org/pypi/urllib3/json + md5 d47dd21a6e66a03c3633cac468ffd010 urllib3-1.25.11.tar.gz +-sha256 8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 urllib3-1.25.11.tar.gz ++sha256 9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3 urllib3-1.24.2.tar.gz # Locally computed sha256 checksums sha256 7c0d136ee0585389adf2d25671bb99687a1f75929f465b7f16ee3f01da37255e LICENSE.txt diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk -index b17a4c0cb6..893d32d976 100644 +index 88e8d2097b..893d32d976 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_URLLIB3_VERSION = 1.25.9 +-PYTHON_URLLIB3_VERSION = 1.25.11 +PYTHON_URLLIB3_VERSION = 1.24.2 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz --PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/05/8c/40cd6949373e23081b3ea20d5594ae523e681b6f472e600fbc95ed046a36 +-PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/76/d9/bbbafc76b18da706451fa91bc2ebe21c0daf8868ef3c30b869ac7cb7f01d +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/fd/fa/b21f4f03176463a6cccdb612a5ff71b927e5224e83483012747c12fc5d62 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt diff --git a/buildroot-patches/0106-Bump-RPI-Firmware-version.patch b/buildroot-patches/0106-Bump-RPI-Firmware-version.patch index b85ec5c9..06078e71 100644 --- a/buildroot-patches/0106-Bump-RPI-Firmware-version.patch +++ b/buildroot-patches/0106-Bump-RPI-Firmware-version.patch @@ -1,6 +1,6 @@ -From b38f0ed890f671542f36a4fa745430caf585ae7b Mon Sep 17 00:00:00 2001 +From 7fe0154f1cb34c51426eb984c0c2a75c354cbe65 Mon Sep 17 00:00:00 2001 From: j1nx -Date: Thu, 29 Oct 2020 21:07:31 +0100 +Date: Wed, 16 Dec 2020 19:23:40 +0100 Subject: [PATCH 1/1] Bump RPI Firmware version --- @@ -9,24 +9,24 @@ Subject: [PATCH 1/1] Bump RPI Firmware version 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash -index 32f2076d6e..a6d704b229 100644 +index 8730ec959b..d10a8b1db9 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed --sha256 bad3eedb256631bdce1e7d3a0ac59fdd38923a68579089a6b64029c5ff7d68f4 rpi-firmware-542aceb30364db3ce87d532ea90451f46bbb84e9.tar.gz -+sha256 05423c51bea350fccf9b2303da175b325c9ff77fcc9b800c2af78596e9503f2a rpi-firmware-0c3ecac52e4ef4dde82e6261b917fd77a884be37.tar.gz +-sha256 c7a8c2b8cfe1977095d62086d340d6c15a383562aba2742e21df7f5f792aeb4b rpi-firmware-358f4c271f2bc10931aae8fe0879ffaded8b9c44.tar.gz ++sha256 163303cc7fea370b3489d8e90b03928e6af8435f9aad7b64995210828dfeaeb6 rpi-firmware-8a5549c137dbce0e082ecf21607dc5e3feac1160.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk -index 8aa855d0ef..aa10db1945 100644 +index 8b2b2c7154..6099e1f170 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ --RPI_FIRMWARE_VERSION = 542aceb30364db3ce87d532ea90451f46bbb84e9 -+RPI_FIRMWARE_VERSION = 0c3ecac52e4ef4dde82e6261b917fd77a884be37 +-RPI_FIRMWARE_VERSION = 358f4c271f2bc10931aae8fe0879ffaded8b9c44 ++RPI_FIRMWARE_VERSION = 8a5549c137dbce0e082ecf21607dc5e3feac1160 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom diff --git a/buildroot-patches/0114-Just-build-all-qttools.patch b/buildroot-patches/0114-Just-build-all-qttools.patch deleted file mode 100644 index 55ed1f5f..00000000 --- a/buildroot-patches/0114-Just-build-all-qttools.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 38eb7557c88fed444774792af1ab30249c862d97 Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Wed, 11 Nov 2020 14:41:06 +0100 -Subject: [PATCH 1/1] Just build all qttools - ---- - ...-designer-tool-fixes-configure-error.patch | 46 ------------------- - package/qt5/qt5tools/qt5tools.mk | 28 ----------- - 2 files changed, 74 deletions(-) - delete mode 100644 package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch - -diff --git a/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch b/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch -deleted file mode 100644 -index 20c5e2a470..0000000000 ---- a/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch -+++ /dev/null -@@ -1,46 +0,0 @@ --From a70da8d731b969305096a0213b70659dc641591a Mon Sep 17 00:00:00 2001 --From: Peter Seiderer --Date: Tue, 17 Dec 2019 11:01:59 +0100 --Subject: [PATCH] Disable designer tool (fixes configure error). -- --Fixes: -- -- .../build/qt5tools-5.14.0/src/designer/src/components/lib/lib.pro -- Project ERROR: Multiple modules claim plugin type 'designer' (uitools, in addition to designer) -- --Signed-off-by: Peter Seiderer --[Rebased for Qt5.15.0] --Signed-off-by: Peter Seiderer ----- -- src/linguist/linguist/linguist.pro | 2 +- -- src/src.pro | 3 --- -- 2 files changed, 1 insertion(+), 4 deletions(-) -- --diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro --index d083896..7d74cfc 100644 ----- a/src/linguist/linguist/linguist.pro --+++ b/src/linguist/linguist/linguist.pro --@@ -1,4 +1,4 @@ ---QT += core-private gui-private widgets uitools-private printsupport --+QT += core-private gui-private widgets printsupport -- -- DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII -- --diff --git a/src/src.pro b/src/src.pro --index 5c256ea..6d079be 100644 ----- a/src/src.pro --+++ b/src/src.pro --@@ -7,10 +7,7 @@ qtHaveModule(widgets) { -- QT_FOR_CONFIG += widgets -- qtConfig(pushbutton):qtConfig(toolbutton) { -- SUBDIRS = assistant \ --- designer \ -- pixeltool --- --- linguist.depends = designer -- } -- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator -- } ---- --2.26.2 -- -diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk -index 0543afd8f7..1d07261474 100644 ---- a/package/qt5/qt5tools/qt5tools.mk -+++ b/package/qt5/qt5tools/qt5tools.mk -@@ -21,44 +21,16 @@ endif - 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.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL - --QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \ -- linguist/lconvert linguist/lrelease linguist/lupdate --QT5TOOLS_INSTALL_STAGING_DIR_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \ -- linguist -- - ifeq ($(BR2_PACKAGE_QT5TOOLS_QDOC_TOOL),y) --QT5TOOLS_BUILD_DIRS_y += qdoc --QT5TOOLS_INSTALL_STAGING_DIR_y += qdoc - QT5TOOLS_DEPENDENCIES += host-clang - endif - --QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_PIXELTOOL) += pixeltool - QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_PIXELTOOL) += pixeltool - --QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTDIAG) += qtdiag - QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTDIAG) += qtdiag - --QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths - QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths - --QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo - QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo - --define QT5TOOLS_BUILD_CMDS -- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) sub-src-qmake_all -- $(foreach p,$(QT5TOOLS_BUILD_DIRS_y), \ -- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src/$(p)$(sep)) --endef -- --# use install target to copy cmake module files --define QT5TOOLS_INSTALL_STAGING_CMDS -- $(foreach p,$(QT5TOOLS_INSTALL_STAGING_DIR_y), \ -- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src/$(p) install$(sep)) --endef -- --define QT5TOOLS_INSTALL_TARGET_CMDS -- $(foreach p,$(QT5TOOLS_INSTALL_TARGET_y), \ -- $(INSTALL) -D -m0755 $(@D)/bin/$(p) $(TARGET_DIR)/usr/bin/$(p)$(sep)) --endef -- - $(eval $(qmake-package)) --- -2.20.1 -