* [ptxdist] [PATCH] qt5 bump to 5.5.0
@ 2015-08-05 9:42 Tim Sander
2015-08-05 15:43 ` Philipp Zabel
0 siblings, 1 reply; 3+ messages in thread
From: Tim Sander @ 2015-08-05 9:42 UTC (permalink / raw)
To: ptxdist
Hi
Below is a bump of qt to the newest released version.
It adapts the existing patches to qt5 and adds two new modules
Qt3d and QtCanvas3d. I have not had the time to test these.
The new module qtandroidextras is skipped as it is not relevant for ptxdist.
It "Works for me" (tm).
Signed-off-by: Tim Sander <tim@krieglstein.org>
---
...t-qtwebengine-allow-building-with-ptxdsit.patch | 30 -------------------
...ve-is-an-optional-dependency-for-qtwebkit.patch | 22 --------------
...a-videonode-plugins-require-qtmultimediaq.patch | 23 ---------------
...HACK-put-wayland-scanner-outout-in-srcdir.patch | 24 ---------------
...tures-don-t-use-gold-linker-for-host-tool.patch | 24 ---------------
patches/qt-everywhere-opensource-src-5.4.2/series | 8 -----
...t-qtwebengine-allow-building-with-ptxdsit.patch | 34 ++++++++++++++++++++++
...ve-is-an-optional-dependency-for-qtwebkit.patch | 26 +++++++++++++++++
...a-videonode-plugins-require-qtmultimediaq.patch | 27 +++++++++++++++++
...HACK-put-wayland-scanner-outout-in-srcdir.patch | 28 ++++++++++++++++++
...tures-don-t-use-gold-linker-for-host-tool.patch | 28 ++++++++++++++++++
patches/qt-everywhere-opensource-src-5.5.0/series | 5 ++++
rules/qt5.in | 10 ++++++-
rules/qt5.make | 14 +++++++--
14 files changed, 169 insertions(+), 134 deletions(-)
delete mode 100644 patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
delete mode 100644 patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
delete mode 100644 patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
delete mode 100644 patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
delete mode 100644 patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
delete mode 100644 patches/qt-everywhere-opensource-src-5.4.2/series
create mode 100644 patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
create mode 100644 patches/qt-everywhere-opensource-src-5.5.0/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
create mode 100644 patches/qt-everywhere-opensource-src-5.5.0/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
create mode 100644 patches/qt-everywhere-opensource-src-5.5.0/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
create mode 100644 patches/qt-everywhere-opensource-src-5.5.0/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
create mode 100644 patches/qt-everywhere-opensource-src-5.5.0/series
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch b/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
deleted file mode 100644
index c18bbbf..0000000
--- a/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 12 May 2015 11:38:35 +0200
-Subject: [PATCH] ptxdist: qtwebengine: allow building with ptxdsit
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- qtwebengine/tools/qmake/mkspecs/features/functions.prf | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/qtwebengine/tools/qmake/mkspecs/features/functions.prf b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
-index 4c2547d571db..6b5d34b527a5 100644
---- a/qtwebengine/tools/qmake/mkspecs/features/functions.prf
-+++ b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
-@@ -12,6 +12,7 @@ defineTest(isPlatformSupported) {
- !isPythonVersionSupported(): return(false)
- linux-g++*|win32-msvc2013|macx-clang: return(true)
- boot2qt: return(true)
-+ linux-ptx-g++: return(true)
-
- skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.")
- return(false)
-@@ -61,7 +62,7 @@ defineReplace(getChromiumSrcDir) {
- }
-
- defineReplace(extractCFlag) {
-- CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
-+ CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS $$PTX_QMAKE_CFLAGS
- !isEmpty(ANDROID_TARGET_CFLAGS): CFLAGS = $$ANDROID_TARGET_CFLAGS
- OPTION = $$find(CFLAGS, $$1)
- OPTION = $$split(OPTION, =)
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch b/patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
deleted file mode 100644
index 2145c91..0000000
--- a/patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 29 Apr 2014 18:35:43 +0200
-Subject: [PATCH] qtdeclarative is an optional dependency for qtwebkit
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- qt.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qt.pro b/qt.pro
-index 15fd48ec71f3..a1d87b9a9d24 100644
---- a/qt.pro
-+++ b/qt.pro
-@@ -77,7 +77,7 @@ addModule(qtfeedback, qtdeclarative, qtmultimedia)
- addModule(qtpim, qtdeclarative)
- addModule(qtwebsockets, qtbase, qtdeclarative)
- addModule(qtwebchannel, qtbase, qtdeclarative qtwebsockets)
--addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors qtwebchannel, WebKit.pro)
-+addModule(qtwebkit, qtbase, qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel, WebKit.pro)
- addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
- addModule(qtwebkit-examples, qtwebkit qttools)
- addModule(qtimageformats, qtbase)
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch b/patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
deleted file mode 100644
index 10d99a4..0000000
--- a/patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 12 May 2015 11:29:53 +0200
-Subject: [PATCH] qtmultimedia: videonode plugins require
- qtmultimediaquicktools
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- qtmultimedia/src/src.pro | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/qtmultimedia/src/src.pro b/qtmultimedia/src/src.pro
-index 26f99bc29fe3..6cbe4f0347ad 100644
---- a/qtmultimedia/src/src.pro
-+++ b/qtmultimedia/src/src.pro
-@@ -23,6 +23,8 @@ qtHaveModule(quick) {
- SUBDIRS += \
- src_qtmultimediaquicktools \
- src_imports
-+
-+ src_plugins.depends += src_qtmultimediaquicktools
- }
-
- # Optional bits
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch b/patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
deleted file mode 100644
index 2ea4c75..0000000
--- a/patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 10 Nov 2014 17:44:10 +0100
-Subject: [PATCH] HACK: put wayland-scanner outout in srcdir
-
-The include paths are currently broken when building OOT
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- qtbase/mkspecs/features/wayland-scanner.prf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtbase/mkspecs/features/wayland-scanner.prf b/qtbase/mkspecs/features/wayland-scanner.prf
-index 5a97d98373fa..a5477e8f9b42 100644
---- a/qtbase/mkspecs/features/wayland-scanner.prf
-+++ b/qtbase/mkspecs/features/wayland-scanner.prf
-@@ -26,7 +26,7 @@ defineReplace(waylandScannerHeaderFiles) {
- }
-
- qt_install_headers {
-- header_dest = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
-+ header_dest = $$MODULE_BASE_INDIR/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
-
- header_files_client = $$waylandScannerHeaderFiles(client, $$header_dest)
- !isEmpty(header_files_client) {
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch b/patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
deleted file mode 100644
index df02743..0000000
--- a/patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 2 Jun 2015 17:35:01 +0200
-Subject: [PATCH] featuresfeatures: don't use gold linker for host tools
-
-The check it it is supported was only done for the target.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- qtbase/mkspecs/features/default_post.prf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtbase/mkspecs/features/default_post.prf b/qtbase/mkspecs/features/default_post.prf
-index e967399258ad..7f08ba31c308 100644
---- a/qtbase/mkspecs/features/default_post.prf
-+++ b/qtbase/mkspecs/features/default_post.prf
-@@ -62,7 +62,7 @@ debug {
- QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE
- }
-
--use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD
-+!host_build: use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD
-
- dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL
- static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/series b/patches/qt-everywhere-opensource-src-5.4.2/series
deleted file mode 100644
index d689a39..0000000
--- a/patches/qt-everywhere-opensource-src-5.4.2/series
+++ /dev/null
@@ -1,8 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
-0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
-0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
-0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
-0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
-# 487e45ed5135b1e39410672e7ce9351c - git-ptx-patches magic
diff --git a/patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch b/patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
new file mode 100644
index 0000000..f7d86ad
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
@@ -0,0 +1,34 @@
+From 18d8d3381e3caca32b2c253f34917280cca47972 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 12 May 2015 11:38:35 +0200
+Subject: [PATCH 1/8] ptxdist: qtwebengine: allow building with ptxdsit
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ qtwebengine/tools/qmake/mkspecs/features/functions.prf | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/qtwebengine/tools/qmake/mkspecs/features/functions.prf b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
+index ef0320da1af0..460f9a91c49f 100644
+--- a/qtwebengine/tools/qmake/mkspecs/features/functions.prf
++++ b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
+@@ -16,6 +16,7 @@ defineTest(isPlatformSupported) {
+ !isPythonVersionSupported(): return(false)
+ linux-g++*|win32-msvc2013|macx-clang: return(true)
+ boot2qt: return(true)
++ linux-ptx-g++: return(true)
+
+ skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.")
+ return(false)
+@@ -72,7 +73,7 @@ defineReplace(getChromiumSrcDir) {
+ }
+
+ defineReplace(extractCFlag) {
+- CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
++ CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS $$PTX_QMAKE_CFLAGS
+ OPTION = $$find(CFLAGS, $$1)
+ OPTION = $$split(OPTION, =)
+ return ($$member(OPTION, 1))
+--
+1.9.1
+
diff --git a/patches/qt-everywhere-opensource-src-5.5.0/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch b/patches/qt-everywhere-opensource-src-5.5.0/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
new file mode 100644
index 0000000..60a4a57
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
@@ -0,0 +1,26 @@
+From fc0ba7fc2fc39ff76c7fd507cc93be775bca02d2 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 29 Apr 2014 18:35:43 +0200
+Subject: [PATCH 2/8] qtdeclarative is an optional dependency for qtwebkit
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ qt.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qt.pro b/qt.pro
+index 6876dfba1853..5eaf64caa111 100644
+--- a/qt.pro
++++ b/qt.pro
+@@ -76,7 +76,7 @@ addModule(qtfeedback, qtdeclarative, qtmultimedia)
+ addModule(qtpim, qtdeclarative)
+ addModule(qtwebsockets, qtbase, qtdeclarative)
+ addModule(qtwebchannel, qtbase, qtdeclarative qtwebsockets)
+-addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors qtwebchannel, WebKit.pro)
++addModule(qtwebkit, qtbase, qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel, WebKit.pro)
+ addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
+ addModule(qtwebkit-examples, qtwebkit qttools)
+ addModule(qtimageformats, qtbase)
+--
+1.9.1
+
diff --git a/patches/qt-everywhere-opensource-src-5.5.0/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch b/patches/qt-everywhere-opensource-src-5.5.0/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
new file mode 100644
index 0000000..dda536a
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
@@ -0,0 +1,27 @@
+From d571d941407e5951475dec60e28474d924e2a3a3 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 12 May 2015 11:29:53 +0200
+Subject: [PATCH 3/8] qtmultimedia: videonode plugins require
+ qtmultimediaquicktools
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ qtmultimedia/src/src.pro | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/qtmultimedia/src/src.pro b/qtmultimedia/src/src.pro
+index 26f99bc29fe3..6cbe4f0347ad 100644
+--- a/qtmultimedia/src/src.pro
++++ b/qtmultimedia/src/src.pro
+@@ -23,6 +23,8 @@ qtHaveModule(quick) {
+ SUBDIRS += \
+ src_qtmultimediaquicktools \
+ src_imports
++
++ src_plugins.depends += src_qtmultimediaquicktools
+ }
+
+ # Optional bits
+--
+1.9.1
+
diff --git a/patches/qt-everywhere-opensource-src-5.5.0/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch b/patches/qt-everywhere-opensource-src-5.5.0/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
new file mode 100644
index 0000000..6e62a8a
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
@@ -0,0 +1,28 @@
+From 7d644980fd38e6d7cba0378d8e19b2602beba4ba Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 10 Nov 2014 17:44:10 +0100
+Subject: [PATCH 4/8] HACK: put wayland-scanner outout in srcdir
+
+The include paths are currently broken when building OOT
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ qtbase/mkspecs/features/wayland-scanner.prf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qtbase/mkspecs/features/wayland-scanner.prf b/qtbase/mkspecs/features/wayland-scanner.prf
+index 5a97d98373fa..a5477e8f9b42 100644
+--- a/qtbase/mkspecs/features/wayland-scanner.prf
++++ b/qtbase/mkspecs/features/wayland-scanner.prf
+@@ -26,7 +26,7 @@ defineReplace(waylandScannerHeaderFiles) {
+ }
+
+ qt_install_headers {
+- header_dest = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
++ header_dest = $$MODULE_BASE_INDIR/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
+
+ header_files_client = $$waylandScannerHeaderFiles(client, $$header_dest)
+ !isEmpty(header_files_client) {
+--
+1.9.1
+
diff --git a/patches/qt-everywhere-opensource-src-5.5.0/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch b/patches/qt-everywhere-opensource-src-5.5.0/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
new file mode 100644
index 0000000..d6e94c6
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
@@ -0,0 +1,28 @@
+From 590cbb399b51dcbc280442c8188cea5841a5fed9 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 2 Jun 2015 17:35:01 +0200
+Subject: [PATCH 5/8] featuresfeatures: don't use gold linker for host tools
+
+The check it it is supported was only done for the target.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ qtbase/mkspecs/features/default_post.prf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qtbase/mkspecs/features/default_post.prf b/qtbase/mkspecs/features/default_post.prf
+index e967399258ad..7f08ba31c308 100644
+--- a/qtbase/mkspecs/features/default_post.prf
++++ b/qtbase/mkspecs/features/default_post.prf
+@@ -62,7 +62,7 @@ debug {
+ QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE
+ }
+
+-use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD
++!host_build: use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD
+
+ dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL
+ static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
+--
+1.9.1
+
diff --git a/patches/qt-everywhere-opensource-src-5.5.0/series b/patches/qt-everywhere-opensource-src-5.5.0/series
new file mode 100644
index 0000000..327dd1e
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.5.0/series
@@ -0,0 +1,5 @@
+0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
+0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
+0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
+0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
+0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
diff --git a/rules/qt5.in b/rules/qt5.in
index 2670ac4..a78b075 100644
--- a/rules/qt5.in
+++ b/rules/qt5.in
@@ -11,7 +11,7 @@ menuconfig QT5
select GCCLIBS_CXX
select GCCLIBS_GCC_S
select ZLIB
- select DBUS if QT5_DBUS || QT5_MODULE_QTWEBENGINE
+ select DBUS if QT5_DBUS
select GLIB if QT5_GLIB
select LIBPNG if QT5_LIBPNG
select LIBJPEG if QT5_LIBJPEG
@@ -255,6 +255,14 @@ config QT5_MODULE_QTBASE
if QT5_MODULE_QTBASE
+config QT5_MODULE_QT3D
+ bool
+ prompt "Qt3D"
+
+config QT5_MODULE_QTCANVAS3D
+ bool
+ prompt "QtCanvas3D"
+
config QT5_MODULE_QTBASE_ACCESSIBILITY
bool
default QT5_ACCESSIBILITY && QT5_MODULE_QTBASE_WIDGETS
diff --git a/rules/qt5.make b/rules/qt5.make
index 330ad55..9f2e32a 100644
--- a/rules/qt5.make
+++ b/rules/qt5.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_QT5) += qt5
#
# Paths and names
#
-QT5_VERSION := 5.4.2
-QT5_MD5 := c23bd0f14d66e7901d24906a1edce9b0
+QT5_VERSION := 5.5.0
+QT5_MD5 := 24d387fbb0e3042cc48aeaff5627bbb6
QT5 := qt-everywhere-opensource-src-$(QT5_VERSION)
QT5_SUFFIX := tar.xz
QT5_URL := \
@@ -136,7 +136,11 @@ QT5_CONF_OPT := \
$(call ptx/ifdef, PTXCONF_QT5_PREPARE_EXAMPLES,-make examples) \
-skip qtactiveqt \
-skip qtandroidextras \
+ $(call ptx/qt5-module, QT3D, qt3d) \
+ -skip qtactiveqt \
+ -skip qtandroidextras \
$(call ptx/qt5-module, QTCONNECTIVITY, qtconnectivity) \
+ $(call ptx/qt5-module, QTCANVAS3D, qtcanvas3d) \
$(call ptx/qt5-module, QTDECLARATIVE, qtdeclarative) \
$(call ptx/qt5-module, QTENGINIO, qtenginio) \
-skip qtdoc \
@@ -297,12 +301,18 @@ QT5_PLUGINS-$(PTXCONF_QT5_PLATFORM_LINUXFB) += platforms/libqlinuxfb
QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QTBASE_GUI) += platforms/libqminimal
QT5_PLUGINS-$(PTXCONF_QT5_PLATFORM_EGLFS) += platforms/libqminimalegl
+### Qt3d ###
+QT5_LIBS_$(PTXCONF_QT5_MODULE_QT3D) += Qt3d
+
### QtConnectivity ###
QT5_LIBS-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY) += Qt5Bluetooth
QT5_LIBS-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY) += Qt5Nfc
QT5_QML-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY_QUICK) += QtBluetooth
QT5_QML-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY_QUICK) += QtNfc
+### QtCanvas3d ###
+QT5_LIBS_$(PTXCONF_QT5_MODULE_CANVAS3D) += QtCanvas3d
+
### QtDeclarative ###
QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE) += Qt5Qml
QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) += Qt5Quick
--
1.9.1
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] qt5 bump to 5.5.0
2015-08-05 9:42 [ptxdist] [PATCH] qt5 bump to 5.5.0 Tim Sander
@ 2015-08-05 15:43 ` Philipp Zabel
2015-08-05 16:00 ` Tim Sander
0 siblings, 1 reply; 3+ messages in thread
From: Philipp Zabel @ 2015-08-05 15:43 UTC (permalink / raw)
To: ptxdist
Hi Tim,
Am Mittwoch, den 05.08.2015, 11:42 +0200 schrieb Tim Sander:
> Hi
>
> Below is a bump of qt to the newest released version.
> It adapts the existing patches to qt5 and adds two new modules
> Qt3d and QtCanvas3d. I have not had the time to test these.
> The new module qtandroidextras is skipped as it is not relevant for ptxdist.
>
> It "Works for me" (tm).
>
> Signed-off-by: Tim Sander <tim@krieglstein.org>
I have started to work on this, too. See my (relative) changes below.
First, please consider generating the patch series with
"git format-patch -N --no-signature" and when moving files around, use
"git format-patch -M" for the patch you send to the list. That is really
helpful to see changes in the patches.
[...]
> diff --git a/rules/qt5.in b/rules/qt5.in
> index 2670ac4..a78b075 100644
> --- a/rules/qt5.in
> +++ b/rules/qt5.in
> @@ -11,7 +11,7 @@ menuconfig QT5
> select GCCLIBS_CXX
> select GCCLIBS_GCC_S
> select ZLIB
> - select DBUS if QT5_DBUS || QT5_MODULE_QTWEBENGINE
> + select DBUS if QT5_DBUS
Why? The qtwebengine build fails when dbus is not yet installed.
[...]
> diff --git a/rules/qt5.make b/rules/qt5.make
> index 330ad55..9f2e32a 100644
> --- a/rules/qt5.make
> +++ b/rules/qt5.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_QT5) += qt5
> #
> # Paths and names
> #
> -QT5_VERSION := 5.4.2
> -QT5_MD5 := c23bd0f14d66e7901d24906a1edce9b0
> +QT5_VERSION := 5.5.0
> +QT5_MD5 := 24d387fbb0e3042cc48aeaff5627bbb6
Sure? I have downloaded a qt-everywhere-opensource-src-5.5.0.tar.xz with
md5sum 65d5282f3dee0336da9ed1f77148952f. See
http://download.qt.io/official_releases/qt/5.5/5.5.0/single/qt-everywhere-opensource-src-5.5.0.tar.xz.mirrorlist
Also patch 0005 doesn't apply.
> QT5 := qt-everywhere-opensource-src-$(QT5_VERSION)
> QT5_SUFFIX := tar.xz
> QT5_URL := \
> @@ -136,7 +136,11 @@ QT5_CONF_OPT := \
> $(call ptx/ifdef, PTXCONF_QT5_PREPARE_EXAMPLES,-make examples) \
> -skip qtactiveqt \
> -skip qtandroidextras \
> + $(call ptx/qt5-module, QT3D, qt3d) \
> + -skip qtactiveqt \
> + -skip qtandroidextras \
These two are already set directly above.
best regards
Philipp
----------8<----------
...ebengine-fix-build-by-allowing-empty-sysr.patch | 22 +++++++++++++++++++++
...-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch | 23 ++++++++++++++++++++++
patches/qt-everywhere-opensource-src-5.5.0/series | 2 ++
rules/qt5.in | 13 +++++++++---
rules/qt5.make | 14 +++++++------
5 files changed, 65 insertions(+), 9 deletions(-)
create mode 100644 patches/qt-everywhere-opensource-src-5.5.0/0006-ptxdist-qtwebengine-fix-build-by-allowing-empty-sysr.patch
create mode 100644 patches/qt-everywhere-opensource-src-5.5.0/0007-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
diff --git a/patches/qt-everywhere-opensource-src-5.5.0/0006-ptxdist-qtwebengine-fix-build-by-allowing-empty-sysr.patch b/patches/qt-everywhere-opensource-src-5.5.0/0006-ptxdist-qtwebengine-fix-build-by-allowing-empty-sysr.patch
new file mode 100644
index 0000000..03fbc83
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0006-ptxdist-qtwebengine-fix-build-by-allowing-empty-sysr.patch
@@ -0,0 +1,22 @@
+From: Philipp Zabel <p.zabel@pengutronix.de>
+Date: Tue, 4 Aug 2015 12:48:00 +0200
+Subject: [PATCH] ptxdist: qtwebengine: fix build by allowing empty sysroot
+
+Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
+---
+ qtwebengine/src/3rdparty/chromium/build/common.gypi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qtwebengine/src/3rdparty/chromium/build/common.gypi b/qtwebengine/src/3rdparty/chromium/build/common.gypi
+index 17089589340e..5fd4d2ee587e 100644
+--- a/qtwebengine/src/3rdparty/chromium/build/common.gypi
++++ b/qtwebengine/src/3rdparty/chromium/build/common.gypi
+@@ -926,7 +926,7 @@
+ 'use_allocator%': 'none',
+ # sysroot needs to be an absolute path otherwise it generates
+ # incorrect results when passed to pkg-config
+- 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debian_wheezy_arm-sysroot',
++ #'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debian_wheezy_arm-sysroot',
+ }], # OS=="linux" and target_arch=="arm" and chromeos==0
+
+ ['OS=="linux" and branding=="Chrome" and buildtype=="Official" and chromeos==0', {
diff --git a/patches/qt-everywhere-opensource-src-5.5.0/0007-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch b/patches/qt-everywhere-opensource-src-5.5.0/0007-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
new file mode 100644
index 0000000..cbc4864
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0007-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
@@ -0,0 +1,23 @@
+From: Philipp Zabel <p.zabel@pengutronix.de>
+Date: Tue, 4 Aug 2015 13:53:28 +0200
+Subject: [PATCH] qtwebengine: #define TRUE in case of USE_SYSTEM_LIBJPEG
+
+Otherwise libjpeg headers #define boolean to an incompatible enum.
+
+Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
+---
+ qtwebengine/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/qtwebengine/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/qtwebengine/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
+index 8a08fe0291af..ef52a292ac87 100644
+--- a/qtwebengine/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
++++ b/qtwebengine/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
+@@ -13,6 +13,7 @@
+
+ extern "C" {
+ #if defined(USE_SYSTEM_LIBJPEG)
++#define TRUE
+ #include <jpeglib.h>
+ #elif defined(USE_LIBJPEG_TURBO)
+ #include "third_party/libjpeg_turbo/jpeglib.h"
diff --git a/patches/qt-everywhere-opensource-src-5.5.0/series b/patches/qt-everywhere-opensource-src-5.5.0/series
index 327dd1e..5b04041 100644
--- a/patches/qt-everywhere-opensource-src-5.5.0/series
+++ b/patches/qt-everywhere-opensource-src-5.5.0/series
@@ -3,3 +3,5 @@
0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
+0006-ptxdist-qtwebengine-fix-build-by-allowing-empty-sysr.patch
+0007-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
diff --git a/rules/qt5.in b/rules/qt5.in
index a78b075..600dff9 100644
--- a/rules/qt5.in
+++ b/rules/qt5.in
@@ -11,7 +11,7 @@ menuconfig QT5
select GCCLIBS_CXX
select GCCLIBS_GCC_S
select ZLIB
- select DBUS if QT5_DBUS
+ select DBUS if QT5_DBUS || QT5_MODULE_QTWEBENGINE
select GLIB if QT5_GLIB
select LIBPNG if QT5_LIBPNG
select LIBJPEG if QT5_LIBJPEG
@@ -27,12 +27,13 @@ menuconfig QT5
select OPENSSL if QT5_OPENSSL
select FONTCONFIG if QT5_GUI
select FREETYPE if QT5_GUI
- select UDEV if QT5_GUI
+ select UDEV if QT5_GUI || QT5_INPUT_LIBINPUT
select UDEV_LIBUDEV if QT5_GUI
select TSLIB if QT5_INPUT_TSLIB
select DIRECTFB if QT5_PLATFORM_DIRECTFB
+ select LIBINPUT if QT5_INPUT_LIBINPUT
select LIBXCB if QT5_PLATFORM_XCB
- select LIBXKBCOMMON if QT5_PLATFORM_XCB
+ select LIBXKBCOMMON if QT5_PLATFORM_XCB || QT5_INPUT_LIBINPUT
select LIBXKBCOMMON_X11 if QT5_PLATFORM_XCB
select XCB_UTIL if QT5_PLATFORM_XCB
select XORG_LIB_X11 if QT5_X11
@@ -239,6 +240,10 @@ config QT5_INPUT_EVDEV
default y
prompt "evdev"
+config QT5_INPUT_LIBINPUT
+ bool
+ prompt "libinput"
+
config QT5_INPUT_TSLIB
bool
prompt "tslib"
@@ -466,7 +471,9 @@ config QT5_MODULE_QTWEBENGINE
bool
select QT5_GUI
select QT5_ICU
+ select QT5_OPENSSL
select QT5_MODULE_QTQUICKCONTROLS
+ select QT5_MODULE_QTWEBCHANNEL
prompt "QtWebEngine"
if QT5_MODULE_QTWEBENGINE
diff --git a/rules/qt5.make b/rules/qt5.make
index 9f2e32a..e8d7adc 100644
--- a/rules/qt5.make
+++ b/rules/qt5.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_QT5) += qt5
# Paths and names
#
QT5_VERSION := 5.5.0
-QT5_MD5 := 24d387fbb0e3042cc48aeaff5627bbb6
+QT5_MD5 := 65d5282f3dee0336da9ed1f77148952f
QT5 := qt-everywhere-opensource-src-$(QT5_VERSION)
QT5_SUFFIX := tar.xz
QT5_URL := \
@@ -137,8 +137,6 @@ QT5_CONF_OPT := \
-skip qtactiveqt \
-skip qtandroidextras \
$(call ptx/qt5-module, QT3D, qt3d) \
- -skip qtactiveqt \
- -skip qtandroidextras \
$(call ptx/qt5-module, QTCONNECTIVITY, qtconnectivity) \
$(call ptx/qt5-module, QTCANVAS3D, qtcanvas3d) \
$(call ptx/qt5-module, QTDECLARATIVE, qtdeclarative) \
@@ -190,7 +188,9 @@ QT5_CONF_OPT := \
--opengl=$(call ptx/ifdef, PTXCONF_QT5_OPENGL,$(PTXCONF_QT5_OPENGL_API),no) \
--disable-system-proxies \
--$(call ptx/endis, PTXCONF_QT5_GLIB)-glib \
- --no-android-style-assets
+ --no-android-style-assets \
+ -no-libproxy \
+ -no-gstreamer
# Note: these options are not listed in '--help' but they exist
QT5_CONF_OPT += \
@@ -199,12 +199,14 @@ QT5_CONF_OPT += \
--$(call ptx/endis, PTXCONF_QT5_GUI)-libudev \
--$(call ptx/endis, PTXCONF_QT5_OPENGL)-egl \
--$(call ptx/endis, PTXCONF_QT5_PLATFORM_XCB)-xkb \
- $(call ptx/qt5-system, QT5_PLATFORM_XCB)-xkbcommon \
+ $(call ptx/qt5-system, QT5_PLATFORM_XCB)-xkbcommon-x11 \
--$(call ptx/endis, PTXCONF_QT5_XI)-xinput2 \
--$(call ptx/endis, PTXCONF_QT5_XRENDER)-xrender \
--$(call ptx/endis, PTXCONF_QT5_XV)-xvideo \
--$(call ptx/endis, PTXCONF_QT5_INPUT_EVDEV)-evdev \
- --$(call ptx/endis, PTXCONF_QT5_INPUT_TSLIB)-tslib
+ --$(call ptx/endis, PTXCONF_QT5_INPUT_TSLIB)-tslib \
+ $(call ptx/ifdef, PTXCONF_QT5_INPUT_LIBINPUT,-libinput,-no-libinput) \
+ $(call ptx/ifdef, PTXCONF_QT5_INPUT_LIBINPUT,-xkbcommon-evdev,-no-xkbcommon-evdev)
QT5_QMAKE_OPT := CONFIG+=release CONFIG-=debug
---------->8----------
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] qt5 bump to 5.5.0
2015-08-05 15:43 ` Philipp Zabel
@ 2015-08-05 16:00 ` Tim Sander
0 siblings, 0 replies; 3+ messages in thread
From: Tim Sander @ 2015-08-05 16:00 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Hi Philipp
Am Mittwoch, 5. August 2015, 17:43:51 schrieb Philipp Zabel:
> > - select DBUS if QT5_DBUS || QT5_MODULE_QTWEBENGINE
> > + select DBUS if QT5_DBUS
> Why? The qtwebengine build fails when dbus is not yet installed.
Probably a typing accident. I overlooked this.
> > -QT5_VERSION := 5.4.2
> > -QT5_MD5 := c23bd0f14d66e7901d24906a1edce9b0
> > +QT5_VERSION := 5.5.0
> > +QT5_MD5 := 24d387fbb0e3042cc48aeaff5627bbb6
>
> Sure? I have downloaded a qt-everywhere-opensource-src-5.5.0.tar.xz with
> md5sum 65d5282f3dee0336da9ed1f77148952f. See
> http://download.qt.io/official_releases/qt/5.5/5.5.0/single/qt-everywhere-op
> ensource-src-5.5.0.tar.xz.mirrorlist Also patch 0005 doesn't apply.
Strange mine has the above but as this might be the newer version i just updated
the md5 hash.
> > + $(call ptx/qt5-module, QT3D, qt3d) \
> > + -skip qtactiveqt \
> > + -skip qtandroidextras \
>
> These two are already set directly above.
Oops.
Below is a patchset done with -M:
Signed-off-by: Tim Sander <tim@krieglstein.org>
---
...1-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch | 14 +++++++++-----
...eclarative-is-an-optional-dependency-for-qtwebkit.patch | 10 +++++++---
...ultimedia-videonode-plugins-require-qtmultimediaq.patch | 6 +++++-
.../0004-HACK-put-wayland-scanner-outout-in-srcdir.patch | 6 +++++-
...turesfeatures-don-t-use-gold-linker-for-host-tool.patch | 6 +++++-
.../series | 3 ---
rules/qt5.in | 8 ++++++++
rules/qt5.make | 12 ++++++++++--
8 files changed, 49 insertions(+), 16 deletions(-)
rename patches/{qt-everywhere-opensource-src-5.4.2 => qt-everywhere-opensource-src-5.5.0}/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch (75%)
rename patches/{qt-everywhere-opensource-src-5.4.2 => qt-everywhere-opensource-src-5.5.0}/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch (74%)
rename patches/{qt-everywhere-opensource-src-5.4.2 => qt-everywhere-opensource-src-5.5.0}/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch (80%)
rename patches/{qt-everywhere-opensource-src-5.4.2 => qt-everywhere-opensource-src-5.5.0}/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch (86%)
rename patches/{qt-everywhere-opensource-src-5.4.2 => qt-everywhere-opensource-src-5.5.0}/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch (84%)
rename patches/{qt-everywhere-opensource-src-5.4.2 => qt-everywhere-opensource-src-5.5.0}/series (72%)
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch b/patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
similarity index 75%
rename from patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
rename to patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
index c18bbbf..f7d86ad 100644
--- a/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
@@ -1,6 +1,7 @@
+From 18d8d3381e3caca32b2c253f34917280cca47972 Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Tue, 12 May 2015 11:38:35 +0200
-Subject: [PATCH] ptxdist: qtwebengine: allow building with ptxdsit
+Subject: [PATCH 1/8] ptxdist: qtwebengine: allow building with ptxdsit
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
@@ -8,10 +9,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/qtwebengine/tools/qmake/mkspecs/features/functions.prf b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
-index 4c2547d571db..6b5d34b527a5 100644
+index ef0320da1af0..460f9a91c49f 100644
--- a/qtwebengine/tools/qmake/mkspecs/features/functions.prf
+++ b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
-@@ -12,6 +12,7 @@ defineTest(isPlatformSupported) {
+@@ -16,6 +16,7 @@ defineTest(isPlatformSupported) {
!isPythonVersionSupported(): return(false)
linux-g++*|win32-msvc2013|macx-clang: return(true)
boot2qt: return(true)
@@ -19,12 +20,15 @@ index 4c2547d571db..6b5d34b527a5 100644
skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.")
return(false)
-@@ -61,7 +62,7 @@ defineReplace(getChromiumSrcDir) {
+@@ -72,7 +73,7 @@ defineReplace(getChromiumSrcDir) {
}
defineReplace(extractCFlag) {
- CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
+ CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS $$PTX_QMAKE_CFLAGS
- !isEmpty(ANDROID_TARGET_CFLAGS): CFLAGS = $$ANDROID_TARGET_CFLAGS
OPTION = $$find(CFLAGS, $$1)
OPTION = $$split(OPTION, =)
+ return ($$member(OPTION, 1))
+--
+1.9.1
+
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch b/patches/qt-everywhere-opensource-src-5.5.0/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
similarity index 74%
rename from patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
rename to patches/qt-everywhere-opensource-src-5.5.0/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
index 2145c91..60a4a57 100644
--- a/patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
@@ -1,6 +1,7 @@
+From fc0ba7fc2fc39ff76c7fd507cc93be775bca02d2 Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Tue, 29 Apr 2014 18:35:43 +0200
-Subject: [PATCH] qtdeclarative is an optional dependency for qtwebkit
+Subject: [PATCH 2/8] qtdeclarative is an optional dependency for qtwebkit
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
@@ -8,10 +9,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qt.pro b/qt.pro
-index 15fd48ec71f3..a1d87b9a9d24 100644
+index 6876dfba1853..5eaf64caa111 100644
--- a/qt.pro
+++ b/qt.pro
-@@ -77,7 +77,7 @@ addModule(qtfeedback, qtdeclarative, qtmultimedia)
+@@ -76,7 +76,7 @@ addModule(qtfeedback, qtdeclarative, qtmultimedia)
addModule(qtpim, qtdeclarative)
addModule(qtwebsockets, qtbase, qtdeclarative)
addModule(qtwebchannel, qtbase, qtdeclarative qtwebsockets)
@@ -20,3 +21,6 @@ index 15fd48ec71f3..a1d87b9a9d24 100644
addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
addModule(qtwebkit-examples, qtwebkit qttools)
addModule(qtimageformats, qtbase)
+--
+1.9.1
+
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch b/patches/qt-everywhere-opensource-src-5.5.0/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
similarity index 80%
rename from patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
rename to patches/qt-everywhere-opensource-src-5.5.0/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
index 10d99a4..dda536a 100644
--- a/patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
@@ -1,6 +1,7 @@
+From d571d941407e5951475dec60e28474d924e2a3a3 Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Tue, 12 May 2015 11:29:53 +0200
-Subject: [PATCH] qtmultimedia: videonode plugins require
+Subject: [PATCH 3/8] qtmultimedia: videonode plugins require
qtmultimediaquicktools
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
@@ -21,3 +22,6 @@ index 26f99bc29fe3..6cbe4f0347ad 100644
}
# Optional bits
+--
+1.9.1
+
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch b/patches/qt-everywhere-opensource-src-5.5.0/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
similarity index 86%
rename from patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
rename to patches/qt-everywhere-opensource-src-5.5.0/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
index 2ea4c75..6e62a8a 100644
--- a/patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
@@ -1,6 +1,7 @@
+From 7d644980fd38e6d7cba0378d8e19b2602beba4ba Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Mon, 10 Nov 2014 17:44:10 +0100
-Subject: [PATCH] HACK: put wayland-scanner outout in srcdir
+Subject: [PATCH 4/8] HACK: put wayland-scanner outout in srcdir
The include paths are currently broken when building OOT
@@ -22,3 +23,6 @@ index 5a97d98373fa..a5477e8f9b42 100644
header_files_client = $$waylandScannerHeaderFiles(client, $$header_dest)
!isEmpty(header_files_client) {
+--
+1.9.1
+
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch b/patches/qt-everywhere-opensource-src-5.5.0/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
similarity index 84%
rename from patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
rename to patches/qt-everywhere-opensource-src-5.5.0/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
index df02743..d6e94c6 100644
--- a/patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
@@ -1,6 +1,7 @@
+From 590cbb399b51dcbc280442c8188cea5841a5fed9 Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Tue, 2 Jun 2015 17:35:01 +0200
-Subject: [PATCH] featuresfeatures: don't use gold linker for host tools
+Subject: [PATCH 5/8] featuresfeatures: don't use gold linker for host tools
The check it it is supported was only done for the target.
@@ -22,3 +23,6 @@ index e967399258ad..7f08ba31c308 100644
dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL
static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
+--
+1.9.1
+
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/series b/patches/qt-everywhere-opensource-src-5.5.0/series
similarity index 72%
rename from patches/qt-everywhere-opensource-src-5.4.2/series
rename to patches/qt-everywhere-opensource-src-5.5.0/series
index d689a39..327dd1e 100644
--- a/patches/qt-everywhere-opensource-src-5.4.2/series
+++ b/patches/qt-everywhere-opensource-src-5.5.0/series
@@ -1,8 +1,5 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
-# 487e45ed5135b1e39410672e7ce9351c - git-ptx-patches magic
diff --git a/rules/qt5.in b/rules/qt5.in
index 2670ac4..0f696ac 100644
--- a/rules/qt5.in
+++ b/rules/qt5.in
@@ -255,6 +255,14 @@ config QT5_MODULE_QTBASE
if QT5_MODULE_QTBASE
+config QT5_MODULE_QT3D
+ bool
+ prompt "Qt3D"
+
+config QT5_MODULE_QTCANVAS3D
+ bool
+ prompt "QtCanvas3D"
+
config QT5_MODULE_QTBASE_ACCESSIBILITY
bool
default QT5_ACCESSIBILITY && QT5_MODULE_QTBASE_WIDGETS
diff --git a/rules/qt5.make b/rules/qt5.make
index 330ad55..83c24bc 100644
--- a/rules/qt5.make
+++ b/rules/qt5.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_QT5) += qt5
#
# Paths and names
#
-QT5_VERSION := 5.4.2
-QT5_MD5 := c23bd0f14d66e7901d24906a1edce9b0
+QT5_VERSION := 5.5.0
+QT5_MD5 := 65d5282f3dee0336da9ed1f77148952f
QT5 := qt-everywhere-opensource-src-$(QT5_VERSION)
QT5_SUFFIX := tar.xz
QT5_URL := \
@@ -136,7 +136,9 @@ QT5_CONF_OPT := \
$(call ptx/ifdef, PTXCONF_QT5_PREPARE_EXAMPLES,-make examples) \
-skip qtactiveqt \
-skip qtandroidextras \
+ $(call ptx/qt5-module, QT3D, qt3d) \
$(call ptx/qt5-module, QTCONNECTIVITY, qtconnectivity) \
+ $(call ptx/qt5-module, QTCANVAS3D, qtcanvas3d) \
$(call ptx/qt5-module, QTDECLARATIVE, qtdeclarative) \
$(call ptx/qt5-module, QTENGINIO, qtenginio) \
-skip qtdoc \
@@ -297,12 +299,18 @@ QT5_PLUGINS-$(PTXCONF_QT5_PLATFORM_LINUXFB) += platforms/libqlinuxfb
QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QTBASE_GUI) += platforms/libqminimal
QT5_PLUGINS-$(PTXCONF_QT5_PLATFORM_EGLFS) += platforms/libqminimalegl
+### Qt3d ###
+QT5_LIBS_$(PTXCONF_QT5_MODULE_QT3D) += Qt3d
+
### QtConnectivity ###
QT5_LIBS-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY) += Qt5Bluetooth
QT5_LIBS-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY) += Qt5Nfc
QT5_QML-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY_QUICK) += QtBluetooth
QT5_QML-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY_QUICK) += QtNfc
+### QtCanvas3d ###
+QT5_LIBS_$(PTXCONF_QT5_MODULE_CANVAS3D) += QtCanvas3d
+
### QtDeclarative ###
QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE) += Qt5Qml
QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) += Qt5Quick
--
1.9.1
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-05 16:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-05 9:42 [ptxdist] [PATCH] qt5 bump to 5.5.0 Tim Sander
2015-08-05 15:43 ` Philipp Zabel
2015-08-05 16:00 ` Tim Sander
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox