diff options
Diffstat (limited to 'meta/recipes-qt/qt5/qtmultimedia')
| -rw-r--r-- | meta/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch | 56 | ||||
| -rw-r--r-- | meta/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch | 100 |
2 files changed, 56 insertions, 100 deletions
diff --git a/meta/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/meta/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch new file mode 100644 index 0000000000..1a629652b4 --- /dev/null +++ b/meta/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch @@ -0,0 +1,56 @@ +From d8911e0db56151d39f7c8c6d9f32349ca54e8c48 Mon Sep 17 00:00:00 2001 +From: Yoann Lopes <yoann.lopes@digia.com> +Date: Thu, 31 Oct 2013 15:06:30 +0100 +Subject: [PATCH] Initial porting effort to GStreamer 1.0. + +* It's already included in 5.5 with this commit: + commit 108dda7a90bd0f0337358b0db47ae55acd16dea6 + Author: Yoann Lopes <yoann.lopes@theqtcompany.com> + Date: Thu Nov 20 17:54:18 2014 +0100 + GStreamer: port to 1.0. +* here we restore only the done_config_gstreamer variable + to explicitly disable it from OE build + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + qtmultimedia.pro | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) + +diff --git a/qtmultimedia.pro b/qtmultimedia.pro +index e58ae1d..81e6ce8 100644 +--- a/qtmultimedia.pro ++++ b/qtmultimedia.pro +@@ -17,19 +17,21 @@ win32 { + contains(QT_CONFIG, alsa):qtCompileTest(alsa) + contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio) + +- isEmpty(GST_VERSION) { +- contains(QT_CONFIG, gstreamer-0.10) { +- GST_VERSION = 0.10 +- } else: contains(QT_CONFIG, gstreamer-1.0) { +- GST_VERSION = 1.0 ++ !done_config_gstreamer { ++ isEmpty(GST_VERSION) { ++ contains(QT_CONFIG, gstreamer-0.10) { ++ GST_VERSION = 0.10 ++ } else: contains(QT_CONFIG, gstreamer-1.0) { ++ GST_VERSION = 1.0 ++ } ++ } ++ cache(GST_VERSION, set) ++ !isEmpty(GST_VERSION):qtCompileTest(gstreamer) { ++ qtCompileTest(gstreamer_photography) ++ qtCompileTest(gstreamer_encodingprofiles) ++ qtCompileTest(gstreamer_appsrc) ++ qtCompileTest(linux_v4l) + } +- } +- cache(GST_VERSION, set) +- !isEmpty(GST_VERSION):qtCompileTest(gstreamer) { +- qtCompileTest(gstreamer_photography) +- qtCompileTest(gstreamer_encodingprofiles) +- qtCompileTest(gstreamer_appsrc) +- qtCompileTest(linux_v4l) + } + + qtCompileTest(resourcepolicy) diff --git a/meta/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch b/meta/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch deleted file mode 100644 index 4fb0f7241f..0000000000 --- a/meta/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch +++ /dev/null @@ -1,100 +0,0 @@ -From ec1740a7bce48435e65ede530e0b96593ac619ea Mon Sep 17 00:00:00 2001 -From: Wenlin Kang <wenlin.kang@windriver.com> -Date: Thu, 8 Sep 2016 12:18:13 +0800 -Subject: [PATCH] qtmultimedia: fix a conflicting declaration - -Use lgl2.h instead of gl2.h and gl2ext.h, -fix a "conflicting declaration" error. - -Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> ---- - src/plugins/videonode/imx6/lgl2.h | 46 ++++++++++++++++++++++ - .../videonode/imx6/qsgvivantevideomaterial.cpp | 5 ++- - src/plugins/videonode/imx6/qsgvivantevideonode.cpp | 5 ++- - 3 files changed, 52 insertions(+), 4 deletions(-) - create mode 100644 src/plugins/videonode/imx6/lgl2.h - -diff --git a/src/plugins/videonode/imx6/lgl2.h b/src/plugins/videonode/imx6/lgl2.h -new file mode 100644 -index 0000000..2423697 ---- /dev/null -+++ b/src/plugins/videonode/imx6/lgl2.h -@@ -0,0 +1,46 @@ -+#ifndef __L_GL2_H__ -+#define __L_GL2_H__ -+ -+// this file comes from <GLES2/gl2.h> and <GLES2/gl2ext.h>, -+// it's a light gl2.h. -+ -+/*------------------------------------------------------------------------- -+ * Definition of KHRONOS_APIENTRY -+ *------------------------------------------------------------------------- -+ * This follows the return type of the function and precedes the function -+ * name in the function prototype. -+ */ -+#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__) -+ /* Win32 but not WinCE */ -+# define KHRONOS_APIENTRY __stdcall -+#else -+# define KHRONOS_APIENTRY -+#endif -+ -+#ifndef GL_APIENTRY -+# define GL_APIENTRY KHRONOS_APIENTRY -+#endif -+ -+#ifndef GL_APIENTRYP -+# define GL_APIENTRYP GL_APIENTRY* -+#endif -+ -+typedef void GLvoid; -+typedef unsigned int GLenum; -+typedef unsigned int GLuint; -+typedef int GLsizei; -+ -+#define GL_VIV_YV12 0x8FC0 -+#define GL_VIV_NV12 0x8FC1 -+#define GL_VIV_YUY2 0x8FC2 -+#define GL_VIV_UYVY 0x8FC3 -+#define GL_VIV_NV21 0x8FC4 -+#define GL_VIV_I420 0x8FC5 -+ -+typedef void (GL_APIENTRYP PFNGLTEXDIRECTVIVMAPPROC) (GLenum Target, GLsizei Width, GLsizei Height, GLenum Format, GLvoid ** Logical, const GLuint * Physical); -+typedef void (GL_APIENTRYP PFNGLTEXDIRECTMAPVIVPROC) (GLenum Target, GLsizei Width, GLsizei Height, GLenum Format, GLvoid ** Logical, const GLuint * Physical); -+typedef void (GL_APIENTRYP PFNGLTEXDIRECTVIVPROC) (GLenum Target, GLsizei Width, GLsizei Height, GLenum Format, GLvoid ** Pixels); -+typedef void (GL_APIENTRYP PFNGLTEXDIRECTINVALIDATEVIVPROC) (GLenum Target); -+typedef void (GL_APIENTRYP PFNGLTEXDIRECTTILEDMAPVIVPROC) (GLenum Target, GLsizei Width, GLsizei Height, GLenum Format, GLvoid ** Logical, const GLuint * Physical); -+ -+#endif -diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp -index 465ccfa..40e7592 100644 ---- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp -+++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp -@@ -37,8 +37,9 @@ - ** - ****************************************************************************/ - --#include <GLES2/gl2.h> --#include <GLES2/gl2ext.h> -+// use lgl2.h instead of <GLES2/gl2.h> and <GLES2/gl2ext.h>, -+// fixes a conflicting declaration issue. -+#include "lgl2.h" - - #include "qsgvivantevideomaterial.h" - #include "qsgvivantevideomaterialshader.h" -diff --git a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp -index c8d83b4..5b1b8f2 100644 ---- a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp -+++ b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp -@@ -37,8 +37,9 @@ - ** - ****************************************************************************/ - --#include <GLES2/gl2.h> --#include <GLES2/gl2ext.h> -+// use lgl2.h instead of <GLES2/gl2.h> and <GLES2/gl2ext.h>, -+// fixes a conflicting declaration issue. -+#include "lgl2.h" - - #include "qsgvivantevideonode.h" - #include "qsgvivantevideomaterialshader.h" |