<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/944618de26436517f483ef64418e1cbe8041e083">https://github.com/macports/macports-ports/commit/944618de26436517f483ef64418e1cbe8041e083</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 944618de264 mesa: update to 22.1.7
</span>944618de264 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 944618de26436517f483ef64418e1cbe8041e083
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Sep 29 15:23:47 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> mesa: update to 22.1.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - move to meson build
</span><span style='display:block; white-space:pre;color:#404040;'> - trim deps
</span><span style='display:block; white-space:pre;color:#404040;'> - use python3
</span><span style='display:block; white-space:pre;color:#404040;'> - enabled tests
</span><span style='display:block; white-space:pre;color:#404040;'> - default to osmesa always
</span><span style='display:block; white-space:pre;color:#404040;'> - require appropriate compilers
</span><span style='display:block; white-space:pre;color:#404040;'> - fix scandir issue on < 10.8
</span><span style='display:block; white-space:pre;color:#404040;'> - conflicts_build during testing if gtest is active
</span><span style='display:block; white-space:pre;color:#404040;'> - requires muniversal
</span><span style='display:block; white-space:pre;color:#404040;'> can't configure properly for multiple arches
</span>---
x11/mesa/Portfile | 217 +++++++--------------
...-Provide-requirements-of-_SET_DrawBuffers.patch | 0
.../{ => old-unused}/disable_shader_cache.patch | 0
...cmds-Fix-a-typo-in-the-__APPLE__-codepath.patch | 0
...-missing-include-of-stddef.h-for-ptrdiff_.patch | 0
...-Provide-requirements-of-_SET_DrawBuffers.patch | 0
...ith-size-differences-between-GLuint-and-G.patch | 0
.../no-missing-prototypes-error.patch | 0
...ess-build-failure-when-using-newer-macOS.patch} | 6 +-
.../patch-include-GL-mesa_glinterop_h.diff | 0
.../files/{ => old-unused}/static-strndup.patch | 0
x11/mesa/files/patch-driver_extensions.diff | 65 ++++++
x11/mesa/files/patch-meson-spec-python.diff | 20 ++
x11/mesa/files/patch-pre-10.8-scandir.diff | 30 +++
14 files changed, 189 insertions(+), 149 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/Portfile b/x11/mesa/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f2a90fb6c7..4cdd2a8b587 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,126 +1,68 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# May need clock_gettime()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup legacysupport 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.newest_darwin_requires_legacy 15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name mesa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 19.0.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories x11 graphics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {jeremyhu @jeremyhu} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license MIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license_noconflict py27-libxml2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Mesa 3D Graphics Library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Mesa is an open-source implementation of the OpenGL specification, a system for rendering interactive 3D graphics.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.mesa3d.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://archive.mesa3d.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms macosx darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 5fd340a6304f7501014e1bd7291e4cfa7a6efcdb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c658d9e93d19bf2de694001c8c9886b8bb89ee2e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d017eb53a810c32dabeedf6ca2238ae1e897ce9090e470e9ce1d6c9e3f1b0862 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11967592
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:flex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bison \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gindent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:expat \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xorgproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libxcb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXdamage \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXfixes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXmu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXxf86vm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-Hack-to-address-build-failure-when-using-newer-macOS.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.args -fvi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-autotools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-platforms=x11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-egl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gbm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-osmesa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-llvm-shared-libs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-gallium-drivers=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# mesa builds with -std=c99 but uses timespec_get() which was added in c11, so this works around that bug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export ac_cv_func_timespec_get=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INDENT=${prefix}/bin/gindent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This project is affected by a bug in Apple's gcc driver driver that I fixed in the apple-gcc42 port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Use that or clang.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# clang-700.1.81 (Xcode 7.2.1) fails at:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# disk_cache.c:637:7: error: cannot compile this atomic library call yet
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# p_atomic_add(cache->size, - (uint64_t)sb.st_blocks * 512);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist gcc-3.3 gcc-4.0 gcc-4.2 llvm-gcc-4.2 {clang < 800}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # versions > 17 do not presently compile on systems prior to 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 17.1.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums sha1 2acc201e24ea67c5231074d6746a42a747228ed6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 43a9b758462316ad344ccdccf72d6d0ce295620e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0686deadde1f126b20aa67e47e8c50502043eee4ecdf60d5009ffda3cebfee50 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9868932
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this option does nothing in mesa 17.x and generates warnings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --enable-autotools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # overwrite previous patchfiles, and then add as needed below
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mesa17-0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mesa17-0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mesa17-0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mesa17-0004-mesa-Deal-with-size-differences-between-GLuint-and-G.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://bugs.freedesktop.org/show_bug.cgi?id=89088
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append INDENT=cat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not needed if legacysupport is used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patchfiles-append static-strndup.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/52811
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-include-GL-mesa_glinterop_h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# timespec_get() and others
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name mesa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 22.1.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9c570f7e00527c662509ab6fb264caf2c780a4ea \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 16109944
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories x11 graphics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {jeremyhu @jeremyhu} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Mesa 3D Graphics Library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Mesa is an open-source implementation of the OpenGL specification, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a system for rendering interactive 3D graphics.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.mesa3d.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://archive.mesa3d.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver_nodot [string map {. {}} ${py_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bison \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-mako \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_ver_nodot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xorgproto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:expat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libxcb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXdamage \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zstd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-meson-spec-python.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-driver_extensions.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pre-10.8-scandir.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@python3@@|${prefix}/bin/python${py_ver}|g" meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://trac.macports.org/ticket/54643
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-glx-tls
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 14} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://trac.macports.org/ticket/54638
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://trac.macports.org/ticket/54643
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append disable_shader_cache.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -Dc_std=c11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dosmesa=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dllvm=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuild-tests=false
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span> if {${os.major} < 9} {
# Xplugin.h is missing on Tiger
configure.cppflags-append -I${filespath}/include
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,36 +81,19 @@ platform darwin {
</span> }
if {[string match *gcc* ${configure.compiler}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Older gcc fail to do -Werror=missing-prototypes correctly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/46827
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append no-missing-prototypes-error.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-delete -I${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description {Use python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-libxml2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON2=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -latomic
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant osmesa description {enable OSMesa library} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-osmesa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-osmesa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tests description "build tests" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # mesa uses it's own internal gtest version and fails with newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build-append gtest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dbuild-tests=false -Dbuild-tests=true
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants-append +osmesa
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#variant openvg description {enable support for OpenVG API} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-delete --disable-egl --disable-openvg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-append --enable-egl --enable-openvg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#default_variants-append +openvg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.cmd meson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target test
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {relnotes/([0-9.]+)\.html}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${homepage}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {relnotes/([0-9.]+)\.html}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch b/x11/mesa/files/old-unused/0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span>similarity index 100%
rename from x11/mesa/files/0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
rename to x11/mesa/files/old-unused/0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/disable_shader_cache.patch b/x11/mesa/files/old-unused/disable_shader_cache.patch
</span>similarity index 100%
rename from x11/mesa/files/disable_shader_cache.patch
rename to x11/mesa/files/old-unused/disable_shader_cache.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/mesa17-0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch b/x11/mesa/files/old-unused/mesa17-0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch
</span>similarity index 100%
rename from x11/mesa/files/mesa17-0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch
rename to x11/mesa/files/old-unused/mesa17-0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/mesa17-0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch b/x11/mesa/files/old-unused/mesa17-0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch
</span>similarity index 100%
rename from x11/mesa/files/mesa17-0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch
rename to x11/mesa/files/old-unused/mesa17-0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/mesa17-0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch b/x11/mesa/files/old-unused/mesa17-0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span>similarity index 100%
rename from x11/mesa/files/mesa17-0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
rename to x11/mesa/files/old-unused/mesa17-0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/mesa17-0004-mesa-Deal-with-size-differences-between-GLuint-and-G.patch b/x11/mesa/files/old-unused/mesa17-0004-mesa-Deal-with-size-differences-between-GLuint-and-G.patch
</span>similarity index 100%
rename from x11/mesa/files/mesa17-0004-mesa-Deal-with-size-differences-between-GLuint-and-G.patch
rename to x11/mesa/files/old-unused/mesa17-0004-mesa-Deal-with-size-differences-between-GLuint-and-G.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/no-missing-prototypes-error.patch b/x11/mesa/files/old-unused/no-missing-prototypes-error.patch
</span>similarity index 100%
rename from x11/mesa/files/no-missing-prototypes-error.patch
rename to x11/mesa/files/old-unused/no-missing-prototypes-error.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/0002-Hack-to-address-build-failure-when-using-newer-macOS.patch b/x11/mesa/files/old-unused/patch-Hack-to-address-build-failure-when-using-newer-macOS.patch
</span>similarity index 86%
rename from x11/mesa/files/0002-Hack-to-address-build-failure-when-using-newer-macOS.patch
rename to x11/mesa/files/old-unused/patch-Hack-to-address-build-failure-when-using-newer-macOS.patch
<span style='display:block; white-space:pre;color:#808080;'>index eed9878b16a..661c8c734bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/0002-Hack-to-address-build-failure-when-using-newer-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/files/old-unused/patch-Hack-to-address-build-failure-when-using-newer-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,10 +9,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> include/c11/threads_posix.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git include/c11/threads_posix.h include/c11/threads_posix.h
</span> index 45cb6075e6e..355d725f7da 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/include/c11/threads_posix.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/include/c11/threads_posix.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/c11/threads_posix.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/c11/threads_posix.h
</span> @@ -382,7 +382,13 @@ tss_set(tss_t key, void *val)
/*-------------------- 7.25.7 Time functions --------------------*/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/patch-include-GL-mesa_glinterop_h.diff b/x11/mesa/files/old-unused/patch-include-GL-mesa_glinterop_h.diff
</span>similarity index 100%
rename from x11/mesa/files/patch-include-GL-mesa_glinterop_h.diff
rename to x11/mesa/files/old-unused/patch-include-GL-mesa_glinterop_h.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/static-strndup.patch b/x11/mesa/files/old-unused/static-strndup.patch
</span>similarity index 100%
rename from x11/mesa/files/static-strndup.patch
rename to x11/mesa/files/old-unused/static-strndup.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/patch-driver_extensions.diff b/x11/mesa/files/patch-driver_extensions.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..98b8cff3f1f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/files/patch-driver_extensions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,65 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5259e83b1e6d1d0faf5a33cfd9b9ffd788ffe15f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Yonggang Luo <luoyonggang@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 28 Jul 2022 16:12:49 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] gallium: Disable dri2 interface on OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Error message:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Undefined symbols for architecture x86_64:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "_dri_kms_driver_extensions", referenced from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _swkmsCreateNewScreen in libdri.a(dri_util.c.o)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "_galliumdrm_driver_extensions", referenced from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _dri2CreateNewScreen in libdri.a(dri_util.c.o)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ld: symbol(s) not found for architecture x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes: b6f7a4836ab ("dri: Fill in the driver extensions for the legacy createNewScreen paths")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6519
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Eric Engestrom <eric@igalia.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Adam Jackson <ajax@redhat.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17784>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson.build | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/gallium/frontends/dri/dri_util.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 8 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git meson.build meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cdff0312e56..ff06cab8281 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1637,6 +1637,10 @@ if dep_libdrm.found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if with_dri2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pre_args += '-DHAVE_DRI2'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dep_libudev = dependency('libudev', required : false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if dep_libudev.found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre_args += '-DHAVE_LIBUDEV'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/gallium/frontends/dri/dri_util.c src/gallium/frontends/dri/dri_util.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8d60526f45b..f96847098e4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gallium/frontends/dri/dri_util.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gallium/frontends/dri/dri_util.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -808,6 +808,8 @@ const __DRIcoreExtension driCoreExtension = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .unbindContext = driUnbindContext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_DRI2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** DRI2 interface */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const __DRIdri2Extension driDRI2Extension = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .base = { __DRI_DRI2, 4 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -837,6 +839,8 @@ const __DRIdri2Extension swkmsDRI2Extension = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .createNewScreen2 = driCreateNewScreen2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const __DRIswrastExtension driSWRastExtension = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .base = { __DRI_SWRAST, 4 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/patch-meson-spec-python.diff b/x11/mesa/files/patch-meson-spec-python.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..963b2652f2e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/files/patch-meson-spec-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2022-09-29 15:08:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2022-09-29 15:08:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'mesa',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ['c', 'cpp'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version : run_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [find_program('python3', 'python'), 'bin/meson_get_version.py'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [find_program('@@python3@@'), 'bin/meson_get_version.py'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check : true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ).stdout(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license : 'MIT',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1002,7 +1002,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-prog_python = import('python').find_installation('python3')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++prog_python = import('python').find_installation('@@python3@@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ has_mako = run_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prog_python, '-c',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '''
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/patch-pre-10.8-scandir.diff b/x11/mesa/files/patch-pre-10.8-scandir.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..460263d4a3d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/files/patch-pre-10.8-scandir.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/util/xmlconfig.c.orig 2022-09-30 20:20:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/util/xmlconfig.c 2022-09-30 20:26:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,6 +65,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PATH_MAX 4096
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HAVE_NEW_SCANDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < 1080)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef HAVE_NEW_SCANDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ be_verbose(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1000,7 +1009,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_NEW_SCANDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scandir_filter(const struct dirent *ent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++scandir_filter(struct dirent *ent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef DT_REG /* systems without d_type in dirent results */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct stat st;
</span></pre><pre style='margin:0'>
</pre>