aboutsummaryrefslogtreecommitdiff
path: root/ports/mesa/dual-osmesa.patch
diff options
context:
space:
mode:
authorYury Bura <yurybura@gmail.com>2021-06-30 02:08:28 +0300
committerGitHub <noreply@github.com>2021-06-29 16:08:28 -0700
commitc482408411c875135023ef6ebf645e823233bbbb (patch)
tree28e7df7a773db241d6106e3c671f354e97ec86b1 /ports/mesa/dual-osmesa.patch
parent75beef03d64893d685ec09346147965ee92e1f3f (diff)
downloadvcpkg-c482408411c875135023ef6ebf645e823233bbbb.tar.gz
vcpkg-c482408411c875135023ef6ebf645e823233bbbb.zip
[llvm] update to 12.0.0, enable zlib and libxml2 (#17302)
* [llvm] update to 12.0.0, enable zlib and libxml2 * [llvm] disable libxml2 by default, arm64-windows should be supported * [llvm] try to fix build with ffi on Windows #17663 * [llvm] re-enable libxml2 * [llvm] fix formatting * [llvm] overwrite version * [mesa] update to v21.1.0 * [llvm] update ci.baseline * [halide] update to the latest master commit * [llvm] disable libxml2 port until complete PR #15390 * update versions * [llvm] fix disabling of external libraries * update version * update ci.baseline * update ci.baseline * fix typo * [llvm] fix libxml2 (depends on #17945) * revert "[halide] update to the latest master commit" * update versions * [halide] fix zlib dependency for tools * update versions * [halide] update to official release v12.0.0 * update versions * [halide] update to v12.0.1 * update version * [mesa] remove llvm from defaults * update version * update ci.baseline * [mesa] update to v21.1.2 and fix build with LLVM on Windows * [llvm] allow to build libunwind project on Windows * update versions * [mesa] update ci.baseline.txt to disable x64-windows-static-md, may be fixed in the PR #18495
Diffstat (limited to 'ports/mesa/dual-osmesa.patch')
-rw-r--r--ports/mesa/dual-osmesa.patch80
1 files changed, 0 insertions, 80 deletions
diff --git a/ports/mesa/dual-osmesa.patch b/ports/mesa/dual-osmesa.patch
deleted file mode 100644
index 8acebe64b..000000000
--- a/ports/mesa/dual-osmesa.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/include/meson.build b/include/meson.build
-index a64d9373a92..22c50eb5eb7 100644
---- a/include/meson.build
-+++ b/include/meson.build
-@@ -89,7 +89,7 @@ if with_egl
- )
- endif
-
--if with_osmesa != 'none'
-+if with_osmesa != []
- install_headers('GL/osmesa.h', subdir : 'GL')
- endif
-
-diff --git a/meson.build b/meson.build
-index 898d025f066..d73818e7ce5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -444,7 +444,7 @@ if with_any_vk and (with_platform_x11 and not with_dri3)
- error('Vulkan drivers require dri3 for X11 support')
- endif
- if with_dri
-- if with_glx == 'disabled' and not with_egl and not with_gbm and with_osmesa != 'classic'
-+ if with_glx == 'disabled' and not with_egl and not with_gbm and not with_osmesa.contains('classic')
- error('building dri drivers require at least one windowing system or classic osmesa')
- endif
- endif
-@@ -1508,8 +1508,8 @@ else
- dep_unwind = null_dep
- endif
-
--if with_osmesa != 'none'
-- if with_osmesa == 'gallium' and not with_gallium_softpipe
-+if with_osmesa != []
-+ if with_osmesa.contains('gallium') and not with_gallium_softpipe
- error('OSMesa gallium requires gallium softpipe or llvmpipe.')
- endif
- if host_machine.system() == 'windows'
-@@ -1710,10 +1710,10 @@ lines = ['',
- with_gles2 ? 'yes' : 'no'),
- ]
-
--if with_osmesa != 'none'
-+if with_osmesa != []
- lines += ''
- suffix = ''
-- if with_osmesa == 'gallium'
-+ if with_osmesa.contains('gallium')
- suffix = '(Gallium)'
- endif
- lines += 'OSMesa: lib' + osmesa_lib_name + suffix
-diff --git a/meson_options.txt b/meson_options.txt
-index 626baf3d5c2..cb3dc3b383f 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -295,9 +295,9 @@ option(
- )
- option(
- 'osmesa',
-- type : 'combo',
-- value : 'none',
-- choices : ['none', 'classic', 'gallium'],
-+ type : 'array',
-+ value : [],
-+ choices : ['classic', 'gallium'],
- description : 'Build OSmesa.'
- )
- option(
-diff --git a/src/mesa/meson.build b/src/mesa/meson.build
-index fa5c54cc6fb..f7b223862fa 100644
---- a/src/mesa/meson.build
-+++ b/src/mesa/meson.build
-@@ -744,7 +744,7 @@ libmesa_gallium = static_library(
- )
-
- subdir('drivers/dri')
--if with_osmesa == 'classic'
-+if with_osmesa.contains('classic')
- subdir('drivers/osmesa')
- endif
- if with_glx == 'xlib'