Mercurial > mxe-octave

annotate src/mesa-1-meson.patch @ 5499:be0a7ce498e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update mesa to version 20.0.8 (bug #58689). * src/mesa.mk: Update version and checksum. Add build-meson to dependecies. Update build rule to use meson and ninja as the build tools. * src/mesa-1-meson.patch: Add new patch. * src/mesa-1-fixes.patch: Remove old patch for the scons rule that is no longer needed. * dist-files.mk: Update file list. * src/build-mako.mk: Depend on and use python3. * src/build-markupsafe.mk: Depend on and use python3.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 05 Jul 2020 20:58:57 +0200
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5499
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 Don't link to Win32 library libstdc++
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 diff --git "a/meson.build" "b/meson.build"
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 index eaaca7f..9b9d2d3 100644
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 --- "a/meson.build"
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 +++ "b/meson.build"
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 @@ -1030,8 +1030,7 @@ if host_machine.system() == 'windows'
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 add_project_link_arguments(
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 '-Wl,--nxcompat',
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 '-Wl,--dynamicbase',
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 '-static-libgcc',
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 - '-static-libstdc++',
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 language : ['c', 'cpp'],
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 )
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 endif