From 6ad5a5b741a2a729d3f72ba31bd09d5d8dcc78a0c8d7959a229105cb6510b4ae Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 17 Oct 2018 18:53:09 +0000 Subject: [PATCH] - Update to new upstream release 6.0.0 OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-headers?expand=0&rev=48 --- 0001-Add-missing-D3D_CS_-variables.patch | 193 ----------------------- mingw-w64-headers-5.0.4.tar.xz | 3 - mingw-w64-headers-6.0.0.tar.xz | 3 + mingw64-headers.changes | 16 +- mingw64-headers.spec | 23 ++- popcnt.patch | 51 ------ 6 files changed, 28 insertions(+), 261 deletions(-) delete mode 100644 0001-Add-missing-D3D_CS_-variables.patch delete mode 100644 mingw-w64-headers-5.0.4.tar.xz create mode 100644 mingw-w64-headers-6.0.0.tar.xz delete mode 100644 popcnt.patch diff --git a/0001-Add-missing-D3D_CS_-variables.patch b/0001-Add-missing-D3D_CS_-variables.patch deleted file mode 100644 index 0de620c..0000000 --- a/0001-Add-missing-D3D_CS_-variables.patch +++ /dev/null @@ -1,193 +0,0 @@ -From cd61f9067b342c8fcf418d724dff4bccbebfaa78 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=B0smail=20D=C3=B6nmez?= -Date: Thu, 12 Jan 2017 08:46:53 +0100 -Subject: [PATCH] Add missing D3D_CS_* variables. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: İsmail Dönmez ---- - mingw-w64-headers/direct-x/include/d3d11.h | 102 +++++++++++++++++++++++++++ - mingw-w64-headers/direct-x/include/d3d11.idl | 52 ++++++++++++++ - 2 files changed, 154 insertions(+) - -diff --git a/mingw-w64-headers/direct-x/include/d3d11.h b/mingw-w64-headers/direct-x/include/d3d11.h -index 52610b96..68ce51b1 100644 ---- a/mingw-w64-headers/direct-x/include/d3d11.h -+++ b/mingw-w64-headers/direct-x/include/d3d11.h -@@ -327,6 +327,108 @@ typedef interface ID3D11VideoProcessorInputView ID3D11VideoProcessorInputView; - - #define D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_POSITIVE (7) - -+#define D3D11_CS_4_X_BUCKET00_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (256) -+ -+#define D3D11_CS_4_X_BUCKET00_MAX_NUM_THREADS_PER_GROUP (64) -+ -+#define D3D11_CS_4_X_BUCKET01_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (240) -+ -+#define D3D11_CS_4_X_BUCKET01_MAX_NUM_THREADS_PER_GROUP (68) -+ -+#define D3D11_CS_4_X_BUCKET02_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (224) -+ -+#define D3D11_CS_4_X_BUCKET02_MAX_NUM_THREADS_PER_GROUP (72) -+ -+#define D3D11_CS_4_X_BUCKET03_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (208) -+ -+#define D3D11_CS_4_X_BUCKET03_MAX_NUM_THREADS_PER_GROUP (76) -+ -+#define D3D11_CS_4_X_BUCKET04_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (192) -+ -+#define D3D11_CS_4_X_BUCKET04_MAX_NUM_THREADS_PER_GROUP (84) -+ -+#define D3D11_CS_4_X_BUCKET05_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (176) -+ -+#define D3D11_CS_4_X_BUCKET05_MAX_NUM_THREADS_PER_GROUP (92) -+ -+#define D3D11_CS_4_X_BUCKET06_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (160) -+ -+#define D3D11_CS_4_X_BUCKET06_MAX_NUM_THREADS_PER_GROUP (100) -+ -+#define D3D11_CS_4_X_BUCKET07_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (144) -+ -+#define D3D11_CS_4_X_BUCKET07_MAX_NUM_THREADS_PER_GROUP (112) -+ -+#define D3D11_CS_4_X_BUCKET08_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (128) -+ -+#define D3D11_CS_4_X_BUCKET08_MAX_NUM_THREADS_PER_GROUP (128) -+ -+#define D3D11_CS_4_X_BUCKET09_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (112) -+ -+#define D3D11_CS_4_X_BUCKET09_MAX_NUM_THREADS_PER_GROUP (144) -+ -+#define D3D11_CS_4_X_BUCKET10_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (96) -+ -+#define D3D11_CS_4_X_BUCKET10_MAX_NUM_THREADS_PER_GROUP (168) -+ -+#define D3D11_CS_4_X_BUCKET11_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (80) -+ -+#define D3D11_CS_4_X_BUCKET11_MAX_NUM_THREADS_PER_GROUP (204) -+ -+#define D3D11_CS_4_X_BUCKET12_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (64) -+ -+#define D3D11_CS_4_X_BUCKET12_MAX_NUM_THREADS_PER_GROUP (256) -+ -+#define D3D11_CS_4_X_BUCKET13_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (48) -+ -+#define D3D11_CS_4_X_BUCKET13_MAX_NUM_THREADS_PER_GROUP (340) -+ -+#define D3D11_CS_4_X_BUCKET14_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (32) -+ -+#define D3D11_CS_4_X_BUCKET14_MAX_NUM_THREADS_PER_GROUP (512) -+ -+#define D3D11_CS_4_X_BUCKET15_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (16) -+ -+#define D3D11_CS_4_X_BUCKET15_MAX_NUM_THREADS_PER_GROUP (768) -+ -+#define D3D11_CS_4_X_DISPATCH_MAX_THREAD_GROUPS_IN_Z_DIMENSION (1) -+ -+#define D3D11_CS_4_X_RAW_UAV_BYTE_ALIGNMENT (256) -+ -+#define D3D11_CS_4_X_THREAD_GROUP_MAX_THREADS_PER_GROUP (768) -+ -+#define D3D11_CS_4_X_THREAD_GROUP_MAX_X (768) -+ -+#define D3D11_CS_4_X_THREAD_GROUP_MAX_Y (768) -+ -+#define D3D11_CS_4_X_UAV_REGISTER_COUNT (1) -+ -+#define D3D11_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION (65535) -+ -+#define D3D11_CS_TGSM_REGISTER_COUNT (8192) -+ -+#define D3D11_CS_TGSM_REGISTER_READS_PER_INST (1) -+ -+#define D3D11_CS_TGSM_RESOURCE_REGISTER_COMPONENTS (1) -+ -+#define D3D11_CS_TGSM_RESOURCE_REGISTER_READ_PORTS (1) -+ -+#define D3D11_CS_THREAD_GROUP_MAX_THREADS_PER_GROUP (1024) -+ -+#define D3D11_CS_THREAD_GROUP_MAX_X (1024) -+ -+#define D3D11_CS_THREAD_GROUP_MAX_Y (1024) -+ -+#define D3D11_CS_THREAD_GROUP_MAX_Z (64) -+ -+#define D3D11_CS_THREAD_GROUP_MIN_X (1) -+ -+#define D3D11_CS_THREAD_GROUP_MIN_Y (1) -+ -+#define D3D11_CS_THREAD_GROUP_MIN_Z (1) -+ -+#define D3D11_CS_THREAD_LOCAL_TEMP_REGISTER_POOL (16384) -+ - #define D3D11_DEFAULT_DEPTH_BIAS (0) - - #define D3D11_DEFAULT_DEPTH_BIAS_CLAMP 0.0f -diff --git a/mingw-w64-headers/direct-x/include/d3d11.idl b/mingw-w64-headers/direct-x/include/d3d11.idl -index 3c39f041..68d6c717 100644 ---- a/mingw-w64-headers/direct-x/include/d3d11.idl -+++ b/mingw-w64-headers/direct-x/include/d3d11.idl -@@ -68,6 +68,58 @@ const INT D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MIN = -10; - const INT D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_NEGATIVE = -8; - const UINT D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_POSITIVE = 7; - -+const UINT D3D11_CS_4_X_BUCKET00_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 256; -+const UINT D3D11_CS_4_X_BUCKET00_MAX_NUM_THREADS_PER_GROUP = 64; -+const UINT D3D11_CS_4_X_BUCKET01_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 240; -+const UINT D3D11_CS_4_X_BUCKET01_MAX_NUM_THREADS_PER_GROUP = 68; -+const UINT D3D11_CS_4_X_BUCKET02_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 224; -+const UINT D3D11_CS_4_X_BUCKET02_MAX_NUM_THREADS_PER_GROUP = 72; -+const UINT D3D11_CS_4_X_BUCKET03_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 208; -+const UINT D3D11_CS_4_X_BUCKET03_MAX_NUM_THREADS_PER_GROUP = 76; -+const UINT D3D11_CS_4_X_BUCKET04_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 192; -+const UINT D3D11_CS_4_X_BUCKET04_MAX_NUM_THREADS_PER_GROUP = 84; -+const UINT D3D11_CS_4_X_BUCKET05_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 176; -+const UINT D3D11_CS_4_X_BUCKET05_MAX_NUM_THREADS_PER_GROUP = 92; -+const UINT D3D11_CS_4_X_BUCKET06_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 160; -+const UINT D3D11_CS_4_X_BUCKET06_MAX_NUM_THREADS_PER_GROUP = 100; -+const UINT D3D11_CS_4_X_BUCKET07_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 144; -+const UINT D3D11_CS_4_X_BUCKET07_MAX_NUM_THREADS_PER_GROUP = 112; -+const UINT D3D11_CS_4_X_BUCKET08_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 128; -+const UINT D3D11_CS_4_X_BUCKET08_MAX_NUM_THREADS_PER_GROUP = 128; -+const UINT D3D11_CS_4_X_BUCKET09_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 112; -+const UINT D3D11_CS_4_X_BUCKET09_MAX_NUM_THREADS_PER_GROUP = 144; -+const UINT D3D11_CS_4_X_BUCKET10_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 96; -+const UINT D3D11_CS_4_X_BUCKET10_MAX_NUM_THREADS_PER_GROUP = 168; -+const UINT D3D11_CS_4_X_BUCKET11_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 80; -+const UINT D3D11_CS_4_X_BUCKET11_MAX_NUM_THREADS_PER_GROUP = 204; -+const UINT D3D11_CS_4_X_BUCKET12_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 64; -+const UINT D3D11_CS_4_X_BUCKET12_MAX_NUM_THREADS_PER_GROUP = 256; -+const UINT D3D11_CS_4_X_BUCKET13_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 48; -+const UINT D3D11_CS_4_X_BUCKET13_MAX_NUM_THREADS_PER_GROUP = 340; -+const UINT D3D11_CS_4_X_BUCKET14_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 32; -+const UINT D3D11_CS_4_X_BUCKET14_MAX_NUM_THREADS_PER_GROUP = 512; -+const UINT D3D11_CS_4_X_BUCKET15_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 16; -+const UINT D3D11_CS_4_X_BUCKET15_MAX_NUM_THREADS_PER_GROUP = 768; -+const UINT D3D11_CS_4_X_DISPATCH_MAX_THREAD_GROUPS_IN_Z_DIMENSION = 1; -+const UINT D3D11_CS_4_X_RAW_UAV_BYTE_ALIGNMENT = 256; -+const UINT D3D11_CS_4_X_THREAD_GROUP_MAX_THREADS_PER_GROUP = 768; -+const UINT D3D11_CS_4_X_THREAD_GROUP_MAX_X = 768; -+const UINT D3D11_CS_4_X_THREAD_GROUP_MAX_Y = 768; -+const UINT D3D11_CS_4_X_UAV_REGISTER_COUNT = 1; -+const UINT D3D11_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION = 65535; -+const UINT D3D11_CS_TGSM_REGISTER_COUNT = 8192; -+const UINT D3D11_CS_TGSM_REGISTER_READS_PER_INST = 1; -+const UINT D3D11_CS_TGSM_RESOURCE_REGISTER_COMPONENTS = 1; -+const UINT D3D11_CS_TGSM_RESOURCE_REGISTER_READ_PORTS = 1; -+const UINT D3D11_CS_THREAD_GROUP_MAX_THREADS_PER_GROUP = 1024; -+const UINT D3D11_CS_THREAD_GROUP_MAX_X = 1024; -+const UINT D3D11_CS_THREAD_GROUP_MAX_Y = 1024; -+const UINT D3D11_CS_THREAD_GROUP_MAX_Z = 64; -+const UINT D3D11_CS_THREAD_GROUP_MIN_X = 1; -+const UINT D3D11_CS_THREAD_GROUP_MIN_Y = 1; -+const UINT D3D11_CS_THREAD_GROUP_MIN_Z = 1; -+const UINT D3D11_CS_THREAD_LOCAL_TEMP_REGISTER_POOL = 16384; -+ - const UINT D3D11_DEFAULT_DEPTH_BIAS = 0; - cpp_quote("#define D3D11_DEFAULT_DEPTH_BIAS_CLAMP 0.0f") - const UINT D3D11_DEFAULT_MAX_ANISOTROPY = 16; --- -2.11.0 - diff --git a/mingw-w64-headers-5.0.4.tar.xz b/mingw-w64-headers-5.0.4.tar.xz deleted file mode 100644 index 30048bf..0000000 --- a/mingw-w64-headers-5.0.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:472603bb2803b2385f201e622f997f917ed2236f603a343efa36c9e78269e97c -size 5185164 diff --git a/mingw-w64-headers-6.0.0.tar.xz b/mingw-w64-headers-6.0.0.tar.xz new file mode 100644 index 0000000..0ee4ac2 --- /dev/null +++ b/mingw-w64-headers-6.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50a497676718a026ba240dd13a055cb08b1e61c70bd2a5bd290be52d161db146 +size 5374676 diff --git a/mingw64-headers.changes b/mingw64-headers.changes index c948929..c90eedf 100644 --- a/mingw64-headers.changes +++ b/mingw64-headers.changes @@ -1,7 +1,21 @@ +------------------------------------------------------------------- +Wed Oct 17 18:50:03 UTC 2018 - Jan Engelhardt + +- Update to new upstream release 6.0.0 + * C++ __cxa_atexit + * Massive additions to support UCRT + * Sync COM interface headers with Wine development + * WinRT additions + * ARM32 and ARM64 additions + * CRT library api-ms-win-core additions + * CRT library def file reorganization +- Removed popcnt.patch, 0001-Add-missing-D3D_CS_-variables.patch + (no longer needed; included upstream) + ------------------------------------------------------------------- Tue Nov 21 11:37:09 UTC 2017 - idonmez@suse.com -- Update to version 5.0.3 +- Update to version 5.0.3 ------------------------------------------------------------------- Thu Apr 20 08:26:10 UTC 2017 - idonmez@suse.com diff --git a/mingw64-headers.spec b/mingw64-headers.spec index ff67ea3..4db2c39 100644 --- a/mingw64-headers.spec +++ b/mingw64-headers.spec @@ -17,23 +17,22 @@ Name: mingw64-headers -Version: 5.0.4 +Version: 6.0.0 Release: 0 Summary: MinGW-w64 headers for Win32 and Win64 License: SUSE-Public-Domain Group: Development/Libraries/C and C++ Url: http://mingw-w64.sf.net/ -#DL-URL: http://downloads.sf.net/mingw-w64/mingw-w64-%version.tar.bz2 +#DL-URL: http://downloads.sf.net/mingw-w64/mingw-w64-v%%version.tar.bz2 +# Unpack DL-URL and re-tar the "mingw64-headers" directory Source: mingw-w64-headers-%version.tar.xz Source1000: %name-rpmlintrc -Patch1: 0001-Add-missing-D3D_CS_-variables.patch -Patch2: popcnt.patch BuildRequires: mingw64-filesystem BuildRequires: xz #!BuildIgnore: post-build-checks Requires: mingw64-unistd-pthread-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %_tmppath/%name-%version-build BuildArch: noarch %description @@ -55,26 +54,24 @@ an actual pthread implementation (like winpthreads) is installed. %prep %setup -q -n mingw-w64-headers -%patch1 -p2 -%patch2 -p2 %build -%{_mingw64_configure} \ +%_mingw64_configure \ --enable-sdk=all \ --enable-secure-api make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install %files %defattr(-,root,root) -%{_mingw64_includedir}/ -%exclude %{_mingw64_includedir}/pthread_*.h +%_mingw64_includedir/ +%exclude %_mingw64_includedir/pthread_*.h %files dummy-pthread %defattr(-,root,root) -%dir %{_mingw64_includedir} -%{_mingw64_includedir}/pthread_*.h +%dir %_mingw64_includedir +%_mingw64_includedir/pthread_*.h %changelog diff --git a/popcnt.patch b/popcnt.patch deleted file mode 100644 index 833c0db..0000000 --- a/popcnt.patch +++ /dev/null @@ -1,51 +0,0 @@ -commit 5aa73896a3313a354cf6550d99ecd652d0abd3b2 -Author: David Grayson -Date: Wed Feb 8 18:56:17 2017 +0100 - - intrin-impl.h: Added __popcnt16, __popcnt, and __popcnt64. - -diff --git a/mingw-w64-headers/include/psdk_inc/intrin-impl.h b/mingw-w64-headers/include/psdk_inc/intrin-impl.h -index f8dc78f9..fc781ff9 100644 ---- a/mingw-w64-headers/include/psdk_inc/intrin-impl.h -+++ b/mingw-w64-headers/include/psdk_inc/intrin-impl.h -@@ -971,6 +971,40 @@ __buildbittesti(InterlockedBitTestAndComplement, __LONG32, "eor", "M", volatile) - - #if defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_) || defined(__arm__) || defined(_ARM_) - -+#if !defined(__clang__) -+ -+#if __INTRINSIC_PROLOG(__popcnt16) -+unsigned short __popcnt16(unsigned short); -+__INTRINSICS_USEINLINE -+unsigned short __popcnt16(unsigned short value) -+{ -+ return __builtin_popcount(value); -+} -+#define __INTRINSIC_DEFINED___popcnt16 -+#endif /* __INTRINSIC_PROLOG */ -+ -+#if __INTRINSIC_PROLOG(__popcnt) -+unsigned int __popcnt(unsigned int); -+__INTRINSICS_USEINLINE -+unsigned int __popcnt(unsigned int value) -+{ -+ return __builtin_popcount(value); -+} -+#define __INTRINSIC_DEFINED___popcnt -+#endif /* __INTRINSIC_PROLOG */ -+ -+#if __INTRINSIC_PROLOG(__popcnt64) -+unsigned __int64 __popcnt64(unsigned __int64); -+__INTRINSICS_USEINLINE -+unsigned __int64 __popcnt64(unsigned __int64 value) -+{ -+ return __builtin_popcountll(value); -+} -+#define __INTRINSIC_DEFINED___popcnt64 -+#endif /* __INTRINSIC_PROLOG */ -+ -+#endif /* !defined(__clang__) */ -+ - #if __INTRINSIC_PROLOG(_InterlockedAnd) - __LONG32 _InterlockedAnd(__LONG32 volatile *, __LONG32); - __INTRINSICS_USEINLINE