Skip to contentSkip to conversation

qt5multimedia: Make it compile with no-opengl

PATCH New Vicente Olivert Riera 3 participants 3 messages Feb 8, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/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

Fixes:

http://autobuild.buildroot.net/results/b77/b77cdf9b1cf6cafd5afef7337553bb32489207e5/

---
 .../0001-Make-it-compile-with-no-opengl.patch      |   53 ++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 deletions(-)
 create mode 100644 package/qt5/qt5multimedia/0001-Make-it-compile-with-no-opengl.patch
package/qt5/qt5multimedia/0001-Make-it-compile-with-no-opengl.patch new file +53 -0
new file mode 100644
index 0000000..58e53e4
@@ -0,0 +1,53 @@
+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 <[email protected]>
+
+From 2b181d546970d18a48a0f36f5d1a22418b61cd4d Mon Sep 17 00:00:00 2001
+From: Laszlo Agocs <[email protected]>
+Date: Tue, 9 Dec 2014 15:34:10 +0100
+Subject: [PATCH] Make it compile with no-opengl
+
+Change-Id: I71358bb1268e5b28b66b1817a3ec0cd98459cfd2
+Reviewed-by: Friedemann Kleint <[email protected]>
+Reviewed-by: Yoann Lopes <[email protected]>
+---
+ 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
+
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 qt5multimedia: Make it compile with no-opengl

Vicente, All,

On 2015-02-08 16:04 +0000, Vicente Olivert Riera spake thusly:

Quoted 8 lines

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:

Quoted 7 lines

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

Fixes:

http://autobuild.buildroot.net/results/b77/b77cdf9b1cf6cafd5afef7337553bb32489207e5/

Regards,
Yann E. MORIN.

Quoted 71 lines
---
 .../0001-Make-it-compile-with-no-opengl.patch      |   53 ++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 deletions(-)
 create mode 100644 package/qt5/qt5multimedia/0001-Make-it-compile-with-no-opengl.patch
package/qt5/qt5multimedia/0001-Make-it-compile-with-no-opengl.patch new file +53 -0
new file mode 100644
index 0000000..58e53e4
@@ -0,0 +1,53 @@
+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 <[email protected]>
+
+From 2b181d546970d18a48a0f36f5d1a22418b61cd4d Mon Sep 17 00:00:00 2001
+From: Laszlo Agocs <[email protected]>
+Date: Tue, 9 Dec 2014 15:34:10 +0100
+Subject: [PATCH] Make it compile with no-opengl
+
+Change-Id: I71358bb1268e5b28b66b1817a3ec0cd98459cfd2
+Reviewed-by: Friedemann Kleint <[email protected]>
+Reviewed-by: Yoann Lopes <[email protected]>
+---
+ 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
+
Signature · 6 lines
1.7.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 qt5multimedia: Make it compile with no-opengl

In reply to Vicente Olivert Riera
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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

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:

Quoted 7 lines

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

Fixes:

http://autobuild.buildroot.net/results/b77/b77cdf9b1cf6cafd5afef7337553bb32489207e5/

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard