From da6b5669c2c2fa0bef0cc7c5742baa3d1e90f808 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 2 Apr 2023 18:46:54 +0200 Subject: [PATCH] crt: drop dx9 patch the same patch was dropped from headers via d77ed728fc3dd, but I forgot to remove it here too --- .../0002-DirectX-9-fixes-for-VLC.patch | 60 ------------------- mingw-w64-crt-git/PKGBUILD | 9 +-- 2 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 mingw-w64-crt-git/0002-DirectX-9-fixes-for-VLC.patch diff --git a/mingw-w64-crt-git/0002-DirectX-9-fixes-for-VLC.patch b/mingw-w64-crt-git/0002-DirectX-9-fixes-for-VLC.patch deleted file mode 100644 index 4afdc4275f..0000000000 --- a/mingw-w64-crt-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-crt-git/PKGBUILD b/mingw-w64-crt-git/PKGBUILD index 481fa7c418..9afe82372d 100644 --- a/mingw-w64-crt-git/PKGBUILD +++ b/mingw-w64-crt-git/PKGBUILD @@ -4,7 +4,7 @@ _realname=crt pkgbase=mingw-w64-${_realname}-git pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" pkgver=10.0.0.r250.g596e965e8 -pkgrel=1 +pkgrel=2 _commit='596e965e83c600665197910e9deef7ddb7dc690a' pkgdesc='MinGW-w64 CRT for Windows' arch=('any') @@ -21,11 +21,9 @@ provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") options=('!strip' '!buildflags' '!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" @@ -36,7 +34,6 @@ prepare() { cd ${srcdir}/mingw-w64 git apply "${srcdir}/0001-Allow-to-use-bessel-and-complex-functions-without-un.patch" - git apply "${srcdir}/0002-DirectX-9-fixes-for-VLC.patch" } build() {