qt5: bump version to 5.4.1

QT5_VERSION_MAJOR = 5.4

QT5_VERSION = $(QT5_VERSION_MAJOR).0

QT5_VERSION = $(QT5_VERSION_MAJOR).1

QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules

include $(sort $(wildcard package/qt5/*/*.mk))

0002-logging-Fix-build-with-uClibc.patch depends on this upstream patch.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>

From d1d3c36e876464a9bae42565f086ded268ab5118 Mon Sep 17 00:00:00 2001

From: Thiago Macieira <thiago.macieira@intel.com>

Date: Wed, 17 Dec 2014 20:24:04 -0800

Subject: [PATCH] Simplify use of __has_include in qlogging.cpp

Easier to just #define it to 0

Change-Id: Ife99fdca6564077762fa67c6d7a5becaf48655d8

Reviewed-by: Olivier Goffart <ogoffart@woboq.com>

---

 src/corelib/global/qlogging.cpp | 21 +++++++++------------

 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp

index 0271573..50d35a6 100644

--- a/src/corelib/global/qlogging.cpp

+++ b/src/corelib/global/qlogging.cpp

@@ -72,20 +72,17 @@

 # include "private/qcore_unix_p.h"

 #endif

-#if !defined QT_NO_REGULAREXPRESSION && !defined(QT_BOOTSTRAPPED)

-#ifdef __has_include

-#if __has_include(<cxxabi.h>) && __has_include(<execinfo.h>)

-#define QLOGGING_HAVE_BACKTRACE

-#endif

-#elif defined(__GLIBCXX__) && defined(__GLIBC__) // (because older version of gcc don't have __has_include)

-#define QLOGGING_HAVE_BACKTRACE

+#ifndef __has_include

+#  define __has_include(x) 0

 #endif

-#ifdef QLOGGING_HAVE_BACKTRACE

-#include <qregularexpression.h>

-#include <cxxabi.h>

-#include <execinfo.h>

-#endif

+#if !defined QT_NO_REGULAREXPRESSION && !defined(QT_BOOTSTRAPPED)

+#  if (defined(__GLIBC__) && defined(__GLIBCXX__)) || (__has_include(<cxxabi.h>) && __has_include(<execinfo.h>))

+#    define QLOGGING_HAVE_BACKTRACE

+#    include <qregularexpression.h>

+#    include <cxxabi.h>

+#    include <execinfo.h>

+#  endif

 #endif

 #include <stdio.h>

-- 

1.9.1

qimage_conversions.cpp: Fix build on big endian systems

Backporting an upstream patch to fix a qt5base build failure on big

endian systems. This is the error message:

image/qimage_conversions.cpp:2257:9: error: expected '}' before numeric 

constant

Upstream commit:

  https://qt.gitorious.org/qt/qtbase/commit/404f4281fda764cafdaa5635db995dabc4f1de8c

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

From 404f4281fda764cafdaa5635db995dabc4f1de8c Mon Sep 17 00:00:00 2001

From: Dmitry Shachnev <mitya57@gmail.com>

Date: Tue, 9 Dec 2014 09:27:53 +0300

Subject: [PATCH] qimage_conversions.cpp: Fix build on big endian systems

Change-Id: I8149eb2deaa101daf85a957ff48c3a7140c43bbc

Reviewed-by: Timo Jyrinki <timo.jyrinki@canonical.com>

Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>

---

 src/gui/image/qimage_conversions.cpp |    4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp

index 17563b1..858a0d9 100644

--- a/src/gui/image/qimage_conversions.cpp

+++ b/src/gui/image/qimage_conversions.cpp

@@ -2252,7 +2252,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat

         convert_ARGB_to_ARGB_PM,

 #else

         0,

-        0

+        0,

 #endif

         0, 0, 0, 0

     }, // Format_RGBA8888

@@ -2281,7 +2281,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat

 #else

         0,

         0,

-        0

+        0,

 #endif

         0, 0, 0, 0

     }, // Format_RGBA8888_Premultiplied

-- 

1.7.1

qdrawhelper.cpp: Fix build on MIPS without DSP support

The qt_memfill32_asm_mips_dsp function is only declared if 

QT_COMPILER_SUPPORTS_MIPS_DSP is defined, so we can't reference it 

unless the same macro is defined.

Backporting an upstream patch to fix this issue.

Upstream commit:

  https://qt.gitorious.org/qt/qtbase/commit/2ca323ccd4f25f409eff8fc0c9804099b78c2bde

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

From 2ca323ccd4f25f409eff8fc0c9804099b78c2bde Mon Sep 17 00:00:00 2001

From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>

Date: Tue, 11 Nov 2014 13:11:54 +0100

Subject: [PATCH] Android: Compile for MIPS

The qt_memfill32_asm_mips_dsp function is only declared if

QT_COMPILER_SUPPORTS_MIPS_DSP is defined, so we can't reference it

unless the same macro is defined.

Change-Id: Ib959b4b969b699ca78804394206266469b4ebf64

Task-number: QTBUG-36017

Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>

Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

---

 src/gui/painting/qdrawhelper.cpp |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp

index f2d27a0..6482cc5 100644

--- a/src/gui/painting/qdrawhelper.cpp

+++ b/src/gui/painting/qdrawhelper.cpp

@@ -6829,7 +6829,7 @@ void qInitDrawhelperAsm()

     qt_fetch_radial_gradient = qt_fetch_radial_gradient_neon;

 #endif

-#ifdef Q_PROCESSOR_MIPS_32

+#if defined(Q_PROCESSOR_MIPS_32) && defined(QT_COMPILER_SUPPORTS_MIPS_DSP)

     qt_memfill32 = qt_memfill32_asm_mips_dsp;

 #endif // Q_PROCESSOR_MIPS_32

-- 

1.7.1

qt5multimedia: Make it compile with no-opengl

Backport an upstream patch to make it compile with no-opengl. Otherwise 

it will fail showing an error message like this one:

qpaintervideosurface.cpp:99:47: error: 'QOpenGLContext' has not been 

declared

Upstream commit:

  https://qt.gitorious.org/qt/qtmultimedia/commit/2b181d546970d18a48a0f36f5d1a22418b61cd4d

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.org>

From 2b181d546970d18a48a0f36f5d1a22418b61cd4d Mon Sep 17 00:00:00 2001

From: Laszlo Agocs <laszlo.agocs@theqtcompany.com>

Date: Tue, 9 Dec 2014 15:34:10 +0100

Subject: [PATCH] Make it compile with no-opengl

Change-Id: I71358bb1268e5b28b66b1817a3ec0cd98459cfd2

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

---

 src/multimediawidgets/qpaintervideosurface.cpp |    4 ++++

 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp

index 3a880de..2ab5dcb 100644

--- a/src/multimediawidgets/qpaintervideosurface.cpp

+++ b/src/multimediawidgets/qpaintervideosurface.cpp

@@ -96,7 +96,9 @@ QVideoSurfaceGenericPainter::QVideoSurfaceGenericPainter()

         << QVideoFrame::Format_ARGB32

         << QVideoFrame::Format_RGB565;

     // The raster formats should be a subset of the GL formats.

+#ifndef QT_NO_OPENGL

     if (QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGLES)

+#endif

         m_imagePixelFormats << QVideoFrame::Format_RGB24;

 }

@@ -137,7 +139,9 @@ QAbstractVideoSurface::Error QVideoSurfaceGenericPainter::start(const QVideoSurf

     const QAbstractVideoBuffer::HandleType t = format.handleType();

     if (t == QAbstractVideoBuffer::NoHandle) {

         bool ok = m_imageFormat != QImage::Format_Invalid && !m_imageSize.isEmpty();

+#ifndef QT_NO_OPENGL

         if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES)

+#endif

             ok &= format.pixelFormat() != QVideoFrame::Format_RGB24;

         if (ok)

             return QAbstractVideoSurface::NoError;

-- 

1.7.1