diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2021-01-19 15:00:53 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2021-01-19 15:01:17 +0000 |
| commit | 1ccce9b313e97a27138cf5d39d103de84f9b0573 (patch) | |
| tree | bd95f8c6de27e19f68be31239bd63282bce7cc81 | |
| parent | 3f216d5881ff420665ab6249bb2ccb50309b5ce3 (diff) | |
Revert "gst-plugins-bad-1.0: Fix d3d11 build error on UWP"
This reverts commit 3f216d5881ff420665ab6249bb2ccb50309b5ce3.
This was only temporary for the tagged 1.18.3 release, it's
fixed in gst-plugins-bad post-1.18.3.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/677>
| -rw-r--r-- | recipes/gst-plugins-bad-1.0.recipe | 2 | ||||
| -rw-r--r-- | recipes/gst-plugins-bad-1.0/0001-d3d11videosink-Fix-build-error-on-UWP.patch | 28 |
2 files changed, 0 insertions, 30 deletions
diff --git a/recipes/gst-plugins-bad-1.0.recipe b/recipes/gst-plugins-bad-1.0.recipe index 3133e33d..7c00ac10 100644 --- a/recipes/gst-plugins-bad-1.0.recipe +++ b/recipes/gst-plugins-bad-1.0.recipe @@ -75,8 +75,6 @@ class Recipe(custom.GStreamer): 'srt', 'libusrsctp', 'zbar'] use_system_libs = True - patches = [name + '/0001-d3d11videosink-Fix-build-error-on-UWP.patch'] - files_lang = ['gst-plugins-bad-1.0'] files_libs = [ diff --git a/recipes/gst-plugins-bad-1.0/0001-d3d11videosink-Fix-build-error-on-UWP.patch b/recipes/gst-plugins-bad-1.0/0001-d3d11videosink-Fix-build-error-on-UWP.patch deleted file mode 100644 index ce1b6298..00000000 --- a/recipes/gst-plugins-bad-1.0/0001-d3d11videosink-Fix-build-error-on-UWP.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3f43fef3ce8cfd2f00d99d3a967e29c724fe8f2d Mon Sep 17 00:00:00 2001 -From: Seungha Yang <seungha@centricular.com> -Date: Mon, 18 Jan 2021 19:23:30 +0900 -Subject: [PATCH] d3d11videosink: Fix build error on UWP - -gstd3d11videosink.c(662): error C2065: 'sink': undeclared identifier - -Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1961> ---- - sys/d3d11/gstd3d11videosink.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sys/d3d11/gstd3d11videosink.c b/sys/d3d11/gstd3d11videosink.c -index b4800ea57..6fb74e0bc 100644 ---- a/sys/d3d11/gstd3d11videosink.c -+++ b/sys/d3d11/gstd3d11videosink.c -@@ -659,7 +659,7 @@ gst_d3d11_video_sink_prepare_window (GstD3D11VideoSink * self) - #if GST_D3D11_WINAPI_ONLY_APP - if (window_type != GST_D3D11_WINDOW_NATIVE_TYPE_CORE_WINDOW && - window_type != GST_D3D11_WINDOW_NATIVE_TYPE_SWAP_CHAIN_PANEL) { -- GST_ERROR_OBJECT (sink, "Overlay handle must be set before READY state"); -+ GST_ERROR_OBJECT (self, "Overlay handle must be set before READY state"); - return FALSE; - } - #endif --- -2.17.1 - |