Bump buildroot to 2019.02
This commit is contained in:
@@ -4,14 +4,21 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
# Module does not follow Qt versionning for 5.6
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION)
|
||||
else
|
||||
QT5VIRTUALKEYBOARD_VERSION = 2.0
|
||||
endif
|
||||
QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)
|
||||
QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-opensource-src-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz
|
||||
QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz
|
||||
QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5base qt5declarative qt5svg
|
||||
QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES
|
||||
|
||||
QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3
|
||||
endif
|
||||
|
||||
QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS = $(call qstrip,$(BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS))
|
||||
ifneq ($(strip $(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
|
||||
@@ -39,8 +46,16 @@ ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_HANDWRITING),y)
|
||||
QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
|
||||
QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=handwriting
|
||||
QT5VIRTUALKEYBOARD_LICENSE := $(QT5VIRTUALKEYBOARD_LICENSE), MIT (lipi-toolkit)
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt
|
||||
else
|
||||
QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION),y)
|
||||
QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=arrow-key-navigation
|
||||
endif
|
||||
|
||||
ifdef QT5VIRTUALKEYBOARD_3RDPARTY_PARTS
|
||||
define QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS
|
||||
@@ -60,6 +75,18 @@ define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML
|
||||
mkdir -p $(TARGET_DIR)/usr/qml/QtQuick/Enterprise
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Enterprise/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick/Enterprise/
|
||||
endef
|
||||
else
|
||||
define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML
|
||||
mkdir -p $(TARGET_DIR)/usr/qml/QtQuick
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick/
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
|
||||
define QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES
|
||||
cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/virtualkeyboard $(TARGET_DIR)/usr/lib/qt/examples/
|
||||
@@ -70,7 +97,7 @@ define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS
|
||||
mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts
|
||||
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so \
|
||||
$(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick
|
||||
$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML)
|
||||
$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS)
|
||||
$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES)
|
||||
endef
|
||||
|
||||
Reference in New Issue
Block a user