diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-08-24 21:53:53 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-08-24 21:53:53 +0530 |
| commit | b02080cb41f76c0dc561afb27baeb1670203bd7b (patch) | |
| tree | 44e9e0513a037c94e5c11ae9e1402d6e036f28cf | |
| parent | 642fa4377553c50614d539a4a34d5c102ca3aac7 (diff) | |
gst-plugins-base: Fix gstgl build on UWP1.17.90
Temporary hack for https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/814
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/579>
| -rw-r--r-- | recipes/gst-plugins-base-1.0.recipe | 2 | ||||
| -rw-r--r-- | recipes/gst-plugins-base-1.0/0001-TEMPORARY-HACK-Rename-egl.h-to-_egl.h.patch | 32 |
2 files changed, 34 insertions, 0 deletions
diff --git a/recipes/gst-plugins-base-1.0.recipe b/recipes/gst-plugins-base-1.0.recipe index 39d1777b..86ca288b 100644 --- a/recipes/gst-plugins-base-1.0.recipe +++ b/recipes/gst-plugins-base-1.0.recipe @@ -223,6 +223,8 @@ class Recipe(custom.GStreamer): self.meson_options['gl_api'] = 'gles2' self.meson_options['gl_platform'] = 'egl' self.meson_options['gl_winsys'] = 'winrt' + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/814 + self.patches = [self.name + '/0001-TEMPORARY-HACK-Rename-egl.h-to-_egl.h.patch'] else: self.disable_plugin('opengl', 'sys', 'gl', library_name='gl') self.meson_options['gl-graphene'] = 'disabled' diff --git a/recipes/gst-plugins-base-1.0/0001-TEMPORARY-HACK-Rename-egl.h-to-_egl.h.patch b/recipes/gst-plugins-base-1.0/0001-TEMPORARY-HACK-Rename-egl.h-to-_egl.h.patch new file mode 100644 index 00000000..f23a7a90 --- /dev/null +++ b/recipes/gst-plugins-base-1.0/0001-TEMPORARY-HACK-Rename-egl.h-to-_egl.h.patch @@ -0,0 +1,32 @@ +From 4b11749cd665fc54ddc04f0acf82d9204ff5b95b Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan <nirbheek@centricular.com> +Date: Mon, 24 Aug 2020 21:17:39 +0530 +Subject: [PATCH] TEMPORARY HACK: Rename egl.h to _egl.h + +Workaround for https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/814 +--- + gst-libs/gst/gl/egl/{egl.h => _egl.h} | 0 + gst-libs/gst/gl/meson.build | 2 +- + 2 files changed, 1 insertion(+), 1 deletion(-) + rename gst-libs/gst/gl/egl/{egl.h => _egl.h} (100%) + +diff --git a/gst-libs/gst/gl/egl/egl.h b/gst-libs/gst/gl/egl/_egl.h +similarity index 100% +rename from gst-libs/gst/gl/egl/egl.h +rename to gst-libs/gst/gl/egl/_egl.h +diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build +index c051e3823..e5f82eddd 100644 +--- a/gst-libs/gst/gl/meson.build ++++ b/gst-libs/gst/gl/meson.build +@@ -501,7 +501,7 @@ if need_platform_egl != 'no' + 'egl/gstgldisplay_egl_device.c', + ] + gl_egl_headers += [ +- 'egl/egl.h', ++ 'egl/_egl.h', + 'egl/gstegl.h', + 'egl/gsteglimage.h', + 'egl/gstgldisplay_egl.h', +-- +2.27.0.windows.1 + |