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 to git 2019-04-13

Module Name:	pkgsrc-wip
Committed By:	David Shao <davshao%gmail.com@localhost>
Pushed By:	dshao
Date:		Sat Apr 13 17:56:03 2019 -0700
Changeset:	2454203d42d7c8908b2d7e9771731935093dcc93

Modified Files:
	MesaLib-dfbsd-meson/Makefile
	MesaLib-dfbsd-meson/distinfo
	MesaLib-dfbsd-meson/dri.mk
	MesaLib-dfbsd-meson/options.mk
	MesaLib-dfbsd-meson/patches/patch-src_intel_isl_isl__tiled__memcpy.c
	MesaLib-dfbsd-meson/patches/patch-src_util_u__process.c
Added Files:
	MesaLib-dfbsd-meson/patches/patch-src_compiler_glsl_glsl__parser__extras.cpp
Removed Files:
	MesaLib-dfbsd-meson/patch-src_compiler_glsl_glsl__parser__extras.cpp

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

Radeonsi works again for a NetBSD amd64 machine with a Radeon R7 240 card.

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

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

diffstat:
 MesaLib-dfbsd-meson/Makefile                       | 11 +++++++--
 MesaLib-dfbsd-meson/distinfo                       | 13 ++++++-----
 MesaLib-dfbsd-meson/dri.mk                         |  3 +--
 MesaLib-dfbsd-meson/options.mk                     | 27 ++++++++++++++--------
 ...atch-src_compiler_glsl_glsl__parser__extras.cpp | 18 ---------------
 ...atch-src_compiler_glsl_glsl__parser__extras.cpp | 18 +++++++++++++++
 .../patch-src_intel_isl_isl__tiled__memcpy.c       | 12 ++++++----
 .../patches/patch-src_util_u__process.c            |  2 +-
 8 files changed, 62 insertions(+), 42 deletions(-)

diffs:
diff --git a/MesaLib-dfbsd-meson/Makefile b/MesaLib-dfbsd-meson/Makefile
index 63611f95b7..31792a2921 100644
--- a/MesaLib-dfbsd-meson/Makefile
+++ b/MesaLib-dfbsd-meson/Makefile
@@ -1,7 +1,13 @@
-# $NetBSD: Makefile,v 1.18 2019/02/22 15:40:35 tnn Exp $
+# $NetBSD: Makefile,v 1.19 2019/04/11 15:52:08 maya Exp $
+
+# 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
+# COMMIT_ID=	a155c26a66d58d9283b314dce4dd2abb71355349
 
 # 2019-04-10	docs: update calendar, and news item and link release notes for 19.0.2
 # COMMIT_ID=	4122f55574f1184e73962135123be1899b1739db
@@ -162,4 +168,5 @@ CFLAGS+=	-Wno-return-type
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/MesaLib-dfbsd-meson/distinfo b/MesaLib-dfbsd-meson/distinfo
index e1065cdfb3..033597f2b4 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-a155c26a66d58d9283b314dce4dd2abb71355349.tar.xz) = e32103296b8e57da451acc250b29fcb27ebc3012
-RMD160 (mesa-a155c26a66d58d9283b314dce4dd2abb71355349.tar.xz) = 883b33ff73908dd5d0476d0884d2d585c3230c4d
-SHA512 (mesa-a155c26a66d58d9283b314dce4dd2abb71355349.tar.xz) = 1f35568be7933921ba2f5e5af88db41792947814fbf768fa78efc39dc1501526b641458a59418de3529f468ff13fff2cd54278d8a76fae2e46acd4cf1c4d0423
-Size (mesa-a155c26a66d58d9283b314dce4dd2abb71355349.tar.xz) = 10874172 bytes
+SHA1 (mesa-b6bed115a5efb281b450c749418646b4ea2e7db7.tar.xz) = d86b027817c711f826b90be4f830052d3aafde24
+RMD160 (mesa-b6bed115a5efb281b450c749418646b4ea2e7db7.tar.xz) = fd508df1d4aa631a6df03218e7b8b11bb89afe6c
+SHA512 (mesa-b6bed115a5efb281b450c749418646b4ea2e7db7.tar.xz) = 100b197bf43629352ae5c927db81408d244a060bd5cc08477307632ba2552db2c5fedee2965eee955fa4fe7a45a7a35adcc6563d4ac67c84c112e2b21fe333d4
+Size (mesa-b6bed115a5efb281b450c749418646b4ea2e7db7.tar.xz) = 10883784 bytes
 SHA1 (patch-configure.ac) = cddca44dbf1e2f447dd30a03440104920d6c24ab
 SHA1 (patch-include_GL_internal_dri__interface.h) = 76803a4ab6ff7e596900a0099dd9712093f8bc21
 SHA1 (patch-meson.build) = 3cd30902cd5af7bc860dd2984a51d9ebf051662e
@@ -12,6 +12,7 @@ SHA1 (patch-src_amd_common_ac__debug.c) = 8233367c3b5bc344442ea8d19488fdd1e3791a
 SHA1 (patch-src_amd_vulkan_radv__device.c) = a7d9549147b662fca0bfff02bf8e8e543ee80fc1
 SHA1 (patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c) = 1fe81a7b16e36dc9125400c20543271216a33a45
 SHA1 (patch-src_compiler_builtin__type__macros.h) = 128030d0c532e5f3982dc6ebde1957fc0ca7f5d5
+SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = ef114d6e288e6d212fce9d1c0606f7d454a171c4
 SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = e18e7b1ffbc74b8acf3d9095a92c750f9d005479
 SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 1b8c7689b18643777d494bbb491866ed0041155d
 SHA1 (patch-src_egl_main_eglglobals.c) = 1b723fb03c13e267b23e7cb94b2f19c2bfa03be5
@@ -53,7 +54,7 @@ SHA1 (patch-src_glx_glxcurrent.c) = 67142b977aadf23b0b0d3a06db3d9450e0b7f892
 SHA1 (patch-src_glx_glxext.c) = 1c044d38faebc310f49248a6b937b1bbc5a16870
 SHA1 (patch-src_intel_Makefile.tools.am) = 5253d5972b48ae3bc8d648bb9f479dcf6cbd3fab
 SHA1 (patch-src_intel_compiler_brw__fs__bank__conflicts.cpp) = 6276d2c6846bb4dd08699921bec4e20202a17478
-SHA1 (patch-src_intel_isl_isl__tiled__memcpy.c) = 265721e521d1d1e43a50cbbcffbc0f0fc47922f7
+SHA1 (patch-src_intel_isl_isl__tiled__memcpy.c) = f019e47e535e2c2ab8d324937362a4c7965311f1
 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
@@ -89,7 +90,7 @@ SHA1 (patch-src_util_ralloc.c) = d311bfd9ed7e673d72e050668d351c1e6552cdc8
 SHA1 (patch-src_util_ralloc.h) = 56ff594c3f5aa450de14363735f4318864102214
 SHA1 (patch-src_util_strndup.h) = 73f49694ca48ad6b9a9d8346c5b84fddec2463bd
 SHA1 (patch-src_util_u__atomic.h) = 31d4514538ef5ee53012695eb5c66134aaec981e
-SHA1 (patch-src_util_u__process.c) = fb174c177d60ead65b22f00c88df59454c53c4ff
+SHA1 (patch-src_util_u__process.c) = 4f905ab7c812ac3f48165857dbc40455879c9f4b
 SHA1 (patch-src_util_u__queue.c) = 17fb475e139d29ae27a54e6f6104d274e50226f7
 SHA1 (patch-src_util_u__thread.h) = 9155dc93d4401aae279e0134b7cd0dc1b53e39fd
 SHA1 (patch-src_util_xmlconfig.c) = fa0cfe2e1348dfb5e91f9c20aae3c43eee1998b5
diff --git a/MesaLib-dfbsd-meson/dri.mk b/MesaLib-dfbsd-meson/dri.mk
index b5bf454044..c573b3f2f6 100644
--- a/MesaLib-dfbsd-meson/dri.mk
+++ b/MesaLib-dfbsd-meson/dri.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.1 2018/10/07 23:49:31 ryoon Exp $
+# $NetBSD: dri.mk,v 1.2 2019/04/11 16:27:03 maya Exp $
 #
 # Currently, this is for convenience only.
 #
@@ -19,7 +19,6 @@ BUILDLINK_API_DEPENDS.libdrm+=		libdrm>=2.4.60
 BUILDLINK_API_DEPENDS.libxcb+=	libxcb>=1.9.3
 .    endif
 .  endif
-.  include "../../textproc/expat/buildlink3.mk"
 .  include "../../x11/xorgproto/buildlink3.mk"
 # XXX these do not have builtin.mk
 .  if ${X11_TYPE} == "modular"
diff --git a/MesaLib-dfbsd-meson/options.mk b/MesaLib-dfbsd-meson/options.mk
index 3ad28454c6..f45168e692 100644
--- a/MesaLib-dfbsd-meson/options.mk
+++ b/MesaLib-dfbsd-meson/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2019/01/26 21:28:29 tnn Exp $
+# $NetBSD: options.mk,v 1.12 2019/04/11 16:27:03 maya Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=		llvm dri
@@ -30,6 +30,7 @@ PKG_SUPPORTED_OPTIONS+=		revert_copy_clear
 PKG_SUPPORTED_OPTIONS+=		physmem_netbsd
 PKG_SUPPORTED_OPTIONS+=		setaffinity_np_netbsd
 PKG_SUPPORTED_OPTIONS+=		no_initial_exec_nonnull
+PKG_SUPPORTED_OPTIONS+=		no_getprogramname
 PKG_SUPPORTED_OPTIONS+=		strict_xsrc_netbsd
 
 PKG_SUPPORTED_OPTIONS+=		x86_tsd_openbsd
@@ -50,6 +51,8 @@ PKG_SUGGESTED_OPTIONS+=		glesv1 glesv2
 
 PKG_SUGGESTED_OPTIONS+=		xa
 
+PKG_SUGGESTED_OPTIONS+=		asm
+
 # .if ${OPSYS} == "NetBSD"
 # PKG_SUGGESTED_OPTIONS+=		noatexit
 # .endif
@@ -81,12 +84,12 @@ PKG_SUGGESTED_OPTIONS+=		dri
 PKG_SUGGESTED_OPTIONS+=		glx-tls
 .endif
 
-.if ${OPSYS} == "DragonFly"
+.if ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=		test_dri3_enable
 .endif
 
 # Revert patch removing support for no dedicated render nodes
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=		no_render_node
 .endif
 
@@ -128,9 +131,13 @@ PKG_SUGGESTED_OPTIONS+=		setaffinity_np_netbsd
 PKG_SUGGESTED_OPTIONS+=		no_initial_exec_nonnull
 .endif
 
-.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+=		strict_xsrc_netbsd
-.endif
+# .if ${OPSYS} == "NetBSD"
+# PKG_SUGGESTED_OPTIONS+=		no_getprogramname
+# .endif
+
+# .if ${OPSYS} == "NetBSD"
+# PKG_SUGGESTED_OPTIONS+=		strict_xsrc_netbsd
+# .endif
 
 # OpenBSD xenocara tsd dispatch assembly for entry_x86_tsd.h
 .if ${OPSYS} == "OpenBSD"
@@ -380,6 +387,7 @@ MESON_ARGS+=	-Dgallium-vdpau=false
 # XA is useful for accelerating xf86-video-vmware
 .if !empty(PKG_OPTIONS:Mxa)
 CONFIGURE_ARGS+=	--enable-xa
+MESON_ARGS+=	-Dgallium-xa=true
 PLIST.xatracker=	yes
 .else
 MESON_ARGS+=	-Dgallium-xa=false
@@ -444,8 +452,6 @@ MESON_ARGS+=		-Dgles1=false
 MESON_ARGS+=		-Dgles2=false
 MESON_ARGS+=		-Dglx=xlib
 MESON_ARGS+=		-Dplatforms=x11
-# XXX configure looks for expat but doesn't actually need it in non-dri case
-CONFIGURE_ENV+=		EXPAT_CFLAGS=" " EXPAT_LIBS=" "
 .if !empty(PKG_OPTIONS:Mllvm)
 PKG_FAIL_REASON+=	"The llvm PKG_OPTION must also be disabled when dri is disabled"
 .endif
@@ -457,7 +463,6 @@ MESON_ARGS+=		--buildtype=debug
 .endif
 
 .if !empty(PKG_OPTIONS:Masm)
-MESON_ARGS+=		-Dasm=true
 .else
 MESON_ARGS+=		-Dasm=false
 .endif
@@ -526,6 +531,10 @@ CPPFLAGS+=	-DSETAFFINITY_NP_NETBSD
 CPPFLAGS+=	-DNO_INITIAL_EXEC_NONNULL
 .endif
 
+.if !empty(PKG_OPTIONS:Mno_getprogramname)
+CPPFLAGS+=	-DNO_GETPROGRAMNAME
+.endif
+
 .if !empty(PKG_OPTIONS:Mstrict_xsrc_netbsd)
 CPPFLAGS+=	-DSTRICT_XSRC_NETBSD
 .endif
diff --git a/MesaLib-dfbsd-meson/patch-src_compiler_glsl_glsl__parser__extras.cpp b/MesaLib-dfbsd-meson/patch-src_compiler_glsl_glsl__parser__extras.cpp
deleted file mode 100644
index c926fe10a6..0000000000
--- a/MesaLib-dfbsd-meson/patch-src_compiler_glsl_glsl__parser__extras.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_compiler_glsl_glsl__parser__extras.cpp,v 1.1 2018/10/07 23:49:31 ryoon Exp $
-
-atexit() is not a good idea in a library; use destructor attribute.
-
---- src/compiler/glsl/glsl_parser_extras.cpp.orig	2017-09-25 16:56:18.000000000 +0000
-+++ src/compiler/glsl/glsl_parser_extras.cpp
-@@ -2224,7 +2224,11 @@ extern "C" {
-  * programs would be invalid.  So this should happen at approximately
-  * program exit.
-  */
-+#if defined(HAVE_NOATEXIT)
-+void __attribute__((__destructor__))
-+#else
- void
-+#endif
- _mesa_destroy_shader_compiler(void)
- {
-    _mesa_destroy_shader_compiler_caches();
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_compiler_glsl_glsl__parser__extras.cpp b/MesaLib-dfbsd-meson/patches/patch-src_compiler_glsl_glsl__parser__extras.cpp
new file mode 100644
index 0000000000..c926fe10a6
--- /dev/null
+++ b/MesaLib-dfbsd-meson/patches/patch-src_compiler_glsl_glsl__parser__extras.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_compiler_glsl_glsl__parser__extras.cpp,v 1.1 2018/10/07 23:49:31 ryoon Exp $
+
+atexit() is not a good idea in a library; use destructor attribute.
+
+--- src/compiler/glsl/glsl_parser_extras.cpp.orig	2017-09-25 16:56:18.000000000 +0000
++++ src/compiler/glsl/glsl_parser_extras.cpp
+@@ -2224,7 +2224,11 @@ extern "C" {
+  * programs would be invalid.  So this should happen at approximately
+  * program exit.
+  */
++#if defined(HAVE_NOATEXIT)
++void __attribute__((__destructor__))
++#else
+ void
++#endif
+ _mesa_destroy_shader_compiler(void)
+ {
+    _mesa_destroy_shader_compiler_caches();
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_intel_isl_isl__tiled__memcpy.c b/MesaLib-dfbsd-meson/patches/patch-src_intel_isl_isl__tiled__memcpy.c
index 8d7843f8e5..0342ae9cac 100644
--- a/MesaLib-dfbsd-meson/patches/patch-src_intel_isl_isl__tiled__memcpy.c
+++ b/MesaLib-dfbsd-meson/patches/patch-src_intel_isl_isl__tiled__memcpy.c
@@ -2,17 +2,21 @@ $NetBSD: patch-src_mesa_drivers_dri_i965_intel__tiled__memcpy.c,v 1.1 2018/10/07
 
 From wip/MesaLib 13.0.1.
 
---- src/intel/isl/isl_tiled_memcpy.c.orig	2019-01-22 16:42:57.000000000 +0000
+--- src/intel/isl/isl_tiled_memcpy.c.orig	2019-04-12 23:16:58.000000000 +0000
 +++ src/intel/isl/isl_tiled_memcpy.c
-@@ -64,6 +64,7 @@ ror(uint32_t n, uint32_t d)
+@@ -64,6 +64,11 @@ ror(uint32_t n, uint32_t d)
     return (n >> d) | (n << (32 - d));
  }
  
-+#if !defined(__NetBSD__)
++#if defined(__NetBSD__)
++/* Handle conflicting declaration and conflicting macro in netbsd */
++#undef bswap32
++#define bswap32(n) __builtin_bswap32(n)
++#else /* !__NetBSD__ */
  static inline uint32_t
  bswap32(uint32_t n)
  {
-@@ -76,6 +77,7 @@ bswap32(uint32_t n)
+@@ -76,6 +81,7 @@ bswap32(uint32_t n)
            (n << 24);
  #endif
  }
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_util_u__process.c b/MesaLib-dfbsd-meson/patches/patch-src_util_u__process.c
index 298d6689cb..0b5b84eac3 100644
--- a/MesaLib-dfbsd-meson/patches/patch-src_util_u__process.c
+++ b/MesaLib-dfbsd-meson/patches/patch-src_util_u__process.c
@@ -7,7 +7,7 @@ $NetBSD$
  
  #if !defined(GET_PROGRAM_NAME)
 -#    if defined(__OpenBSD__) || defined(NetBSD) || defined(__UCLIBC__) || defined(ANDROID)
-+#    if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__UCLIBC__) || defined(ANDROID)
++#    if defined(__OpenBSD__) || defined(NetBSD) || defined(__UCLIBC__) || defined(ANDROID) || defined(NO_GETPROGRAMNAME)
  /* This is a hack. It's said to work on OpenBSD, NetBSD and GNU.
   * Rogelio M.Serrano Jr. reported it's also working with UCLIBC. It's
   * used as a last resort, if there is no documented facility available. */
Home | Main Index | Thread Index | Old Index