diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-10-05 05:42:17 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-10-05 17:12:02 +0530 |
| commit | 41b480c3828939272c7acdf3363cc3fc0c79651e (patch) | |
| tree | 92b77d013bfd7885613e92dc8428d1023222788e | |
| parent | 02ff9959cd97f28401590b974351ce87ba50e9e5 (diff) | |
gst-plugins-bad: Local patch to fix UWP debug build
We need to add this via a patch because gstreamer is already tagged.
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3118
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/956>
| -rw-r--r-- | recipes/0001-d3d11-Fix-debug-build-on-UWP.patch | 50 | ||||
| -rw-r--r-- | recipes/gst-plugins-bad-1.0.recipe | 3 |
2 files changed, 53 insertions, 0 deletions
diff --git a/recipes/0001-d3d11-Fix-debug-build-on-UWP.patch b/recipes/0001-d3d11-Fix-debug-build-on-UWP.patch new file mode 100644 index 00000000..b0a90921 --- /dev/null +++ b/recipes/0001-d3d11-Fix-debug-build-on-UWP.patch @@ -0,0 +1,50 @@ +From dbd3007664de97f8bb8fa86349452f37a8bb7ba0 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan <nirbheek@centricular.com> +Date: Wed, 5 Oct 2022 05:38:54 +0530 +Subject: [PATCH] d3d11: Fix debug build on UWP + +GstDXGIGetDebugInterface() is unused when targeting UWP. We directly +call DXGIGetDebugInterface1() in that case. + +Fixes build failure: + +../gst-libs/gst/d3d11/gstd3d11device.cpp(271): error C2440: '=': cannot convert from 'HRESULT (__cdecl *)(UINT,const IID &,void **)' to 'DXGIGetDebugInterface_t' +../gst-libs/gst/d3d11/gstd3d11device.cpp(271): note: This conversion requires a reinterpret_cast, a C-style cast or function-style cast +--- + gst-libs/gst/d3d11/gstd3d11device.cpp | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/gst-libs/gst/d3d11/gstd3d11device.cpp b/gst-libs/gst/d3d11/gstd3d11device.cpp +index db42e3925c..fc668736a9 100644 +--- a/gst-libs/gst/d3d11/gstd3d11device.cpp ++++ b/gst-libs/gst/d3d11/gstd3d11device.cpp +@@ -258,22 +258,21 @@ gst_d3d11_device_d3d11_debug (GstD3D11Device * device, + static gboolean + gst_d3d11_device_enable_dxgi_debug (void) + { ++#if (!GST_D3D11_WINAPI_ONLY_APP) + static GModule *dxgi_debug_module = nullptr; + + GST_D3D11_CALL_ONCE_BEGIN { +-#if (!GST_D3D11_WINAPI_ONLY_APP) + dxgi_debug_module = g_module_open ("dxgidebug.dll", G_MODULE_BIND_LAZY); + + if (dxgi_debug_module) + g_module_symbol (dxgi_debug_module, + "DXGIGetDebugInterface", (gpointer *) & GstDXGIGetDebugInterface); +-#else +- GstDXGIGetDebugInterface = DXGIGetDebugInterface1; +-#endif +- } GST_D3D11_CALL_ONCE_END; ++ } ++ GST_D3D11_CALL_ONCE_END; + + if (!GstDXGIGetDebugInterface) + return FALSE; ++#endif + + return TRUE; + } +-- +2.37.3 + diff --git a/recipes/gst-plugins-bad-1.0.recipe b/recipes/gst-plugins-bad-1.0.recipe index 2d3a0218..e538767b 100644 --- a/recipes/gst-plugins-bad-1.0.recipe +++ b/recipes/gst-plugins-bad-1.0.recipe @@ -84,6 +84,9 @@ class Recipe(custom.GStreamer): 'srt', 'zbar'] use_system_libs = True + # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3118 + patches = ['0001-d3d11-Fix-debug-build-on-UWP.patch'] + files_lang = ['gst-plugins-bad-1.0'] files_libs = [ |