Mercurial > mxe-octave

annotate src/mesa-2-ucrt.patch @ 6213:5f64fb928091 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build-gcc: Avoid library clash when calling msgfmt. * src/build-gcc-1-msgfmt.patch: Don't use libraries from the build tree when calling `msgfmt`. * dist-files.mk: Add patch to list.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 06 May 2022 19:36:10 +0200
parents 88dfa92d0c86
children 8b434abc6fc1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5962
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 From a3b60fc23f2968e2d22c8d46baf29d4cd90b0d5c Mon Sep 17 00:00:00 2001
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 From: Jeremy Drake <github@jdrake.com>
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 Date: Sat, 16 Oct 2021 16:50:46 -0700
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 Subject: [PATCH] mesa: fixes for UCRT.
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 --- mesa-21.2.4/meson.build.orig 2021-10-16 16:02:38.021997300 -0700
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 +++ mesa-21.2.4/meson.build 2021-10-16 16:03:24.287545400 -0700
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 @@ -1046,8 +1046,6 @@
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 '-D_HAS_EXCEPTIONS=0', # Tell C++ STL to not use exceptions
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 '-DNOMINMAX',
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 ]
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 - else
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 - pre_args += ['-D__MSVCRT_VERSION__=0x0700']
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 endif
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 elif host_machine.system() == 'openbsd'
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 pre_args += '-D_ISOC11_SOURCE'
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 --- mesa-21.2.4/src/compiler/spirv/vtn_private.h.orig 2021-10-16 15:28:02.537761600 -0700
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 +++ mesa-21.2.4/src/compiler/spirv/vtn_private.h 2021-10-16 15:28:05.959391400 -0700
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 @@ -41,7 +41,7 @@
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 struct vtn_decoration;
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 /* setjmp/longjmp is broken on MinGW: https://sourceforge.net/p/mingw-w64/bugs/406/ */
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 -#ifdef __MINGW32__
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 +#if defined(__MINGW32__) && !defined(_UCRT)
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 #define vtn_setjmp __builtin_setjmp
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 #define vtn_longjmp __builtin_longjmp
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 #else
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 --- mesa-21.2.4/src/compiler/nir/nir.h.orig 2021-10-14 12:59:05.367845000 -0700
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 +++ mesa-21.2.4/src/compiler/nir/nir.h 2021-10-16 15:55:09.881268400 -0700
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 @@ -54,7 +54,7 @@
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 #include "nir_opcodes.h"
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 -#if defined(_WIN32) && !defined(snprintf)
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35 +#if defined(_WIN32) && !defined(snprintf) && !defined(_UCRT)
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 #define snprintf _snprintf
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37 #endif
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39 --- mesa-21.2.4/src/compiler/nir/nir_lower_atomics_to_ssbo.c.orig 2021-10-14 12:59:05.375845200 -0700
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
40 +++ mesa-21.2.4/src/compiler/nir/nir_lower_atomics_to_ssbo.c 2021-10-16 15:55:30.818804300 -0700
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
41 @@ -27,10 +27,6 @@
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
42 #include "nir.h"
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
43 #include "nir_builder.h"
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
44
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
45 -#if defined(_WIN32) && !defined(snprintf)
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
46 -#define snprintf _snprintf
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
47 -#endif
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
48 -
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
49 /*
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
50 * Remap atomic counters to SSBOs, starting from the shader's next SSBO slot
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
51 * (info.num_ssbos).
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
52 --- mesa-21.2.4/src/gallium/drivers/swr/swr_fence.cpp.orig 2021-10-16 16:29:10.287533700 -0700
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
53 +++ mesa-21.2.4/src/gallium/drivers/swr/swr_fence.cpp 2021-10-16 16:29:45.678206500 -0700
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
54 @@ -29,7 +29,7 @@
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
55 #include "swr_screen.h"
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
56 #include "swr_fence.h"
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
57
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
58 -#ifdef __APPLE__
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
59 +#if defined(__APPLE__) || defined(__MINGW32__)
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
60 #include <sched.h>
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
61 #endif
88dfa92d0c86 Add patches for building packages with UCRT.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
62