qt5: bump version to 5.4.1

Also remove all patches that have been applied to 5.4.1 branch

Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

1 files changed, 0 insertions, 53 deletions

diff --git a/package/qt5/qt5multimedia/0001-Make-it-compile-with-no-opengl.patch b/package/qt5/qt5multimedia/0001-Make-it-compile-with-no-opengl.patch
deleted file mode 100644
index 58e53e4d4a..0000000000
--- a/package/qt5/qt5multimedia/0001-Make-it-compile-with-no-opengl.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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
-