pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

MesaLib-dfbsd-meson: Update wip/MesaLib-dfbsd-meson git through 2019-03-13



Module Name:	pkgsrc-wip
Committed By:	David Shao <davshao%gmail.com@localhost>
Pushed By:	dshao
Date:		Wed Mar 13 19:55:51 2019 -0700
Changeset:	065a6797939d1da2c373e4fd2c4ae9112738f8cb

Modified Files:
	MesaLib-dfbsd-meson/Makefile
	MesaLib-dfbsd-meson/distinfo
	MesaLib-dfbsd-meson/patches/patch-meson.build

Log Message:
MesaLib-dfbsd-meson: Update wip/MesaLib-dfbsd-meson git through 2019-03-13

Fix for egl/dri: Avoid out of bounds array access

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=065a6797939d1da2c373e4fd2c4ae9112738f8cb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 MesaLib-dfbsd-meson/Makefile                  | 20 ++++----------------
 MesaLib-dfbsd-meson/distinfo                  | 10 +++++-----
 MesaLib-dfbsd-meson/patches/patch-meson.build | 21 +++++++++++++++++++--
 3 files changed, 28 insertions(+), 23 deletions(-)

diffs:
diff --git a/MesaLib-dfbsd-meson/Makefile b/MesaLib-dfbsd-meson/Makefile
index a801e94876..cb8a6eef4a 100644
--- a/MesaLib-dfbsd-meson/Makefile
+++ b/MesaLib-dfbsd-meson/Makefile
@@ -1,22 +1,10 @@
 # $NetBSD: Makefile,v 1.18 2019/02/22 15:40:35 tnn Exp $
 
-# 2019-03-12	intel/fs: Fix opt_peephole_csel to not throw away saturates.
-COMMIT_ID=	3570d15b6d88bdcd353b31ffe5460d04a88b7b6f
-
-# 2019-03-06	st/glsl: start spilling out common st glsl conversion code
-# COMMIT_ID=	ecceb076e5c99cea94b853a9600947fe78b3ca74
-
-# 2019-03-05	anv: Implement VK_EXT_inline_uniform_block
-# COMMIT_ID=	43f40dc7cb234e007fe612b67cc765288ddf0533
+# 2019-03-13	anv/pass: Flag the need for a RT flush for resolve attachments
+COMMIT_ID=	489bf2de237a190b966a412efda89d12d1daacde
 
-# 2019-03-02	st/mesa: add support for lowering fp64/int64 for nir drivers
-# COMMIT_ID=	cb4e3e3ef6e47811303ad3413a4ab2048696a6f6
-
-# 2019-02-28	scons: Workaround failures with MSVC when using SCons 3.0.[2-4].
-# COMMIT_ID=	838c0485e01f3d3403b430aa6df5b4a1f5262dc3
-
-# 2019-02-26	panfrost/midgard: Allow flt to run on most units
-# COMMIT_ID=	b7a5b81d1488d4ec11ca49664b4f83ffd9dade2f
+# 2019-03-12	intel/fs: Fix opt_peephole_csel to not throw away saturates.
+# COMMIT_ID=	3570d15b6d88bdcd353b31ffe5460d04a88b7b6f
 
 PORTNAME=	mesa		
 
diff --git a/MesaLib-dfbsd-meson/distinfo b/MesaLib-dfbsd-meson/distinfo
index 633b89ceb7..bfc8ea64f4 100644
--- a/MesaLib-dfbsd-meson/distinfo
+++ b/MesaLib-dfbsd-meson/distinfo
@@ -1,12 +1,12 @@
 $NetBSD: distinfo,v 1.16 2019/02/22 15:40:35 tnn Exp $
 
-SHA1 (mesa-3570d15b6d88bdcd353b31ffe5460d04a88b7b6f.tar.xz) = 9d207c5a74826110ef57eb74d25664b4239e0042
-RMD160 (mesa-3570d15b6d88bdcd353b31ffe5460d04a88b7b6f.tar.xz) = 47b274ebdd25551c51c07aae8c950673300d18d8
-SHA512 (mesa-3570d15b6d88bdcd353b31ffe5460d04a88b7b6f.tar.xz) = 8b7479bd72a94335a4ff03e1c7a7a9ffc18da5b0b7edf04880a7fa34c08af8da393d19c9498a0f831a4ab5aa9f0f6907009ca664206eb9956691a51a4d6ca0bc
-Size (mesa-3570d15b6d88bdcd353b31ffe5460d04a88b7b6f.tar.xz) = 10675608 bytes
+SHA1 (mesa-489bf2de237a190b966a412efda89d12d1daacde.tar.xz) = 9f5a3d3c20bffe90fe140b90ad8067f7a72798c6
+RMD160 (mesa-489bf2de237a190b966a412efda89d12d1daacde.tar.xz) = aa966f81474d4029db5df4421a0999cd93a371d7
+SHA512 (mesa-489bf2de237a190b966a412efda89d12d1daacde.tar.xz) = 007d74f5073a5d9cd0a1283d1fb8a7619c93a504498594f6dd315cb3d30f83fd5b1ca90e5d28d9d05a9f94a34f3c409f3bf602dab7cb108d47027153f0cc2457
+Size (mesa-489bf2de237a190b966a412efda89d12d1daacde.tar.xz) = 10704508 bytes
 SHA1 (patch-configure.ac) = cddca44dbf1e2f447dd30a03440104920d6c24ab
 SHA1 (patch-include_GL_internal_dri__interface.h) = 76803a4ab6ff7e596900a0099dd9712093f8bc21
-SHA1 (patch-meson.build) = a1df13b2efa52a6bd04ffd7a3063401c96bcc3cf
+SHA1 (patch-meson.build) = 1d90d3b14c8569f2c9a7c5bda506ed464365f7a3
 SHA1 (patch-meson__options.txt) = 171ac109444b0ce8ea37e53b72f529a4b5e5c6f6
 SHA1 (patch-src_amd_common_ac__debug.c) = 8233367c3b5bc344442ea8d19488fdd1e3791ae9
 SHA1 (patch-src_amd_vulkan_radv__device.c) = a029ba89311fe62e3712573993fabf38910e9838
diff --git a/MesaLib-dfbsd-meson/patches/patch-meson.build b/MesaLib-dfbsd-meson/patches/patch-meson.build
index a0bcb1bae9..168588e60f 100644
--- a/MesaLib-dfbsd-meson/patches/patch-meson.build
+++ b/MesaLib-dfbsd-meson/patches/patch-meson.build
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- meson.build.orig	2019-03-06 23:05:20.000000000 +0000
+--- meson.build.orig	2019-03-13 22:58:27.000000000 +0000
 +++ meson.build
 @@ -50,6 +50,7 @@ with_tests = get_option('build-tests')
  with_valgrind = get_option('valgrind')
@@ -10,7 +10,7 @@ $NetBSD$
  with_glx_read_only_text = get_option('glx-read-only-text')
  with_glx_direct = get_option('glx-direct')
  with_osmesa = get_option('osmesa')
-@@ -338,7 +339,10 @@ if with_egl and not (with_platform_drm o
+@@ -343,7 +344,10 @@ if with_egl and not (with_platform_drm o
    endif
  endif
  
@@ -22,3 +22,20 @@ $NetBSD$
  if with_glx != 'disabled'
    if not (with_platform_x11 and with_any_opengl)
      error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
+@@ -1098,7 +1102,15 @@ endif
+ dep_zlib = dependency('zlib', version : '>= 1.2.3')
+ pre_args += '-DHAVE_ZLIB'
+ dep_thread = dependency('threads')
+-if dep_thread.found() and host_machine.system() != 'windows'
++if dep_thread.found() and ['freebsd', 'dragonfly'].contains(host_machine.system())
++  pre_args += '-DHAVE_PTHREAD'
++  if cc.has_function(
++      'pthread_setaffinity_np',
++      dependencies : dep_thread,
++      prefix : '#include <pthread_np.h>')
++    pre_args += '-DHAVE_PTHREAD_SETAFFINITY'
++  endif
++elif dep_thread.found() and host_machine.system() != 'windows'
+   pre_args += '-DHAVE_PTHREAD'
+   if cc.has_function(
+       'pthread_setaffinity_np',


Home | Main Index | Thread Index | Old Index