From fa194cc464f280b9d0f61946d552a2cf1cd5e6a7 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Tue, 10 Apr 2018 00:15:05 +0000 Subject: [PATCH] graphics/mesa-{libs,dri}: update to 18.1.0 Changes: https://www.mesa3d.org/relnotes/18.1.0.html ABI: https://abi-laboratory.pro/tracker/timeline/mesa/ PR: 227685 Tested by: Greg V Reviewed by: ? Approved by: ? --- 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 diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index 9990b3dff98a..8ff59a18cb01 100644 --- a/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.2 +MESABASEVERSION= 18.1.0 # if there is a subversion, don't include the '-' between 7.11-rc2. -MESASUBVERSION= +MESASUBVERSION= rc3 MASTER_SITES= https://mesa.freedesktop.org/archive/ \ https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \ diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo index 25a1faa4cf36..5266db2491c1 100644 --- a/graphics/mesa-dri/distinfo +++ b/graphics/mesa-dri/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524932716 -SHA256 (mesa-18.0.2.tar.xz) = 98fa159768482dc568b9f8bf0f36c7acb823fa47428ffd650b40784f16b9e7b3 -SIZE (mesa-18.0.2.tar.xz) = 10949364 +TIMESTAMP = 1525457111 +SHA256 (mesa-18.1.0-rc3.tar.xz) = 1f1f596f3232b9ae02c71b390593859e35cb4c60a42e776eddd5d9800e279123 +SIZE (mesa-18.1.0-rc3.tar.xz) = 11121648 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 - # include - # include --#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 - # include 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 + #include + #include ++#ifdef __GLIBC__ + #include ++#else ++#include ++#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)