5 files changed, 35 insertions, 25 deletions

diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
index 77f70106569c..e7c6f0de7347 100644
--- a/graphics/mesa-dri/Makefile.common
+++ b/graphics/mesa-dri/Makefile.common
@@ -14,7 +14,7 @@
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-MESABASEVERSION=	18.0.4
+MESABASEVERSION=	18.1.0
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo
index 755223024f07..dcd4a50ab7df 100644
--- a/graphics/mesa-dri/distinfo
+++ b/graphics/mesa-dri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526581104
-SHA256 (mesa-18.0.4.tar.xz) = 1f3bcfe7cef0a5c20dae2b41df5d7e0a985e06be0183fa4d43b6068fcba2920f
-SIZE (mesa-18.0.4.tar.xz) = 10939356
+TIMESTAMP = 1526720775
+SHA256 (mesa-18.1.0.tar.xz) = c855c5b67ef993b7621f76d8b120769ec0415f1c3616eaff44ef7f7f300aceba
+SIZE (mesa-18.1.0.tar.xz) = 11118776
diff --git a/graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__network.c b/graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__network.c
deleted file mode 100644
index 95489a7e25ae..000000000000
--- 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>
diff --git a/graphics/mesa-dri/files/patch-src_gallium_drivers_freedreno_freedreno__screen.c b/graphics/mesa-dri/files/patch-src_gallium_drivers_freedreno_freedreno__screen.c
new file mode 100644
index 000000000000..2f35eb0307c8
--- /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);
diff --git a/graphics/mesa-dri/files/patch-src_util_os__time.c b/graphics/mesa-dri/files/patch-src_util_os__time.c
index cce12d16316d..46c1a4e07b37 100644
--- a/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)