MesaLib-dfbsd: Update wip/MesaLib-dfbsd to 17.1.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: MesaLib-dfbsd: Update wip/MesaLib-dfbsd to 17.1.1
From: David Shao <davshao%gmail.com@localhost>
Date: Fri, 09 Jun 2017 05:00:55 +0000
Module Name:	pkgsrc-wip
Committed By:	David Shao <davshao%gmail.com@localhost>
Pushed By:	dshao
Date:		Thu Jun 8 22:00:55 2017 -0700
Changeset:	f41a8da72c2b10d70f3c16f0fed779d656eb8c45

Modified Files:
	MesaLib-dfbsd/Makefile
	MesaLib-dfbsd/distinfo
	MesaLib-dfbsd/patches/patch-src_egl_drivers_dri2_platform__drm.c
	MesaLib-dfbsd/patches/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp
	MesaLib-dfbsd/patches/patch-src_gallium_targets_dri_Makefile.in
	MesaLib-dfbsd/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c
	MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_common_xmlconfig.c
	MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_i965_intel__screen.c
	MesaLib-dfbsd/patches/patch-src_mesa_main_context.c
	MesaLib-dfbsd/patches/patch-src_mesa_x86_common__x86.c
	MesaLib-dfbsd/patches/patch-src_util_strndup.h
Added Files:
	MesaLib-dfbsd/patches/patch-src_gallium_drivers_vc4_vc4__bufmgr.c
	MesaLib-dfbsd/patches/patch-src_glx_glxext.c
	MesaLib-dfbsd/patches/patch-src_intel_tools_aubinator__error__decode.c
	MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_i965_brw__sync.c
	MesaLib-dfbsd/patches/patch-src_util_build__id.c
	MesaLib-dfbsd/patches/patch-src_util_ralloc.c
Removed Files:
	MesaLib-dfbsd/patches/patch-src_glsl_ralloc.c
	MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_i965_brw__context.h
	MesaLib-dfbsd/patches/patch-src_util_strndup.c

Log Message:
MesaLib-dfbsd: Update wip/MesaLib-dfbsd to 17.1.1

New development release plus bug-fix subsequent release
for Mesa 17.1.1.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f41a8da72c2b10d70f3c16f0fed779d656eb8c45

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 MesaLib-dfbsd/Makefile                             |  2 +-
 MesaLib-dfbsd/distinfo                             | 35 +++++++++---------
 .../patch-src_egl_drivers_dri2_platform__drm.c     |  6 ++--
 .../patch-src_gallium_drivers_vc4_vc4__bufmgr.c    | 18 ++++++++++
 ...lium_state__trackers_clover_llvm_invocation.cpp |  6 ++--
 .../patch-src_gallium_targets_dri_Makefile.in      | 11 +++---
 ...rc_gallium_winsys_svga_drm_vmw__screen__ioctl.c | 26 +++++++-------
 MesaLib-dfbsd/patches/patch-src_glsl_ralloc.c      | 42 ----------------------
 MesaLib-dfbsd/patches/patch-src_glx_glxext.c       | 20 +++++++++++
 ...atch-src_intel_tools_aubinator__error__decode.c | 19 ++++++++++
 .../patch-src_mesa_drivers_dri_common_xmlconfig.c  | 12 +++----
 .../patch-src_mesa_drivers_dri_i965_brw__context.h | 15 --------
 .../patch-src_mesa_drivers_dri_i965_brw__sync.c    | 17 +++++++++
 ...patch-src_mesa_drivers_dri_i965_intel__screen.c | 10 +++---
 .../patches/patch-src_mesa_main_context.c          | 10 +++---
 .../patches/patch-src_mesa_x86_common__x86.c       | 12 +++----
 MesaLib-dfbsd/patches/patch-src_util_build__id.c   | 22 ++++++++++++
 MesaLib-dfbsd/patches/patch-src_util_ralloc.c      | 25 +++++++++++++
 MesaLib-dfbsd/patches/patch-src_util_strndup.c     | 30 ----------------
 MesaLib-dfbsd/patches/patch-src_util_strndup.h     | 12 +++----
 20 files changed, 194 insertions(+), 156 deletions(-)

diffs:
diff --git a/MesaLib-dfbsd/Makefile b/MesaLib-dfbsd/Makefile
index 6d2ff78422..4a0c61096d 100644
--- a/MesaLib-dfbsd/Makefile
+++ b/MesaLib-dfbsd/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.129 2016/10/20 12:06:06 wiz Exp $
 
-DISTNAME=	mesa-17.0.2
+DISTNAME=	mesa-17.1.1
 PKGNAME=	${DISTNAME:S/mesa/MesaLib/}
 CATEGORIES=	graphics x11
 # Waiting for 17.0.1 subdirectory to be created
diff --git a/MesaLib-dfbsd/distinfo b/MesaLib-dfbsd/distinfo
index 58f5a0cb2e..7100a37468 100644
--- a/MesaLib-dfbsd/distinfo
+++ b/MesaLib-dfbsd/distinfo
@@ -1,12 +1,12 @@
 $NetBSD: distinfo,v 1.117 2016/05/18 12:55:28 wiz Exp $
 
-SHA1 (mesa-17.0.2.tar.xz) = efbba51e7f8cd13ba93984e98bae9d8822c20e70
-RMD160 (mesa-17.0.2.tar.xz) = 72b4e9e3e1a25af95a116569abfb0a27cc8e349a
-SHA512 (mesa-17.0.2.tar.xz) = df0cb47d01dee16d1d72e0a5fd9d49ab412294761ca647cbb6b411e16892b8be503d87911591339d4630d16b7c948897bfa4321b2c5a8a4219fa58b347015471
-Size (mesa-17.0.2.tar.xz) = 9451056 bytes
+SHA1 (mesa-17.1.1.tar.xz) = e25d16be7924e3aec75eac78f3820e36a20c7c4e
+RMD160 (mesa-17.1.1.tar.xz) = 6a29989f4fc211a5b11c81469ac85844a02c21c7
+SHA512 (mesa-17.1.1.tar.xz) = 4679b8c1a957e515e9f7a6658f2264d4c458379a37fa8f64c9ef03e817857a683fc527a8172d3ae68ca5ebc84a1a78264e18807704c5130c95efdf0431502bc7
+Size (mesa-17.1.1.tar.xz) = 9854480 bytes
 SHA1 (patch-include_c11_threads__posix.h) = 0f80c61a2fcfb2ce039fec6b50f126c3e84c33f9
 SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = a08fc533940472bfa7634f0a2285e85d42c7a4e2
-SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = 75144a5c2cbcda3f7ccd708ff2ac03c823c045d7
+SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = d57bc532cda89c49ce271bf55c5de97c48a9a5fe
 SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 942cfdb72bcb52057dea0a02a8be5629920fd4fb
 SHA1 (patch-src_egl_main_eglglobals.c) = 07a7cc6df618c2e6d74406b794a565bd728a5dd8
 SHA1 (patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c) = fef19b60f00e6450ca48eebd6e3625e177fef689
@@ -15,16 +15,18 @@ SHA1 (patch-src_gallium_auxiliary_util_u__network.c) = b54de38b3663fa820728a6b05
 SHA1 (patch-src_gallium_auxiliary_util_u__network.h) = c6106d67b4fa9db0d790474182d6e0ce0c5da677
 SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = 04f95784c3270c9bb7e95377982e217962481525
 SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626
-SHA1 (patch-src_gallium_state__trackers_clover_llvm_invocation.cpp) = 4e07c31b214183c01a636ada10b5885200bac359
+SHA1 (patch-src_gallium_drivers_vc4_vc4__bufmgr.c) = 1d591d346486fdf58893f69ab92a272e6a31a987
+SHA1 (patch-src_gallium_state__trackers_clover_llvm_invocation.cpp) = d676e9426ff4c12242cc6db855a287f6792e3987
 SHA1 (patch-src_gallium_state__trackers_clover_llvm_metadata.hpp) = 60c137f7d37f7effe8eb4356d0a20db6945e067f
-SHA1 (patch-src_gallium_targets_dri_Makefile.in) = 2306f133b89adf8deddfe0f8085af91768e57975
+SHA1 (patch-src_gallium_targets_dri_Makefile.in) = e559683395286a3f9cdff9a325565bb82bf89dc3
 SHA1 (patch-src_gallium_winsys_radeon_drm_radeon__drm__winsys.c) = 967e8b0d6100f4584fea8635168e3eed31b4deb9
-SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c) = 4c0c8b511aee89ec390f2d790eb5def29a0743e1
-SHA1 (patch-src_glsl_ralloc.c) = b1463dab0680f53b254f41be358fd58bd5456e59
+SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c) = 22829b2d44bf47fa366148328737d0528cd273a7
 SHA1 (patch-src_glx_apple_apple__glapi.c) = df70afc24759978f954ac3a774a14e6518dde97a
 SHA1 (patch-src_glx_glxclient.h) = f0358179ae397bc8677597b0ccb9a471f40f15de
 SHA1 (patch-src_glx_glxcurrent.c) = 713f75bcafb186c7123d19a6aae3deaed9d5fa69
+SHA1 (patch-src_glx_glxext.c) = 04896824cf9239cc740739e928476f3bda7b55b6
 SHA1 (patch-src_intel_tools_aubinator.c) = 37a0a2de6de5bc70a2be6f5aa6dd64a16c88e5c0
+SHA1 (patch-src_intel_tools_aubinator__error__decode.c) = d8f636e3c3e76763a505a1dce23de0b198ad62fa
 SHA1 (patch-src_mapi_entry.c) = b0af9f644ed5be023010b44981827bfce5986d79
 SHA1 (patch-src_mapi_entry__x86-64__tls.h) = b100d1dd432a00fe4df010d488491fb1367fa6d4
 SHA1 (patch-src_mapi_entry__x86__tls.h) = a763f1f1a5e4eb458f7a654266e53e6470d3a882
@@ -35,20 +37,21 @@ SHA1 (patch-src_mapi_u__current.c) = 1731375d82119be326b35d141d7879e083d6d620
 SHA1 (patch-src_mapi_u__current.h) = 214dd29cb0c4fe127eb1157b04b12ddfc455b4b0
 SHA1 (patch-src_mesa_drivers_dri_Makefile.in) = 3fce85c54eece5d68182069a275e66740f458d64
 SHA1 (patch-src_mesa_drivers_dri_common_Makefile.in) = 88f1bb2ac2905a418dc476e1619d2420c421de63
-SHA1 (patch-src_mesa_drivers_dri_common_xmlconfig.c) = ad6f459e6df955c6a06cde7e03de7d0324b0281f
+SHA1 (patch-src_mesa_drivers_dri_common_xmlconfig.c) = b4f3eb90e3f0e91c6e42568fed10c033196ede44
 SHA1 (patch-src_mesa_drivers_dri_i915_intel__screen.c) = 5a49fc290aa95f2e817442f02f9f71cca134a5c0
-SHA1 (patch-src_mesa_drivers_dri_i965_brw__context.h) = 0af70340ffe9600932d73ee9b24202dbc3bc1967
-SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = fc921f63684489d002253d898279105ce566e8b3
+SHA1 (patch-src_mesa_drivers_dri_i965_brw__sync.c) = df72503eedc64c11423bf30e0467fcbcf22864b7
+SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = f394b41e4325dae2185f31e49931c40c1a1e375a
 SHA1 (patch-src_mesa_drivers_dri_i965_intel__tiled__memcpy.c) = c0d465fb65939ead71c9d02b6f6793824dbf441d
 SHA1 (patch-src_mesa_drivers_dri_swrast_swrast.c) = e173d4870ea54b920c4683ed15a6259babf988d1
-SHA1 (patch-src_mesa_main_context.c) = c7514c20286eca73ac9e914899752b7d16322957
+SHA1 (patch-src_mesa_main_context.c) = ab1d770ed9c90077d5b7b76aaacbd51fee8db537
 SHA1 (patch-src_mesa_main_extensions.c) = f2fef39e0605e28b13fcab505f930b5fcb44b4ce
 SHA1 (patch-src_mesa_main_macros.h) = a73e93653773a2c121aa8e5c14bc558cce63f94a
 SHA1 (patch-src_mesa_main_shader__query.cpp) = 3f9c31645d87855759def11344dee16af23c7be3
 SHA1 (patch-src_mesa_tnl_t__pipeline.c) = 5033aaf34fc8c8cf484280270dfc220c17fc366a
 SHA1 (patch-src_mesa_x86_assyntax.h) = c28c4ed2390118aae7f3bc09d459e51119fc8405
-SHA1 (patch-src_mesa_x86_common__x86.c) = a96746fdade9186804fdfcc24ad3e2da4c63e43e
-SHA1 (patch-src_util_strndup.c) = b8dfae71f1b219e44f884b8fc6f89a86201353c3
-SHA1 (patch-src_util_strndup.h) = a48a0ebefbc79a770db4baa590d3f858bb52cacf
+SHA1 (patch-src_mesa_x86_common__x86.c) = f8c4b93443ef66d017f6aa114b877565b30f2598
+SHA1 (patch-src_util_build__id.c) = aa21458d638357b26799abccba891472495ec03c
+SHA1 (patch-src_util_ralloc.c) = d311bfd9ed7e673d72e050668d351c1e6552cdc8
+SHA1 (patch-src_util_strndup.h) = 73f49694ca48ad6b9a9d8346c5b84fddec2463bd
 SHA1 (patch-src_util_u__atomic.h) = beb1df2bb28151bde0405bcae3994107be6813a5
 SHA1 (patch-src_util_u__endian.h) = 64d36c80d34039032239a6740a6a925e075ab72b
diff --git a/MesaLib-dfbsd/patches/patch-src_egl_drivers_dri2_platform__drm.c b/MesaLib-dfbsd/patches/patch-src_egl_drivers_dri2_platform__drm.c
index c5ccec66b0..9b88f270ae 100644
--- a/MesaLib-dfbsd/patches/patch-src_egl_drivers_dri2_platform__drm.c
+++ b/MesaLib-dfbsd/patches/patch-src_egl_drivers_dri2_platform__drm.c
@@ -2,11 +2,11 @@ $NetBSD$
 
 netbsd-5 build fix
 
---- src/egl/drivers/dri2/platform_drm.c.orig	2016-11-10 22:06:40.000000000 +0000
+--- src/egl/drivers/dri2/platform_drm.c.orig	2017-05-10 14:13:57.000000000 +0000
 +++ src/egl/drivers/dri2/platform_drm.c
-@@ -683,7 +683,9 @@ dri2_initialize_drm(_EGLDriver *drv, _EG
-          goto cleanup;
+@@ -696,7 +696,9 @@ dri2_initialize_drm(_EGLDriver *drv, _EG
        }
+       dri2_dpy->own_device = 1;
     } else {
 +#ifdef F_DUPFD_CLOEXEC
        fd = fcntl(gbm_device_get_fd(gbm), F_DUPFD_CLOEXEC, 3);
diff --git a/MesaLib-dfbsd/patches/patch-src_gallium_drivers_vc4_vc4__bufmgr.c b/MesaLib-dfbsd/patches/patch-src_gallium_drivers_vc4_vc4__bufmgr.c
new file mode 100644
index 0000000000..341da6ac95
--- /dev/null
+++ b/MesaLib-dfbsd/patches/patch-src_gallium_drivers_vc4_vc4__bufmgr.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Patch from FreeBSD ports graphics/mesa-dri 17.1.0
+
+# define ETIME as ETIMEOUT same as in intel driver
+
+--- src/gallium/drivers/vc4/vc4_bufmgr.c.orig	2017-05-25 07:13:13.000000000 +0000
++++ src/gallium/drivers/vc4/vc4_bufmgr.c
+@@ -27,6 +27,9 @@
+ #include <fcntl.h>
+ #include <xf86drm.h>
+ #include <xf86drmMode.h>
++#ifndef ETIME
++#define ETIME ETIMEDOUT
++#endif
+ 
+ #include "util/u_hash_table.h"
+ #include "util/u_memory.h"
diff --git a/MesaLib-dfbsd/patches/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp b/MesaLib-dfbsd/patches/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp
index 68b68f79c1..78bd95552c 100644
--- a/MesaLib-dfbsd/patches/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp
+++ b/MesaLib-dfbsd/patches/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
-From FreeBSD ports for graphics/libGL mesa 13.0.5
+Patch from FreeBSD ports graphics/mesa-dri 17.1.0
 
 # fix errors like the following
 #
@@ -11,7 +11,7 @@ ic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5c_strEv' can not be used when
 # /usr/bin/ld: final link failed: Bad value
 #
 
---- src/gallium/state_trackers/clover/llvm/invocation.cpp.orig	2017-02-13 11:55:49.000000000 +0000
+--- src/gallium/state_trackers/clover/llvm/invocation.cpp.orig	2017-05-25 07:13:13.000000000 +0000
 +++ src/gallium/state_trackers/clover/llvm/invocation.cpp
 @@ -93,6 +93,10 @@ namespace {
        return ctx;
@@ -30,7 +30,7 @@ ic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5c_strEv' can not be used when
        // class to recognize it as an OpenCL source file.
 +
 +#if defined(__FreeBSD__)
-+      std::vector<const char *> copts;
++      std::vector<const char *> copts(opts.size());
 +      std::transform(opts.begin(), opts.end(), copts.begin(), cstr);
 +#else
        const std::vector<const char *> copts =
diff --git a/MesaLib-dfbsd/patches/patch-src_gallium_targets_dri_Makefile.in b/MesaLib-dfbsd/patches/patch-src_gallium_targets_dri_Makefile.in
index c76bf2f63f..83534c76ec 100644
--- a/MesaLib-dfbsd/patches/patch-src_gallium_targets_dri_Makefile.in
+++ b/MesaLib-dfbsd/patches/patch-src_gallium_targets_dri_Makefile.in
@@ -3,17 +3,18 @@ $NetBSD: patch-src_gallium_targets_dri_Makefile.in,v 1.1 2015/04/25 11:19:18 tnn
 DRI drivers need explicit linkage to glapi. FDO bug 57702. We only need to do
 this for the "mega" drivers since that's where final linking takes place.
 
---- src/gallium/targets/dri/Makefile.in.orig	2017-01-25 13:26:47.000000000 +0000
+--- src/gallium/targets/dri/Makefile.in.orig	2017-05-10 14:14:10.000000000 +0000
 +++ src/gallium/targets/dri/Makefile.in
-@@ -800,7 +800,10 @@ GALLIUM_TARGET_CFLAGS = \
+@@ -783,8 +783,10 @@ GALLIUM_TARGET_CFLAGS = \
  	$(LIBDRM_CFLAGS) \
  	$(VISIBILITY_CFLAGS)
  
--GALLIUM_COMMON_LIB_DEPS = -lm $(LIBSENSORS_LIBS) $(CLOCK_LIB) \
+-GALLIUM_COMMON_LIB_DEPS = -lm $(LIBUNWIND_LIBS) $(LIBSENSORS_LIBS) \
+-	$(CLOCK_LIB) $(PTHREAD_LIBS) $(DLOPEN_LIBS) $(am__append_1)
 +GALLIUM_COMMON_LIB_DEPS = \
 +	$(top_srcdir)/src/mapi/shared-glapi/libglapi.la \
 +	-lm \
-+	$(LIBSENSORS_LIBS) $(CLOCK_LIB) \
- 	$(PTHREAD_LIBS) $(DLOPEN_LIBS) $(am__append_1)
++	$(LIBUNWIND_LIBS) $(LIBSENSORS_LIBS) $(CLOCK_LIB) $(PTHREAD_LIBS) $(DLOPEN_LIBS) $(am__append_1)
  GALLIUM_WINSYS_CFLAGS = \
  	-I$(top_srcdir)/src \
+ 	-I$(top_srcdir)/include \
diff --git a/MesaLib-dfbsd/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c b/MesaLib-dfbsd/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c
index 33ac3a3547..c1e0382461 100644
--- a/MesaLib-dfbsd/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c
+++ b/MesaLib-dfbsd/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c
@@ -2,31 +2,31 @@ $NetBSD: patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c,v 1.3 2015/05/15
 
 Make sure ERESTART gets defined.
 
---- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c.orig	2017-02-13 11:55:49.000000000 +0000
+--- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c.orig	2017-05-25 07:13:13.000000000 +0000
 +++ src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
-@@ -48,6 +48,25 @@
+@@ -48,9 +48,25 @@
  
  #include "os/os_mman.h"
  
 +#if defined(__NetBSD__)
 +#define _KMEMUSER
-+#include <errno.h>
-+#if !defined(ERESTART)
-+#define ERESTART -3
-+#endif
 +#endif
 +
-+#if defined(__FreeBSD__)
-+#include <errno.h>
+ #include <errno.h>
+ #include <unistd.h>
+ 
++#if defined(__NetBSD__)
 +#if !defined(ERESTART)
-+#define ERESTART -1
++#define ERESTART (-3)
 +#endif
 +#endif
 +
-+#if defined(__DragonFly__)
-+#define _KERNEL_STRUCTURES 1
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#if !defined(ERESTART)
++#define ERESTART (-1)
++#endif
 +#endif
 +
- #include <errno.h>
- #include <unistd.h>
+ #define VMW_MAX_DEFAULT_TEXTURE_SIZE   (128 * 1024 * 1024)
+ #define VMW_FENCE_TIMEOUT_SECONDS 60
  
diff --git a/MesaLib-dfbsd/patches/patch-src_glsl_ralloc.c b/MesaLib-dfbsd/patches/patch-src_glsl_ralloc.c
deleted file mode 100644
index 4a632b185b..0000000000
--- a/MesaLib-dfbsd/patches/patch-src_glsl_ralloc.c
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-src_glsl_ralloc.c,v 1.4 2016/02/23 11:16:55 jperkin Exp $
-
-FreeBSD reported atexit bug for 10.6:
-https://bugs.freedesktop.org/show_bug.cgi?id=91869
-
-* Fix exit time segfault of qt5 application with modular xorg
-* Provide compat strnlen for older Darwin.
-
---- src/util/ralloc.c.orig	2017-02-13 11:55:50.000000000 +0000
-+++ src/util/ralloc.c
-@@ -325,7 +325,7 @@ ralloc_parent(const void *ptr)
- 
- static void *autofree_context = NULL;
- 
--static void
-+static void __attribute__((__destructor__))
- autofree(void)
- {
-    ralloc_free(autofree_context);
-@@ -336,7 +336,6 @@ ralloc_autofree_context(void)
- {
-    if (unlikely(autofree_context == NULL)) {
-       autofree_context = ralloc_context(NULL);
--      atexit(autofree);
-    }
-    return autofree_context;
- }
-@@ -373,7 +372,14 @@ ralloc_strndup(const void *ctx, const ch
-    if (unlikely(str == NULL))
-       return NULL;
- 
-+#if (defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 < 1070)
-+   for (n = 0; n < max; n++, str++) {
-+     if (!*str)
-+       break;
-+   }
-+#else
-    n = strnlen(str, max);
-+#endif
-    ptr = ralloc_array(ctx, char, n + 1);
-    memcpy(ptr, str, n);
-    ptr[n] = '\0';
diff --git a/MesaLib-dfbsd/patches/patch-src_glx_glxext.c b/MesaLib-dfbsd/patches/patch-src_glx_glxext.c
new file mode 100644
index 0000000000..dd813cf19b
--- /dev/null
+++ b/MesaLib-dfbsd/patches/patch-src_glx_glxext.c
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Patch from FreeBSD ports graphics/mesa-dri 17.1.0
+
+# work-around for https://bugs.freedesktop.org/show_bug.cgi?id=100627
+
+--- src/glx/glxext.c.orig	2017-05-25 07:13:13.000000000 +0000
++++ src/glx/glxext.c
+@@ -906,7 +906,11 @@ __glXInitialize(Display * dpy)
+ #if defined(GLX_USE_DRM)
+    if (glx_direct && glx_accel) {
+ #if defined(HAVE_DRI3)
++#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__NetBSD__)) && !defined (__DRM_NEXT__)
++      if (getenv("LIBGL_DRI3_ENABLE") && !getenv("LIBGL_DRI3_DISABLE"))
++#else
+       if (!getenv("LIBGL_DRI3_DISABLE"))
++#endif
+          dpyPriv->dri3Display = dri3_create_display(dpy);
+ #endif /* HAVE_DRI3 */
+       dpyPriv->dri2Display = dri2CreateDisplay(dpy);
diff --git a/MesaLib-dfbsd/patches/patch-src_intel_tools_aubinator__error__decode.c b/MesaLib-dfbsd/patches/patch-src_intel_tools_aubinator__error__decode.c
new file mode 100644
index 0000000000..367c6bf05e
--- /dev/null
+++ b/MesaLib-dfbsd/patches/patch-src_intel_tools_aubinator__error__decode.c
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Patch from FreeBSD ports graphics/mesa-dri 17.1.0
+
+# expose getline in FreeBSD's stdio.h
+#
+
+--- src/intel/tools/aubinator_error_decode.c.orig	2017-05-25 07:13:13.000000000 +0000
++++ src/intel/tools/aubinator_error_decode.c
+@@ -22,6 +22,9 @@
+  *
+  */
+ 
++#ifdef __FreeBSD__
++#define _WITH_GETLINE
++#endif
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_common_xmlconfig.c b/MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_common_xmlconfig.c
index c79e11a66b..8df9b313db 100644
--- a/MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_common_xmlconfig.c
+++ b/MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_common_xmlconfig.c
@@ -3,7 +3,7 @@ $NetBSD: patch-src_mesa_drivers_dri_common_xmlconfig.c,v 1.3 2016/02/23 11:16:55
 PR pkg/50202.
 Provide compat strndup for older Darwin.
 
---- src/mesa/drivers/dri/common/xmlconfig.c.orig	2016-11-10 22:05:17.000000000 +0000
+--- src/mesa/drivers/dri/common/xmlconfig.c.orig	2017-05-10 14:13:57.000000000 +0000
 +++ src/mesa/drivers/dri/common/xmlconfig.c
 @@ -50,12 +50,17 @@ extern char *program_invocation_name, *p
  #    define GET_PROGRAM_NAME() program_invocation_short_name
@@ -23,7 +23,7 @@ Provide compat strndup for older Darwin.
  #elif defined(__NetBSD__) && defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106000100)
  #    include <stdlib.h>
  #    define GET_PROGRAM_NAME() getprogname()
-@@ -111,6 +116,24 @@ static const char *__getProgramName () {
+@@ -115,6 +120,24 @@ __getProgramName()
  #    endif
  #endif
  
@@ -46,9 +46,9 @@ Provide compat strndup for older Darwin.
 +#endif
 +
  /** \brief Find an option in an option cache with the name as key */
- static uint32_t findOption (const driOptionCache *cache, const char *name) {
-     uint32_t len = strlen (name);
-@@ -939,7 +962,7 @@ static void parseOneConfigFile (XML_Pars
+ static uint32_t
+ findOption(const driOptionCache *cache, const char *name)
+@@ -980,7 +1003,7 @@ parseOneConfigFile(XML_Parser p)
  }
  
  #ifndef SYSCONFDIR
@@ -56,4 +56,4 @@ Provide compat strndup for older Darwin.
 +#define SYSCONFDIR "/usr/pkg/etc"
  #endif
  
- void driParseConfigFiles (driOptionCache *cache, const driOptionCache *info,
+ void
diff --git a/MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_i965_brw__context.h b/MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_i965_brw__context.h
deleted file mode 100644
index 5211633943..0000000000
--- a/MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_i965_brw__context.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Use added MESA_ALIGN to ensure no clash if OS had one-argument defined ALIGN.
-
---- src/mesa/drivers/dri/i965/brw_context.h.orig	2017-02-13 11:55:49.000000000 +0000
-+++ src/mesa/drivers/dri/i965/brw_context.h
-@@ -1595,7 +1595,7 @@ brw_program_const(const struct gl_progra
- static inline int
- brw_register_blocks(int reg_count)
- {
--   return ALIGN(reg_count, 16) / 16 - 1;
-+   return MESA_ALIGN(reg_count, 16) / 16 - 1;
- }
- 
- static inline uint32_t
diff --git a/MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_i965_brw__sync.c b/MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_i965_brw__sync.c
new file mode 100644
index 0000000000..b7f139b9c9
--- /dev/null
+++ b/MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_i965_brw__sync.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+libdrm libsync.h should probably be patched instead for ETIME.
+
+--- src/mesa/drivers/dri/i965/brw_sync.c.orig	2017-05-25 07:13:13.000000000 +0000
++++ src/mesa/drivers/dri/i965/brw_sync.c
+@@ -38,6 +38,10 @@
+  * performance bottleneck, though.
+  */
+ 
++#ifndef ETIME
++#define ETIME ETIMEDOUT
++#endif
++
+ #include <libsync.h> /* Requires Android or libdrm-2.4.72 */
+ 
+ #include "main/imports.h"
diff --git a/MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_i965_intel__screen.c b/MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_i965_intel__screen.c
index 980846b17a..6f26118442 100644
--- a/MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_i965_intel__screen.c
+++ b/MesaLib-dfbsd/patches/patch-src_mesa_drivers_dri_i965_intel__screen.c
@@ -6,9 +6,9 @@ to a two argument ALIGN.
 
 Fix build on older NetBSD w/o _SC_PHYS_PAGES.
 
---- src/mesa/drivers/dri/i965/intel_screen.c.orig	2017-02-13 11:55:49.000000000 +0000
+--- src/mesa/drivers/dri/i965/intel_screen.c.orig	2017-05-10 14:13:57.000000000 +0000
 +++ src/mesa/drivers/dri/i965/intel_screen.c
-@@ -26,6 +26,11 @@
+@@ -27,6 +27,11 @@
  #include <errno.h>
  #include <time.h>
  #include <unistd.h>
@@ -20,9 +20,9 @@ Fix build on older NetBSD w/o _SC_PHYS_PAGES.
  #include "main/context.h"
  #include "main/framebuffer.h"
  #include "main/renderbuffer.h"
-@@ -902,6 +907,13 @@ brw_query_renderer_integer(__DRIscreen *
+@@ -1019,6 +1024,13 @@ brw_query_renderer_integer(__DRIscreen *
        const unsigned gpu_mappable_megabytes =
-          (aper_size / (1024 * 1024)) * 3 / 4;
+          screen->aperture_threshold / (1024 * 1024);
  
 +#if defined(HW_PHYSMEM64)
 +      int mib[2] = { CTL_HW, HW_PHYSMEM64 };
@@ -34,7 +34,7 @@ Fix build on older NetBSD w/o _SC_PHYS_PAGES.
        const long system_memory_pages = sysconf(_SC_PHYS_PAGES);
        const long system_page_size = sysconf(_SC_PAGE_SIZE);
  
-@@ -910,6 +922,7 @@ brw_query_renderer_integer(__DRIscreen *
+@@ -1027,6 +1039,7 @@ brw_query_renderer_integer(__DRIscreen *
  
        const uint64_t system_memory_bytes = (uint64_t) system_memory_pages
           * (uint64_t) system_page_size;
diff --git a/MesaLib-dfbsd/patches/patch-src_mesa_main_context.c b/MesaLib-dfbsd/patches/patch-src_mesa_main_context.c
index 28c4735c7e..7381717f36 100644
--- a/MesaLib-dfbsd/patches/patch-src_mesa_main_context.c
+++ b/MesaLib-dfbsd/patches/patch-src_mesa_main_context.c
@@ -2,9 +2,9 @@ $NetBSD: patch-src_mesa_main_context.c,v 1.3 2015/09/26 08:45:02 tnn Exp $
 
 * Fix exit time segfault of qt5 application with modular xorg
 
---- src/mesa/main/context.c.orig	2017-02-13 11:55:49.000000000 +0000
+--- src/mesa/main/context.c.orig	2017-05-10 14:13:57.000000000 +0000
 +++ src/mesa/main/context.c
-@@ -348,11 +348,14 @@ mtx_t OneTimeLock = _MTX_INITIALIZER_NP;
+@@ -351,11 +351,14 @@ mtx_t OneTimeLock = _MTX_INITIALIZER_NP;
   * Calls all the various one-time-fini functions in Mesa
   */
  
@@ -22,7 +22,7 @@ $NetBSD: patch-src_mesa_main_context.c,v 1.3 2015/09/26 08:45:02 tnn Exp $
  }
  
  /**
-@@ -367,7 +370,6 @@ one_time_fini(void)
+@@ -370,7 +373,6 @@ one_time_fini(void)
  static void
  one_time_init( struct gl_context *ctx )
  {
@@ -30,7 +30,7 @@ $NetBSD: patch-src_mesa_main_context.c,v 1.3 2015/09/26 08:45:02 tnn Exp $
  
     mtx_lock(&OneTimeLock);
  
-@@ -392,8 +394,6 @@ one_time_init( struct gl_context *ctx )
+@@ -395,8 +397,6 @@ one_time_init( struct gl_context *ctx )
           _mesa_ubyte_to_float_color_tab[i] = (float) i / 255.0F;
        }
  
@@ -38,4 +38,4 @@ $NetBSD: patch-src_mesa_main_context.c,v 1.3 2015/09/26 08:45:02 tnn Exp $
 -
  #if defined(DEBUG) && defined(__DATE__) && defined(__TIME__)
        if (MESA_VERBOSE != 0) {
- 	 _mesa_debug(ctx, "Mesa %s DEBUG build %s %s\n",
+          _mesa_debug(ctx, "Mesa %s DEBUG build %s %s\n",
diff --git a/MesaLib-dfbsd/patches/patch-src_mesa_x86_common__x86.c b/MesaLib-dfbsd/patches/patch-src_mesa_x86_common__x86.c
index 4a882807e0..39591f41f5 100644
--- a/MesaLib-dfbsd/patches/patch-src_mesa_x86_common__x86.c
+++ b/MesaLib-dfbsd/patches/patch-src_mesa_x86_common__x86.c
@@ -2,18 +2,18 @@ $NetBSD: patch-src_mesa_x86_common__x86.c,v 1.2 2015/09/11 00:03:36 tnn Exp $
 
 DragonFly support.
 
---- src/mesa/x86/common_x86.c.orig	2017-02-13 11:55:50.000000000 +0000
+--- src/mesa/x86/common_x86.c.orig	2017-05-10 14:13:58.000000000 +0000
 +++ src/mesa/x86/common_x86.c
-@@ -38,7 +38,7 @@
- #if defined(USE_SSE_ASM) && defined(__linux__)
- #include <linux/version.h>
- #endif
+@@ -35,7 +35,7 @@
+  */
+ 
+ /* XXX these includes should probably go into imports.h or glheader.h */
 -#if defined(USE_SSE_ASM) && defined(__FreeBSD__)
 +#if defined(USE_SSE_ASM) && (defined(__FreeBSD__) || defined(__DragonFly__))
  #include <sys/types.h>
  #include <sys/sysctl.h>
  #endif
-@@ -128,7 +128,7 @@ static LONG WINAPI ExceptionFilter(LPEXC
+@@ -125,7 +125,7 @@ static LONG WINAPI ExceptionFilter(LPEXC
   */
  void _mesa_check_os_sse_support( void )
  {
diff --git a/MesaLib-dfbsd/patches/patch-src_util_build__id.c b/MesaLib-dfbsd/patches/patch-src_util_build__id.c
new file mode 100644
index 0000000000..28756fd9ca
--- /dev/null
+++ b/MesaLib-dfbsd/patches/patch-src_util_build__id.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Patch taken from FreeBSD ports graphics/mesa-dri mesa 17.1.0
+
+--- src/util/build_id.c.orig	2017-05-25 07:13:13.000000000 +0000
++++ src/util/build_id.c
+@@ -33,7 +33,15 @@
+ #endif
+ 
+ #ifndef ElfW
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#ifdef __LP64__
++#define ElfW(type) Elf64_##type
++#else
++#define ElfW(type) Elf32_##type
++#endif /* __LP64__ */
++#else
+ #define ElfW(type) Elf_##type
++#endif /* __FreeBSD__ || __DragonFly__ */
+ #endif
+ 
+ #define ALIGN(val, align)      (((val) + (align) - 1) & ~((align) - 1))
diff --git a/MesaLib-dfbsd/patches/patch-src_util_ralloc.c b/MesaLib-dfbsd/patches/patch-src_util_ralloc.c
new file mode 100644
index 0000000000..da1e2ef346
--- /dev/null
+++ b/MesaLib-dfbsd/patches/patch-src_util_ralloc.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_glsl_ralloc.c,v 1.4 2016/02/23 11:16:55 jperkin Exp $
+
+FreeBSD reported atexit bug for 10.6:
+https://bugs.freedesktop.org/show_bug.cgi?id=91869
+
+* Fix exit time segfault of qt5 application with modular xorg
+* Provide compat strnlen for older Darwin.
+
+--- src/util/ralloc.c.orig	2017-05-10 14:13:58.000000000 +0000
++++ src/util/ralloc.c
+@@ -368,7 +368,14 @@ ralloc_strndup(const void *ctx, const ch
+    if (unlikely(str == NULL))
+       return NULL;
+ 
++#if (defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 < 1070)
++   for (n = 0; n < max; n++, str++) {
++     if (!*str)
++       break;
++   }
++#else
+    n = strnlen(str, max);
++#endif
+    ptr = ralloc_array(ctx, char, n + 1);
+    memcpy(ptr, str, n);
+    ptr[n] = '\0';
diff --git a/MesaLib-dfbsd/patches/patch-src_util_strndup.c b/MesaLib-dfbsd/patches/patch-src_util_strndup.c
deleted file mode 100644
index 3afd89bf1f..0000000000
--- a/MesaLib-dfbsd/patches/patch-src_util_strndup.c
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_util_strndup.c,v 1.1 2016/02/23 11:16:55 jperkin Exp $
-
-Provide compat strndup for older Darwin.
-
---- src/util/strndup.c.orig	2016-01-22 15:44:31.000000000 +0000
-+++ src/util/strndup.c
-@@ -21,7 +21,7 @@
-  * IN THE SOFTWARE.
-  */
- 
--#if defined(_WIN32)
-+#if defined(_WIN32) || (defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 < 1070)
- #include <stdlib.h>
- #include <string.h>
- #include "strndup.h"
-@@ -35,7 +35,14 @@ strndup(const char *str, size_t max)
-    if (!str)
-       return NULL;
- 
-+#if defined(__APPLE__)
-+   for (n = 0; n < max; n++, str++) {
-+      if (!*str)
-+          break;
-+   }
-+#else
-    n = strnlen(str, max);
-+#endif
-    ptr = (char *) calloc(n + 1, sizeof(char));
-    if (!ptr)
-       return NULL;
diff --git a/MesaLib-dfbsd/patches/patch-src_util_strndup.h b/MesaLib-dfbsd/patches/patch-src_util_strndup.h
index 5de6a78338..29175c03de 100644
--- a/MesaLib-dfbsd/patches/patch-src_util_strndup.h
+++ b/MesaLib-dfbsd/patches/patch-src_util_strndup.h
@@ -2,14 +2,14 @@ $NetBSD: patch-src_util_strndup.h,v 1.1 2016/02/23 11:16:55 jperkin Exp $
 
 Provide compat strndup for older Darwin.
 
---- src/util/strndup.h.orig	2016-01-22 15:44:31.000000000 +0000
+--- src/util/strndup.h.orig	2017-05-10 14:13:58.000000000 +0000
 +++ src/util/strndup.h
-@@ -25,7 +25,7 @@
- 
- #include <stdlib.h> // size_t
+@@ -24,7 +24,7 @@
+ #ifndef STRNDUP_H
+ #define STRNDUP_H
  
 -#if defined(_WIN32)
 +#if defined(_WIN32) || (defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 < 1070)
  
- #ifdef __cplusplus
- extern "C" {
+ #include <stdlib.h> // size_t
+ #include <string.h>
Prev by Date: retroarch: Add support for ROM scanning and pick up directories from pkgsrc
Next by Date: libpthread-stubs-dfbsd: Update wip/libpthread-stubs-dfbsd to 0.4
Previous by Thread: retroarch: Add support for ROM scanning and pick up directories from pkgsrc
Next by Thread: libpthread-stubs-dfbsd: Update wip/libpthread-stubs-dfbsd to 0.4
Indexes:
Home | Main Index | Thread Index | Old Index