diff options
| author | zeising <zeising@FreeBSD.org> | 2018-05-31 03:18:01 +0800 |
|---|---|---|
| committer | zeising <zeising@FreeBSD.org> | 2018-05-31 03:18:01 +0800 |
| commit | 3f87a4800231e40ebf6929687a5f21abdffdb3f2 (patch) | |
| tree | c5acc6b9172afd562a09500823e0d2ade76c2076 /graphics/mesa-dri/files | |
| parent | bd2a62ee5705cd00fbfbd98b1fe1166d7ede54bf (diff) | |
| download | freebsd-ports-gnome-3f87a4800231e40ebf6929687a5f21abdffdb3f2.tar.gz freebsd-ports-gnome-3f87a4800231e40ebf6929687a5f21abdffdb3f2.tar.zst freebsd-ports-gnome-3f87a4800231e40ebf6929687a5f21abdffdb3f2.zip | |
graphics/mesa-libs, graphics/mesa-dri: Update to 18.1.0
Update mesa ports to 18.1
Changes: https://www.mesa3d.org/relnotes/18.1.0.html
PR: 227685
Submitted by: jbeich
Tested by: Greg V, Carlos J. Puga Medina
Diffstat (limited to 'graphics/mesa-dri/files')
3 files changed, 31 insertions, 21 deletions
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) |