diff --git a/mingw-w64-headers-git/0002-DirectX-9-fixes-for-VLC.patch b/mingw-w64-headers-git/0002-DirectX-9-fixes-for-VLC.patch deleted file mode 100644 index 4afdc4275f..0000000000 --- a/mingw-w64-headers-git/0002-DirectX-9-fixes-for-VLC.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 9fc65fb4feda041b745bb0e15994537f2ad5b400 Mon Sep 17 00:00:00 2001 -From: Alexey Pavlov -Date: Thu, 14 Sep 2017 11:18:59 +0300 -Subject: [PATCH] DirectX 9 fixes for VLC - ---- - mingw-w64-headers/include/d3d9.h | 37 ++ - 1 files changed, 37 insertions(+), 0 deletions(-) - -diff --git a/mingw-w64-headers/include/d3d9.h b/mingw-w64-headers/include/d3d9.h -index aea02f4e..27bb2833 100644 ---- a/mingw-w64-headers/include/d3d9.h -+++ b/mingw-w64-headers/include/d3d9.h -@@ -2201,6 +2201,43 @@ DECLARE_INTERFACE_(IDirect3DDevice9Ex, IDirect3DDevice9) - - #endif /* !defined(D3D_DISABLE_9EX) */ - -+/***************************************************************************** -+ * IDirect3D9ExOverlayExtension interface -+ */ -+#define INTERFACE IDirect3D9ExOverlayExtension -+DECLARE_INTERFACE_(IDirect3D9ExOverlayExtension,IUnknown) -+{ -+ /*** IUnknown methods ***/ -+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; -+ STDMETHOD_(ULONG,AddRef)(THIS) PURE; -+ STDMETHOD_(ULONG,Release)(THIS) PURE; -+ /*** IDirect3D9ExOverlayExtension methods ***/ -+ STDMETHOD(CheckDeviceOverlayType)(THIS_ UINT Adapter, D3DDEVTYPE DevType, UINT OverlayWidth, UINT OverlayHeight, -+ D3DFORMAT OverlayFormat, D3DDISPLAYMODEEX* pDisplayMode, D3DDISPLAYROTATION DisplayRotation, D3DOVERLAYCAPS* pOverlayCaps) PURE; -+}; -+#undef INTERFACE -+ -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3D9ExOverlayExtension, 0x187aeb13, 0xaaf5, 0x4c59, 0x87, 0x6d, 0xe0, 0x59, 0x8, 0x8c, 0xd, 0xf8); -+#endif -+ -+#if !defined(__cplusplus) || defined(CINTERFACE) -+/*** IUnknown methods ***/ -+#define IDirect3D9ExOverlayExtension_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -+#define IDirect3D9ExOverlayExtension_AddRef(p) (p)->lpVtbl->AddRef(p) -+#define IDirect3D9ExOverlayExtension_Release(p) (p)->lpVtbl->Release(p) -+/*** IDirect3D9ExOverlayExtension ***/ -+#define IDirect3D9ExOverlayExtension_CheckDeviceOverlayType(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->CheckDeviceOverlayType(p,a,b,c,d,e,f,g,h) -+#else -+/*** IUnknown methods ***/ -+#define IDirect3D9ExOverlayExtension_QueryInterface(p,a,b) (p)->QueryInterface(a,b) -+#define IDirect3D9ExOverlayExtension_AddRef(p) (p)->AddRef() -+#define IDirect3D9ExOverlayExtension_Release(p) (p)->Release() -+/*** IDirect3D9ExOverlayExtension ***/ -+#define IDirect3D9ExOverlayExtension_CheckDeviceOverlayType(p,a,b,c,d,e,f,g,h) (p)->CheckDeviceOverlayType(a,b,c,d,e,f,g,h) -+#endif -+ -+ - #ifdef __cplusplus - extern "C" { - #endif /* defined(__cplusplus) */ --- -2.14.2 - diff --git a/mingw-w64-headers-git/PKGBUILD b/mingw-w64-headers-git/PKGBUILD index 49aae6b9b4..cd585a61d2 100644 --- a/mingw-w64-headers-git/PKGBUILD +++ b/mingw-w64-headers-git/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}-git pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" pkgdesc="MinGW-w64 headers for Windows" pkgver=10.0.0.r153.g31e6f8e5a -pkgrel=1 +pkgrel=2 _commit='31e6f8e5a26d211e4f047f23736be3e9ae1d5058' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -17,11 +17,9 @@ provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") options=('!strip' '!libtool' '!emptydirs') source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64#commit=$_commit" - 0001-Allow-to-use-bessel-and-complex-functions-without-un.patch - 0002-DirectX-9-fixes-for-VLC.patch) + 0001-Allow-to-use-bessel-and-complex-functions-without-un.patch) sha256sums=('SKIP' - 'd641257f7e1469aff89adc33e57702b75fe9667ca035978f890eae1020b6814c' - '09b1c7b62f666a07609af57e10c2b0ad815b78356f4b0f1fb6d827a1109a0ec7') + 'd641257f7e1469aff89adc33e57702b75fe9667ca035978f890eae1020b6814c') pkgver() { cd "${srcdir}/mingw-w64" @@ -32,8 +30,6 @@ prepare() { cd ${srcdir}/mingw-w64 git apply "${srcdir}/0001-Allow-to-use-bessel-and-complex-functions-without-un.patch" - # https://code.videolan.org/videolan/vlc/-/blob/e9eceaed4d838dbd84638bfb2e4bdd08294163b1/contrib/src/d3d9/d3d9.patch - git apply "${srcdir}/0002-DirectX-9-fixes-for-VLC.patch" cd ${srcdir}/mingw-w64/mingw-w64-headers touch include/windows.*.h include/wincrypt.h include/prsht.h