Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 May 2018 19:18:01 +0000 (UTC)
From:      Niclas Zeising <zeising@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r471152 - in head/graphics/mesa-dri: . files
Message-ID:  <201805301918.w4UJI1HL036287@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zeising
Date: Wed May 30 19:18:01 2018
New Revision: 471152
URL: https://svnweb.freebsd.org/changeset/ports/471152

Log:
  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

Added:
  head/graphics/mesa-dri/files/patch-src_gallium_drivers_freedreno_freedreno__screen.c   (contents, props changed)
Deleted:
  head/graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__network.c
Modified:
  head/graphics/mesa-dri/Makefile.common
  head/graphics/mesa-dri/distinfo
  head/graphics/mesa-dri/files/patch-src_util_os__time.c

Modified: head/graphics/mesa-dri/Makefile.common
==============================================================================
--- head/graphics/mesa-dri/Makefile.common	Wed May 30 19:14:08 2018	(r471151)
+++ head/graphics/mesa-dri/Makefile.common	Wed May 30 19:18:01 2018	(r471152)
@@ -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=
 

Modified: head/graphics/mesa-dri/distinfo
==============================================================================
--- head/graphics/mesa-dri/distinfo	Wed May 30 19:14:08 2018	(r471151)
+++ head/graphics/mesa-dri/distinfo	Wed May 30 19:18:01 2018	(r471152)
@@ -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

Added: head/graphics/mesa-dri/files/patch-src_gallium_drivers_freedreno_freedreno__screen.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/mesa-dri/files/patch-src_gallium_drivers_freedreno_freedreno__screen.c	Wed May 30 19:18:01 2018	(r471152)
@@ -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);

Modified: head/graphics/mesa-dri/files/patch-src_util_os__time.c
==============================================================================
--- head/graphics/mesa-dri/files/patch-src_util_os__time.c	Wed May 30 19:14:08 2018	(r471151)
+++ head/graphics/mesa-dri/files/patch-src_util_os__time.c	Wed May 30 19:18:01 2018	(r471152)
@@ -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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805301918.w4UJI1HL036287>