rixty
/
OpenVoiceOS
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS
1
1
Fork 0
Code Issues Releases Wiki Activity

Add kwin_wayland and its dependencies

This commit is contained in:
j1nx 2020-10-13 12:26:29 +02:00
parent b5918577bc
commit 057b157760
27 changed files with 248 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildroot-external/Config.in
View File

@ -14,11 +14,13 @@ menu "Additional drivers, libraries and/or applications"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/fann/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/hostname-service/Config.in"
menu "KF5"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-attica/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-breeze-icons/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kactivities/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-karchive/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kauth/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kbookmarks/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kcmutils/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kcodecs/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kcompletion/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kconfig/Config.in"
@ -26,21 +28,27 @@ menu "KF5"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kcrash/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kdbusaddons/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kdeclarative/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kdecoration/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kded/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kglobalaccel/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kguiaddons/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-ki18n/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kiconthemes/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kidletime/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kinit/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kio/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kirigami2/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kitemviews/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kjobwidgets/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-knewstuff/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-knotifications/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kpackage/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kscreenlocker/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kservice/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-ktextwidgets/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kwayland/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kwidgetsaddons/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kwin/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kwindowsystem/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kxmlgui/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-phonon/Config.in"

21
buildroot-external/configs/rpi4_64-gui_defconfig
View File

@ -183,6 +183,7 @@ BR2_PACKAGE_DEJAVU=y
BR2_PACKAGE_LIBERATION=y
BR2_PACKAGE_GLMARK2=y
BR2_PACKAGE_KMSCUBE=y
BR2_PACKAGE_FREERDP=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y
@ -194,6 +195,7 @@ BR2_PACKAGE_QT53D=y
BR2_PACKAGE_QT5BASE_CONCURRENT=y
BR2_PACKAGE_QT5BASE_SQLITE_QT=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
@ -204,6 +206,8 @@ BR2_PACKAGE_QT5GRAPHICALEFFECTS=y
BR2_PACKAGE_QT5IMAGEFORMATS=y
BR2_PACKAGE_QT5MULTIMEDIA=y
BR2_PACKAGE_QT5SCRIPT=y
BR2_PACKAGE_QT5SENSORS=y
BR2_PACKAGE_QT5TOOLS_DESIGNER=y
BR2_PACKAGE_QT5VIRTUALKEYBOARD=y
BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS="en_US"
BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION=y
@ -215,10 +219,10 @@ BR2_PACKAGE_QT5WEBVIEW=y
BR2_PACKAGE_KF5=y
BR2_PACKAGE_KF5_KCOREADDONS=y
BR2_PACKAGE_KF5_NETWORKMANAGER_QT=y
BR2_PACKAGE_WESTON=y
BR2_PACKAGE_WESTON_DEFAULT_DRM=y
BR2_PACKAGE_WESTON_FBDEV=y
BR2_PACKAGE_WESTON_RDP=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_XCB_UTIL_CURSOR=y
BR2_PACKAGE_XLIB_LIBSM=y
BR2_PACKAGE_XKEYBOARD_CONFIG=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7650=y
@ -373,6 +377,7 @@ BR2_PACKAGE_OPENJPEG=y
BR2_PACKAGE_TIFF=y
BR2_PACKAGE_WAFFLE=y
BR2_PACKAGE_LIBCEC=y
BR2_PACKAGE_LIBINPUT=y
BR2_PACKAGE_LIBV4L=y
BR2_PACKAGE_LIBV4L_UTILS=y
BR2_PACKAGE_WIRINGPI=y
@ -488,18 +493,26 @@ BR2_PACKAGE_BARESIP=y
BR2_PACKAGE_BTSPEAKER=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_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_KIDLETIME=y
BR2_PACKAGE_KF5_KINIT=y
BR2_PACKAGE_KF5_KIRIGAMI2=y
BR2_PACKAGE_KF5_KNEWSTUFF=y
BR2_PACKAGE_KF5_KNOTIFICATIONS=y
BR2_PACKAGE_KF5_KPACKAGE=y
BR2_PACKAGE_KF5_KSCREENLOCKER=y
BR2_PACKAGE_KF5_KWAYLAND=y
BR2_PACKAGE_KF5_KWIN=y
BR2_PACKAGE_KF5_PHONON=y
BR2_PACKAGE_KF5_PLASMA_FRAMEWORK=y
BR2_PACKAGE_KF5_PLASMA_NANO=y

2
buildroot-external/package/kf5-attica/Config.in Normal file
View File

@ -0,0 +1,2 @@
config BR2_PACKAGE_KF5_ATTICA
bool "kf5-attica"

2
buildroot-external/package/kf5-attica/kf5-attica.hash Normal file
View File

@ -0,0 +1,2 @@
# Locally calculated
sha256 011240a6ff59e2b39bcf6d4ba6128e6e60c6318c185e7316a71cfec28e69c69a attica-5.73.0.tar.xz

17
buildroot-external/package/kf5-attica/kf5-attica.mk Normal file
View File

@ -0,0 +1,17 @@
################################################################################
#
# kf5-attica
#
################################################################################
KF5_ATTICA_VERSION = $(KF5_VERSION)
KF5_ATTICA_SITE = $(KF5_SITE)
KF5_ATTICA_SOURCE = attica-$(KF5_ATTICA_VERSION).tar.xz
KF5_ATTICA_LICENSE = BSD-3-Clause
KF5_ATTICA_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_ATTICA_DEPENDENCIES = host-pkgconf
KF5_ATTICA_INSTALL_STAGING = YES
KF5_ATTICA_SUPPORTS_IN_SOURCE_BUILD = NO
$(eval $(cmake-package))

2
buildroot-external/package/kf5-kcmutils/Config.in Normal file
View File

@ -0,0 +1,2 @@
config BR2_PACKAGE_KF5_KCMUTILS
bool "kf5-kcmutils"

2
buildroot-external/package/kf5-kcmutils/kf5-kcmutils.hash Normal file
View File

@ -0,0 +1,2 @@
# Locally calculated
sha256 b28bf672bbe21e8d1b4e6ea924c1bb318c81c43dcbb86bebb3f5775e18945ca9 kcmutils-5.73.0.tar.xz

19
buildroot-external/package/kf5-kcmutils/kf5-kcmutils.mk Normal file
View File

@ -0,0 +1,19 @@
################################################################################
#
# kf5-kcmutils
#
################################################################################
KF5_KCMUTILS_VERSION = $(KF5_VERSION)
KF5_KCMUTILS_SITE = $(KF5_SITE)
KF5_KCMUTILS_SOURCE = kcmutils-$(KF5_KCMUTILS_VERSION).tar.xz
KF5_KCMUTILS_LICENSE = BSD-3-Clause
KF5_KCMUTILS_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KCMUTILS_DEPENDENCIES = host-pkgconf
KF5_KCMUTILS_INSTALL_STAGING = YES
KF5_KCMUTILS_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_KCMUTILS_CONF_OPTS += -DKF5_HOST_TOOLING="$(HOST_DIR)/lib/x86_64-linux-gnu/cmake"
$(eval $(cmake-package))

2
buildroot-external/package/kf5-kdecoration/Config.in Normal file
View File

@ -0,0 +1,2 @@
config BR2_PACKAGE_KF5_KDECORATION
bool "kf5-kdecoration"

2
buildroot-external/package/kf5-kdecoration/kf5-kdecoration.hash Normal file
View File

@ -0,0 +1,2 @@
# Locally calculated
sha256 f09856245f2cb08d9013da4c3128b5438f1e2f58af40031eb547ae765f57a9c8 kdecoration-5.18.5.tar.xz

19
buildroot-external/package/kf5-kdecoration/kf5-kdecoration.mk Normal file
View File

@ -0,0 +1,19 @@
################################################################################
#
# kf5-kdecoration
#
################################################################################
KF5_KDECORATION_VERSION = 5.18.5
KF5_KDECORATION_SITE = https://download.kde.org/stable/plasma/$(KF5_KDECORATION_VERSION)
KF5_KDECORATION_SOURCE = kdecoration-$(KF5_KDECORATION_VERSION).tar.xz
KF5_KDECORATION_LICENSE = BSD-3-Clause
KF5_KDECORATION_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KDECORATION_DEPENDENCIES = host-pkgconf libcanberra kf5-plasma-framework kf5-kwayland
KF5_KDECORATION_INSTALL_STAGING = YES
KF5_KDECORATION_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_KDECORATION_CONF_OPTS += -DKF5_HOST_TOOLING="$(HOST_DIR)/lib/x86_64-linux-gnu/cmake"
$(eval $(cmake-package))

2
buildroot-external/package/kf5-kidletime/Config.in Normal file
View File

@ -0,0 +1,2 @@
config BR2_PACKAGE_KF5_KIDLETIME
bool "kf5-kidletime"

2
buildroot-external/package/kf5-kidletime/kf5-kidletime.hash Normal file
View File

@ -0,0 +1,2 @@
# Locally calculated
sha256 52a8af3f061101c406a592ec277a2c84846e3910af1d3dbfc3e15beb9cfd24a2 kidletime-5.73.0.tar.xz

17
buildroot-external/package/kf5-kidletime/kf5-kidletime.mk Normal file
View File

@ -0,0 +1,17 @@
################################################################################
#
# kf5-kidletime
#
################################################################################
KF5_KIDLETIME_VERSION = $(KF5_VERSION)
KF5_KIDLETIME_SITE = $(KF5_SITE)
KF5_KIDLETIME_SOURCE = kidletime-$(KF5_KIDLETIME_VERSION).tar.xz
KF5_KIDLETIME_LICENSE = BSD-3-Clause
KF5_KIDLETIME_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KIDLETIME_DEPENDENCIES = host-pkgconf
KF5_KIDLETIME_INSTALL_STAGING = YES
KF5_KIDLETIME_SUPPORTS_IN_SOURCE_BUILD = NO
$(eval $(cmake-package))

2
buildroot-external/package/kf5-kinit/Config.in Normal file
View File

@ -0,0 +1,2 @@
config BR2_PACKAGE_KF5_KINIT
bool "kf5-kinit"

2
buildroot-external/package/kf5-kinit/kf5-kinit.hash Normal file
View File

@ -0,0 +1,2 @@
# Locally calculated
sha256 0c61e90f3db83b4dc5f2438cf7880a02b600a5739cb05e5ee372aeff98b8b770 kinit-5.73.0.tar.xz

19
buildroot-external/package/kf5-kinit/kf5-kinit.mk Normal file
View File

@ -0,0 +1,19 @@
################################################################################
#
# kf5-kinit
#
################################################################################
KF5_KINIT_VERSION = $(KF5_VERSION)
KF5_KINIT_SITE = $(KF5_SITE)
KF5_KINIT_SOURCE = kinit-$(KF5_KINIT_VERSION).tar.xz
KF5_KINIT_LICENSE = BSD-3-Clause
KF5_KINIT_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KINIT_DEPENDENCIES = host-pkgconf
KF5_KINIT_INSTALL_STAGING = YES
KF5_KINIT_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_KINIT_CONF_OPTS += -DKF5_HOST_TOOLING="$(HOST_DIR)/lib/x86_64-linux-gnu/cmake"
$(eval $(cmake-package))

2
buildroot-external/package/kf5-knewstuff/Config.in Normal file
View File

@ -0,0 +1,2 @@
config BR2_PACKAGE_KF5_KNEWSTUFF
bool "kf5-knewstuff"

2
buildroot-external/package/kf5-knewstuff/kf5-knewstuff.hash Normal file
View File

@ -0,0 +1,2 @@
# Locally calculated
sha256 7669e62973f7e228975a07f15bb1c7f716edd81ce82d5f578a80b1f501abda1e knewstuff-5.73.0.tar.xz

19
buildroot-external/package/kf5-knewstuff/kf5-knewstuff.mk Normal file
View File

@ -0,0 +1,19 @@
################################################################################
#
# kf5-knewstuff
#
################################################################################
KF5_KNEWSTUFF_VERSION = $(KF5_VERSION)
KF5_KNEWSTUFF_SITE = $(KF5_SITE)
KF5_KNEWSTUFF_SOURCE = knewstuff-$(KF5_KNEWSTUFF_VERSION).tar.xz
KF5_KNEWSTUFF_LICENSE = BSD-3-Clause
KF5_KNEWSTUFF_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KNEWSTUFF_DEPENDENCIES = host-pkgconf
KF5_KNEWSTUFF_INSTALL_STAGING = YES
KF5_KNEWSTUFF_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_KNEWSTUFF_CONF_OPTS += -DKF5_HOST_TOOLING="$(HOST_DIR)/lib/x86_64-linux-gnu/cmake"
$(eval $(cmake-package))

2
buildroot-external/package/kf5-kscreenlocker/Config.in Normal file
View File

@ -0,0 +1,2 @@
config BR2_PACKAGE_KF5_KSCREENLOCKER
bool "kf5-kscreenlocker"

2
buildroot-external/package/kf5-kscreenlocker/kf5-kscreenlocker.hash Normal file
View File

@ -0,0 +1,2 @@
# Locally calculated
sha256 b4269cd027e1fee721760a22ca5d738d3d98622fa222fcf9e57d2da77a4e18d2 kscreenlocker-5.18.5.tar.xz

19
buildroot-external/package/kf5-kscreenlocker/kf5-kscreenlocker.mk Normal file
View File

@ -0,0 +1,19 @@
################################################################################
#
# kf5-kscreenlocker
#
################################################################################
KF5_KSCREENLOCKER_VERSION = 5.18.5
KF5_KSCREENLOCKER_SITE = https://download.kde.org/stable/plasma/$(KF5_KSCREENLOCKER_VERSION)
KF5_KSCREENLOCKER_SOURCE = kscreenlocker-$(KF5_KSCREENLOCKER_VERSION).tar.xz
KF5_KSCREENLOCKER_LICENSE = BSD-3-Clause
KF5_KSCREENLOCKER_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KSCREENLOCKER_DEPENDENCIES = host-pkgconf kf5-plasma-framework kf5-kwayland
KF5_KSCREENLOCKER_INSTALL_STAGING = YES
KF5_KSCREENLOCKER_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_KSCREENLOCKER_CONF_OPTS += -DKF5_HOST_TOOLING="$(HOST_DIR)/lib/x86_64-linux-gnu/cmake"
$(eval $(cmake-package))

2
buildroot-external/package/kf5-kwin/Config.in Normal file
View File

@ -0,0 +1,2 @@
config BR2_PACKAGE_KF5_KWIN
bool "kf5-kwin"

2
buildroot-external/package/kf5-kwin/kf5-kwin.hash Normal file
View File

@ -0,0 +1,2 @@
# Locally calculated
sha256 ca39c63fd740432e95490031fd9d5ac003da034582014fa41c2be2b89627ddf8 kwin-5.18.5.tar.xz

21
buildroot-external/package/kf5-kwin/kf5-kwin.mk Normal file
View File

@ -0,0 +1,21 @@
################################################################################
#
# kf5-kwin
#
################################################################################
KF5_KWIN_VERSION = 5.18.5
KF5_KWIN_SITE = https://download.kde.org/stable/plasma/$(KF5_KWIN_VERSION)
KF5_KWIN_SOURCE = kwin-$(KF5_KWIN_VERSION).tar.xz
KF5_KWIN_LICENSE = BSD-3-Clause
KF5_KWIN_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
KF5_KWIN_DEPENDENCIES = host-pkgconf qt5sensors kf5-plasma-framework kf5-kwayland \
kf5-kidletime kf5-kinit kf5-kcmutils kf5-knewstuff \
kf5-attica kf5-kdecoration kf5-kscreenlocker
KF5_KWIN_INSTALL_STAGING = YES
KF5_KWIN_SUPPORTS_IN_SOURCE_BUILD = NO
KF5_KWIN_CONF_OPTS += -DKF5_HOST_TOOLING="$(HOST_DIR)/lib/x86_64-linux-gnu/cmake"
$(eval $(cmake-package))

41
buildroot-patches/0114-Add-the-qtdesigner-programs-to-qt5tools-packages.patch Normal file
View File

@ -0,0 +1,41 @@
From 773d2f8333c9120a75e9b9b2db788e32228ab25b Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Tue, 13 Oct 2020 12:20:40 +0200
Subject: [PATCH 1/1] Add the qtdesigner programs to qt5tools packages
---
package/qt5/qt5tools/Config.in | 5 +++++
package/qt5/qt5tools/qt5tools.mk | 3 +++
2 files changed, 8 insertions(+)
diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in
index 60106c1ee3..b538c0f05c 100644
--- a/package/qt5/qt5tools/Config.in
+++ b/package/qt5/qt5tools/Config.in
@@ -56,4 +56,9 @@ config BR2_PACKAGE_QT5TOOLS_QTPLUGININFO
help
Compile and install the qtplugininfo program.
+config BR2_PACKAGE_QT5TOOLS_DESIGNER
+ bool "qtdesigner"
+ help
+ Compile and install the qtdesigner programs.
+
endif
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
index 0d00022998..9100d21ccd 100644
--- a/package/qt5/qt5tools/qt5tools.mk
+++ b/package/qt5/qt5tools/qt5tools.mk
@@ -50,6 +50,9 @@ QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths
QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo
QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo
+QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_DESIGNER) += designer
+QT5TOOLS_INSTALL_STAGING_DIR_$(BR2_PACKAGE_QT5TOOLS_DESIGNER) += designer
+
define QT5TOOLS_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
endef
--
2.20.1