libdrm: update to 2.4.95.

Merge two patches for the same file.

Changes:

This release adds a fallback for realpath() which was blocked by the
web-browser sand-boxing. While the browsers are fixed-up they seem to have
little incentive to roll bugfix releases :-\

Ayan Kumar Halder (1):
      libdrm: headers: Sync with drm-next

Christian König (4):
      tests/amdgpu: add unaligned VM test
      amdgpu: remove invalid check in amdgpu_bo_alloc
      test/amdgpu: add proper error handling v2
      test/amdgpu: add GDS, GWS and OA tests

Daniel Stone (1):
      CI: Capture test logs as GitLab artifacts

Daniel Vetter (1):
      Add basic CONTRIBUTING file

Emil Velikov (9):
      xf86drm: fallback to normal path when realpath fails
      intel: annotate the intel genx helpers as private
      automake: set NM before running the tests
      *-symbols-check: error out when using unset variables
      gitlab-ci: pass the correct toggles to configure
      Bump to version 2.4.95
      Revert "Bump to version 2.4.95"
      intel: include i915_pciids.h in the tarball
      Bump to version 2.4.95

Eric Engestrom (10):
      add gitlab-ci builds of libdrm
      xf86drm: merge get_normal_pci_path() into get_real_pci_path()
      xf86drm: rename "real_path" to "pci_path"
      gitlab-ci: use templates to deduplicate the build commands
      headers/README: fix/add link to drm-next
      intel: add missing drm_public exports
      nouveau: add missing drm_public exports
      radeon: add missing drm_public exports
      omap: fix symbol annotations
      freedreno: add missing drm_public

Ezequiel Garcia (1):
      tests/util: Add support for sun4i-drm driver

Junwei Zhang (1):
      amdgpu: add error return value for finding bo by cpu mapping (v2)

Lucas De Marchi (19):
      intel: add generic functions to check PCI ID
      intel: make gen11 use generic gen macro
      intel: make gen10 use generic gen macro
      intel: make gen9 use generic gen macro
      intel: get gen once for gen >= 9
      intel: annotate public functions
      libkms: annotate public functions
      nouveau: annotate public functions
      amdgpu: annotate public functions
      libdrm: annotate public functions
      etnaviv: annotate public functions
      freedreno: annotate public functions
      omap: annotate public functions
      radeon: annotate public functions
      tegra: annotate public functions
      exynos: annotate public functions
      meson: make symbols hidden by default
      autotools: make symbols hidden by default
      android: make symbols hidden by default

Michel Dänzer (1):
      amdgpu-symbol-check: Add amdgpu_find_bo_by_cpu_mapping

Qiang Yu (2):
      amdgpu: add amdgpu_bo_inc_ref() function.
      amdgpu: amdgpu_bo_inc_ref don't return dummy int

Rob Clark (2):
      freedreno: fix spelling typo
      freedreno: move ring_cache behind fd_bo_del()

Stefan Agner (2):
      modeprint: use libutil to lookup strings
      modeprint: print encoder type

Tom Anderson (1):
      Fix build with -std=c11

5 files changed, 23 insertions, 36 deletions

diff --git a/x11/libdrm/Makefile b/x11/libdrm/Makefile
index 0e38b71eb42..215d50a7b4c 100644
--- a/x11/libdrm/Makefile
+++ b/x11/libdrm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2018/09/09 04:04:56 maya Exp $
+# $NetBSD: Makefile,v 1.85 2018/10/05 12:57:20 wiz Exp $
 
-DISTNAME=		libdrm-2.4.94
+DISTNAME=		libdrm-2.4.95
 CATEGORIES=		x11 graphics
-PKGREVISION=		1
 MASTER_SITES=		http://dri.freedesktop.org/libdrm/
 EXTRACT_SUFX=		.tar.bz2
 
diff --git a/x11/libdrm/distinfo b/x11/libdrm/distinfo
index 19dcf46f9f2..f148cda1c05 100644
--- a/x11/libdrm/distinfo
+++ b/x11/libdrm/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.84 2018/09/09 04:04:56 maya Exp $
+$NetBSD: distinfo,v 1.85 2018/10/05 12:57:20 wiz Exp $
 
-SHA1 (libdrm-2.4.94.tar.bz2) = f8daee6cc2e7d2c9eb2dd062a2712172fb9f4e18
-RMD160 (libdrm-2.4.94.tar.bz2) = 14d94fa857c53e7d5580d3221c3b1ef310e9ecc2
-SHA512 (libdrm-2.4.94.tar.bz2) = 1a1699d6ea70b8759b37f3863e0802a99430b58f02e62632ad451356e2463eaf6faf4b810323f7dcc85ffdcca28f674b32caa5631ebd65b83e5b86bd59a35937
-Size (libdrm-2.4.94.tar.bz2) = 829060 bytes
-SHA1 (patch-ab) = ebc345d7f1aeb583b3ebb883fb3b27abc5b8133c
+SHA1 (libdrm-2.4.95.tar.bz2) = fd7c1002001ef1aa1b6094eb2b78f1031e233bb3
+RMD160 (libdrm-2.4.95.tar.bz2) = b697aa87205fcae9485899c5057717f9fb7f6eb8
+SHA512 (libdrm-2.4.95.tar.bz2) = 9bf8178a871bb059471f58f236c8362245e08877b732b2c8366d402e8066c9a74707e4ec3bf680fca12303f1319875edc98ae8e31bc9826f172798f47197e631
+Size (libdrm-2.4.95.tar.bz2) = 820722 bytes
 SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea
 SHA1 (patch-include_drm_drm.h) = 48a912f40bf2b2a1c23edbe4446fa7869212f17b
 SHA1 (patch-libkms_vmwgfx.c) = d2204c0b79098c6c36b7f282b486c58c6354bd1d
 SHA1 (patch-radeon_radeon__bo__gem.c) = 4924fde172b2a2a713d47bf7b60a6b52851d7a8f
 SHA1 (patch-radeon_radeon__cs__gem.c) = 516b5dd6408c10a4f33f2815b3719e34a16d863a
-SHA1 (patch-xf86drm.c) = 8626fb9fad16a75a009f7483d9ba3411856134ad
-SHA1 (patch-xf86drmMode.c) = 09b2a9292825e6b952ee8ad5d6e4cd2bdc90228d
+SHA1 (patch-xf86drm.c) = 9a76f433c3b4688575cd60362396fb74d3294a4b
+SHA1 (patch-xf86drmMode.c) = 7a0d8ea4a0110b295d8cb4fe870ee523d420ea6b
 SHA1 (patch-xf86drmMode.h) = a28b02887389be8670193c119f711901af61a6b2
diff --git a/x11/libdrm/patches/patch-ab b/x11/libdrm/patches/patch-ab
deleted file mode 100644
index 8059e934d27..00000000000
--- a/x11/libdrm/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2015/08/14 17:12:35 wiz Exp $
-
---- xf86drm.c.orig	2015-08-13 22:27:03.000000000 +0000
-+++ xf86drm.c
-@@ -79,7 +79,7 @@
- #endif
- 
- #ifdef __NetBSD__
--#define DRM_MAJOR 34
-+#define DRM_MAJOR 180
- #endif
- 
- #ifdef __OpenBSD__
diff --git a/x11/libdrm/patches/patch-xf86drm.c b/x11/libdrm/patches/patch-xf86drm.c
index 9a38f89765e..609c095fb44 100644
--- a/x11/libdrm/patches/patch-xf86drm.c
+++ b/x11/libdrm/patches/patch-xf86drm.c
@@ -1,20 +1,22 @@
-$NetBSD: patch-xf86drm.c,v 1.1 2018/09/09 04:04:57 maya Exp $
+$NetBSD: patch-xf86drm.c,v 1.2 2018/10/05 12:57:20 wiz Exp $
 
 Implement drmParseSubsystemType, drmParsePciBusInfo for NetBSD
 
---- xf86drm.c.orig	2018-09-09 02:59:41.597386206 +0000
+--- xf86drm.c.orig	2018-10-04 14:50:03.000000000 +0000
 +++ xf86drm.c
-@@ -85,6 +85,9 @@
+@@ -84,7 +84,10 @@
+ #endif
  
  #ifdef __NetBSD__
- #define DRM_MAJOR 180
+-#define DRM_MAJOR 34
++#define DRM_MAJOR 180
 +#include <sys/param.h>
 +#include <dev/pci/pcireg.h>
 +#include <pci.h>
  #endif
  
  #ifdef __OpenBSD__
-@@ -2990,6 +2993,65 @@ static int drmParseSubsystemType(int maj
+@@ -2997,6 +3000,65 @@ static int drmParseSubsystemType(int maj
          return DRM_BUS_VIRTIO;
  
      return -EINVAL;
@@ -80,7 +82,7 @@ Implement drmParseSubsystemType, drmParsePciBusInfo for NetBSD
  #elif defined(__OpenBSD__)
      return DRM_BUS_PCI;
  #else
-@@ -3040,6 +3102,73 @@ static int drmParsePciBusInfo(int maj, i
+@@ -3046,6 +3108,73 @@ static int drmParsePciBusInfo(int maj, i
      info->func = func;
  
      return 0;
@@ -154,7 +156,7 @@ Implement drmParseSubsystemType, drmParsePciBusInfo for NetBSD
  #elif defined(__OpenBSD__)
      struct drm_pciinfo pinfo;
      int fd, type;
-@@ -3209,6 +3338,41 @@ static int drmParsePciDeviceInfo(int maj
+@@ -3213,6 +3342,41 @@ static int drmParsePciDeviceInfo(int maj
          return parse_config_sysfs_file(maj, min, device);
  
      return 0;
diff --git a/x11/libdrm/patches/patch-xf86drmMode.c b/x11/libdrm/patches/patch-xf86drmMode.c
index 9f5d1ef9c46..76fa639aafd 100644
--- a/x11/libdrm/patches/patch-xf86drmMode.c
+++ b/x11/libdrm/patches/patch-xf86drmMode.c
@@ -1,12 +1,12 @@
-$NetBSD: patch-xf86drmMode.c,v 1.3 2018/05/26 21:44:47 wiz Exp $
+$NetBSD: patch-xf86drmMode.c,v 1.4 2018/10/05 12:57:20 wiz Exp $
 
 Disable checking for hw.dri.%d.modesetting.
 This sysctl is only available if a KMS module is loaded. But the libdrm
 check happens before X got a chance of loading the KMS module.
 
---- xf86drmMode.c.orig	2018-05-09 22:26:03.000000000 +0000
+--- xf86drmMode.c.orig	2018-10-04 14:50:03.000000000 +0000
 +++ xf86drmMode.c
-@@ -793,38 +793,20 @@ int drmCheckModesettingSupported(const c
+@@ -800,38 +800,20 @@ drm_public int drmCheckModesettingSuppor
  	if (found)
  		return 0;
  #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
@@ -58,9 +58,9 @@ check happens before X got a chance of loading the KMS module.
  #elif defined(__DragonFly__)
  	return 0;
  #elif defined(__OpenBSD__)
-@@ -978,7 +960,7 @@ int drmModePageFlipTarget(int fd, uint32
+@@ -987,7 +969,7 @@ drm_public int drmModePageFlipTarget(int
  
- int drmModeSetPlane(int fd, uint32_t plane_id, uint32_t crtc_id,
+ drm_public int drmModeSetPlane(int fd, uint32_t plane_id, uint32_t crtc_id,
  		    uint32_t fb_id, uint32_t flags,
 -		    int32_t crtc_x, int32_t crtc_y,
 +		    uint32_t crtc_x, uint32_t crtc_y,