From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH 15/19] gstreamer1.0-plugins-good: remove 0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch
Date: Fri, 19 Apr 2024 14:19:41 +0200 [thread overview]
Message-ID: <20240419121945.1920944-15-alex@linutronix.de> (raw)
In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de>
At some point this patch became unnecessary as the respective qt5 plugin is building without issues
without it (checked on qemuarm/qemuarm64).
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch | 54 -------------------
.../gstreamer1.0-plugins-good_1.22.11.bb | 1 -
2 files changed, 55 deletions(-)
delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch
deleted file mode 100644
index 9703a3a8894..00000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 99f48716051ce5ddb8c1b77292213af1e462549e 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
-
-gst/gl/gstglfuncs.h is included via ext/qt/gstqtgl.h which has logic to
-prefer qt headers definitions for GLsync
-
-This helps in fixing build errors like below
-
-/mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/QtGui/qopengles2ext.h:24:26: error: conflicting declaration 'typedef struct __GLsync* GLsync'
- 24 | typedef struct __GLsync *GLsync;
- | ^~~~~~
-In file included from /mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/gstreamer-1.0/gst/gl/gstglfuncs.h:84,
- from ../gst-plugins-good-1.16.2/ext/qt/gstqsgtexture.cc:30:
-/mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/gstreamer-1.0/gst/gl/glprototypes/gstgl_compat.h:40:18: note: previous declaration as 'typedef void* GLsync
-'
- 40 | typedef gpointer GLsync;
- | ^~~~~~
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- ext/qt/gstqsgtexture.cc | 2 +-
- ext/qt/qtwindow.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc
-index 663696b..36b17d4 100644
---- a/ext/qt/gstqsgtexture.cc
-+++ b/ext/qt/gstqsgtexture.cc
-@@ -27,7 +27,7 @@
-
- #include <gst/video/video.h>
- #include <gst/gl/gl.h>
--#include <gst/gl/gstglfuncs.h>
-+#include <ext/qt/gstqtgl.h>
- #include "gstqsgtexture.h"
-
- #define GST_CAT_DEFAULT gst_qsg_texture_debug
-diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc
-index 2872cb5..5a36be9 100644
---- a/ext/qt/qtwindow.cc
-+++ b/ext/qt/qtwindow.cc
-@@ -25,7 +25,7 @@
- #include <stdio.h>
-
- #include <gst/video/video.h>
--#include <gst/gl/gstglfuncs.h>
-+#include <ext/qt/gstqtgl.h>
- #include "qtwindow.h"
- #include "gstqsgtexture.h"
- #include "gstqtglutility.h"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb
index edd8609b7cd..57924d5c9fc 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb
@@ -5,7 +5,6 @@ HOMEPAGE = "https://gstreamer.freedesktop.org/"
BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues"
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 \
file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch"
SRC_URI[sha256sum] = "6ddd032381827d31820540735f0004b429436b0bdac19aaeab44fa22faad52e2"
--
2.39.2
next prev parent reply other threads:[~2024-04-19 12:20 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-19 12:19 [PATCH 01/19] liba52: remove the recipe Alexander Kanavin
2024-04-19 12:19 ` [PATCH 02/19] package_rpm: remove support for DIRFILES Alexander Kanavin
2024-04-19 16:38 ` [OE-core] " Ross Burton
2024-04-19 16:40 ` Ross Burton
2024-04-19 12:19 ` [PATCH 03/19] serf: mark patch as inappropriate for upstream submission Alexander Kanavin
2024-04-19 12:19 ` [PATCH 04/19] swig: merge .inc into .bb Alexander Kanavin
2024-04-20 12:11 ` [OE-core] " Richard Purdie
2024-04-20 17:58 ` Alexander Kanavin
2024-04-22 10:46 ` Alexander Kanavin
2024-04-19 12:19 ` [PATCH 05/19] swig: convert from autotools to cmake Alexander Kanavin
2024-04-19 12:19 ` [PATCH 06/19] kea: remove unnecessary reproducibility patch Alexander Kanavin
2024-04-19 12:19 ` [PATCH 07/19] expect: mark patches as Inactive-Upstream Alexander Kanavin
2024-04-19 12:19 ` [PATCH 08/19] apr: submit 0001-Add-option-to-disable-timed-dependant-tests.patch upstream Alexander Kanavin
2024-04-19 12:19 ` [PATCH 09/19] busybox: submit CVE-2022-28391 patches upstream Alexander Kanavin
2024-04-19 12:19 ` [PATCH 10/19] busybox: remove busybox-udhcpc-no_deconfig.patch Alexander Kanavin
2024-04-19 12:19 ` [PATCH 11/19] icu: add upstream submission links for fix-install-manx.patch Alexander Kanavin
2024-04-19 12:19 ` [PATCH 12/19] mpeg2dec: remove the recipe Alexander Kanavin
2024-04-21 17:49 ` [OE-core] " Khem Raj
2024-04-21 18:18 ` Alexander Kanavin
2024-04-19 12:19 ` [PATCH 13/19] apr: drop 0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch Alexander Kanavin
2024-04-19 12:19 ` [PATCH 14/19] libtraceevent: submit meson.patch upstream Alexander Kanavin
2024-04-23 11:02 ` [OE-core] " Ross Burton
2024-04-19 12:19 ` Alexander Kanavin [this message]
2024-04-19 12:19 ` [PATCH 16/19] xinput-calibrator: mark upstream as inactive in a patch Alexander Kanavin
2024-04-19 12:19 ` [PATCH 17/19] bash: mark build-tests.patch as Inappropriate Alexander Kanavin
2024-04-19 12:19 ` [PATCH 18/19] connman: make 0002-resolve-musl-does-not-implement-res_ninit.patch libc-agnostic Alexander Kanavin
2024-04-19 12:19 ` [PATCH 19/19] connman: submit 0002-resolve-musl-does-not-implement-res_ninit.patch upstream Alexander Kanavin
2024-04-23 11:03 ` [OE-core] " Ross Burton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240419121945.1920944-15-alex@linutronix.de \
--to=alex.kanavin@gmail.com \
--cc=alex@linutronix.de \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).