projects
/
feed
/
video.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e874136
)
bump qt5 to 5.8.0-rc1, getting rid of meta-pkgs
author
Mirko Vogt
<mirko-dev@nanl.de>
Wed, 18 Jan 2017 02:43:38 +0000
(
03:43
+0100)
committer
Mirko Vogt
<mirko-dev@nanl.de>
Wed, 18 Jan 2017 12:31:05 +0000
(13:31 +0100)
frameworks/qt5base/Makefile
patch
|
blob
|
history
frameworks/qt5graphicaleffects/Makefile
patch
|
blob
|
history
frameworks/qt5quick1/Makefile
patch
|
blob
|
history
frameworks/qt5quick2-controls2/Makefile
patch
|
blob
|
history
frameworks/qt5quick2/Makefile
patch
|
blob
|
history
frameworks/qt5script/Makefile
patch
|
blob
|
history
diff --git
a/frameworks/qt5base/Makefile
b/frameworks/qt5base/Makefile
index 4fc5d24b10b765fea5d72f1240e971fcb1f7d78f..ed3f0936492981590e1519b1c02db9b2721ecc3e 100644
(file)
--- a/
frameworks/qt5base/Makefile
+++ b/
frameworks/qt5base/Makefile
@@
-12,9
+12,9
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=qt5base
include $(TOPDIR)/rules.mk
PKG_NAME:=qt5base
-PKG_VERSION:=5.8.0-
beta
+PKG_VERSION:=5.8.0-
rc
PKG_RELEASE:=1
PKG_RELEASE:=1
-PKG_MD5SUM:=
3f4ab8a104166270368764fb057e6581
+PKG_MD5SUM:=
e71df4a4f99f8006e74d63c6a7d61af9
PKG_SYS_NAME:=qtbase-opensource-src-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_SYS_NAME).tar.xz
PKG_SYS_NAME:=qtbase-opensource-src-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_SYS_NAME).tar.xz
@@
-64,16
+64,15
@@
define Package/qt5base/Default
CATEGORY:=Video
SUBMENU:=Frameworks and Toolkits
TITLE:=Qt5base
CATEGORY:=Video
SUBMENU:=Frameworks and Toolkits
TITLE:=Qt5base
- DEPENDS+=qt5base
URL:=http://qt.io
MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
endef
URL:=http://qt.io
MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
endef
-define Package/qt5base
- $(call Package/qt5base/Default)
- DEPENDS:=
- MENU:=1
-endef
+
#
define Package/qt5base
+
#
$(call Package/qt5base/Default)
+
#
DEPENDS:=
+
#
MENU:=1
+
#
endef
define Package/qt5base-concurrent
$(call Package/qt5base/Default)
define Package/qt5base-concurrent
$(call Package/qt5base/Default)
@@
-508,7
+507,7
@@
define Package/qt5base-examples/install
$(call Build/Install/Examples,$(1))
endef
$(call Build/Install/Examples,$(1))
endef
-$(eval $(call BuildPackage,qt5base))
+
#
$(eval $(call BuildPackage,qt5base))
$(eval $(call BuildPackage,qt5base-concurrent))
$(eval $(call BuildPackage,qt5base-core))
$(eval $(call BuildPackage,qt5base-gui))
$(eval $(call BuildPackage,qt5base-concurrent))
$(eval $(call BuildPackage,qt5base-core))
$(eval $(call BuildPackage,qt5base-gui))
diff --git
a/frameworks/qt5graphicaleffects/Makefile
b/frameworks/qt5graphicaleffects/Makefile
index faed1fc5340b4f1f9b0270ed166493db26038262..2959427e0058a4de8fbe02c571e563ec76bc64e2 100644
(file)
--- a/
frameworks/qt5graphicaleffects/Makefile
+++ b/
frameworks/qt5graphicaleffects/Makefile
@@
-8,9
+8,9
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=qt5graphicaleffects
include $(TOPDIR)/rules.mk
PKG_NAME:=qt5graphicaleffects
-PKG_VERSION:=5.8.0-
beta
+PKG_VERSION:=5.8.0-
rc
PKG_RELEASE:=1
PKG_RELEASE:=1
-PKG_MD5SUM:=
802b257bc0139805df5c946b63c42f9b
+PKG_MD5SUM:=
2ed96cdf9c2fc581d2bf073a1d121ab6
PKG_SYS_NAME:=qtgraphicaleffects-opensource-src-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_SYS_NAME).tar.xz
PKG_SYS_NAME:=qtgraphicaleffects-opensource-src-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_SYS_NAME).tar.xz
diff --git
a/frameworks/qt5quick1/Makefile
b/frameworks/qt5quick1/Makefile
index 4bf31d11791fa1c25959978ac1355f954f8ea793..32c3751e2a85171f264c0836ebaa43e050eefb17 100644
(file)
--- a/
frameworks/qt5quick1/Makefile
+++ b/
frameworks/qt5quick1/Makefile
@@
-35,11
+35,11
@@
define Package/qt5quick1/Default
MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
endef
MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
endef
-define Package/qt5quick1
- $(call Package/qt5quick1/Default)
- DEPENDS:=+qt5base +qt5script
- MENU:=1
-endef
+
#
define Package/qt5quick1
+
#
$(call Package/qt5quick1/Default)
+
#
DEPENDS:=+qt5base +qt5script
+
#
MENU:=1
+
#
endef
define Package/qt5quick1-declarative
$(call Package/qt5quick1/Default)
define Package/qt5quick1-declarative
$(call Package/qt5quick1/Default)
@@
-86,7
+86,7
@@
define Package/qt5quick1-examples/install
$(call Build/Install/Examples,$(1))
endef
$(call Build/Install/Examples,$(1))
endef
-$(eval $(call BuildPackage,qt5quick1))
+
#
$(eval $(call BuildPackage,qt5quick1))
$(eval $(call BuildPackage,qt5quick1-declarative))
$(eval $(call BuildPackage,qt5quick1-imports))
$(eval $(call BuildPackage,qt5quick1-examples))
$(eval $(call BuildPackage,qt5quick1-declarative))
$(eval $(call BuildPackage,qt5quick1-imports))
$(eval $(call BuildPackage,qt5quick1-examples))
diff --git
a/frameworks/qt5quick2-controls2/Makefile
b/frameworks/qt5quick2-controls2/Makefile
index c6f9bb4ef8132ec88918f1de32d920d8898a26b1..c68177c2be8de22f9b89e41cb85ca0531ea0930d 100644
(file)
--- a/
frameworks/qt5quick2-controls2/Makefile
+++ b/
frameworks/qt5quick2-controls2/Makefile
@@
-8,9
+8,9
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=qt5quick2-controls2
include $(TOPDIR)/rules.mk
PKG_NAME:=qt5quick2-controls2
-PKG_VERSION:=5.8.0-
beta
+PKG_VERSION:=5.8.0-
rc
PKG_RELEASE:=1
PKG_RELEASE:=1
-PKG_MD5SUM:=
391d8bfb6de2e0a270bfc98e1801d46e
+PKG_MD5SUM:=
54fc452366663b4b1120ac9fb95bfb6b
PKG_SYS_NAME:=qtquickcontrols2-opensource-src-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_SYS_NAME).tar.xz
PKG_SYS_NAME:=qtquickcontrols2-opensource-src-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_SYS_NAME).tar.xz
diff --git
a/frameworks/qt5quick2/Makefile
b/frameworks/qt5quick2/Makefile
index c4caf0dbfcfcccaaef1142989bb8584240931385..00232f2fcacacae27a1381fc002ac988114f3771 100644
(file)
--- a/
frameworks/qt5quick2/Makefile
+++ b/
frameworks/qt5quick2/Makefile
@@
-8,9
+8,9
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=qt5quick2
include $(TOPDIR)/rules.mk
PKG_NAME:=qt5quick2
-PKG_VERSION:=5.8.0-
beta
+PKG_VERSION:=5.8.0-
rc
PKG_RELEASE:=1
PKG_RELEASE:=1
-PKG_MD5SUM:=
5b984473f70cfd20fba8267c7268f2f
e
+PKG_MD5SUM:=
1df3d20503a2b104fe436f83fabd2f5
e
PKG_SYS_NAME:=qtdeclarative-opensource-src-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_SYS_NAME).tar.xz
PKG_SYS_NAME:=qtdeclarative-opensource-src-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_SYS_NAME).tar.xz
@@
-30,16
+30,16
@@
define Package/qt5quick2/Default
CATEGORY:=Video
SUBMENU:=Frameworks and Toolkits
TITLE:=Qt5quick2
CATEGORY:=Video
SUBMENU:=Frameworks and Toolkits
TITLE:=Qt5quick2
- DEPENDS+=qt5quick2
+
#
DEPENDS+=qt5quick2
URL:=http://qt.io
MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
endef
URL:=http://qt.io
MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
endef
-define Package/qt5quick2
- $(call Package/qt5quick2/Default)
- DEPENDS:=
- MENU:=1
-endef
+
#
define Package/qt5quick2
+
#
$(call Package/qt5quick2/Default)
+
#
DEPENDS:=
+
#
MENU:=1
+
#
endef
define Package/qt5quick2-qml
$(call Package/qt5quick2/Default)
define Package/qt5quick2-qml
$(call Package/qt5quick2/Default)
@@
-50,7
+50,7
@@
endef
define Package/qt5quick2-quick
$(call Package/qt5quick2/Default)
TITLE+=quick
define Package/qt5quick2-quick
$(call Package/qt5quick2/Default)
TITLE+=quick
- DEPENDS+=+qt5quick2-qml +qt5base-gui
+qt5quick2-2d-sw-renderer-GLstubs
+ DEPENDS+=+qt5quick2-qml +qt5base-gui
endef
define Package/qt5quick2-test
endef
define Package/qt5quick2-test
@@
-221,7
+221,7
@@
define Package/qt5quick2-qml-quick/install
endef
endef
-$(eval $(call BuildPackage,qt5quick2))
+
#
$(eval $(call BuildPackage,qt5quick2))
$(eval $(call BuildPackage,qt5quick2-qml))
$(eval $(call BuildPackage,qt5quick2-quick))
$(eval $(call BuildPackage,qt5quick2-test))
$(eval $(call BuildPackage,qt5quick2-qml))
$(eval $(call BuildPackage,qt5quick2-quick))
$(eval $(call BuildPackage,qt5quick2-test))
diff --git
a/frameworks/qt5script/Makefile
b/frameworks/qt5script/Makefile
index ea6afeda7b10aeba42541b41d1dda1932c0dc147..355f11bff11d00785e0da2fbf5c0819446ce94a7 100644
(file)
--- a/
frameworks/qt5script/Makefile
+++ b/
frameworks/qt5script/Makefile
@@
-30,16
+30,17
@@
define Package/qt5script/Default
CATEGORY:=Video
SUBMENU:=Frameworks and Toolkits
TITLE:=Qt5script
CATEGORY:=Video
SUBMENU:=Frameworks and Toolkits
TITLE:=Qt5script
- DEPENDS:=qt5script +qt5base-core
+# DEPENDS:=qt5script +qt5base-core
+ DEPENDS:=+qt5base-core
URL:=http://qt.io
MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
endef
URL:=http://qt.io
MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
endef
-define Package/qt5script
- $(call Package/qt5script/Default)
- DEPENDS:=+qt5base
- MENU:=1
-endef
+
#
define Package/qt5script
+
#
$(call Package/qt5script/Default)
+
#
DEPENDS:=+qt5base
+
#
MENU:=1
+
#
endef
define Package/qt5script-script
$(call Package/qt5script/Default)
define Package/qt5script-script
$(call Package/qt5script/Default)
@@
-80,7
+81,7
@@
define Package/qt5script-examples/install
$(call Build/Install/Examples,$(1))
endef
$(call Build/Install/Examples,$(1))
endef
-$(eval $(call BuildPackage,qt5script))
+
#
$(eval $(call BuildPackage,qt5script))
$(eval $(call BuildPackage,qt5script-script))
$(eval $(call BuildPackage,qt5script-scriptTools))
$(eval $(call BuildPackage,qt5script-examples))
$(eval $(call BuildPackage,qt5script-script))
$(eval $(call BuildPackage,qt5script-scriptTools))
$(eval $(call BuildPackage,qt5script-examples))