FreeBSD Bugzilla – Attachment 193319 Details for
Bug 227685
graphics/mesa-dri: update to 18.1.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
rc4
mesa-18.1.0.diff (text/plain), 4.65 KB, created by
Jan Beich
on 2018-05-12 10:26:06 UTC
(
hide
)
Description:
rc4
Filename:
MIME Type:
Creator:
Jan Beich
Created:
2018-05-12 10:26:06 UTC
Size:
4.65 KB
patch
obsolete
>From a91a1fec79b5cf35dec623d5e2b797f5300c4d77 Mon Sep 17 00:00:00 2001 >From: Jan Beich <jbeich@FreeBSD.org> >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 48a282dda153..cea8fe9c578b 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.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}/ \ >diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo >index e6143fbefd54..d98d4cd0f193 100644 >--- a/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 >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)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 227685
:
192719
|
192860
|
192884
|
193049
|
193319
|
193545
|
193555
|
193822