mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-04 11:23:46 +00:00
Code Issues Releases Activity

graphics/mesa-{libs,dri}: update to 18.3.2

Browse Source 
Changes:	https://www.mesa3d.org/relnotes/18.3.0.html
Changes:	https://www.mesa3d.org/relnotes/18.3.1.html
Changes:	https://www.mesa3d.org/relnotes/18.3.2.html
PR:		233034
Tested by:	Kevin Oberman
Approved by:	maintainer timeout (2 weeks after 2019Q1)
Differential Revision:	https://reviews.freebsd.org/D17872
This commit is contained in:
Jan Beich 2019-01-17 15:34:55 +00:00
parent 435f466d59
commit cd740e600a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=490570
10 changed files with 159 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/mesa-dri/Makefile.common
View File

@ -14,7 +14,7 @@
MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
MESABASEVERSION= 18.2.8
MESABASEVERSION= 18.3.2
# if there is a subversion, don't include the '-' between 7.11-rc2.
MESASUBVERSION=

6
graphics/mesa-dri/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1545926521
SHA256 (mesa-18.2.8.tar.xz) = 1d2ed9fd435d86d95b7215b287258d3e6b1180293a36f688e5a2efc18298d863
SIZE (mesa-18.2.8.tar.xz) = 11385224
TIMESTAMP = 1547724382
SHA256 (mesa-18.3.2.tar.xz) = f7ce7181c07b6d8e0132da879af1729523a6c8aa87f79a9d59dfd064024cfb35
SIZE (mesa-18.3.2.tar.xz) = 11868440

27
graphics/mesa-dri/files/configure.ac
View File

@ -1,6 +1,6 @@
--- configure.ac.orig 2017-04-01 15:33:36 UTC
--- configure.ac.orig 2018-11-09 11:03:00 UTC
+++ configure.ac
@@ -894,7 +894,7 @@ case "$host_os" in
@@ -931,7 +931,7 @@ case "$host_os" in
darwin*)
;;
*)
@ -9,8 +9,21 @@
[AC_CHECK_LIB([rt], [clock_gettime], [CLOCK_LIB=-lrt],
[AC_MSG_ERROR([Could not find clock_gettime])])])
AC_SUBST([CLOCK_LIB])
@@ -942,7 +942,10 @@ if test "x$pthread_stubs_possible" = xyes; then
fi
@@ -982,8 +982,12 @@ save_LIBS="$LIBS"
LIBS="$PTHREAD_LIBS"
AC_MSG_CHECKING(whether pthread_setaffinity_np is supported)
AC_LINK_IFELSE([AC_LANG_SOURCE([[
+ #if defined(__DragonFly__) || defined(__FreeBSD__)
+ #include <pthread_np.h>
+ #else
#define _GNU_SOURCE
#include <pthread.h>
+ #endif
int main() {
void *a = (void*) &pthread_setaffinity_np;
long b = (long) a;
@@ -995,7 +999,10 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([[
LIBS="$save_LIBS"
dnl Check for futex for fast inline simple_mtx_t.
-AC_CHECK_HEADER([linux/futex.h], [DEFINES="$DEFINES -DHAVE_LINUX_FUTEX_H"])
@ -21,7 +34,7 @@
dnl SELinux awareness.
AC_ARG_ENABLE([selinux],
@@ -1121,7 +1121,7 @@ fi
@@ -1278,7 +1285,7 @@ fi
AC_SUBST(LIBSENSORS_LIBS)
case "$host_os" in
@ -30,7 +43,7 @@
dri3_default=yes
;;
*)
@@ -1884,9 +1884,9 @@ fi
@@ -1932,9 +1939,9 @@ fi
if test x"$have_xlease" = xyes; then
randr_modules="x11-xcb xcb-randr"
@ -42,7 +55,7 @@
fi
AM_CONDITIONAL(HAVE_PLATFORM_X11, echo "$platforms" | grep -q 'x11')
@@ -2061,8 +2070,6 @@ if test "x$enable_opencl" = xyes; then
@@ -2515,8 +2522,6 @@ if test "x$enable_opencl" = xyes; then
CLANG_LIBDIR=${LLVM_LIBDIR}
fi
CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}

64
graphics/mesa-dri/files/patch-compat-include-guards Normal file
View File

@ -0,0 +1,64 @@
Partially revert https://cgit.freedesktop.org/mesa/mesa/commit/?id=f7d42ee7d319
in order to allow ports like devel/allegro, devel/sdl{12,20}, graphics/glew,
graphics/libepoxy, x11-toolkits/qt5-gui to skip <GL/glext.h> inclusion via <GL/gl.h>.
--- include/GLES2/gl2.h.orig 2018-11-09 11:03:00 UTC
+++ include/GLES2/gl2.h
@@ -1,5 +1,5 @@
-#ifndef __gles2_gl2_h_
-#define __gles2_gl2_h_ 1
+#ifndef __gl2_h_
+#define __gl2_h_ 1
#ifdef __cplusplus
extern "C" {
--- include/GLES2/gl2ext.h.orig 2018-11-09 11:03:00 UTC
+++ include/GLES2/gl2ext.h
@@ -1,5 +1,5 @@
-#ifndef __gles2_gl2ext_h_
-#define __gles2_gl2ext_h_ 1
+#ifndef __gl2ext_h_
+#define __gl2ext_h_ 1
#ifdef __cplusplus
extern "C" {
--- include/GLES3/gl3.h.orig 2018-11-09 11:03:00 UTC
+++ include/GLES3/gl3.h
@@ -1,5 +1,5 @@
-#ifndef __gles2_gl3_h_
-#define __gles2_gl3_h_ 1
+#ifndef __gl3_h_
+#define __gl3_h_ 1
#ifdef __cplusplus
extern "C" {
--- include/GL/glcorearb.h.orig 2018-11-09 11:03:00 UTC
+++ include/GL/glcorearb.h
@@ -1,5 +1,5 @@
-#ifndef __gl_glcorearb_h_
-#define __gl_glcorearb_h_ 1
+#ifndef __glcorearb_h_
+#define __glcorearb_h_ 1
#ifdef __cplusplus
extern "C" {
--- include/GL/glext.h.orig 2018-11-09 11:03:00 UTC
+++ include/GL/glext.h
@@ -1,5 +1,5 @@
-#ifndef __gl_glext_h_
-#define __gl_glext_h_ 1
+#ifndef __glext_h_
+#define __glext_h_ 1
#ifdef __cplusplus
extern "C" {
--- include/GL/glxext.h.orig 2018-11-09 11:03:00 UTC
+++ include/GL/glxext.h
@@ -1,5 +1,5 @@
-#ifndef __glx_glxext_h_
-#define __glx_glxext_h_ 1
+#ifndef __glxext_h_
+#define __glxext_h_ 1
#ifdef __cplusplus
extern "C" {

31
graphics/mesa-dri/files/patch-configure
View File

@ -1,6 +1,6 @@
--- configure.orig 2018-01-23 18:08:55 UTC
--- configure.orig 2018-11-09 11:03:06 UTC
+++ configure
@@ -21895,12 +21895,13 @@ case "$host_os" in
@@ -22659,12 +22659,13 @@ case "$host_os" in
darwin*)
;;
*)
@ -18,9 +18,22 @@
_ACEOF
CLOCK_LIB=
else
@@ -22559,11 +22559,20 @@ $as_echo "yes" >&6; }
fi
fi
@@ -23330,8 +23331,12 @@ $as_echo_n "checking whether pthread_setaffinity_np is
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+ #if defined(__DragonFly__) || defined(__FreeBSD__)
+ #include <pthread_np.h>
+ #else
#define _GNU_SOURCE
#include <pthread.h>
+ #endif
int main() {
void *a = (void*) &pthread_setaffinity_np;
long b = (long) a;
@@ -23350,11 +23355,20 @@ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$save_LIBS"
-ac_fn_c_check_header_mongrel "$LINENO" "linux/futex.h" "ac_cv_header_linux_futex_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_futex_h" = xyes; then :
@ -42,7 +55,7 @@
# Check whether --enable-selinux was given.
@@ -23308,7 +23308,7 @@ fi
@@ -24252,7 +24266,7 @@ fi
case "$host_os" in
@ -51,7 +64,7 @@
dri3_default=yes
;;
*)
@@ -26000,31 +26000,11 @@ fi
@@ -26640,31 +26654,11 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$XCB_RANDR_PKG_ERRORS" >&5
@ -85,7 +98,7 @@
else
XCB_RANDR_CFLAGS=$pkg_cv_XCB_RANDR_CFLAGS
XCB_RANDR_LIBS=$pkg_cv_XCB_RANDR_LIBS
@@ -26092,31 +26072,11 @@ fi
@@ -26732,31 +26726,11 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$XLIB_RANDR_PKG_ERRORS" >&5
@ -119,7 +132,7 @@
else
XLIB_RANDR_CFLAGS=$pkg_cv_XLIB_RANDR_CFLAGS
XLIB_RANDR_LIBS=$pkg_cv_XLIB_RANDR_LIBS
@@ -27096,9 +27106,6 @@ rm -f core conftest.err conftest.$ac_obj
@@ -28792,9 +28766,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
CLANG_LIBDIR=${LLVM_LIBDIR}
fi
CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}

19
graphics/mesa-dri/files/patch-src_amd_vulkan_radv__device.c Normal file
View File

@ -0,0 +1,19 @@
- 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,14 @@
#include "util/debug.h"
#include "util/mesa-sha1.h"
+#ifndef CLOCK_MONOTONIC_RAW
+# ifdef CLOCK_MONOTONIC_FAST
+# define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC_FAST
+# else
+# define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC
+# endif
+#endif
+
static int
radv_device_get_cache_uuid(enum radeon_family family, void *uuid)
{

11
graphics/mesa-dri/files/patch-src_intel_tools_aubinator.c → graphics/mesa-dri/files/patch-src_intel_tools_aub__mem.c
View File

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

18
graphics/mesa-dri/files/patch-src_intel_vulkan_anv__device.c
View File

@ -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,27 @@
#include <unistd.h>
#include <fcntl.h>
#include <xf86drm.h>
@@ -40,6 +42,10 @@
@@ -44,6 +46,17 @@
#include "genxml/gen7_pack.h"
+#ifndef ETIME
+#define ETIME ETIMEDOUT
+#endif
+#ifndef CLOCK_MONOTONIC_RAW
+# ifdef CLOCK_MONOTONIC_FAST
+# define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC_FAST
+# else
+# define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC
+# endif
+#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;

13
graphics/mesa-dri/files/patch-src_util_u__thread.h
View File

@ -1,21 +1,24 @@
- Implement setting thread name
- Use monotonic clock for timeouts
--- src/util/u_thread.h.orig 2018-02-09 02:18:00 UTC
--- src/util/u_thread.h.orig 2018-11-09 11:03:00 UTC
+++ src/util/u_thread.h
@@ -34,7 +34,11 @@
@@ -34,7 +34,14 @@
#ifdef HAVE_PTHREAD
#include <signal.h>
+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#include <pthread_np.h>
+# if !defined(__DragonFly__)
+# define cpu_set_t cpuset_t
+# endif
+#undef ALIGN /* Avoid conflict on FreeBSD in main/macros.h */
#endif
+#endif
static inline thrd_t u_thread_create(int (*routine)(void *), void *param)
@@ -65,6 +69,12 @@ static inline void u_thread_setname( const char *name
{
@@ -64,6 +69,12 @@ static inline void u_thread_setname( const char *name
(__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) && \
defined(__linux__)
pthread_setname_np(pthread_self(), name);
@ -28,7 +31,7 @@
# endif
#endif
(void)name;
@@ -78,7 +88,7 @@ static inline void u_thread_setname( const char *name
@@ -134,7 +145,7 @@ util_get_L3_for_pinned_thread(thrd_t thread, unsigned
static inline int64_t
u_thread_get_time_nano(thrd_t thread)
{

2
graphics/mesa-dri/pkg-plist
View File

@ -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 @@ libdata/pkgconfig/dri.pc
@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