diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-09-08 15:44:22 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-09-08 15:53:23 +0530 |
| commit | cdd5f931d892d2a278d08554f9ef5d8c42be63c1 (patch) | |
| tree | c7ed4d708fc7872685c1df87700ac10be0ff79a6 | |
| parent | 227a32b838e494137da04c47dcee72f4ff2d30fd (diff) | |
gst-plugins-base: Fix build on UWP again
This was fixed in -base minus a typo. Remove this patch after
https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/810 is merged.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/591>
| -rw-r--r-- | recipes/gst-plugins-base-1.0.recipe | 2 | ||||
| -rw-r--r-- | recipes/gst-plugins-base-1.0/0001-meson-Actually-build-gstgl-without-implicit-include-.patch | 26 |
2 files changed, 28 insertions, 0 deletions
diff --git a/recipes/gst-plugins-base-1.0.recipe b/recipes/gst-plugins-base-1.0.recipe index d33a77c9..10fa4f83 100644 --- a/recipes/gst-plugins-base-1.0.recipe +++ b/recipes/gst-plugins-base-1.0.recipe @@ -24,6 +24,8 @@ class Recipe(custom.GStreamer): platform_deps = {Platform.ANDROID: [ 'tremor' ], Platform.IOS: [ 'tremor' ] } use_system_libs = True + patches = [name + '/0001-meson-Actually-build-gstgl-without-implicit-include-.patch'] + files_bins = ['gst-discoverer-1.0', 'gst-play-1.0', 'gst-device-monitor-1.0'] files_libs = ['libgstallocators-1.0', diff --git a/recipes/gst-plugins-base-1.0/0001-meson-Actually-build-gstgl-without-implicit-include-.patch b/recipes/gst-plugins-base-1.0/0001-meson-Actually-build-gstgl-without-implicit-include-.patch new file mode 100644 index 00000000..a95e943b --- /dev/null +++ b/recipes/gst-plugins-base-1.0/0001-meson-Actually-build-gstgl-without-implicit-include-.patch @@ -0,0 +1,26 @@ +From a925557b17f0e3852036828dcd924013e0225f23 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan <nirbheek@centricular.com> +Date: Tue, 8 Sep 2020 15:41:55 +0530 +Subject: [PATCH] meson: Actually build gstgl without implicit include dirs + +Fixes a typo from https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/800 +--- + gst-libs/gst/gl/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build +index aab2b13..db11c5e 100644 +--- a/gst-libs/gst/gl/meson.build ++++ b/gst-libs/gst/gl/meson.build +@@ -1002,7 +1002,7 @@ if build_gstgl + dependencies : [gst_base_dep, video_dep, allocators_dep, gmodule_dep, + gl_lib_deps, gl_platform_deps, gl_winsys_deps, gl_misc_deps], + # don't confuse EGL/egl.h with gst-libs/gl/egl/egl.h on case-insensitive file systems +- implicit_include_directories : true) ++ implicit_include_directories : false) + + if build_gir + gl_gir = gnome.generate_gir(gstgl, +-- +2.27.0.windows.1 + |