diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-04-19 14:19:41 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-25 10:10:15 +0100 |
| commit | 6655b2bd9f26793d139f3d244b1fd9bc04665275 (patch) | |
| tree | 59d3587d42158c3e976b7bbc521fdfb3b60c5cc0 | |
| parent | 2a25f926a75175420a5f059ecac7e310a9f3714c (diff) | |
| download | poky-6655b2bd9f26793d139f3d244b1fd9bc04665275.tar.gz | |
gstreamer1.0-plugins-good: remove 0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch
At some point this patch became unnecessary as the respective qt5 plugin is building without issues
without it (checked on qemuarm/qemuarm64).
(From OE-Core rev: 093575753b928d36a21dca6ff2378b4e299ff4af)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2 files changed, 0 insertions, 55 deletions
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 9703a3a889..0000000000 --- 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 @@ | |||
| 1 | From 99f48716051ce5ddb8c1b77292213af1e462549e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 31 Mar 2020 21:23:28 -0700 | ||
| 4 | Subject: [PATCH] qt: include ext/qt/gstqtgl.h instead of gst/gl/gstglfuncs.h | ||
| 5 | |||
| 6 | gst/gl/gstglfuncs.h is included via ext/qt/gstqtgl.h which has logic to | ||
| 7 | prefer qt headers definitions for GLsync | ||
| 8 | |||
| 9 | This helps in fixing build errors like below | ||
| 10 | |||
| 11 | /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' | ||
| 12 | 24 | typedef struct __GLsync *GLsync; | ||
| 13 | | ^~~~~~ | ||
| 14 | 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, | ||
| 15 | from ../gst-plugins-good-1.16.2/ext/qt/gstqsgtexture.cc:30: | ||
| 16 | /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 | ||
| 17 | ' | ||
| 18 | 40 | typedef gpointer GLsync; | ||
| 19 | | ^~~~~~ | ||
| 20 | |||
| 21 | Upstream-Status: Pending | ||
| 22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 23 | |||
| 24 | --- | ||
| 25 | ext/qt/gstqsgtexture.cc | 2 +- | ||
| 26 | ext/qt/qtwindow.cc | 2 +- | ||
| 27 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 28 | |||
| 29 | diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc | ||
| 30 | index 663696b..36b17d4 100644 | ||
| 31 | --- a/ext/qt/gstqsgtexture.cc | ||
| 32 | +++ b/ext/qt/gstqsgtexture.cc | ||
| 33 | @@ -27,7 +27,7 @@ | ||
| 34 | |||
| 35 | #include <gst/video/video.h> | ||
| 36 | #include <gst/gl/gl.h> | ||
| 37 | -#include <gst/gl/gstglfuncs.h> | ||
| 38 | +#include <ext/qt/gstqtgl.h> | ||
| 39 | #include "gstqsgtexture.h" | ||
| 40 | |||
| 41 | #define GST_CAT_DEFAULT gst_qsg_texture_debug | ||
| 42 | diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc | ||
| 43 | index 2872cb5..5a36be9 100644 | ||
| 44 | --- a/ext/qt/qtwindow.cc | ||
| 45 | +++ b/ext/qt/qtwindow.cc | ||
| 46 | @@ -25,7 +25,7 @@ | ||
| 47 | #include <stdio.h> | ||
| 48 | |||
| 49 | #include <gst/video/video.h> | ||
| 50 | -#include <gst/gl/gstglfuncs.h> | ||
| 51 | +#include <ext/qt/gstqtgl.h> | ||
| 52 | #include "qtwindow.h" | ||
| 53 | #include "gstqsgtexture.h" | ||
| 54 | #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 edd8609b7c..57924d5c9f 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/" | |||
| 5 | BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues" | 5 | BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues" |
| 6 | 6 | ||
| 7 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ | 7 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ |
| 8 | file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ | ||
| 9 | file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch" | 8 | file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch" |
| 10 | 9 | ||
| 11 | SRC_URI[sha256sum] = "6ddd032381827d31820540735f0004b429436b0bdac19aaeab44fa22faad52e2" | 10 | SRC_URI[sha256sum] = "6ddd032381827d31820540735f0004b429436b0bdac19aaeab44fa22faad52e2" |
