diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-08-30 03:26:00 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-08-30 03:29:15 +0530 |
| commit | 387a51102f4eecbc43f2f5db61caaa07b2a0eb02 (patch) | |
| tree | a4a242535074e9d1116f466f74c3c1c14ef25d24 | |
| parent | b02080cb41f76c0dc561afb27baeb1670203bd7b (diff) | |
Back to development, and revert gstgl UWP hack
This reverts commit b02080cb41f76c0dc561afb27baeb1670203bd7b since
https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/800
has been merged and also goes back to building git so we can use it.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/582>
| -rw-r--r-- | recipes/custom.py | 2 | ||||
| -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 |
3 files changed, 1 insertions, 35 deletions
diff --git a/recipes/custom.py b/recipes/custom.py index 3c3a48b6..4c692aeb 100644 --- a/recipes/custom.py +++ b/recipes/custom.py @@ -13,7 +13,7 @@ def running_on_cerbero_ci(): class GStreamer(recipe.Recipe): licenses = [License.LGPLv2Plus] version = '1.17.90' - tagged_for_release = True + tagged_for_release = False # Decide what stype to use use_git = True diff --git a/recipes/gst-plugins-base-1.0.recipe b/recipes/gst-plugins-base-1.0.recipe index 86ca288b..39d1777b 100644 --- a/recipes/gst-plugins-base-1.0.recipe +++ b/recipes/gst-plugins-base-1.0.recipe @@ -223,8 +223,6 @@ 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 deleted file mode 100644 index f23a7a90..00000000 --- a/recipes/gst-plugins-base-1.0/0001-TEMPORARY-HACK-Rename-egl.h-to-_egl.h.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 - |