On Mon, 2022-12-05 at 21:13 +0100, Markus Volk wrote: > Rename USE_X11 to HAVE_X11 to avoid naming conflict with eglplatform.h > > Signed-off-by: Markus Volk <[email protected]> > --- > .../0001-replace-USE_X11-by-HAVE_X11.patch | 319 ++++++++++++++++++ > .../gstreamer/gstreamer1.0-vaapi_1.20.4.bb | 9 +- > 2 files changed, 324 insertions(+), 4 deletions(-) > create mode 100644 > meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-replace-USE_X11-by-HAVE_X11.patch > > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-replace-USE_X11-by-HAVE_X11.patch > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-replace-USE_X11-by-HAVE_X11.patch > new file mode 100644 > index 0000000000..8cb17a8a0b > --- /dev/null > +++ > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-replace-USE_X11-by-HAVE_X11.patch > @@ -0,0 +1,319 @@ > +From ff9c63505183f7620b68d7d848ad6b16a7497c75 Mon Sep 17 00:00:00 2001 > +From: Markus Volk <[email protected]> > +Date: Mon, 5 Dec 2022 20:56:43 +0100 > +Subject: [PATCH] replace USE_X11 by HAVE_X11 > + > +currently used variable collides with eglplatform.h > + > +Signed-off-by: Markus Volk <[email protected]> > + > +Patch-Status: Inappropriate > +--- > + ChangeLog | 2 +- > + gst-libs/gst/vaapi/gstvaapidisplay.c | 2 +- > + gst-libs/gst/vaapi/gstvaapidisplay_egl.c | 4 ++-- > + gst-libs/gst/vaapi/meson.build | 4 ++-- > + gst/vaapi/gstvaapipluginutil.c | 12 ++++++------ > + gst/vaapi/gstvaapisink.c | 4 ++-- > + gst/vaapi/gstvaapivideocontext.c | 4 ++-- > + meson.build | 10 +++++----- > + tests/examples/meson.build | 2 +- > + tests/internal/output.c | 4 ++-- > + tests/internal/test-display.c | 4 ++-- > + tests/internal/test-windows.c | 4 ++-- > + 12 files changed, 28 insertions(+), 28 deletions(-) > +
FWIW I do agree with Alex, we can't afford to carry a patch like this ourselves and we should discuss it with upstream as it is presumably something they'd want to fix. If they reject it for some reason, that is a different discussion. Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#174308): https://lists.openembedded.org/g/openembedded-core/message/174308 Mute This Topic: https://lists.openembedded.org/mt/95477995/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
