MesaLib-dfbsd-meson: Update wip/MesaLib-dfbsd-meson to git 2019-04-17

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: MesaLib-dfbsd-meson: Update wip/MesaLib-dfbsd-meson to git 2019-04-17
From: David Shao <davshao%gmail.com@localhost>
Date: Thu, 18 Apr 2019 15:42:02 +0000
Module Name:	pkgsrc-wip
Committed By:	David Shao <davshao%gmail.com@localhost>
Pushed By:	dshao
Date:		Thu Apr 18 08:42:02 2019 -0700
Changeset:	0b1170c3e18e274b77eee261ea88d87d43f69c40

Modified Files:
	MesaLib-dfbsd-meson/Makefile
	MesaLib-dfbsd-meson/distinfo
	MesaLib-dfbsd-meson/options.mk
Added Files:
	MesaLib-dfbsd-meson/patch-src_mesa_drivers_dri_i965_brw__performance__query.c
	MesaLib-dfbsd-meson/patches/patch-src_intel_perf_gen__perf.h
Removed Files:
	MesaLib-dfbsd-meson/patches/patch-src_mesa_drivers_dri_i965_brw__performance__query.c

Log Message:
MesaLib-dfbsd-meson: Update wip/MesaLib-dfbsd-meson to git 2019-04-17

Options osmesa, xa, xvmc, vdpau, vaapi default selected.
Radeonsi works on NetBSD, FreeBSD 12, DragonFly amd64 Radeon R7 240 card,
Intel graphics untested.

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

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

diffstat:
 MesaLib-dfbsd-meson/Makefile                       | 32 +++---------
 MesaLib-dfbsd-meson/distinfo                       | 10 ++--
 MesaLib-dfbsd-meson/options.mk                     |  4 +-
 ...mesa_drivers_dri_i965_brw__performance__query.c | 61 ++++++++++++++++++++++
 .../patches/patch-src_intel_perf_gen__perf.h       | 14 +++++
 ...mesa_drivers_dri_i965_brw__performance__query.c | 61 ----------------------
 6 files changed, 90 insertions(+), 92 deletions(-)

diffs:
diff --git a/MesaLib-dfbsd-meson/Makefile b/MesaLib-dfbsd-meson/Makefile
index ec68360b4c..6260905ce4 100644
--- a/MesaLib-dfbsd-meson/Makefile
+++ b/MesaLib-dfbsd-meson/Makefile
@@ -1,7 +1,13 @@
 # $NetBSD: Makefile,v 1.19 2019/04/11 15:52:08 maya Exp $
 
+# 2019-04-17	Add no_aos_sampling GALLIVM_PERF option
+COMMIT_ID=	829f278ad0042b0bb5026b10e7393fa3e11498b2
+
+# 2019-04-17	gallivm: fix saturated signed add / sub with llvm 9
+# COMMIT_ID=	dded2edf8bedb9a5bafd7788e52dc8e714527186
+
 # 2019-04-16	radeonsi/nir: fix scanning of bindless images
-COMMIT_ID=	3c5a9ab9f01d1d299eea1b99b9346c639fc30612
+# COMMIT_ID=	3c5a9ab9f01d1d299eea1b99b9346c639fc30612
 
 # 2019-04-16	iris: Add texture cache flushing hacks for blit and resource_copy_regionHEADmaster
 # COMMIT_ID=	c4478889b7176ea5aed52d1630bedb43797a00f0
@@ -12,30 +18,6 @@ COMMIT_ID=	3c5a9ab9f01d1d299eea1b99b9346c639fc30612
 # 2019-04-16	compiler/glsl: handle case where we have multiple users for types
 # COMMIT_ID=	624789e3708c87ea2a4c8d2266266b489b421cba
 
-# 2019-04-14	draw: fix building error in draw_gs_init()
-# COMMIT_ID=	1af7701666bea2d6f4d0d226f5efc2fa65103872
-
-# 2019-04-13	nir: add lower_ftrunc
-# COMMIT_ID=	b6bed115a5efb281b450c749418646b4ea2e7db7
-
-# 2019-04-12	v3d: Use the new lower_to_scratch implementation for indirects on temps.
-# COMMIT_ID=	dc402be73e4bbb9b43213a4266b98a46092e3038
-
-# 2019-04-10	lima: implement blit with util_blitter
-# COMMIT_ID=	a155c26a66d58d9283b314dce4dd2abb71355349
-
-# 2019-04-10	docs: update calendar, and news item and link release notes for 19.0.2
-# COMMIT_ID=	4122f55574f1184e73962135123be1899b1739db
-
-# 2019-04-10	gallium/aux: Report error if loading of a pipe driver fails.
-# COMMIT_ID=	6ec9733b9f16e94dc3b3a0e6f9e88bced6955e86
-
-# 2019-04-09	bin: drop unused import from install_megadrivers.py
-# COMMIT_ID=	eb699c15750f6e927e666bdd0ef2b6d6aff8a1b9
-
-# 2019-04-08	drisw: Try harder to probe whether MIT-SHM works
-# COMMIT_ID=	52426ce4a929f7e1389baf490967fc02357b3f5e
-
 PORTNAME=	mesa		
 
 DISTNAME=	${PORTNAME}-${COMMIT_ID}
diff --git a/MesaLib-dfbsd-meson/distinfo b/MesaLib-dfbsd-meson/distinfo
index 5fa4c25735..046217cec7 100644
--- a/MesaLib-dfbsd-meson/distinfo
+++ b/MesaLib-dfbsd-meson/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.16 2019/02/22 15:40:35 tnn Exp $
 
-SHA1 (mesa-3c5a9ab9f01d1d299eea1b99b9346c639fc30612.tar.xz) = 3978b3ac7de30224597a93d3e34ef7a40b921c73
-RMD160 (mesa-3c5a9ab9f01d1d299eea1b99b9346c639fc30612.tar.xz) = 2ad43694458087c7ba7bb02f151c573a983fcf90
-SHA512 (mesa-3c5a9ab9f01d1d299eea1b99b9346c639fc30612.tar.xz) = 6c33f6bf2608cceb176eed042fecdb54b94597f7bf79885569c30ef87749d102a3419102ac4d10d6a7d123ea3b0edb286066bb06494a0adb94fb979421d9fefb
-Size (mesa-3c5a9ab9f01d1d299eea1b99b9346c639fc30612.tar.xz) = 10822044 bytes
+SHA1 (mesa-829f278ad0042b0bb5026b10e7393fa3e11498b2.tar.xz) = 392341257c672f0c118481e23bbc32badf5f1813
+RMD160 (mesa-829f278ad0042b0bb5026b10e7393fa3e11498b2.tar.xz) = 28eb2bdf011b1107c24c1d297fa04bf0c1edbfb1
+SHA512 (mesa-829f278ad0042b0bb5026b10e7393fa3e11498b2.tar.xz) = 6f616c3e71544289d6543f3232b0f2f9ce7e25f1cb1954de46e5000ae843bc567fdbc1b3f4c09ff9688c09f18bb42f45b1ef5f6553e7fa88153d961ea7af54c0
+Size (mesa-829f278ad0042b0bb5026b10e7393fa3e11498b2.tar.xz) = 10796708 bytes
 SHA1 (patch-include_GL_internal_dri__interface.h) = 76803a4ab6ff7e596900a0099dd9712093f8bc21
 SHA1 (patch-meson.build) = 3cd30902cd5af7bc860dd2984a51d9ebf051662e
 SHA1 (patch-meson__options.txt) = 171ac109444b0ce8ea37e53b72f529a4b5e5c6f6
@@ -51,6 +51,7 @@ SHA1 (patch-src_glx_glxcurrent.c) = 67142b977aadf23b0b0d3a06db3d9450e0b7f892
 SHA1 (patch-src_glx_glxext.c) = 1c044d38faebc310f49248a6b937b1bbc5a16870
 SHA1 (patch-src_intel_compiler_brw__fs__bank__conflicts.cpp) = 6276d2c6846bb4dd08699921bec4e20202a17478
 SHA1 (patch-src_intel_isl_isl__tiled__memcpy.c) = f019e47e535e2c2ab8d324937362a4c7965311f1
+SHA1 (patch-src_intel_perf_gen__perf.h) = 2915eb9dc7161d74d73b8e238dc1f0d0d9b82935
 SHA1 (patch-src_intel_tools_aub__mem.c) = 671e478a843b70c12c5038ad314c108925ab5cc7
 SHA1 (patch-src_intel_tools_aubinator__error__decode.c) = 159b57f9a3c1fd37ab1e5b49ff911073e2e9ff9b
 SHA1 (patch-src_intel_tools_error2aub.c) = e38395e3889f6e3af645f312a429ce2a7d285231
@@ -68,7 +69,6 @@ SHA1 (patch-src_mapi_u__current.h) = 13e91936db8d468c4f4744eb5cc01ad879b53539
 SHA1 (patch-src_mapi_u__execmem.c) = 3b448405aeea0b17cfa58e8fe66708467b6eeb8a
 SHA1 (patch-src_mesa_drivers_dri_i915_intel__screen.c) = fb9324dcbc8ffbc00bee6aedcc38db2e94b24f9d
 SHA1 (patch-src_mesa_drivers_dri_i965_brw__bufmgr.c) = 7a6edf46b9364bcdb2dbe8d70a2e6a1d0610dc40
-SHA1 (patch-src_mesa_drivers_dri_i965_brw__performance__query.c) = 9579ab29e0a913aa0516665e72a8573097932312
 SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = 1b5de370add6984fb44968c055b7d8d5a54417dd
 SHA1 (patch-src_mesa_drivers_dri_swrast_swrast.c) = 4c0ca7dec2398a15f77b643d0f86af41ca202be3
 SHA1 (patch-src_mesa_main_context.c) = a7c796810104971e2fd76b15397d068e628f0a9e
diff --git a/MesaLib-dfbsd-meson/options.mk b/MesaLib-dfbsd-meson/options.mk
index f45168e692..d7af7973f9 100644
--- a/MesaLib-dfbsd-meson/options.mk
+++ b/MesaLib-dfbsd-meson/options.mk
@@ -40,9 +40,11 @@ PKG_SUPPORTED_OPTIONS+=		no_linear_alloc_destructor
 
 PKG_SUPPORTED_OPTIONS+=		invert_atomic_add_unless
 
-# PKG_SUGGESTED_OPTIONS+=		xvmc
+PKG_SUGGESTED_OPTIONS+=		xvmc
 PKG_SUGGESTED_OPTIONS+=		vdpau vaapi
 
+PKG_SUGGESTED_OPTIONS+=		osmesa
+
 # glesv1 and glesv2 build error on NetBSD
 # due to no table_noop_array for tls patch
 .if ${OPSYS} != "NetBSD"
diff --git a/MesaLib-dfbsd-meson/patch-src_mesa_drivers_dri_i965_brw__performance__query.c b/MesaLib-dfbsd-meson/patch-src_mesa_drivers_dri_i965_brw__performance__query.c
new file mode 100644
index 0000000000..53a741526f
--- /dev/null
+++ b/MesaLib-dfbsd-meson/patch-src_mesa_drivers_dri_i965_brw__performance__query.c
@@ -0,0 +1,61 @@
+$NetBSD: patch-src_mesa_drivers_dri_i965_brw__performance__query.c,v 1.2 2018/10/16 15:21:20 jperkin Exp $
+
+--- src/mesa/drivers/dri/i965/brw_performance_query.c.orig	2019-02-21 18:11:53.000000000 +0000
++++ src/mesa/drivers/dri/i965/brw_performance_query.c
+@@ -1797,6 +1797,9 @@ enumerate_sysfs_metrics(struct brw_conte
+    DIR *metricsdir = NULL;
+    struct dirent *metric_entry;
+    int len;
++#ifdef __sun
++   struct stat s;
++#endif
+ 
+    len = snprintf(buf, sizeof(buf), "%s/metrics", brw->perfquery.sysfs_dev_dir);
+    if (len < 0 || len >= sizeof(buf)) {
+@@ -1813,10 +1816,19 @@ enumerate_sysfs_metrics(struct brw_conte
+    while ((metric_entry = readdir(metricsdir))) {
+       struct hash_entry *entry;
+ 
++#if defined(__sun)
++      stat(metric_entry->d_name, &s);
++      if ((s.st_mode != S_IFDIR &&
++           s.st_mode != S_IFLNK) ||
++          metric_entry->d_name[0] == '.')
++         continue;
++#else
++
+       if ((metric_entry->d_type != DT_DIR &&
+            metric_entry->d_type != DT_LNK) ||
+           metric_entry->d_name[0] == '.')
+          continue;
++#endif
+ 
+       DBG("metric set: %s\n", metric_entry->d_name);
+       entry = _mesa_hash_table_search(brw->perfquery.oa_metrics_table,
+@@ -2056,6 +2068,9 @@ get_sysfs_dev_dir(struct brw_context *br
+    DIR *drmdir;
+    struct dirent *drm_entry;
+    int len;
++#ifdef __sun
++   struct stat s;
++#endif
+ 
+    brw->perfquery.sysfs_dev_dir[0] = '\0';
+ 
+@@ -2087,9 +2102,16 @@ get_sysfs_dev_dir(struct brw_context *br
+    }
+ 
+    while ((drm_entry = readdir(drmdir))) {
++#if defined(__sun)
++      stat(drm_entry->d_name, &s);
++      if ((s.st_mode == S_IFDIR ||
++           s.st_mode == S_IFLNK) &&
++          strncmp(drm_entry->d_name, "card", 4) == 0)
++#else
+       if ((drm_entry->d_type == DT_DIR ||
+            drm_entry->d_type == DT_LNK) &&
+           strncmp(drm_entry->d_name, "card", 4) == 0)
++#endif
+       {
+          len = snprintf(brw->perfquery.sysfs_dev_dir,
+                         sizeof(brw->perfquery.sysfs_dev_dir),
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_intel_perf_gen__perf.h b/MesaLib-dfbsd-meson/patches/patch-src_intel_perf_gen__perf.h
new file mode 100644
index 0000000000..b01d65e18f
--- /dev/null
+++ b/MesaLib-dfbsd-meson/patches/patch-src_intel_perf_gen__perf.h
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/intel/perf/gen_perf.h.orig	2019-04-17 15:42:13.000000000 +0000
++++ src/intel/perf/gen_perf.h
+@@ -28,7 +28,9 @@
+ #include <stdint.h>
+ #include <string.h>
+ 
++#ifdef MAJOR_IN_SYSMACROS
+ #include <sys/sysmacros.h>
++#endif
+ 
+ #include "util/hash_table.h"
+ #include "util/ralloc.h"
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_mesa_drivers_dri_i965_brw__performance__query.c b/MesaLib-dfbsd-meson/patches/patch-src_mesa_drivers_dri_i965_brw__performance__query.c
deleted file mode 100644
index 53a741526f..0000000000
--- a/MesaLib-dfbsd-meson/patches/patch-src_mesa_drivers_dri_i965_brw__performance__query.c
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-src_mesa_drivers_dri_i965_brw__performance__query.c,v 1.2 2018/10/16 15:21:20 jperkin Exp $
-
---- src/mesa/drivers/dri/i965/brw_performance_query.c.orig	2019-02-21 18:11:53.000000000 +0000
-+++ src/mesa/drivers/dri/i965/brw_performance_query.c
-@@ -1797,6 +1797,9 @@ enumerate_sysfs_metrics(struct brw_conte
-    DIR *metricsdir = NULL;
-    struct dirent *metric_entry;
-    int len;
-+#ifdef __sun
-+   struct stat s;
-+#endif
- 
-    len = snprintf(buf, sizeof(buf), "%s/metrics", brw->perfquery.sysfs_dev_dir);
-    if (len < 0 || len >= sizeof(buf)) {
-@@ -1813,10 +1816,19 @@ enumerate_sysfs_metrics(struct brw_conte
-    while ((metric_entry = readdir(metricsdir))) {
-       struct hash_entry *entry;
- 
-+#if defined(__sun)
-+      stat(metric_entry->d_name, &s);
-+      if ((s.st_mode != S_IFDIR &&
-+           s.st_mode != S_IFLNK) ||
-+          metric_entry->d_name[0] == '.')
-+         continue;
-+#else
-+
-       if ((metric_entry->d_type != DT_DIR &&
-            metric_entry->d_type != DT_LNK) ||
-           metric_entry->d_name[0] == '.')
-          continue;
-+#endif
- 
-       DBG("metric set: %s\n", metric_entry->d_name);
-       entry = _mesa_hash_table_search(brw->perfquery.oa_metrics_table,
-@@ -2056,6 +2068,9 @@ get_sysfs_dev_dir(struct brw_context *br
-    DIR *drmdir;
-    struct dirent *drm_entry;
-    int len;
-+#ifdef __sun
-+   struct stat s;
-+#endif
- 
-    brw->perfquery.sysfs_dev_dir[0] = '\0';
- 
-@@ -2087,9 +2102,16 @@ get_sysfs_dev_dir(struct brw_context *br
-    }
- 
-    while ((drm_entry = readdir(drmdir))) {
-+#if defined(__sun)
-+      stat(drm_entry->d_name, &s);
-+      if ((s.st_mode == S_IFDIR ||
-+           s.st_mode == S_IFLNK) &&
-+          strncmp(drm_entry->d_name, "card", 4) == 0)
-+#else
-       if ((drm_entry->d_type == DT_DIR ||
-            drm_entry->d_type == DT_LNK) &&
-           strncmp(drm_entry->d_name, "card", 4) == 0)
-+#endif
-       {
-          len = snprintf(brw->perfquery.sysfs_dev_dir,
-                         sizeof(brw->perfquery.sysfs_dev_dir),
Prev by Date: gnunet: Fix PLIST.
Next by Date: thedarkmod: New patches.
Previous by Thread: gnunet: Fix PLIST.
Next by Thread: thedarkmod: New patches.
Indexes:
Home | Main Index | Thread Index | Old Index