@@ -, +, @@ 
---
 graphics/mesa-dri/Makefile.common             |  4 +--
 graphics/mesa-dri/distinfo                    |  6 ++--
 ...ch-src_gallium_auxiliary_util_u__network.c | 11 -------
 ...lium_drivers_freedreno_freedreno__screen.c | 30 +++++++++++++++++++
 .../mesa-dri/files/patch-src_util_os__time.c  | 11 +------
 5 files changed, 36 insertions(+), 26 deletions(-)
 delete mode 100644 graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__network.c
 create mode 100644 graphics/mesa-dri/files/patch-src_gallium_drivers_freedreno_freedreno__screen.c
--- b/graphics/mesa-dri/Makefile.common	
+++ b/graphics/mesa-dri/Makefile.common	
@@ -14,9 +14,9 @@ 
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-MESABASEVERSION=	18.0.3
+MESABASEVERSION=	18.1.0
 # if there is a subversion, don't include the '-' between 7.11-rc2.
-MESASUBVERSION=
+MESASUBVERSION=		rc4
 
 MASTER_SITES=	https://mesa.freedesktop.org/archive/ \
 		https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \
--- b/graphics/mesa-dri/distinfo	
+++ b/graphics/mesa-dri/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1525688481
-SHA256 (mesa-18.0.3.tar.xz) = 099d9667327a76a61741a533f95067d76ea71a656e66b91507b3c0caf1d49e30
-SIZE (mesa-18.0.3.tar.xz) = 10922936
+TIMESTAMP = 1526081222
+SHA256 (mesa-18.1.0-rc4.tar.xz) = 8207155b822af999d621aa4e9013dff8b78dd46be8abc385e33ca8389e6dce6b
+SIZE (mesa-18.1.0-rc4.tar.xz) = 11118452
--- a/graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__network.c	
+++ /dev/null	
@@ -1,11 +0,0 @@ 
---- src/gallium/auxiliary/util/u_network.c.orig	2018-01-23 18:08:49 UTC
-+++ src/gallium/auxiliary/util/u_network.c
-@@ -9,7 +9,7 @@
- #  include <winsock2.h>
- #  include <windows.h>
- #  include <ws2tcpip.h>
--#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) || \
-+#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_HAIKU) || \
-    defined(PIPE_OS_APPLE) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS)
- #  include <sys/socket.h>
- #  include <netinet/in.h>
--- /dev/null	
+++ b/graphics/mesa-dri/files/patch-src_gallium_drivers_freedreno_freedreno__screen.c	
@@ -0,0 +1,30 @@ 
+- Without sysinfo() fall back to sysconf()
+
+--- src/gallium/drivers/freedreno/freedreno_screen.c.orig	2018-04-21 05:48:24 UTC
++++ src/gallium/drivers/freedreno/freedreno_screen.c
+@@ -43,7 +43,11 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef __GLIBC__
+ #include <sys/sysinfo.h>
++#else
++#include <unistd.h>
++#endif
+ 
+ #include "freedreno_screen.h"
+ #include "freedreno_resource.h"
+@@ -837,9 +841,13 @@ fd_screen_create(struct fd_device *dev)
+ 		screen->priority_mask = (1 << val) - 1;
+ 	}
+ 
++#ifdef __GLIBC__
+ 	struct sysinfo si;
+ 	sysinfo(&si);
+ 	screen->ram_size = si.totalram;
++#else
++	screen->ram_size = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGE_SIZE);
++#endif
+ 
+ 	DBG("Pipe Info:");
+ 	DBG(" GPU-id:          %d", screen->gpu_id);
--- b/graphics/mesa-dri/files/patch-src_util_os__time.c	
+++ b/graphics/mesa-dri/files/patch-src_util_os__time.c	
@@ -1,16 +1,7 @@ 
 - Use monotonic clock for timeouts
 
---- src/util/os_time.c.orig	2018-01-23 18:08:50 UTC
+--- src/util/os_time.c.orig	2018-04-21 05:48:25 UTC
 +++ src/util/os_time.c
-@@ -55,7 +55,7 @@
- int64_t
- os_time_get_nano(void)
- {
--#if defined(PIPE_OS_LINUX)
-+#if defined(PIPE_OS_BSD) || defined(PIPE_OS_LINUX)
- 
-    struct timespec tv;
-    clock_gettime(CLOCK_MONOTONIC, &tv);
 @@ -95,7 +95,7 @@ os_time_get_nano(void)
  void
  os_time_sleep(int64_t usecs)