vars/build.vars:native_packages_deps_x11: adds {glproto,damageproto,libXdamage,mesa} v{1.4.17,1.2.1,1.1.4,18.0.0} (via Redfoxmoon.)

vars/build.vars:libpthread_stubs: updated to v0.4 (via Redfoxmoon.)
vars/build.vars:python2_host:${PKG_CONFIGURE_ARGS_EXTRA}: configure w/ --enable-unicode=ucs4[1] (fixes mesa.)
vars/build.vars:python2:${PKG_CONFIGURE_ARGS_EXTRA}: configure w/ --enable-unicode=ucs4[1] for consistency.
vars/mesa.vars:${PKG_CONFIG_CACHE_EXTRA}: force correct python2.7 binary path.
patches/mesa-18.0.0.local.patch: via Redfoxmoon.

References:
Sat, 31 Mar 2018 16:01:36 +0000 [1] Compile with '--enable-unicode=ucs4' by default? · Issue #257 · pyenv/pyenv · GitHub <https://github.com/pyenv/pyenv/issues/257>

3 files changed, 102 insertions, 6 deletions

diff --git a/patches/mesa-18.0.0.local.patch b/patches/mesa-18.0.0.local.patch
new file mode 100644
index 00000000..e5278bda
--- /dev/null
+++ b/patches/mesa-18.0.0.local.patch
@@ -0,0 +1,72 @@
+diff -ru mesa-18.0.0.orig/src/gallium/auxiliary/os/os_misc.c mesa-18.0.0/src/gallium/auxiliary/os/os_misc.c
+--- mesa-18.0.0.orig/src/gallium/auxiliary/os/os_misc.c	2018-03-27 19:35:14.000000000 +0200
++++ mesa-18.0.0/src/gallium/auxiliary/os/os_misc.c	2018-03-31 17:16:02.843416010 +0200
+@@ -47,7 +47,7 @@
+ #endif
+ 
+ 
+-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS)
++#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_MIDIPIX)
+ #  include <unistd.h>
+ #elif defined(PIPE_OS_APPLE) || defined(PIPE_OS_BSD)
+ #  include <sys/sysctl.h>
+@@ -124,7 +124,7 @@
+ bool
+ os_get_total_physical_memory(uint64_t *size)
+ {
+-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS)
++#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_MIDIPIX)
+    const long phys_pages = sysconf(_SC_PHYS_PAGES);
+    const long page_size = sysconf(_SC_PAGE_SIZE);
+ 
+diff -ru mesa-18.0.0.orig/src/gallium/auxiliary/rtasm/rtasm_x86sse.h mesa-18.0.0/src/gallium/auxiliary/rtasm/rtasm_x86sse.h
+--- mesa-18.0.0.orig/src/gallium/auxiliary/rtasm/rtasm_x86sse.h	2018-03-27 19:35:14.000000000 +0200
++++ mesa-18.0.0/src/gallium/auxiliary/rtasm/rtasm_x86sse.h	2018-03-31 17:12:28.412711185 +0200
+@@ -140,7 +140,7 @@
+ {
+ #ifdef PIPE_ARCH_X86
+    return X86_32;
+-#elif (defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_WINDOWS)) && defined(PIPE_ARCH_X86_64)
++#elif (defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_WINDOWS) || defined(PIPE_OS_MIDIPIX)) && defined(PIPE_ARCH_X86_64)
+    return X86_64_WIN64_ABI;
+ #elif defined(PIPE_ARCH_X86_64)
+    return X86_64_STD_ABI;
+diff -ru mesa-18.0.0.orig/src/gallium/auxiliary/util/u_network.c mesa-18.0.0/src/gallium/auxiliary/util/u_network.c
+--- mesa-18.0.0.orig/src/gallium/auxiliary/util/u_network.c	2018-03-27 19:35:14.000000000 +0200
++++ mesa-18.0.0/src/gallium/auxiliary/util/u_network.c	2018-03-31 17:14:07.064114855 +0200
+@@ -10,7 +10,7 @@
+ #  include <windows.h>
+ #  include <ws2tcpip.h>
+ #elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) || \
+-   defined(PIPE_OS_APPLE) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS)
++   defined(PIPE_OS_APPLE) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_MIDIPIX)
+ #  include <sys/socket.h>
+ #  include <netinet/in.h>
+ #  include <unistd.h>
+diff -ru mesa-18.0.0.orig/src/gallium/include/pipe/p_config.h mesa-18.0.0/src/gallium/include/pipe/p_config.h
+--- mesa-18.0.0.orig/src/gallium/include/pipe/p_config.h	2018-03-27 19:35:15.000000000 +0200
++++ mesa-18.0.0/src/gallium/include/pipe/p_config.h	2018-03-31 17:16:40.779187231 +0200
+@@ -213,6 +213,11 @@
+ #define PIPE_OS_UNIX
+ #endif
+ 
++#if defined(__midipix__)
++#define PIPE_OS_MIDIPIX
++#define PIPE_OS_UNIX
++#endif
++
+ /*
+  * Try to auto-detect the subsystem.
+  * 
+diff -ru mesa-18.0.0.orig/src/util/xmlconfig.c mesa-18.0.0/src/util/xmlconfig.c
+--- mesa-18.0.0.orig/src/util/xmlconfig.c	2018-03-27 19:35:15.000000000 +0200
++++ mesa-18.0.0/src/util/xmlconfig.c	2018-03-31 17:36:30.362136400 +0200
+@@ -40,7 +40,7 @@
+ 
+ #undef GET_PROGRAM_NAME
+ 
+-#if (defined(__GNU_LIBRARY__) || defined(__GLIBC__)) && !defined(__UCLIBC__)
++#if (defined(__GNU_LIBRARY__) || defined(__GLIBC__) || defined(__midipix__)) && !defined(__UCLIBC__)
+ #    if !defined(__GLIBC__) || (__GLIBC__ < 2)
+ /* These aren't declared in any libc5 header */
+ extern char *program_invocation_name, *program_invocation_short_name;
diff --git a/vars/build.vars b/vars/build.vars
index e4b86ed2..e64a597a 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -322,7 +322,7 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${PKG_PYTHON2_HOST_SHA256SUM:=304c9b202ea6fbd0a4a8e0ad3733715fbd4749f2204a9173a58ec53c32ea73e8};
 : ${PKG_PYTHON2_HOST_VERSION:=2.7.14};
 : ${PKG_PYTHON2_HOST_URL:=https://www.python.org/ftp/python/${PKG_PYTHON2_HOST_VERSION}/Python-${PKG_PYTHON2_HOST_VERSION}.tgz};
-: ${PKG_PYTHON2_HOST_CONFIGURE_ARGS_EXTRA:="--enable-ipv6 --enable-shared"};
+: ${PKG_PYTHON2_HOST_CONFIGURE_ARGS_EXTRA:="--enable-ipv6 --enable-shared --enable-unicode=ucs4"};
 : ${PKG_PYTHON3_HOST_SHA256SUM:=687e067d9f391da645423c7eda8205bae9d35edc0c76ef5218dcbe4cc770d0d7};
 : ${PKG_PYTHON3_HOST_VERSION:=3.5.1};
 : ${PKG_PYTHON3_HOST_URL:=https://www.python.org/ftp/python/${PKG_PYTHON3_HOST_VERSION}/Python-${PKG_PYTHON3_HOST_VERSION}.tgz};
@@ -550,9 +550,9 @@ NATIVE_PACKAGES_DEPS_X11_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGE
 NATIVE_PACKAGES_DEPS_X11_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_X11_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 NATIVE_PACKAGES_DEPS_X11_PACKAGES="
-inputproto kbproto xcb_proto xproto fixesproto recordproto libXau libpthread_stubs xcb
+inputproto kbproto xcb_proto xproto fixesproto recordproto glproto libXau libpthread_stubs xcb
 xextproto xtrans libX11 libXext freetype fontconfig renderproto Xrender
-libXft libXfixes libXi libXtst libICE libSM libXt libXmu libXpm libXaw libxkbfile
+libXft libXfixes libXi libXtst libICE libSM libXt libXmu libXpm libXaw libxkbfile damageproto libXdamage mesa
 harfbuzz pixman cairo dbus sdl2 pango atk at_spi2_core at_spi2_atk gdk libepoxy gtk2 gtk3 imlib2 libcaca";
 NATIVE_PACKAGES_DEPS_X11_PREFIX="${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
@@ -574,11 +574,14 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
 : ${PKG_RECORDPROTO_SHA256SUM:=a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370};
 : ${PKG_RECORDPROTO_VERSION:=1.14.2};
 : ${PKG_RECORDPROTO_URL:=http://www.x.org/releases/individual/proto/recordproto-${PKG_RECORDPROTO_VERSION}.tar.bz2};
+: ${PKG_GLPROTO_SHA256SUM:=9d8130fec2b98bd032db7730fa092dd9dec39f3de34f4bb03ceb43b9903dbc96};
+: ${PKG_GLPROTO_VERSION:=1.4.17};
+: ${PKG_GLPROTO_URL:=https://www.x.org/releases/individual/proto/glproto-${PKG_GLPROTO_VERSION}.tar.gz};
 : ${PKG_LIBXAU_SHA256SUM:=fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2};
 : ${PKG_LIBXAU_VERSION:=1.0.8};
 : ${PKG_LIBXAU_URL:=https://www.x.org/releases/individual/lib/libXau-${PKG_LIBXAU_VERSION}.tar.bz2};
-: ${PKG_LIBPTHREAD_STUBS_SHA256SUM:=35b6d54e3cc6f3ba28061da81af64b9a92b7b757319098172488a660e3d87299};
-: ${PKG_LIBPTHREAD_STUBS_VERSION:=0.3};
+: ${PKG_LIBPTHREAD_STUBS_SHA256SUM:=e4d05911a3165d3b18321cc067fdd2f023f06436e391c6a28dff618a78d2e733};
+: ${PKG_LIBPTHREAD_STUBS_VERSION:=0.4};
 : ${PKG_LIBPTHREAD_STUBS_URL:=https://xcb.freedesktop.org/dist/libpthread-stubs-${PKG_LIBPTHREAD_STUBS_VERSION}.tar.bz2};
 : ${PKG_XCB_SHA256SUM:=4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b};
 : ${PKG_XCB_VERSION:=1.12};
@@ -647,6 +650,19 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
 : ${PKG_LIBXKBFILE_SHA256SUM:=51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a};
 : ${PKG_LIBXKBFILE_VERSION:=1.0.9};
 : ${PKG_LIBXKBFILE_URL:=https://www.x.org/releases/individual/lib/libxkbfile-${PKG_LIBXKBFILE_VERSION}.tar.bz2};
+: ${PKG_DAMAGEPRORO_SHA256SUM:=5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b};
+: ${PKG_DAMAGEPROTO_VERSION:=1.2.1};
+: ${PKG_DAMAGEPROTO_URL:=https://www.x.org/releases/individual/proto/damageproto-${PKG_DAMAGEPROTO_VERSION}.tar.bz2};
+: ${PKG_LIBXDAMAGE_SHA256SUM:=7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad};
+: ${PKG_LIBXDAMAGE_VERSION:=1.1.4};
+: ${PKG_LIBXDAMAGE_URL:=https://x.org/releases/individual/lib/libXdamage-${PKG_LIBXDAMAGE_VERSION}.tar.bz2};
+: ${PKG_MESA_SHA256SUM:=694e5c3d37717d23258c1f88bc134223c5d1aac70518d2f9134d6df3ee791eea};
+: ${PKG_MESA_VERSION:=18.0.0};
+: ${PKG_MESA_URL:=https://mesa.freedesktop.org/archive/mesa-${PKG_MESA_VERSION}.tar.xz};
+: ${PKG_MESA_CONFIGURE_ARGS_EXTRA:="--enable-glx=xlib --with-platforms=x11 --disable-dri --disable-gbm --disable-egl --with-gallium-drivers= --disable-llvm --disable-asm"};
+: ${PKG_MESA_LIBTOOL:=slibtool-shared};
+: ${PKG_MESA_CFLAGS_CONFIGURE_EXTRA:="-D_GNU_SOURCE"};
+: ${PKG_MESA_CXXFLAGS_CONFIGURE_EXTRA:="-D_GNU_SOURCE"};
 : ${PKG_PIXMAN_VERSION:=0.34.0};
 : ${PKG_PIXMAN_URL:=https://www.cairographics.org/releases/pixman-${PKG_PIXMAN_VERSION}.tar.gz};
 : ${PKG_PIXMAN_SHA256SUM:=21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e};
@@ -870,7 +886,7 @@ patch patchutils perl python2 python3 ruby smallbasic tcl";
 : ${PKG_PYTHON2_SHA256SUM:=304c9b202ea6fbd0a4a8e0ad3733715fbd4749f2204a9173a58ec53c32ea73e8};
 : ${PKG_PYTHON2_VERSION:=2.7.14};
 : ${PKG_PYTHON2_URL:=https://www.python.org/ftp/python/${PKG_PYTHON2_VERSION}/Python-${PKG_PYTHON2_VERSION}.tgz};
-: ${PKG_PYTHON2_CONFIGURE_ARGS:="--build=x86_64 -C --enable-ipv6 --enable-shared --host=${DEFAULT_TARGET} --prefix=${PREFIX_NATIVE}"};
+: ${PKG_PYTHON2_CONFIGURE_ARGS:="--build=x86_64 -C --enable-ipv6 --enable-shared --enable-unicode=ucs4 --host=${DEFAULT_TARGET} --prefix=${PREFIX_NATIVE}"};
 : ${PKG_PYTHON2_ENV_VARS_EXTRA:="PYTHON_FOR_BUILD=${PREFIX}/bin/python2.7.wrapper"};
 : ${PKG_PYTHON3_SHA256SUM:=687e067d9f391da645423c7eda8205bae9d35edc0c76ef5218dcbe4cc770d0d7};
 : ${PKG_PYTHON3_VERSION:=3.5.1};
diff --git a/vars/mesa.vars b/vars/mesa.vars
new file mode 100644
index 00000000..5efd1cdd
--- /dev/null
+++ b/vars/mesa.vars
@@ -0,0 +1,8 @@
+#
+# set -o errexit -o noglob are assumed.
+#
+
+: ${PKG_MESA_CONFIG_CACHE_EXTRA:="
+ac_cv_prog_PYTHON2=${PREFIX}/bin/python2.7"};
+
+# vim:filetype=sh