From a10bcb7bbe41bc71c03f9d6511b80a6732f156ce Mon Sep 17 00:00:00 2001 From: Alexpux Date: Mon, 10 Feb 2014 18:49:02 +0400 Subject: [PATCH] mingw-w64: Update to 6477. --- mingw-w64-crt/PKGBUILD | 7 +- ...Added-__uuidof-support-to-interfaces.patch | 225 ------------------ mingw-w64-headers/PKGBUILD | 11 +- 3 files changed, 4 insertions(+), 239 deletions(-) delete mode 100644 mingw-w64-headers/0001-d3d9.h-Added-__uuidof-support-to-interfaces.patch diff --git a/mingw-w64-crt/PKGBUILD b/mingw-w64-crt/PKGBUILD index 424dd6deb3..a4375f576d 100644 --- a/mingw-w64-crt/PKGBUILD +++ b/mingw-w64-crt/PKGBUILD @@ -4,10 +4,10 @@ _realname=crt _mingw_suff=mingw-w64-${CARCH} pkgname="${_mingw_suff}-${_realname}-svn" _ver_base=4.0.0 -_revision=6459 +_revision= _fragment= [[ -n ${_revision} ]] && _fragment="#revision=${_revision}" -pkgver=4.0.0.6459 +pkgver=4.0.0.6475 pkgrel=1 pkgdesc='MinGW-w64 CRT for Windows' arch=('any') @@ -16,11 +16,8 @@ license=('custom') groups=("${_mingw_suff}-toolchain" "${_mingw_suff}") depends=("${_mingw_suff}-headers-svn") makedepends=("subversion" "${_mingw_suff}-gcc" "${_mingw_suff}-binutils") -optdepends=() provides=("${_mingw_suff}-${_realname}") conflicts=("${_mingw_suff}-${_realname}") -replaces=() -backup=() options=('!strip' 'staticlibs' '!emptydirs') source=("${_realname}"::"svn+svn://svn.code.sf.net/p/mingw-w64/code/trunk/mingw-w64-crt${_fragment}") md5sums=('SKIP') diff --git a/mingw-w64-headers/0001-d3d9.h-Added-__uuidof-support-to-interfaces.patch b/mingw-w64-headers/0001-d3d9.h-Added-__uuidof-support-to-interfaces.patch deleted file mode 100644 index 4b0ddb6c2e..0000000000 --- a/mingw-w64-headers/0001-d3d9.h-Added-__uuidof-support-to-interfaces.patch +++ /dev/null @@ -1,225 +0,0 @@ -diff --git a/direct-x/include/d3d9.h b/direct-x/include/d3d9.h -index 098fc9a..20625b0 100644 ---- a/direct-x/include/d3d9.h -+++ b/direct-x/include/d3d9.h -@@ -203,6 +203,10 @@ DECLARE_INTERFACE_(IDirect3D9,IUnknown) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3D9, 0x81BDCBCA, 0x64D4, 0x426D, 0xAE, 0x8D, 0xAD, 0x1, 0x47, 0xF4, 0x27, 0x5C); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3D9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -288,6 +292,10 @@ DECLARE_INTERFACE_(IDirect3D9Ex,IDirect3D9) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3D9Ex, 0x02177241, 0x69FC, 0x400C, 0x8F, 0xF1, 0x93, 0xA4, 0x4D, 0xF6, 0x86, 0x1D); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3D9Ex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -358,6 +366,10 @@ DECLARE_INTERFACE_(IDirect3DVolume9,IUnknown) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DVolume9, 0x24f416e6, 0x1f67, 0x4aa7, 0xb8, 0x8e, 0xd3, 0x3f, 0x6f, 0x31, 0x28, 0xa1); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DVolume9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -410,6 +422,10 @@ DECLARE_INTERFACE_(IDirect3DSwapChain9,IUnknown) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DSwapChain9, 0x794950f2, 0xadfc, 0x458a, 0x90, 0x5e, 0x10, 0xa1, 0xb, 0xb, 0x50, 0x3b); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DSwapChain9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -464,6 +480,10 @@ DECLARE_INTERFACE_(IDirect3DSwapChain9Ex,IDirect3DSwapChain9) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DSwapChain9Ex, 0x91886caf, 0x1c3d, 0x4d2e, 0xa0, 0xab, 0x3e, 0x4c, 0x7d, 0x8d, 0x33, 0x3); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DSwapChain9Ex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -522,6 +542,10 @@ DECLARE_INTERFACE_(IDirect3DResource9,IUnknown) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DResource9, 0x5eec05d, 0x8f7d, 0x4362, 0xb9, 0x99, 0xd1, 0xba, 0xf3, 0x57, 0xc7, 0x4); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DResource9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -581,6 +605,10 @@ DECLARE_INTERFACE_(IDirect3DSurface9,IDirect3DResource9) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DSurface9, 0xcfbaf3a, 0x9ff6, 0x429a, 0x99, 0xb3, 0xa2, 0x79, 0x6a, 0xf8, 0xb8, 0x9b); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DSurface9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -651,6 +679,10 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer9,IDirect3DResource9) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DVertexBuffer9, 0xb64bb1b5, 0xfd70, 0x4df6, 0xbf, 0x91, 0x19, 0xd0, 0xa1, 0x24, 0x55, 0xe3); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DVertexBuffer9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -715,6 +747,10 @@ DECLARE_INTERFACE_(IDirect3DIndexBuffer9,IDirect3DResource9) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DIndexBuffer9, 0x7c9dd65e, 0xd3f7, 0x4529, 0xac, 0xee, 0x78, 0x58, 0x30, 0xac, 0xde, 0x35); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DIndexBuffer9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -782,6 +818,10 @@ DECLARE_INTERFACE_(IDirect3DBaseTexture9,IDirect3DResource9) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DBaseTexture9, 0x580ca87e, 0x1d3c, 0x4d54, 0x99, 0x1d, 0xb7, 0xd3, 0xe3, 0xc2, 0x98, 0xce); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DBaseTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -862,6 +902,10 @@ DECLARE_INTERFACE_(IDirect3DCubeTexture9,IDirect3DBaseTexture9) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DCubeTexture9, 0xfff32f81, 0xd953, 0x473a, 0x92, 0x23, 0x93, 0xd6, 0x52, 0xab, 0xa9, 0x3f); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DCubeTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -953,6 +997,10 @@ DECLARE_INTERFACE_(IDirect3DTexture9,IDirect3DBaseTexture9) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DTexture9, 0x85c31227, 0x3de5, 0x4f00, 0x9b, 0x3a, 0xf1, 0x1a, 0xc3, 0x8c, 0x18, 0xb5); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -1044,6 +1092,10 @@ DECLARE_INTERFACE_(IDirect3DVolumeTexture9,IDirect3DBaseTexture9) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DVolumeTexture9, 0x2518526c, 0xe789, 0x4111, 0xa7, 0xb9, 0x47, 0xef, 0x32, 0x8d, 0x13, 0xe6); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DVolumeTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -1116,6 +1168,10 @@ DECLARE_INTERFACE_(IDirect3DVertexDeclaration9,IUnknown) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DVertexDeclaration9, 0xdd13c59c, 0x36fa, 0x4098, 0xa8, 0xfb, 0xc7, 0xed, 0x39, 0xdc, 0x85, 0x46); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DVertexDeclaration9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -1150,6 +1206,10 @@ DECLARE_INTERFACE_(IDirect3DVertexShader9,IUnknown) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DVertexShader9, 0xefc5557e, 0x6265, 0x4613, 0x8a, 0x94, 0x43, 0x85, 0x78, 0x89, 0xeb, 0x36); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DVertexShader9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -1184,6 +1244,10 @@ DECLARE_INTERFACE_(IDirect3DPixelShader9,IUnknown) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DPixelShader9, 0x6d3bdbdc, 0x5b02, 0x4415, 0xb8, 0x52, 0xce, 0x5e, 0x8b, 0xcc, 0xb2, 0x89); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DPixelShader9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -1219,6 +1283,10 @@ DECLARE_INTERFACE_(IDirect3DStateBlock9,IUnknown) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DStateBlock9, 0xb07c4fe5, 0x310d, 0x4ba8, 0xa2, 0x3c, 0x4f, 0xf, 0x20, 0x6f, 0x21, 0x8b); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DStateBlock9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -1258,6 +1326,10 @@ DECLARE_INTERFACE_(IDirect3DQuery9,IUnknown) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DQuery9, 0xd9771460, 0xa695, 0x4f26, 0xbb, 0xd3, 0x27, 0xb8, 0x40, 0xb5, 0x41, 0xcc); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DQuery9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -1419,6 +1491,10 @@ DECLARE_INTERFACE_(IDirect3DDevice9,IUnknown) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DDevice9, 0xd0223b96, 0xbf7a, 0x43fd, 0x92, 0xbd, 0xa4, 0x3b, 0xd, 0x82, 0xb9, 0xeb); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DDevice9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -@@ -1824,6 +1900,10 @@ DECLARE_INTERFACE_(IDirect3DDevice9Ex,IDirect3DDevice9) - }; - #undef INTERFACE - -+#ifdef __CRT_UUID_DECL -+__CRT_UUID_DECL(IDirect3DDevice9Ex, 0xb18b10ce, 0x2649, 0x405a, 0x87, 0xf, 0x95, 0xf7, 0x77, 0xd4, 0x31, 0x3a); -+#endif -+ - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirect3DDevice9Ex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) - diff --git a/mingw-w64-headers/PKGBUILD b/mingw-w64-headers/PKGBUILD index 365751e358..ae6995e492 100644 --- a/mingw-w64-headers/PKGBUILD +++ b/mingw-w64-headers/PKGBUILD @@ -5,28 +5,22 @@ _mingw_suff=mingw-w64-${CARCH} pkgname="${_mingw_suff}-${_realname}-svn" pkgdesc="MinGW-w64 headers for Windows" _ver_base=4.0.0 -_revision=6459 +_revision= _fragment= [[ -n ${_revision} ]] && _fragment="#revision=${_revision}" -pkgver=4.0.0.6459 +pkgver=4.0.0.6477 pkgrel=1 arch=('any') url="http://mingw-w64.sourceforge.net" license=('custom') groups=("${_mingw_suff}-toolchain" "${_mingw_suff}") -depends=() makedepends=('subversion') -optdepends=() provides=("${_mingw_suff}-${_realname}") conflicts=("${_mingw_suff}-${_realname}") -replaces=() -backup=() options=('!strip' '!libtool' '!emptydirs') source=("${_realname}"::"svn+svn://svn.code.sf.net/p/mingw-w64/code/trunk/mingw-w64-headers${_fragment}" - 0001-d3d9.h-Added-__uuidof-support-to-interfaces.patch 0002-Add-missing-API-to-directx9-shader-header.patch) md5sums=('SKIP' - 'e0a110be67cc8f0fedddcd3b8b913074' '067a17efcdc4b0bfaff82cbed9009cd4') pkgver() { @@ -37,7 +31,6 @@ pkgver() { prepare() { cd ${srcdir}/${_realname} - patch -p1 -i ${srcdir}/0001-d3d9.h-Added-__uuidof-support-to-interfaces.patch patch -p1 -i ${srcdir}/0002-Add-missing-API-to-directx9-shader-header.patch }