libdrm-dfbsd-meson: Update wip/libdrm-dfbsd-meson through 2019-03-12

[David Shao <davshao%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	David Shao <davshao%gmail.com@localhost>
Pushed By:	dshao
Date:		Wed Mar 13 17:22:16 2019 -0700
Changeset:	d01a6f5e47e69a40b677eeaaf1dcca655062297c

Modified Files:
	libdrm-dfbsd-meson/Makefile
	libdrm-dfbsd-meson/distinfo
	libdrm-dfbsd-meson/patches/patch-xf86atomic.h

Log Message:
libdrm-dfbsd-meson: Update wip/libdrm-dfbsd-meson through 2019-03-12

Change to option whether or not to invert result of
atomic_add_unless.  Mesa3D now has the same function
but on DragonFly correct to not invert this.

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

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

diffstat:
 libdrm-dfbsd-meson/Makefile                   | 14 +++++++++++++-
 libdrm-dfbsd-meson/distinfo                   | 10 +++++-----
 libdrm-dfbsd-meson/patches/patch-xf86atomic.h |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diffs:
diff --git a/libdrm-dfbsd-meson/Makefile b/libdrm-dfbsd-meson/Makefile
index d03a53fffe..3801350f5e 100644
--- a/libdrm-dfbsd-meson/Makefile
+++ b/libdrm-dfbsd-meson/Makefile
@@ -1,7 +1,10 @@
 # $NetBSD: Makefile,v 1.91 2019/01/22 21:50:47 wiz Exp $
 
+# 2019-03-12		xf86drm: Fix segmentation fault while parsing device info
+COMMIT_ID=		4735ca71af9f741e2438104d543dc3c5a8107f35
+
 # 2019-02-26		configure.ac fix build error for config.h in autotools
-COMMIT_ID=		d54e546852dd6ffdc732ffa17f102b7ce87a7352
+# COMMIT_ID=		d54e546852dd6ffdc732ffa17f102b7ce87a7352
 
 # 2019-02-01		amdgpu: add some raven marketing names
 # COMMIT_ID=		6415bd3ced9d80137e30cb90837eb01932607882
@@ -80,6 +83,11 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.libdrm
 PKG_SUPPORTED_OPTIONS=	libkms
 PKG_SUGGESTED_OPTIONS=
 
+PKG_SUPPORTED_OPTIONS+=	invert_atomic_add_unless
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
+PKG_SUGGESTED_OPTIONS+=	invert_atomic_add_unless 
+.endif
+
 # .if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
 # PKG_SUGGESTED_OPTIONS+=	libkms
 # .endif
@@ -97,6 +105,10 @@ CONFIGURE_ARGS+=	--disable-libkms
 MESON_ARGS+=	-Dlibkms=false
 .endif
 
+.if !empty(PKG_OPTIONS:Minvert_atomic_add_unless)
+CPPFLAGS+=	-DINVERT_ATOMIC_ADD_UNLESS
+.endif
+
 # Meson
 # CPPFLAGS+=	-Wno-return-type
 .include "../../devel/py-meson/build.mk"
diff --git a/libdrm-dfbsd-meson/distinfo b/libdrm-dfbsd-meson/distinfo
index 6b02458c14..6777b6c22c 100644
--- a/libdrm-dfbsd-meson/distinfo
+++ b/libdrm-dfbsd-meson/distinfo
@@ -1,15 +1,15 @@
 $NetBSD: distinfo,v 1.92 2019/01/22 21:50:47 wiz Exp $
 
-SHA1 (drm-d54e546852dd6ffdc732ffa17f102b7ce87a7352.tar.xz) = 1ffbd5068192f922364a651816dd5b5cdea46bef
-RMD160 (drm-d54e546852dd6ffdc732ffa17f102b7ce87a7352.tar.xz) = 9518b785bf973a5584a5fd81e421115122e7dc81
-SHA512 (drm-d54e546852dd6ffdc732ffa17f102b7ce87a7352.tar.xz) = bcb73e1c4ce5245032e4f362c49c01872d2debc7eb859107b2f6cbd7d7e94b219f9c16d3a036c12a7363bf1392ca5f0f7d9d856fbeca02ed8eb1537dc514b364
-Size (drm-d54e546852dd6ffdc732ffa17f102b7ce87a7352.tar.xz) = 395812 bytes
+SHA1 (drm-4735ca71af9f741e2438104d543dc3c5a8107f35.tar.xz) = c00f51a79df0e5733dca2b6ab7025129f9b02e83
+RMD160 (drm-4735ca71af9f741e2438104d543dc3c5a8107f35.tar.xz) = da5e031ac3923839865543473ea6f76e708ede72
+SHA512 (drm-4735ca71af9f741e2438104d543dc3c5a8107f35.tar.xz) = 40014a5d3122054fa1f9bd252a211410cb08b725f5e2f45626c743274a21ee3d4125290ee94f9770af2fa6a8f5e1f3a98c123e36c2b410fff5b11cec9cf7f804
+Size (drm-4735ca71af9f741e2438104d543dc3c5a8107f35.tar.xz) = 395888 bytes
 SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea
 SHA1 (patch-include_drm_drm.h) = 48a912f40bf2b2a1c23edbe4446fa7869212f17b
 SHA1 (patch-libkms_vmwgfx.c) = de56a4f1724bef5f237f183eca889b8cef3b81af
 SHA1 (patch-libsync.h) = 1e0603e72a54a069fc9d2ab2c9559d22381a69d3
 SHA1 (patch-meson.build) = 32b7b69c936d658a382a0b4e2b157649a9c4782d
-SHA1 (patch-xf86atomic.h) = 887db95db00125bdfa1ab298b2ccc555dec70366
+SHA1 (patch-xf86atomic.h) = c1be2a2b7715ac37c997a63de817f4d715046e26
 SHA1 (patch-xf86drm.c) = 3cd8c6a6e26728d92ec3fc03cfffa778a65c286b
 SHA1 (patch-xf86drmMode.c) = d7c6617ef54f76dc3dac00098adbb2f6fb02d685
 SHA1 (patch-xf86drmMode.h) = 265989e670cc7ead9bb5002e116e5ab56439ede6
diff --git a/libdrm-dfbsd-meson/patches/patch-xf86atomic.h b/libdrm-dfbsd-meson/patches/patch-xf86atomic.h
index da8af22050..53c5bec69f 100644
--- a/libdrm-dfbsd-meson/patches/patch-xf86atomic.h
+++ b/libdrm-dfbsd-meson/patches/patch-xf86atomic.h
@@ -11,7 +11,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=100077
  	c = atomic_read(v);
  	while (c != unless && (old = atomic_cmpxchg(v, c, c + add)) != c)
  		c = old;
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
++#if defined(INVERT_ATOMIC_ADD_UNLESS)
 +	return c != unless;
 +#else
  	return c == unless;