diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2020-10-05 00:36:26 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2020-10-05 00:36:26 +0100 |
| commit | 67f75f90923e0df7326893f0f5206936c30175a9 (patch) | |
| tree | e7bd5e8ef703ae4841d1271f855b0ba6d30f610e | |
| parent | d1862bc4331f69ffa20c1410787ec8052fa55eec (diff) | |
Revert "gst-plugins-base: Fix build on UWP again"
This reverts commit cdd5f931d892d2a278d08554f9ef5d8c42be63c1.
Fixed in -base in https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/849
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/627>
| -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, 0 insertions, 28 deletions
diff --git a/recipes/gst-plugins-base-1.0.recipe b/recipes/gst-plugins-base-1.0.recipe index 10fa4f83..d33a77c9 100644 --- a/recipes/gst-plugins-base-1.0.recipe +++ b/recipes/gst-plugins-base-1.0.recipe @@ -24,8 +24,6 @@ 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 deleted file mode 100644 index a95e943b..00000000 --- a/recipes/gst-plugins-base-1.0/0001-meson-Actually-build-gstgl-without-implicit-include-.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 - |