[vlc-commits] contrib: wine-headers: update to wine 5.0

[Biswapriyo Nath]

vlc | branch: master | Biswapriyo Nath <nathbappai at gmail.com> | Sat Jan 25 00:07:39 2020 +0530| [d27b2d8751483824f4bed565043a5fe965742486] | committer: Steve Lhomme

contrib: wine-headers: update to wine 5.0

* The dxgidebug.patch and processor_format.patch were added in upstream.
* This patch removes those and update wine tarball to version 5.0.

Signed-off-by: Biswapriyo Nath <nathbappai at gmail.com>
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d27b2d8751483824f4bed565043a5fe965742486
---

 contrib/src/wine-headers/SHA512SUMS             |  2 +-
 contrib/src/wine-headers/dxgidebug.patch        | 50 -------------------------
 contrib/src/wine-headers/processor_format.patch | 16 --------
 contrib/src/wine-headers/rules.mak              |  6 +--
 4 files changed, 3 insertions(+), 71 deletions(-)

diff --git a/contrib/src/wine-headers/SHA512SUMS b/contrib/src/wine-headers/SHA512SUMS
index bb2b5ddec9..430fcfee3a 100644
--- a/contrib/src/wine-headers/SHA512SUMS
+++ b/contrib/src/wine-headers/SHA512SUMS
@@ -1 +1 @@
-261420efdf14595715cff5bb6a61223b0f2090b89dc05dca8c053a8a81abc3018715d41db50769a0f0488c658efc0742ac0f577b578e69eace70be4e463131dd  wine-4.5.tar.xz
+681de951804c3dd3ae8c677a0ea52d172b04cac58594698b191cd972b25899cd2030d01a25fc2ad2eb6b99976a30319d2bd5ba8b7ff98b1a8b43832fa6514b83  wine-5.0.tar.xz
diff --git a/contrib/src/wine-headers/dxgidebug.patch b/contrib/src/wine-headers/dxgidebug.patch
deleted file mode 100644
index 5ee47922cc..0000000000
--- a/contrib/src/wine-headers/dxgidebug.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/include/dxgidebug.idl b/include/dxgidebug.idl
---- /dev/null
-+++ b/include/dxgidebug.idl
-@@ -0,0 +1,44 @@
-+/*
-+ * Copyright 2015 Steve Lhomme
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA02110-1301, USA
-+ */
-+
-+import "oaidl.idl";
-+
-+cpp_quote("DEFINE_GUID(DXGI_DEBUG_ALL,   0xe48ae283, 0xda80, 0x490b,0x87, 0xe6, 0x43, 0xe9, 0xa9, 0xcf, 0xda, 0x08);")
-+cpp_quote("DEFINE_GUID(DXGI_DEBUG_DX,    0x35cdd7fc, 0x13b2, 0x421d,0xa5, 0xd7, 0x7e, 0x44, 0x51, 0x28, 0x7d, 0x64);")
-+cpp_quote("DEFINE_GUID(DXGI_DEBUG_DXGI,  0x25cddaa4, 0xb1c6, 0x47e1,0xac, 0x3e, 0x98, 0x87, 0x5b, 0x5a, 0x2e, 0x2a);")
-+cpp_quote("DEFINE_GUID(DXGI_DEBUG_APP,   0x06cd6e01, 0x4219, 0x4ebd,0x87, 0x90, 0x27, 0xed, 0x23, 0x36, 0x0c, 0x62);")
-+
-+typedef enum DXGI_DEBUG_RLO_FLAGS {
-+    DXGI_DEBUG_RLO_SUMMARY         = 0x0001,
-+    DXGI_DEBUG_RLO_DETAIL          = 0x0002,
-+    DXGI_DEBUG_RLO_IGNORE_INTERNAL = 0x0004,
-+    DXGI_DEBUG_RLO_ALL             = 0x0007
-+} DXGI_DEBUG_RLO_FLAGS;
-+
-+[
-+    object,
-+    local,
-+    uuid(119e7452-de9e-40fe-8806-88f90c12b441)
-+]
-+interface IDXGIDebug : IUnknown
-+{
-+    HRESULT ReportLiveObjects(
-+        [in] GUID apiid,
-+        [in] DXGI_DEBUG_RLO_FLAGS flags);
-+}
-+
---
-1.9.5.msysgit.0
diff --git a/contrib/src/wine-headers/processor_format.patch b/contrib/src/wine-headers/processor_format.patch
deleted file mode 100644
index b54f82ec0c..0000000000
--- a/contrib/src/wine-headers/processor_format.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur wine-headers/include/d3d11.idl wine-headers.new/include/d3d11.idl
---- wine-headers/include/d3d11.idl	2019-03-29 22:25:31.000000000 +0100
-+++ wine-headers.new/include/d3d11.idl	2019-04-08 18:42:21.842723245 +0200
-@@ -3793,6 +3793,12 @@
-     D3D11_CREATE_DEVICE_VIDEO_SUPPORT   = 0x0800
- } D3D11_CREATE_DEVICE_FLAG;
- 
-+typedef enum D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT
-+{
-+    D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_INPUT = 0x00000001,
-+    D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT = 0x00000002,
-+} D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT;
-+
- const UINT D3D11_SDK_VERSION = 7;
- 
- cpp_quote("#include <d3d10_1.h>")
diff --git a/contrib/src/wine-headers/rules.mak b/contrib/src/wine-headers/rules.mak
index 9705a1ce21..becee0d609 100644
--- a/contrib/src/wine-headers/rules.mak
+++ b/contrib/src/wine-headers/rules.mak
@@ -1,6 +1,6 @@
 # WINE
-WINE_VERSION := 4.5
-WINE_URL := https://dl.winehq.org/wine/source/4.x/wine-$(WINE_VERSION).tar.xz
+WINE_VERSION := 5.0
+WINE_URL := https://dl.winehq.org/wine/source/5.0/wine-$(WINE_VERSION).tar.xz
 
 ifdef HAVE_WIN32
 PKGS += wine-headers
@@ -29,8 +29,6 @@ $(TARBALLS)/wine-$(WINE_VERSION).tar.xz:
 wine-headers: wine-$(WINE_VERSION).tar.xz .sum-wine-headers
 	$(UNPACK)
 	$(APPLY) $(SRC)/wine-headers/dxva2api.patch
-	$(APPLY) $(SRC)/wine-headers/dxgidebug.patch
-	$(APPLY) $(SRC)/wine-headers/processor_format.patch
 	$(MOVE)
 
 wine_widl = echo "GEN $(1)" && \