Attachment #193319 for bug #227685

Lines 14-22 Link Here

(-)b/graphics/mesa-dri/Makefile.common (-2 / +2 lines)
14	MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}	14	MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
15	MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}	15	MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
16		16
17	MESABASEVERSION= 18.0.3	17	MESABASEVERSION= 18.1.0
18	# if there is a subversion, don't include the '-' between 7.11-rc2.	18	# if there is a subversion, don't include the '-' between 7.11-rc2.
19	MESASUBVERSION=	19	MESASUBVERSION= rc4
20		20
21	MASTER_SITES= https://mesa.freedesktop.org/archive/ \	21	MASTER_SITES= https://mesa.freedesktop.org/archive/ \
22	https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \	22	https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \

Lines 1-3 Link Here

(-)b/graphics/mesa-dri/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1525688481	1	TIMESTAMP = 1526081222
2	SHA256 (mesa-18.0.3.tar.xz) = 099d9667327a76a61741a533f95067d76ea71a656e66b91507b3c0caf1d49e30	2	SHA256 (mesa-18.1.0-rc4.tar.xz) = 8207155b822af999d621aa4e9013dff8b78dd46be8abc385e33ca8389e6dce6b
3	SIZE (mesa-18.0.3.tar.xz) = 10922936	3	SIZE (mesa-18.1.0-rc4.tar.xz) = 11118452

Removed Link Here

(-)a/graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__network.c (-11 lines)
1	--- src/gallium/auxiliary/util/u_network.c.orig 2018-01-23 18:08:49 UTC
2	+++ src/gallium/auxiliary/util/u_network.c
3	@@ -9,7 +9,7 @@
4	# include <winsock2.h>
5	# include <windows.h>
6	# include <ws2tcpip.h>
7	-#elif defined(PIPE_OS_LINUX) \|\| defined(PIPE_OS_HAIKU) \|\| \
8	+#elif defined(PIPE_OS_LINUX) \|\| defined(PIPE_OS_BSD) \|\| defined(PIPE_OS_HAIKU) \|\| \
9	defined(PIPE_OS_APPLE) \|\| defined(PIPE_OS_CYGWIN) \|\| defined(PIPE_OS_SOLARIS)
10	# include <sys/socket.h>
11	# include <netinet/in.h>




- 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);




- Use monotonic clock for timeouts

--- 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)

Return to bug 227685

Added Link Here

(-)b/graphics/mesa-dri/files/patch-src_gallium_drivers_freedreno_freedreno__screen.c (+30 lines)
1	- Without sysinfo() fall back to sysconf()
2
3	--- src/gallium/drivers/freedreno/freedreno_screen.c.orig 2018-04-21 05:48:24 UTC
4	+++ src/gallium/drivers/freedreno/freedreno_screen.c
5	@@ -43,7 +43,11 @@
6	#include <errno.h>
7	#include <stdio.h>
8	#include <stdlib.h>
9	+#ifdef __GLIBC__
10	#include <sys/sysinfo.h>
11	+#else
12	+#include <unistd.h>
13	+#endif
14
15	#include "freedreno_screen.h"
16	#include "freedreno_resource.h"
17	@@ -837,9 +841,13 @@ fd_screen_create(struct fd_device *dev)
18	screen->priority_mask = (1 << val) - 1;
19	}
20
21	+#ifdef __GLIBC__
22	struct sysinfo si;
23	sysinfo(&si);
24	screen->ram_size = si.totalram;
25	+#else
26	+ screen->ram_size = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGE_SIZE);
27	+#endif
28
29	DBG("Pipe Info:");
30	DBG(" GPU-id: %d", screen->gpu_id);

Lines 1-16 Link Here

(-)b/graphics/mesa-dri/files/patch-src_util_os__time.c (-10 / +1 lines)
1	- Use monotonic clock for timeouts	1	- Use monotonic clock for timeouts
2		2
3	--- src/util/os_time.c.orig 2018-01-23 18:08:50 UTC	3	--- src/util/os_time.c.orig 2018-04-21 05:48:25 UTC
4	+++ src/util/os_time.c	4	+++ src/util/os_time.c
5	@@ -55,7 +55,7 @@
6	int64_t
7	os_time_get_nano(void)
8	{
9	-#if defined(PIPE_OS_LINUX)
10	+#if defined(PIPE_OS_BSD) \|\| defined(PIPE_OS_LINUX)
11
12	struct timespec tv;
13	clock_gettime(CLOCK_MONOTONIC, &tv);
14	@@ -95,7 +95,7 @@ os_time_get_nano(void)	5	@@ -95,7 +95,7 @@ os_time_get_nano(void)
15	void	6	void
16	os_time_sleep(int64_t usecs)	7	os_time_sleep(int64_t usecs)