Skip to contentSkip to conversation

qt5webkit: disable for MIPS64

PATCH New Vicente Olivert Riera 3 participants 6 messages Dec 17, 2013 – Dec 20, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 qt5webkit: disable for MIPS64

qt5webkit is not currently supported on MIPS64 platforms, so disable the possibility of selecting this package in that platform.

In the future the following changes would be needed to fix this problem:
A new Source/JavaScriptCore/assembler/MacroAssemblerMIPS64.h file needs to be created in order to add support for MIPS64 and MacroAssembler.h needs to be modified to include that file in case of CPU(MIPS64). Also Source/WTF/wtf/Platform.h and Source/WTF/wtf/dtoa/utils.h need to be modified to add MIPS64 support.

---
 package/qt5/qt5webkit/Config.in |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
package/qt5/qt5webkit/Config.in +2 -0
index 9eb5ef8..4a578ff 100644
@@ -8,6 +8,8 @@ config BR2_PACKAGE_QT5WEBKIT
 	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB
 	# This module does not support static linking
 	depends on !BR2_PREFER_STATIC_LIB
+	# This package is not supported on MIPS 64-bit architecture
+	depends on !BR2_mips64 && !BR2_mips64el
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
Signature · 1 line
1.7.1
#1 lore raw

PATCH 2/3 qt5: version bump

-bump version to 5.2.0
-remove unneeded patches
-remove invalid configure options

---
 package/qt5/qt5.mk                                 |    4 +-
 ...-Add-egl-cflags-when-opengles2-is-enabled.patch |   32 ----
 .../qt5/qt5base/qt5base-0003-uclibc-no-lfs.patch   |   36 -----
 package/qt5/qt5base/qt5base-0004-egl-cflags.patch  |   28 ----
 .../qt5base-0005-fix-gui-build-without-png.patch   |   22 ---
 ...ate-vc_dispmanx_element_change_attributes.patch |   44 -----
 ...-detect-posix_fallocate-at-configure-time.patch |  166 --------------------
 ...igure-Parse-device-option-value-correctly.patch |   37 -----
 package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch |   29 ----
 ...cs-devices-linux_device_post.conf-for-non.patch |  107 -------------
 package/qt5/qt5base/qt5base.mk                     |    3 -
 ...t-0002-ANGLE-doesn-t-build-with-bison-3.0.patch |   38 -----
 12 files changed, 2 insertions(+), 544 deletions(-)
 delete mode 100644 package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch
 delete mode 100644 package/qt5/qt5base/qt5base-0003-uclibc-no-lfs.patch
 delete mode 100644 package/qt5/qt5base/qt5base-0004-egl-cflags.patch
 delete mode 100644 package/qt5/qt5base/qt5base-0005-fix-gui-build-without-png.patch
 delete mode 100644 package/qt5/qt5base/qt5base-0006-qeglfshooksrpi-update-vc_dispmanx_element_change_attributes.patch
 delete mode 100644 package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch
 delete mode 100644 package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-correctly.patch
 delete mode 100644 package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch
 delete mode 100644 package/qt5/qt5base/qt5base-0009-Fixed-mkspecs-devices-linux_device_post.conf-for-non.patch
 delete mode 100644 package/qt5/qt5webkit/qt5webkit-0002-ANGLE-doesn-t-build-with-bison-3.0.patch
package/qt5/qt5.mk +2 -2
index 671a217..e925fb4 100644
@@ -1,5 +1,5 @@
-QT5_VERSION = 5.1.1
-QT5_SITE = http://download.qt-project.org/official_releases/qt/5.1/$(QT5_VERSION)/submodules/
+QT5_VERSION = 5.2.0
+QT5_SITE = http://download.qt-project.org/official_releases/qt/5.2/$(QT5_VERSION)/submodules/
 include $(sort $(wildcard package/qt5/*/*.mk))
 
 define QT5_LA_PRL_FILES_FIXUP
package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch deleted +0 -32
deleted file mode 100644
index 87acd9b..0000000
@@ -1,32 +0,0 @@
-From cbffa1e467a4c8b9e8061364b69e250b23fb7b59 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <[email protected]>
-Date: Sun, 15 Sep 2013 11:15:33 +0300
-Subject: [PATCH] xcb: Add egl cflags when opengles2 is enabled
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch is sent to upstream and applied:
-https://qt.gitorious.org/qt/qtbase/commit/ff7b57bbb936bc86a64aa2a947fa8984adf400c8
-
-Signed-off-by: Fatih A????c?? <[email protected]>
----
- src/plugins/platforms/xcb/xcb-plugin.pro |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro
-index 8299528..bc21afe 100644
---- a/src/plugins/platforms/xcb/xcb-plugin.pro
-+++ b/src/plugins/platforms/xcb/xcb-plugin.pro
-@@ -73,7 +73,7 @@ contains(QT_CONFIG, xcb-render) {
- contains(QT_CONFIG, opengl) {
-     contains(QT_CONFIG, opengles2) {
-         DEFINES += XCB_USE_EGL
--        LIBS += -lEGL
-+        CONFIG += egl
-         HEADERS += qxcbeglsurface.h
- 
-         # EGL on MeeGo 1.2 Harmattan needs this macro to map EGLNativeDisplayType
--- 
-1.7.10.4
-
package/qt5/qt5base/qt5base-0003-uclibc-no-lfs.patch deleted +0 -36
deleted file mode 100644
index 9772d49..0000000
@@ -1,36 +0,0 @@
-From 6f88b27de256266947a7f6a3e70e18510754aab2 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <[email protected]>
-Date: Sat, 14 Apr 2012 20:36:07 +0200
-Subject: [PATCH] mkspecs/common/posix: fix !largefile builds on uClibc
-
-uClibc doesn't even define O_LARGEFILE when not configured with large file
-support, so ensure this define is only used when Qt is built with
--largefile, otherwise the build fails with:
-
-io/qtemporaryfile.cpp: In function 'bool createFileFromTemplate(
-        NativeFileHandle&, QFileSystemEntry::NativePath&, size_t, size_t,
-        QSystemError&)':
-io/qtemporaryfile.cpp:197:57: error: 'O_LARGEFILE' was not declared in
-        this scope
-
-Moved to qt5 by Thomas Petazzoni.
-
-Reported-Upstream: https://bugreports.qt-project.org/browse/QTBUG-25321
-Signed-off-by: Peter Korsgaard <[email protected]>
-
-Index: b/mkspecs/common/posix/qplatformdefs.h
-===================================================================
---- a/mkspecs/common/posix/qplatformdefs.h
-+++ b/mkspecs/common/posix/qplatformdefs.h
-@@ -123,7 +123,11 @@
- #define QT_READ                 ::read
- #define QT_WRITE                ::write
- 
-+#ifdef QT_LARGEFILE_SUPPORT
- #define QT_OPEN_LARGEFILE       O_LARGEFILE
-+#else
-+#define QT_OPEN_LARGEFILE       0
-+#endif
- #define QT_OPEN_RDONLY          O_RDONLY
- #define QT_OPEN_WRONLY          O_WRONLY
- #define QT_OPEN_RDWR            O_RDWR
package/qt5/qt5base/qt5base-0004-egl-cflags.patch deleted +0 -28
deleted file mode 100644
index bff82a8..0000000
@@ -1,28 +0,0 @@
-egl.prf: Append egl CFLAGS to QMAKE_C[XX]FLAGS
-
-Projects including egl in their config (e.g. with CONFIG += egl) cannot get
-egl CFLAGS without this.
-
-Signed-off-by: Fatih A????c?? <[email protected]>
-
---- a/configure
-+++ b/configure
-@@ -4934,6 +4934,7 @@
-         QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null`
-         QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL"
-         QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL"
-+        QMakeVar set QMAKE_CFLAGS_EGL "$QMAKE_CFLAGS_EGL"
-     fi       # detect EGL support
-     if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
-         CFG_EGL=yes
---- a/mkspecs/features/egl.prf
-+++ b/mkspecs/features/egl.prf
-@@ -14,6 +14,8 @@
- } else {
-     INCLUDEPATH += $$QMAKE_INCDIR_EGL
-     LIBS_PRIVATE += $$QMAKE_LIBS_EGL
-+    QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL
-+    QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EGL
-     LIBS += $$QMAKE_LFLAGS_EGL
-     for(p, QMAKE_LIBDIR_EGL) {
-         exists($$p):LIBS_PRIVATE += -L$$p
package/qt5/qt5base/qt5base-0005-fix-gui-build-without-png.patch deleted +0 -22
deleted file mode 100644
index ea0a7e3..0000000
@@ -1,22 +0,0 @@
-[PATCH] fix QtGUI build without PNG support
-
-Upstream bug: https://bugreports.qt-project.org/browse/QTBUG-33496
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- src/gui/kernel/qplatformtheme.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: qt5base-5.1.1/src/gui/kernel/qplatformtheme.cpp
-===================================================================
---- qt5base-5.1.1.orig/src/gui/kernel/qplatformtheme.cpp
-+++ qt5base-5.1.1/src/gui/kernel/qplatformtheme.cpp
-@@ -48,7 +48,7 @@
- #include <QtCore/qfileinfo.h>
- #include <qpalette.h>
- #include <qtextformat.h>
--#include <qiconloader_p.h>
-+#include <private/qiconloader_p.h>
- 
- QT_BEGIN_NAMESPACE
- 
package/qt5/qt5base/qt5base-0006-qeglfshooksrpi-update-vc_dispmanx_element_change_attributes.patch deleted +0 -44

44 lines not on this page · raw message

package/qt5/qt5base/qt5base-0007-detect-posix_fallocate-at-configure-time.patch deleted +0 -166

166 lines not on this page · raw message

package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-correctly.patch deleted +0 -37
deleted file mode 100644
index aaf1d35..0000000
@@ -1,37 +0,0 @@
-From 4723f3fd04edf1aad6750ca91fd4648216d8b408 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <[email protected]>
-Date: Sat, 21 Sep 2013 00:14:39 +0300
-Subject: [PATCH] configure: Parse -device-option value correctly
-
-The regular expression does not parse correctly when a device option value
-contains the character '=' (e.g. QMAKE_CFLAGS="-D_FILE_OFFSET_BITS=64").
-
-In order to break string at the first equal sign and to simplify code,
-use "cut" command as in other places in configure script.
-
-Task-number: QTBUG-33584
-Change-Id: I05b474d2ba6bff84c1e40d00475963bab36d94b6
-Reviewed-by: Oswald Buddenhagen <[email protected]>
-Signed-off-by: Fatih A????c?? <[email protected]>
----
- configure | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 64568dd..388899e 100755
---- a/configure
-+++ b/configure
-@@ -1609,8 +1609,8 @@ while [ "$#" -gt 0 ]; do
-         [ "$XPLATFORM" = "undefined" ] && exit 101
-         ;;
-     device-option)
--        DEV_VAR=`echo $VAL | sed "s,^\(.*\)=.*,\1,"`
--        DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"`
-+        DEV_VAR=`echo $VAL | cut -d '=' -f 1`
-+        DEV_VAL=`echo $VAL | cut -d '=' -f 2-`
-         DeviceVar set $DEV_VAR "$DEV_VAL"
-         ;;
-     qpa)
--- 
-1.8.4.rc3
-
package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch deleted +0 -29
deleted file mode 100644
index 906b56a..0000000
@@ -1,29 +0,0 @@
-Set loadAcquire() as const
-
-Fixes powerpc build.
-
-Fetched-from: https://bugzilla.redhat.com/attachment.cgi?id=812643
-Signed-off-by: Fatih A????c?? <[email protected]>
-
-Index: qtbase-opensource-src-5.1.1/src/corelib/thread/qoldbasicatomic.h
-===================================================================
---- qtbase-opensource-src-5.1.1.orig/src/corelib/thread/qoldbasicatomic.h
-+++ qtbase-opensource-src-5.1.1/src/corelib/thread/qoldbasicatomic.h
-@@ -63,7 +63,7 @@ public:
-     // Atomic API, implemented in qatomic_XXX.h
- 
-     int load() const { return _q_value; }
--    int loadAcquire() { return _q_value; }
-+    int loadAcquire() const { return _q_value; }
-     void store(int newValue) { _q_value = newValue; }
-     void storeRelease(int newValue) { _q_value = newValue; }
- 
-@@ -107,7 +107,7 @@ public:
-     // Atomic API, implemented in qatomic_XXX.h
- 
-     T *load() const { return _q_value; }
--    T *loadAcquire() { return _q_value; }
-+    T *loadAcquire() const { return _q_value; }
-     void store(T *newValue) { _q_value = newValue; }
-     void storeRelease(T *newValue) { _q_value = newValue; }
- 
package/qt5/qt5base/qt5base-0009-Fixed-mkspecs-devices-linux_device_post.conf-for-non.patch deleted +0 -107

107 lines not on this page · raw message

package/qt5/qt5base/qt5base.mk +0 -3
index d95b186..1b753d3 100644
@@ -23,10 +23,7 @@ QT5BASE_CONFIGURE_OPTS += \
 	-no-kms \
 	-no-cups \
 	-no-nis \
-	-no-libudev \
 	-no-iconv \
-	-no-gstreamer \
-	-no-gtkstyle \
 	-system-zlib \
 	-system-pcre \
 	-no-pch
package/qt5/qt5webkit/qt5webkit-0002-ANGLE-doesn-t-build-with-bison-3.0.patch deleted +0 -38
deleted file mode 100644
index e69e137..0000000
@@ -1,38 +0,0 @@
-From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <[email protected]>
-Date: Fri, 16 Aug 2013 18:27:07 +0200
-Subject: [PATCH] ANGLE doesn't build with bison 3.0
-
-https://bugs.webkit.org/show_bug.cgi?id=119798
-
-Reviewed by Antti Koivisto.
-
-Make glslang.y compatible with bison 3.0
-by using %lex-param to set YYLEX_PARAM.
-
-* src/compiler/glslang.y:
-
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk at 154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-Task-number: QTBUG-32913
-Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3
-Reviewed-by: Jocelyn Turcotte <[email protected]>
----
- Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-index 3cad335..b41e95a 100644
---- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-+++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
- %expect 1 /* One shift reduce conflict because of if | else */
- %pure-parser
- %parse-param {TParseContext* context}
-+%lex-param {YYLEX_PARAM}
- 
- %union {
-     struct {
--- 
-1.8.4.2
-
Signature · 1 line
1.7.1
#2 lore raw

PATCH 2/3 qt5: version bump

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Vicente" == Vicente Olivert Riera <[email protected]> writes:

(quoted diff) +0 -3
-bump version to 5.2.0
-remove unneeded patches
-remove invalid configure options
---
 package/qt5/qt5.mk                                 |    4 +-
 ...-Add-egl-cflags-when-opengles2-is-enabled.patch |   32 ----
 .../qt5/qt5base/qt5base-0003-uclibc-no-lfs.patch   |   36 -----

This patch is still needed.

Quoted 1 line
 package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch |   29 ----

And so is this.

It also needs a new patch to build on uClibc, which I've submitted upstream:

https://bugreports.qt-project.org/browse/QTBUG-35742

Committed series with those changes, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/3 qt5: version bump

Dear Peter Korsgaard,

Quoted 12 lines · Peter Korsgaard
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Vicente" == Vicente Olivert Riera <[email protected]> writes:

(quoted diff) +0 -3
-bump version to 5.2.0
-remove unneeded patches
-remove invalid configure options
---
 package/qt5/qt5.mk                                 |    4 +-
 ...-Add-egl-cflags-when-opengles2-is-enabled.patch |   32 ----
 .../qt5/qt5base/qt5base-0003-uclibc-no-lfs.patch   |   36 -----
Quoted 5 lines

This patch is still needed.

Quoted 1 line
 package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch |   29 ----

And so is this.

IMO, this is a good reason, for package bumps, to *require* in the commit log some details about how patches are updated: why some patches are removed, some others added, and the others updated. By requiring this, we will really encourage people to think about the patches, and provide a justification as to why an existing patch is no longer needed.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#4 lore raw

PATCH 2/3 qt5: version bump

Quoted 6 lines
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

This patch is still needed.

Quoted 1 line
 package/qt5/qt5base/qt5base-0008-qatomic-ppc.patch |   29 ----
Quoted 7 lines
Quoted 1 line

And so is this.

IMO, this is a good reason, for package bumps, to *require* in the commit log some details about how patches are updated: why some patches are removed, some others added, and the others updated. By requiring this, we will really encourage people to think about the patches, and provide a justification as to why an existing patch is no longer needed.

Agreed!

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 3/3 qt5base: Add support for MIPS64 BigEndian

In reply to Vicente Olivert Riera

This patch adds support for MIPS64 BigEndian platforms and has already been merged upstream:

https://github.com/qtproject/qtbase/commit/cea101bd10cc158b97d5fbf45b33dad9b649c08b

Now we can remove the restriction on the Config.in to disable the selection of this packages on MIPS64 BigEndian platforms.

---
 package/qt5/Config.in                              |    1 -
 .../qt5base-0001-Fix-build-MIPS64-bigendian.patch  |   51 ++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletions(-)
 create mode 100644 package/qt5/qt5base/qt5base-0001-Fix-build-MIPS64-bigendian.patch
package/qt5/Config.in +0 -1
index b92d329..42724dc 100644
@@ -9,7 +9,6 @@ menuconfig BR2_PACKAGE_QT5
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_PACKAGE_QT
-	depends on !BR2_mips64 || !BR2_MIPS_NABI64
 	help
 	  This option enables the Qt5 framework. Sub-options allow to
 	  select which modules should be built.
package/qt5/qt5base/qt5base-0001-Fix-build-MIPS64-bigendian.patch new file +51 -0

51 lines not on this page · raw message

Signature · 1 line
1.7.1