Page MenuHomeFreeBSD
Files F149051788

D17872.id50079.diff
No OneTemporary
Actions

D17872.id50079.diff
View Options

Index: graphics/mesa-dri/Makefile.common
===================================================================
--- graphics/mesa-dri/Makefile.common
+++ graphics/mesa-dri/Makefile.common
@@ -14,9 +14,9 @@
MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
-MESABASEVERSION= 18.2.4
+MESABASEVERSION= 18.3.0
# if there is a subversion, don't include the '-' between 7.11-rc2.
-MESASUBVERSION=
+MESASUBVERSION= rc1
MASTER_SITES= https://mesa.freedesktop.org/archive/ \
https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \
Index: graphics/mesa-dri/distinfo
===================================================================
--- graphics/mesa-dri/distinfo
+++ graphics/mesa-dri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1541010385
-SHA256 (mesa-18.2.4.tar.xz) = 621d1aebb57876d5b6a5d2dcf4eb7e0620e650c6fe5cf3655c65e243adc9cb4e
-SIZE (mesa-18.2.4.tar.xz) = 11377556
+TIMESTAMP = 1541520962
+SHA256 (mesa-18.3.0-rc1.tar.xz) = 013cdfb4b91f5d7aebfb2d8a66ede2cc9f6d311e42a99d686f6b90678bca588f
+SIZE (mesa-18.3.0-rc1.tar.xz) = 11863980
Index: graphics/mesa-dri/files/patch-src_amd_vulkan_radv__device.c
===================================================================
--- /dev/null
+++ graphics/mesa-dri/files/patch-src_amd_vulkan_radv__device.c
@@ -0,0 +1,15 @@
+- Define CLOCK_MONOTONIC_RAW if missing
+
+--- src/amd/vulkan/radv_device.c.orig 2018-11-06 16:16:02 UTC
++++ src/amd/vulkan/radv_device.c
+@@ -50,6 +50,10 @@
+ #include "util/debug.h"
+ #include "util/mesa-sha1.h"
+
++#ifndef CLOCK_MONOTONIC_RAW
++#define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC
++#endif
++
+ static int
+ radv_device_get_cache_uuid(enum radeon_family family, void *uuid)
+ {
Index: graphics/mesa-dri/files/patch-src_intel_tools_aub__mem.c
===================================================================
--- graphics/mesa-dri/files/patch-src_intel_tools_aub__mem.c
+++ graphics/mesa-dri/files/patch-src_intel_tools_aub__mem.c
@@ -1,8 +1,13 @@
- Partially implement memfd_create() via mkostemp()
---- src/intel/tools/aubinator.c.orig 2018-08-02 15:41:20 UTC
-+++ src/intel/tools/aubinator.c
-@@ -52,7 +52,29 @@
+--- src/intel/tools/aub_mem.c.orig 2018-11-06 16:16:02 UTC
++++ src/intel/tools/aub_mem.c
+@@ -30,11 +30,34 @@
+
+ #ifndef HAVE_MEMFD_CREATE
+ #include <sys/syscall.h>
++#include <fcntl.h>
+
static inline int
memfd_create(const char *name, unsigned int flags)
{
Index: graphics/mesa-dri/files/patch-src_intel_vulkan_anv__device.c
===================================================================
--- graphics/mesa-dri/files/patch-src_intel_vulkan_anv__device.c
+++ graphics/mesa-dri/files/patch-src_intel_vulkan_anv__device.c
@@ -1,7 +1,8 @@
- Without sysinfo() fall back to sysconf()
- Define ETIME if missing
+- Define CLOCK_MONOTONIC_RAW if missing
---- src/intel/vulkan/anv_device.c.orig 2018-01-23 18:08:50 UTC
+--- src/intel/vulkan/anv_device.c.orig 2018-11-06 16:16:02 UTC
+++ src/intel/vulkan/anv_device.c
@@ -25,7 +25,9 @@
#include <stdbool.h>
@@ -13,20 +14,23 @@
#include <unistd.h>
#include <fcntl.h>
#include <xf86drm.h>
-@@ -40,6 +42,10 @@
+@@ -44,6 +46,13 @@
#include "genxml/gen7_pack.h"
+#ifndef ETIME
+#define ETIME ETIMEDOUT
+#endif
++#ifndef CLOCK_MONOTONIC_RAW
++#define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC
++#endif
+
static void
compiler_debug_log(void *data, const char *fmt, ...)
{ }
-@@ -75,10 +81,15 @@ anv_compute_heap_size(int fd, uint64_t *heap_size)
- }
-
+@@ -64,10 +73,15 @@ static VkResult
+ anv_compute_heap_size(int fd, uint64_t gtt_size, uint64_t *heap_size)
+ {
/* Query the total ram from the system */
+#ifdef __GLIBC__
struct sysinfo info;
Index: graphics/mesa-dri/files/patch-src_util_Makefile.in
===================================================================
--- /dev/null
+++ graphics/mesa-dri/files/patch-src_util_Makefile.in
@@ -0,0 +1,17 @@
+../../src/util/.libs/libmesautil.a(libmesautil_la-half_float.o): In function `_mesa_float_to_half':
+half_float.c:(.text+0x91): undefined reference to `lrintf'
+half_float.c:(.text+0xc1): undefined reference to `lrintf'
+cc: error: linker command failed with exit code 1 (use -v to see invocation)
+
+--- src/util/Makefile.in.orig 2018-11-06 16:16:12 UTC
++++ src/util/Makefile.in
+@@ -963,7 +963,8 @@ libmesautil_la_LIBADD = \
+ $(PTHREAD_LIBS) \
+ $(CLOCK_LIB) \
+ $(ZLIB_LIBS) \
+- $(LIBATOMIC_LIBS)
++ $(LIBATOMIC_LIBS) \
++ -lm
+
+ libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES)
+ libxmlconfig_la_CFLAGS = \
Index: graphics/mesa-dri/pkg-plist
===================================================================
--- graphics/mesa-dri/pkg-plist
+++ graphics/mesa-dri/pkg-plist
@@ -1,4 +1,3 @@
-etc/drirc
@comment include/EGL/egl.h
@comment include/EGL/eglext.h
@comment include/EGL/eglextchromium.h
@@ -89,5 +88,6 @@
@comment libdata/pkgconfig/gl.pc
@comment libdata/pkgconfig/glesv2.pc
@comment libdata/pkgconfig/osmesa.pc
+share/drirc.d/00-mesa-defaults.conf
%%INTEL_VDRIVER%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json
%%RADEON_VDRIVER%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 23, 12:27 AM (10 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30147965
Default Alt Text
D17872.id50079.diff (5 KB)

Event Timeline