mirror of
https://git.yoctoproject.org/poky
synced 2026-04-09 11:02:22 +02:00
gstreamer1.0-plugins-good: upgrade to version 1.18.0
* 0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch
Removed since these are included in 1.18.0
License-Update: remove file://common/coverage/coverage-report.pl
Upstream dont have it any more.
(From OE-Core rev: 06f51b0ae0e5a3071778f7d4134bf719b25a103f)
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
ce6b2b57ad
commit
af090eec2b
@@ -1,70 +0,0 @@
|
||||
From 3e0d5577444b32579bdf5b69d720a322322ff7bc Mon Sep 17 00:00:00 2001
|
||||
From: Milian Wolff <milian.wolff@kdab.com>
|
||||
Date: Tue, 26 Nov 2019 15:08:20 +0100
|
||||
Subject: [PATCH] qmlgl: ensure Qt defines GLsync to fix compile on some platforms
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
By explictly including QtGui/qopengl.h we force the code path that
|
||||
defines GLsync in the Qt-specific way. Without that, some platforms
|
||||
failed to compile the qmlgl plugin, since neither Qt nor gstreamer
|
||||
defined GLsync then, leading to e.g.:
|
||||
|
||||
```
|
||||
make[4]: Entering directory '/.../gst-plugins-good-1.16.1/ext/qt'
|
||||
CXX libgstqmlgl_la-qtitem.lo
|
||||
In file included from gstqtgl.h:32,
|
||||
from qtitem.h:27,
|
||||
from qtitem.cc:28:
|
||||
/.../usr/include/gstreamer-1.0/
|
||||
gst/gl/gstglfuncs.h:93:17: error: expected identifier before ‘*’ token
|
||||
ret (GSTGLAPI *name) args;
|
||||
^
|
||||
/.../usr/include/gstreamer-1.0/
|
||||
gst/gl/glprototypes/sync.h:27:1: note: in expansion of macro
|
||||
‘GST_GL_EXT_FUNCTION’
|
||||
GST_GL_EXT_FUNCTION (GLsync, FenceSync,
|
||||
^~~~~~~~~~~~~~~~~~~
|
||||
```
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/commit/3e0d5577444b32579bdf5b69d720a322322ff7bc]
|
||||
---
|
||||
ext/qt/gstqtgl.h | 18 +++++++++++-------
|
||||
1 file changed, 11 insertions(+), 7 deletions(-)
|
||||
|
||||
--- a/ext/qt/gstqtgl.h
|
||||
+++ b/ext/qt/gstqtgl.h
|
||||
@@ -22,14 +22,7 @@
|
||||
#include <QtGui/qtgui-config.h>
|
||||
#endif
|
||||
|
||||
-/* qt uses the same trick as us to typedef GLsync on GLES2 but to a different
|
||||
- * type which confuses the preprocessor. Instead of trying to reconcile the
|
||||
- * two, we instead use the GLsync definition from Qt from above, and ensure
|
||||
- * that we don't typedef GLsync in gstglfuncs.h */
|
||||
#include <gst/gl/gstglconfig.h>
|
||||
-#undef GST_GL_HAVE_GLSYNC
|
||||
-#define GST_GL_HAVE_GLSYNC 1
|
||||
-#include <gst/gl/gstglfuncs.h>
|
||||
|
||||
/* The glext.h guard was renamed in 2018, but some software which
|
||||
* includes their own copy of the GL headers (such as qt) might have
|
||||
@@ -46,6 +39,17 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+/* pulls in GLsync, see below */
|
||||
+#include <QtGui/qopengl.h>
|
||||
+
|
||||
+/* qt uses the same trick as us to typedef GLsync on GLES2 but to a different
|
||||
+ * type which confuses the preprocessor. Instead of trying to reconcile the
|
||||
+ * two, we instead use the GLsync definition from Qt from above, and ensure
|
||||
+ * that we don't typedef GLsync in gstglfuncs.h */
|
||||
+#undef GST_GL_HAVE_GLSYNC
|
||||
+#define GST_GL_HAVE_GLSYNC 1
|
||||
+#include <gst/gl/gstglfuncs.h>
|
||||
+
|
||||
#if defined(QT_OPENGL_ES_2)
|
||||
#include <QtGui/QOpenGLContext>
|
||||
#include <QtGui/QOpenGLFunctions>
|
||||
@@ -1,4 +1,4 @@
|
||||
From d08234a659bec1fd5c984fedefbeb8192af07839 Mon Sep 17 00:00:00 2001
|
||||
From bf8b2fa0f6870589d036f0f33c140a3f85b530a0 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 31 Mar 2020 21:23:28 -0700
|
||||
Subject: [PATCH] qt: include ext/qt/gstqtgl.h instead of gst/gl/gstglfuncs.h
|
||||
@@ -26,7 +26,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc
|
||||
index 2b314e0..12b15dd 100644
|
||||
index a05d26e..4cc9fc6 100644
|
||||
--- a/ext/qt/gstqsgtexture.cc
|
||||
+++ b/ext/qt/gstqsgtexture.cc
|
||||
@@ -27,7 +27,7 @@
|
||||
@@ -39,7 +39,7 @@ index 2b314e0..12b15dd 100644
|
||||
|
||||
#define GST_CAT_DEFAULT gst_qsg_texture_debug
|
||||
diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc
|
||||
index 62d26b6..bf68ebb 100644
|
||||
index 9360c33..0dfd3f1 100644
|
||||
--- a/ext/qt/qtwindow.cc
|
||||
+++ b/ext/qt/qtwindow.cc
|
||||
@@ -25,7 +25,7 @@
|
||||
@@ -52,5 +52,5 @@ index 62d26b6..bf68ebb 100644
|
||||
#include "gstqsgtexture.h"
|
||||
#include "gstqtglutility.h"
|
||||
--
|
||||
2.26.0
|
||||
2.28.0
|
||||
|
||||
|
||||
@@ -1,19 +1,16 @@
|
||||
require gstreamer1.0-plugins-common.inc
|
||||
|
||||
SRC_URI = " \
|
||||
https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
|
||||
file://0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch \
|
||||
file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \
|
||||
"
|
||||
SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
|
||||
file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "bd025f8f14974f94b75ac69a9d1b9c93"
|
||||
SRC_URI[sha256sum] = "40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319"
|
||||
SRC_URI[md5sum] = "c437bf42bf830bc0f482c7d088fb37a5"
|
||||
SRC_URI[sha256sum] = "6329bc377a3afea5cf1ab329a91cc4a906f075781780d1edc59e8bea8c1a8bac"
|
||||
|
||||
S = "${WORKDIR}/gst-plugins-good-${PV}"
|
||||
|
||||
LICENSE = "GPLv2+ & LGPLv2.1+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
|
||||
file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \
|
||||
file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
|
||||
|
||||
DEPENDS += "gstreamer1.0-plugins-base libcap zlib"
|
||||
@@ -54,6 +51,7 @@ PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack"
|
||||
PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
|
||||
|
||||
EXTRA_OEMESON += " \
|
||||
-Ddoc=disabled \
|
||||
-Daalib=disabled \
|
||||
-Ddirectsound=disabled \
|
||||
-Ddv=disabled \
|
||||
Reference in New Issue
Block a user