libdrm-dfbsd-meson: Update wip/libdrm-dfbsd-meson to 2019-03-25 git

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

Module Name:	pkgsrc-wip
Committed By:	David Shao <davshao%gmail.com@localhost>
Pushed By:	dshao
Date:		Tue Mar 26 19:34:51 2019 -0700
Changeset:	083ace3e8f5278f79786f849bb66b4eeb83ae111

Modified Files:
	libdrm-dfbsd-meson/Makefile
	libdrm-dfbsd-meson/distinfo
	libdrm-dfbsd-meson/patches/patch-xf86atomic.h
	libdrm-dfbsd-meson/patches/patch-xf86drm.c
Added Files:
	libdrm-dfbsd-meson/patches/patch-intel_intel__bufmgr__gem.c
	libdrm-dfbsd-meson/patches/patch-intel_uthash.h

Log Message:
libdrm-dfbsd-meson: Update wip/libdrm-dfbsd-meson to 2019-03-25 git

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

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

diffstat:
 libdrm-dfbsd-meson/Makefile                        | 24 +++++++++--
 libdrm-dfbsd-meson/distinfo                        | 14 +++---
 .../patches/patch-intel_intel__bufmgr__gem.c       | 14 ++++++
 libdrm-dfbsd-meson/patches/patch-intel_uthash.h    | 13 ++++++
 libdrm-dfbsd-meson/patches/patch-xf86atomic.h      | 27 +++++++++++-
 libdrm-dfbsd-meson/patches/patch-xf86drm.c         | 50 +++++++++++++++-------
 6 files changed, 115 insertions(+), 27 deletions(-)

diffs:
diff --git a/libdrm-dfbsd-meson/Makefile b/libdrm-dfbsd-meson/Makefile
index 3801350f5e..6775197fa7 100644
--- a/libdrm-dfbsd-meson/Makefile
+++ b/libdrm-dfbsd-meson/Makefile
@@ -1,7 +1,16 @@
 # $NetBSD: Makefile,v 1.91 2019/01/22 21:50:47 wiz Exp $
 
+# 2019-03-25		intel: sync i915_pciids.h with kernel
+COMMIT_ID=		ae836decb41a69d00bfadab78a7cb69f88de4c94
+
+# 2019-03-20		tests/amdgpu: minor fix for dispatch/draw test
+# COMMIT_ID=		a85b31c973d9f619be862655793ab957318321dc
+
+# 2019-03-18		tests/amdgpu: add memcpy draw test
+# COMMIT_ID=		852a9d20ad645d399774a2b3ff1746521841ba54
+
 # 2019-03-12		xf86drm: Fix segmentation fault while parsing device info
-COMMIT_ID=		4735ca71af9f741e2438104d543dc3c5a8107f35
+# COMMIT_ID=		4735ca71af9f741e2438104d543dc3c5a8107f35
 
 # 2019-02-26		configure.ac fix build error for config.h in autotools
 # COMMIT_ID=		d54e546852dd6ffdc732ffa17f102b7ce87a7352
@@ -33,9 +42,9 @@ ONLY_FOR_PLATFORM=	NetBSD-*-* DragonFly-*-* FreeBSD-*-* OpenBSD-*-* \
 
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config
-USE_LIBTOOL=		yes
+# USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	libdrm.pc.in
-GNU_CONFIGURE=		yes
+# GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -92,6 +101,11 @@ PKG_SUGGESTED_OPTIONS+=	invert_atomic_add_unless
 # PKG_SUGGESTED_OPTIONS+=	libkms
 # .endif
 
+PKG_SUPPORTED_OPTIONS+= strict_xsrc_netbsd
+.if ${OPSYS} == "NetBSD"
+PKG_SUGGESTED_OPTIONS+= strict_xsrc_netbsd
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=	libkms	
@@ -109,6 +123,10 @@ MESON_ARGS+=	-Dlibkms=false
 CPPFLAGS+=	-DINVERT_ATOMIC_ADD_UNLESS
 .endif
 
+.if !empty(PKG_OPTIONS:Mstrict_xsrc_netbsd)
+CPPFLAGS+=	-DSTRICT_XSRC_NETBSD
+.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 6777b6c22c..1e8773bd92 100644
--- a/libdrm-dfbsd-meson/distinfo
+++ b/libdrm-dfbsd-meson/distinfo
@@ -1,15 +1,17 @@
 $NetBSD: distinfo,v 1.92 2019/01/22 21:50:47 wiz Exp $
 
-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 (drm-ae836decb41a69d00bfadab78a7cb69f88de4c94.tar.xz) = 0766d4d58fc9a1c2dfedbf799a1f45d03a8dd853
+RMD160 (drm-ae836decb41a69d00bfadab78a7cb69f88de4c94.tar.xz) = 6adef5c438e3f3c73cfb12b1a3ce6270ae5e3c82
+SHA512 (drm-ae836decb41a69d00bfadab78a7cb69f88de4c94.tar.xz) = eda65490b0d36e49173a05f9dfda9bcf85cb4b84697ca7b115c44f453830c7d4210eaca42df073b9147036b6912fdd5ac95235e0b041ac570b88b2acc606dda1
+Size (drm-ae836decb41a69d00bfadab78a7cb69f88de4c94.tar.xz) = 400388 bytes
 SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea
 SHA1 (patch-include_drm_drm.h) = 48a912f40bf2b2a1c23edbe4446fa7869212f17b
+SHA1 (patch-intel_intel__bufmgr__gem.c) = 29598cfacd6b6f7432001d0d884b4e4204c18d4a
+SHA1 (patch-intel_uthash.h) = fba0a7bb2437760b06640a3d69f1a44b62726a3a
 SHA1 (patch-libkms_vmwgfx.c) = de56a4f1724bef5f237f183eca889b8cef3b81af
 SHA1 (patch-libsync.h) = 1e0603e72a54a069fc9d2ab2c9559d22381a69d3
 SHA1 (patch-meson.build) = 32b7b69c936d658a382a0b4e2b157649a9c4782d
-SHA1 (patch-xf86atomic.h) = c1be2a2b7715ac37c997a63de817f4d715046e26
-SHA1 (patch-xf86drm.c) = 3cd8c6a6e26728d92ec3fc03cfffa778a65c286b
+SHA1 (patch-xf86atomic.h) = e8af89dfefe0537e33dce16609b083261792b1ad
+SHA1 (patch-xf86drm.c) = 2aa77835d011d074cfb24248ba4fd1d18fc5b4b9
 SHA1 (patch-xf86drmMode.c) = d7c6617ef54f76dc3dac00098adbb2f6fb02d685
 SHA1 (patch-xf86drmMode.h) = 265989e670cc7ead9bb5002e116e5ab56439ede6
diff --git a/libdrm-dfbsd-meson/patches/patch-intel_intel__bufmgr__gem.c b/libdrm-dfbsd-meson/patches/patch-intel_intel__bufmgr__gem.c
new file mode 100644
index 0000000000..e1757c4e40
--- /dev/null
+++ b/libdrm-dfbsd-meson/patches/patch-intel_intel__bufmgr__gem.c
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- intel/intel_bufmgr_gem.c.orig	2019-03-12 11:55:31.000000000 +0000
++++ intel/intel_bufmgr_gem.c
+@@ -43,6 +43,9 @@
+ #include <unistd.h>
+ #include <assert.h>
+ #include <pthread.h>
++#if defined(STRICT_XSRC_NETBSD)
++#include <stddef.h>
++#endif
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
diff --git a/libdrm-dfbsd-meson/patches/patch-intel_uthash.h b/libdrm-dfbsd-meson/patches/patch-intel_uthash.h
new file mode 100644
index 0000000000..980a5cc120
--- /dev/null
+++ b/libdrm-dfbsd-meson/patches/patch-intel_uthash.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- intel/uthash.h.orig	2019-03-12 11:55:31.000000000 +0000
++++ intel/uthash.h
+@@ -71,7 +71,7 @@ do {                                    
+ typedef unsigned int uint32_t;
+ typedef unsigned char uint8_t;
+ #endif
+-#elif defined(__GNUC__) && !defined(__VXWORKS__)
++#elif ((defined(STRICT_XSRC_NETBSD) && defined(__lint__)) || defined(__GNUC__)) && !defined(__VXWORKS__)
+ #include <stdint.h>
+ #else
+ typedef unsigned int uint32_t;
diff --git a/libdrm-dfbsd-meson/patches/patch-xf86atomic.h b/libdrm-dfbsd-meson/patches/patch-xf86atomic.h
index 53c5bec69f..d6d0dcaf7d 100644
--- a/libdrm-dfbsd-meson/patches/patch-xf86atomic.h
+++ b/libdrm-dfbsd-meson/patches/patch-xf86atomic.h
@@ -1,13 +1,36 @@
 $NetBSD$
 
+Option to define atomic types similar to current NetBSD xsrc.
+
 This single patch allows glxgears to run properly on
 an Intel integrated graphics IvyBridge machine on DragonFly.
 libdrm atomic_add_unless() may reverse return value meaning
 https://bugs.freedesktop.org/show_bug.cgi?id=100077
 
---- xf86atomic.h.orig	2015-09-22 04:34:51.000000000 +0000
+--- xf86atomic.h.orig	2019-03-12 11:55:31.000000000 +0000
 +++ xf86atomic.h
-@@ -111,7 +111,11 @@ static inline int atomic_add_unless(atom
+@@ -79,12 +79,20 @@ typedef struct {
+ #define HAS_ATOMIC_OPS 1
+ 
+ #if defined(__NetBSD__)
++#if defined(STRICT_XSRC_NETBSD)
++#define LIBDRM_ATOMIC_TYPE unsigned int
++#else /* !STRICT_XSRC_NETBSD */
+ #define LIBDRM_ATOMIC_TYPE int
++#endif /*STRICT_XSRC_NETBSD */
+ #else
+ #define LIBDRM_ATOMIC_TYPE uint_t
+ #endif
+ 
++#if defined(STRICT_XSRC_NETBSD)
++typedef struct { volatile LIBDRM_ATOMIC_TYPE atomic; } atomic_t;
++#else /* !STRICT_XSRC_NETBSD */
+ typedef struct { LIBDRM_ATOMIC_TYPE atomic; } atomic_t;
++#endif /*STRICT_XSRC_NETBSD */
+ 
+ # define atomic_read(x) (int) ((x)->atomic)
+ # define atomic_set(x, val) ((x)->atomic = (LIBDRM_ATOMIC_TYPE)(val))
+@@ -107,7 +115,11 @@ static inline int atomic_add_unless(atom
  	c = atomic_read(v);
  	while (c != unless && (old = atomic_cmpxchg(v, c, c + add)) != c)
  		c = old;
diff --git a/libdrm-dfbsd-meson/patches/patch-xf86drm.c b/libdrm-dfbsd-meson/patches/patch-xf86drm.c
index 5f5fc685af..4c7105623e 100644
--- a/libdrm-dfbsd-meson/patches/patch-xf86drm.c
+++ b/libdrm-dfbsd-meson/patches/patch-xf86drm.c
@@ -4,7 +4,7 @@ Implement drmParseSubsystemType, drmParsePciBusInfo for NetBSD
 
 Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
 
---- xf86drm.c.orig	2019-01-22 16:32:41.000000000 +0000
+--- xf86drm.c.orig	2019-03-12 11:55:31.000000000 +0000
 +++ xf86drm.c
 @@ -46,6 +46,11 @@
  #include <signal.h>
@@ -100,7 +100,7 @@ Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
  /**
   * Compare two busid strings
   *
-@@ -351,7 +401,11 @@ static int drmOpenDevice(dev_t dev, int
+@@ -351,7 +401,11 @@ static int drmOpenDevice(dev_t dev, int 
          return -EINVAL;
      };
  
@@ -160,7 +160,16 @@ Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
  
  /**
   * Open the device by bus ID.
-@@ -2779,12 +2846,29 @@ static bool drmNodeIsDRM(int maj, int mi
+@@ -2594,7 +2661,7 @@ drm_public int drmCommandNone(int fd, un
+ {
+     unsigned long request;
+ 
+-    request = DRM_IO( DRM_COMMAND_BASE + drmCommandIndex);
++    request = DRM_IO( (DRM_COMMAND_BASE + drmCommandIndex) );
+ 
+     if (drmIoctl(fd, request, NULL)) {
+         return -errno;
+@@ -2820,12 +2887,29 @@ static bool drmNodeIsDRM(int maj, int mi
               maj, min);
      return stat(path, &sbuf) == 0;
  #else
@@ -190,7 +199,7 @@ Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
      struct stat sbuf;
      int maj, min, type;
  
-@@ -2803,6 +2887,7 @@ drm_public int drmGetNodeTypeFromFd(int
+@@ -2844,6 +2928,7 @@ drm_public int drmGetNodeTypeFromFd(int 
      if (type == -1)
          errno = ENODEV;
      return type;
@@ -198,7 +207,7 @@ Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
  }
  
  drm_public int drmPrimeHandleToFD(int fd, uint32_t handle, uint32_t flags,
-@@ -2881,6 +2966,25 @@ static char *drmGetMinorNameForFD(int fd
+@@ -2922,6 +3007,25 @@ static char *drmGetMinorNameForFD(int fd
  
      closedir(sysdir);
      return NULL;
@@ -224,7 +233,16 @@ Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
  #else
      struct stat sbuf;
      char buf[PATH_MAX + 1];
-@@ -3014,7 +3118,66 @@ static int drmParseSubsystemType(int maj
+@@ -2957,7 +3061,7 @@ static char *drmGetMinorNameForFD(int fd
+         return NULL;
+ 
+     n = snprintf(buf, sizeof(buf), dev_name, DRM_DIR_NAME, min - base);
+-    if (n == -1 || n >= sizeof(buf))
++    if (n == -1 || n >= (int)sizeof(buf))
+         return NULL;
+ 
+     return strdup(buf);
+@@ -3055,7 +3159,66 @@ static int drmParseSubsystemType(int maj
      }
  
      return -EINVAL;
@@ -292,7 +310,7 @@ Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
      return DRM_BUS_PCI;
  #else
  #warning "Missing implementation of drmParseSubsystemType"
-@@ -3022,6 +3185,7 @@ static int drmParseSubsystemType(int maj
+@@ -3063,6 +3226,7 @@ static int drmParseSubsystemType(int maj
  #endif
  }
  
@@ -300,7 +318,7 @@ Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
  static void
  get_pci_path(int maj, int min, char *pci_path)
  {
-@@ -3037,8 +3201,14 @@ get_pci_path(int maj, int min, char *pci
+@@ -3078,8 +3242,14 @@ get_pci_path(int maj, int min, char *pci
      if (term && strncmp(term, "/virtio", 7) == 0)
          *term = 0;
  }
@@ -315,7 +333,7 @@ Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
  {
  #ifdef __linux__
      unsigned int domain, bus, dev, func;
-@@ -3063,7 +3233,74 @@ static int drmParsePciBusInfo(int maj, i
+@@ -3104,7 +3274,74 @@ static int drmParsePciBusInfo(int maj, i
      info->func = func;
  
      return 0;
@@ -391,7 +409,7 @@ Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
      struct drm_pciinfo pinfo;
      int fd, type;
  
-@@ -3087,6 +3324,61 @@ static int drmParsePciBusInfo(int maj, i
+@@ -3128,6 +3365,61 @@ static int drmParsePciBusInfo(int maj, i
      info->func = pinfo.func;
  
      return 0;
@@ -453,7 +471,7 @@ Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
  #else
  #warning "Missing implementation of drmParsePciBusInfo"
      return -EINVAL;
-@@ -3135,7 +3427,11 @@ static int drmGetNodeType(const char *na
+@@ -3176,7 +3468,11 @@ static int drmGetNodeType(const char *na
          sizeof(DRM_RENDER_MINOR_NAME) - 1) == 0)
          return DRM_NODE_RENDER;
  
@@ -465,7 +483,7 @@ Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
  }
  
  static int drmGetMaxNodeName(void)
-@@ -3218,6 +3514,9 @@ static int parse_config_sysfs_file(int m
+@@ -3259,6 +3555,9 @@ static int parse_config_sysfs_file(int m
  #endif
  
  static int drmParsePciDeviceInfo(int maj, int min,
@@ -475,7 +493,7 @@ Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
                                   drmPciDeviceInfoPtr device,
                                   uint32_t flags)
  {
-@@ -3229,7 +3528,49 @@ static int drmParsePciDeviceInfo(int maj
+@@ -3270,7 +3569,49 @@ static int drmParsePciDeviceInfo(int maj
          return parse_config_sysfs_file(maj, min, device);
  
      return 0;
@@ -526,7 +544,7 @@ Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
      struct drm_pciinfo pinfo;
      int fd, type;
  
-@@ -3254,6 +3595,43 @@ static int drmParsePciDeviceInfo(int maj
+@@ -3295,6 +3636,43 @@ static int drmParsePciDeviceInfo(int maj
      device->subdevice_id = pinfo.subdevice_id;
  
      return 0;
@@ -570,7 +588,7 @@ Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
  #else
  #warning "Missing implementation of drmParsePciDeviceInfo"
      return -EINVAL;
-@@ -3380,18 +3758,42 @@ static int drmProcessPciDevice(drmDevice
+@@ -3421,18 +3799,42 @@ static int drmProcessPciDevice(drmDevice
  
      dev->businfo.pci = (drmPciBusInfoPtr)addr;
  
@@ -613,7 +631,7 @@ Patches from FreeBSD ports / DragonFly dports for graphics/libdrm 2.4.84.
      }
  
      *device = dev;
-@@ -4099,6 +4501,23 @@ drm_public char *drmGetDeviceNameFromFd2
+@@ -4101,6 +4503,23 @@ drm_public char *drmGetDeviceNameFromFd2
      free(value);
  
      return strdup(path);