projects / feed / video.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
qt5: update to 5.15.0 (LTS release)
[feed/video.git] / frameworks / qt5quick2 / Makefile
diff --git a/frameworks/qt5quick2/Makefile b/frameworks/qt5quick2/Makefile
index 4f63d085d766ed4799a2c2f5ffb3b3ccb1b97238..4d0cd28decf2dedd155904c97becfb918be261a2 100644 (file)
--- a/frameworks/qt5quick2/Makefile
+++ b/frameworks/qt5quick2/Makefile
@@ -1,6 +1,6 @@
 #
-# Copyright (C) 2015 OpenWrt
-# Author: Mirko Vogt <mirko@openwrt.org>
+# Copyright (C) 2020 OpenWrt
+# Author: Mirko Vogt <mirko-openwrt@nanl.de>
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qt5quick2
-PKG_VERSION:=5.9.1
+PKG_VERSION:=5.15.0
 PKG_RELEASE:=1
-PKG_HASH:=d2fe6c9c1a9f19af6e96553c6d75366ab8f397bc232acd67d31476955fee94ff
+PKG_HASH:=9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699
 
-PKG_SYS_NAME:=qtdeclarative-opensource-src-$(PKG_VERSION)
+PKG_SYS_NAME:=qtdeclarative-everywhere-src-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_SYS_NAME).tar.xz
-PKG_SOURCE_URL:=http://download.qt-project.org/official_releases/qt/$(basename $(PKG_VERSION))/$(PKG_VERSION)/submodules
+PKG_SOURCE_URL:=https://download.qt.io/official_releases/qt/$(basename $(PKG_VERSION))/$(PKG_VERSION)/submodules
 
 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_SYS_NAME)
 PKG_BUILD_PARALLEL:=1
@@ -29,10 +29,10 @@ define Package/qt5quick2/Default
   SECTION:=video-frameworks
   CATEGORY:=Video
   SUBMENU:=Frameworks and Toolkits
-  TITLE:=Qt5quick2
+  TITLE:=Qt5Quick2
 #  DEPENDS+=qt5quick2
   URL:=http://qt.io
-  MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
+  MAINTAINER:=Mirko Vogt <mirko-openwrt@nanl.de>
 endef
 
 # define Package/qt5quick2
@@ -43,96 +43,153 @@ endef
 
 define Package/qt5quick2-qml
   $(call Package/qt5quick2/Default)
-  TITLE+=qml
+  TITLE+=Qml
   DEPENDS+=+qt5base-network
 endef
 
+define Package/qt5quick2-qml-models
+  $(call Package/qt5quick2/Default)
+  TITLE+=QmlModels
+  DEPENDS+=+qt5quick2-qml
+endef
+
+define Package/qt5quick2-qml-worker-script
+  $(call Package/qt5quick2/Default)
+  TITLE+=QmlWorkerScript
+  DEPENDS+=+qt5quick2-qml
+endef
+
 define Package/qt5quick2-quick
   $(call Package/qt5quick2/Default)
-  TITLE+=quick
-  DEPENDS+=+qt5quick2-qml +qt5base-gui
+  TITLE+=Quick
+  DEPENDS+=+qt5base-gui +qt5quick2-qml-models
 endef
 
-define Package/qt5quick2-test
+define Package/qt5quick2-quick-test
   $(call Package/qt5quick2/Default)
-  TITLE+=test
-  DEPENDS+=+qt5quick2-quick +qt5base-gui +qt5base-widgets +qt5base-test
+  TITLE+=QuickTest
+  DEPENDS+=+qt5quick2-quick +qt5base-widgets +qt5base-test
 endef
 
-define Package/qt5quick2-particles
+#define Package/qt5quick2-particles
+#  $(call Package/qt5quick2/Default)
+#  TITLE+=particles
+#  DEPENDS+=+qt5quick2-quick
+#endef
+
+define Package/qt5quick2-quick-widgets
   $(call Package/qt5quick2/Default)
-  TITLE+=particles
-  DEPENDS+=+qt5quick2-quick
+  TITLE+=QuickWidgets
+  DEPENDS+=+qt5quick2-quick +qt5base-widgets
 endef
 
-define Package/qt5quick2-widgets
+define Package/qt5quick2-quick-shapes
   $(call Package/qt5quick2/Default)
-  TITLE+=widgets
-  DEPENDS+=+qt5quick2-quick +qt5base-gui +qt5base-widgets
+  TITLE+=QuickShapes
+  DEPENDS+=+qt5quick2-quick
 endef
 
 ###
 
-define Package/qt5quick2-qml-statemachine
+define Package/qt5quick2-qml-module-qtqml-models2
+  $(call Package/qt5quick2/Default)
+  TITLE+=QML QtQml models
+  DEPENDS+=+qt5quick2-qml-models
+endef
+
+define Package/qt5quick2-qml-module-qtqml-statemachine
   $(call Package/qt5quick2/Default)
-  TITLE+=QML statemachine
+  TITLE+=QML StateMachine
   DEPENDS:=+qt5quick2-qml
 endef
 
-define Package/qt5quick2-qml-models
+define Package/qt5quick2-qml-module-qtqml-workerscript2
   $(call Package/qt5quick2/Default)
-  TITLE+=QML models
-  DEPENDS+=+qt5quick2-qml
+  TITLE+=QML WorkerScript
+  DEPENDS:=+qt5quick2-qml-worker-script
 endef
 
-define Package/qt5quick2-qml-folderlistmodel
+###
+
+define Package/qt5quick2-qml-module-qtlabs-animation
+  $(call Package/qt5quick2/Default)
+  TITLE+=QML QtLabs animation
+  DEPENDS:=+qt5quick2-qml +qt5quick2-quick
+endef
+
+define Package/qt5quick2-qml-module-qtlabs-folderlistmodel
   $(call Package/qt5quick2/Default)
-  TITLE+=QML folderlistmodel
+  TITLE+=QML QtLabs folderlistmodel
   DEPENDS:=+qt5quick2-qml
 endef
 
-define Package/qt5quick2-qml-settings
+define Package/qt5quick2-qml-module-qtlabs-models
+  $(call Package/qt5quick2/Default)
+  TITLE+=QML QtLabs qmlmodels
+  DEPENDS+=+qt5quick2-qml-models
+endef
+
+define Package/qt5quick2-qml-module-qtlabs-settings
   $(call Package/qt5quick2/Default)
-  TITLE+=QML settings
+  TITLE+=QML QtLabs settings
   DEPENDS:=+qt5quick2-qml
 endef
 
-define Package/qt5quick2-qml-test
+define Package/qt5quick2-qml-module-qtlabs-sharedimage
   $(call Package/qt5quick2/Default)
-  TITLE+=QML folderlistmodel
-  DEPENDS+=+qt5quick2-quick +qt5base-gui +qt5quick2-test
+  TITLE+=QML QtLabs sharedimage
+  DEPENDS:=+qt5quick2-quick
 endef
 
-define Package/qt5quick2-qml-layouts
+define Package/qt5quick2-qml-module-qtlabs-wavefrontmesh
   $(call Package/qt5quick2/Default)
-  TITLE+=QML layouts
-  DEPENDS+=+qt5quick2-quick
+  TITLE+=QML QtLabs wavefrontmesh
+  DEPENDS:=+qt5quick2-quick
 endef
 
-define Package/qt5quick2-qml-particles
+
+define Package/qt5quick2-qml-module-qttest
   $(call Package/qt5quick2/Default)
-  TITLE+=QML particles
-  DEPENDS+=+qt5quick2-particles
+  TITLE+=QML QtTest
+  DEPENDS+=+qt5quick2-quick +qt5quick2-quick-test
 endef
 
-define Package/qt5quick2-qml-window
+define Package/qt5quick2-qml-module-qtquick-layouts
   $(call Package/qt5quick2/Default)
-  TITLE+=QML window
+  TITLE+=QML QtQuick Layouts
   DEPENDS+=+qt5quick2-quick
 endef
 
-define Package/qt5quick2-qml-localstorage
+#define Package/qt5quick2-qml-module-qtquick-particles2
+#  $(call Package/qt5quick2/Default)
+#  TITLE+=QML particles
+#  DEPENDS+=+qt5quick2-particles
+#endef
+
+define Package/qt5quick2-qml-module-qtquick-localstorage
   $(call Package/qt5quick2/Default)
-  TITLE+=QML localstorage
+  TITLE+=QML QtQuick LocalStorage
   DEPENDS+=+qt5quick2-qml +qt5base-sql
 endef
 
-define Package/qt5quick2-qml-quick
+define Package/qt5quick2-qml-module-qtquick-shapes
+  $(call Package/qt5quick2/Default)
+  TITLE+=QML QtQuick Shapes
+  DEPENDS+=+qt5quick2-quick-shapes
+endef
+
+define Package/qt5quick2-qml-module-qtquick-window2
   $(call Package/qt5quick2/Default)
-  TITLE+=QML quick2
+  TITLE+=QML QtQuick Window.2
   DEPENDS+=+qt5quick2-quick
 endef
 
+define Package/qt5quick2-qml-module-qtquick2
+  $(call Package/qt5quick2/Default)
+  TITLE+=QML QtQuick.2
+  DEPENDS+=+qt5quick2-quick +qt5quick2-qml-worker-script
+endef
+
 ####
 
 define Build/InstallDev
@@ -155,81 +212,132 @@ endef
 
 define Package/qt5quick2-qml/install
        $(call Build/Install/Libs,$(1),libQt5Qml)
+
+       $(INSTALL_DIR) \
+         $(1)/$(QT_INSTALL_QML)
+
+       $(CP) \
+         $(PKG_INSTALL_DIR)/$(QT_INSTALL_QML)/builtins.qmltypes \
+         $(1)/$(QT_INSTALL_QML)/
+endef
+
+define Package/qt5quick2-qml-models/install
+       $(call Build/Install/Libs,$(1),libQt5QmlModels)
+endef
+
+define Package/qt5quick2-qml-worker-script/install
+       $(call Build/Install/Libs,$(1),libQt5QmlWorkerScript)
 endef
 
 define Package/qt5quick2-quick/install
        $(call Build/Install/Libs,$(1),libQt5Quick)
 endef
 
-define Package/qt5quick2-test/install
+define Package/qt5quick2-quick-test/install
        $(call Build/Install/Libs,$(1),libQt5QuickTest)
 endef
 
-define Package/qt5quick2-particles/install
-       $(call Build/Install/Libs,$(1),libQt5QuickParticles)
-endef
+#define Package/qt5quick2-particles/install
+#      $(call Build/Install/Libs,$(1),libQt5QuickParticles)
+#endef
 
-define Package/qt5quick2-widgets/install
+define Package/qt5quick2-quick-widgets/install
        $(call Build/Install/Libs,$(1),libQt5QuickWidgets)
 endef
 
-
-define Package/qt5quick2-qml-statemachine/install
-       $(call Build/Install/QMLplugin,$(1),/QtQml/StateMachine,*)
+define Package/qt5quick2-quick-shapes/install
+       $(call Build/Install/Libs,$(1),libQt5QuickShapes)
 endef
 
-define Package/qt5quick2-qml-models/install
+define Package/qt5quick2-qml-module-qtqml-models2/install
        $(call Build/Install/QMLplugin,$(1),QtQml/Models.2,*)
 endef
 
-define Package/qt5quick2-qml-folderlistmodel/install
+define Package/qt5quick2-qml-module-qtqml-statemachine/install
+       $(call Build/Install/QMLplugin,$(1),QtQml/StateMachine,*)
+endef
+
+define Package/qt5quick2-qml-module-qtqml-workerscript2/install
+       $(call Build/Install/QMLplugin,$(1),QtQml/WorkerScript.2,*)
+endef
+
+define Package/qt5quick2-qml-module-qtlabs-animation/install
+       $(call Build/Install/QMLplugin,$(1),Qt/labs/animation/,*)
+endef
+
+define Package/qt5quick2-qml-module-qtlabs-folderlistmodel/install
        $(call Build/Install/QMLplugin,$(1),Qt/labs/folderlistmodel,*)
 endef
 
-define Package/qt5quick2-qml-settings/install
+define Package/qt5quick2-qml-module-qtlabs-models/install
+       $(call Build/Install/QMLplugin,$(1),Qt/labs/qmlmodels,*)
+endef
+
+define Package/qt5quick2-qml-module-qtlabs-settings/install
        $(call Build/Install/QMLplugin,$(1),Qt/labs/settings/,*)
 endef
 
-define Package/qt5quick2-qml-test/install
+define Package/qt5quick2-qml-module-qtlabs-sharedimage/install
+       $(call Build/Install/QMLplugin,$(1),Qt/labs/sharedimage/,*)
+endef
+
+define Package/qt5quick2-qml-module-qtlabs-wavefrontmesh/install
+       $(call Build/Install/QMLplugin,$(1),Qt/labs/wavefrontmesh/,*)
+endef
+
+define Package/qt5quick2-qml-module-qttest/install
        $(call Build/Install/QMLplugin,$(1),QtTest,*)
        $(INSTALL_DIR) $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/qmltestrunner $(1)/usr/bin/
 endef
 
-define Package/qt5quick2-qml-layouts/install
+define Package/qt5quick2-qml-module-qtquick-layouts/install
        $(call Build/Install/QMLplugin,$(1),QtQuick/Layouts,*)
 endef
 
-define Package/qt5quick2-qml-particles/install
-       $(call Build/Install/QMLplugin,$(1),QtQuick/Particles.2,*)
+#define Package/qt5quick2-qml-module-qtquick-particles2/install
+#      $(call Build/Install/QMLplugin,$(1),QtQuick/Particles.2,*)
+#endef
+
+define Package/qt5quick2-qml-module-qtquick-localstorage/install
+       $(call Build/Install/QMLplugin,$(1),QtQuick/LocalStorage,*)
 endef
 
-define Package/qt5quick2-qml-window/install
-       $(call Build/Install/QMLplugin,$(1),QtQuick/Window.2,*)
+define Package/qt5quick2-qml-module-qtquick-shapes/install
+       $(call Build/Install/QMLplugin,$(1),QtQuick/Shapes,*)
 endef
 
-define Package/qt5quick2-qml-localstorage/install
-       $(call Build/Install/QMLplugin,$(1),QtQuick/LocalStorage,*)
+define Package/qt5quick2-qml-module-qtquick-window2/install
+       $(call Build/Install/QMLplugin,$(1),QtQuick/Window.2,*)
 endef
 
-define Package/qt5quick2-qml-quick/install
+define Package/qt5quick2-qml-module-qtquick2/install
        $(call Build/Install/QMLplugin,$(1),QtQuick.2,*)
 endef
 
 
 #$(eval $(call BuildPackage,qt5quick2))
 $(eval $(call BuildPackage,qt5quick2-qml))
-$(eval $(call BuildPackage,qt5quick2-quick))
-$(eval $(call BuildPackage,qt5quick2-test))
-$(eval $(call BuildPackage,qt5quick2-particles))
-$(eval $(call BuildPackage,qt5quick2-widgets))
-$(eval $(call BuildPackage,qt5quick2-qml-statemachine))
 $(eval $(call BuildPackage,qt5quick2-qml-models))
-$(eval $(call BuildPackage,qt5quick2-qml-folderlistmodel))
-$(eval $(call BuildPackage,qt5quick2-qml-settings))
-$(eval $(call BuildPackage,qt5quick2-qml-test))
-$(eval $(call BuildPackage,qt5quick2-qml-layouts))
-$(eval $(call BuildPackage,qt5quick2-qml-particles))
-$(eval $(call BuildPackage,qt5quick2-qml-window))
-$(eval $(call BuildPackage,qt5quick2-qml-localstorage))
-$(eval $(call BuildPackage,qt5quick2-qml-quick))
+$(eval $(call BuildPackage,qt5quick2-qml-worker-script))
+$(eval $(call BuildPackage,qt5quick2-quick))
+$(eval $(call BuildPackage,qt5quick2-quick-test))
+#$(eval $(call BuildPackage,qt5quick2-particles))
+$(eval $(call BuildPackage,qt5quick2-quick-widgets))
+$(eval $(call BuildPackage,qt5quick2-quick-shapes))
+$(eval $(call BuildPackage,qt5quick2-qml-module-qtqml-models2))
+$(eval $(call BuildPackage,qt5quick2-qml-module-qtqml-statemachine))
+$(eval $(call BuildPackage,qt5quick2-qml-module-qtqml-workerscript2))
+$(eval $(call BuildPackage,qt5quick2-qml-module-qtlabs-models))
+$(eval $(call BuildPackage,qt5quick2-qml-module-qtlabs-folderlistmodel))
+$(eval $(call BuildPackage,qt5quick2-qml-module-qtlabs-settings))
+$(eval $(call BuildPackage,qt5quick2-qml-module-qtlabs-animation))
+$(eval $(call BuildPackage,qt5quick2-qml-module-qtlabs-sharedimage))
+$(eval $(call BuildPackage,qt5quick2-qml-module-qtlabs-wavefrontmesh))
+$(eval $(call BuildPackage,qt5quick2-qml-module-qtquick2))
+$(eval $(call BuildPackage,qt5quick2-qml-module-qtquick-layouts))
+#$(eval $(call BuildPackage,qt5quick2-qml-module-qtquick-particles2))
+$(eval $(call BuildPackage,qt5quick2-qml-module-qtquick-localstorage))
+$(eval $(call BuildPackage,qt5quick2-qml-module-qtquick-shapes))
+$(eval $(call BuildPackage,qt5quick2-qml-module-qtquick-window2))
+$(eval $(call BuildPackage,qt5quick2-qml-module-qttest))
Mirror of video feed