CVS commit: pkgsrc/x11/libdrm

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Sep  8 15:55:04 UTC 2019

Modified Files:
        pkgsrc/x11/libdrm: Makefile distinfo
        pkgsrc/x11/libdrm/patches: patch-xf86drm.c

Log Message:
libdrm: don't steal another linux "return" line for the netbsd block.

Thanks wiz for the heads up. PR pkg/54534


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/x11/libdrm/Makefile
cvs rdiff -u -r1.94 -r1.95 pkgsrc/x11/libdrm/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libdrm/patches/patch-xf86drm.c

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

Modified files:

Index: pkgsrc/x11/libdrm/Makefile
diff -u pkgsrc/x11/libdrm/Makefile:1.93 pkgsrc/x11/libdrm/Makefile:1.94
--- pkgsrc/x11/libdrm/Makefile:1.93     Sun Sep  8 15:43:37 2019
+++ pkgsrc/x11/libdrm/Makefile  Sun Sep  8 15:55:04 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.93 2019/09/08 15:43:37 maya Exp $
+# $NetBSD: Makefile,v 1.94 2019/09/08 15:55:04 maya Exp $
 
 DISTNAME=              libdrm-2.4.98
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            x11 graphics
 MASTER_SITES=          http://dri.freedesktop.org/libdrm/
 EXTRACT_SUFX=          .tar.bz2

Index: pkgsrc/x11/libdrm/distinfo
diff -u pkgsrc/x11/libdrm/distinfo:1.94 pkgsrc/x11/libdrm/distinfo:1.95
--- pkgsrc/x11/libdrm/distinfo:1.94     Sun Sep  8 15:43:37 2019
+++ pkgsrc/x11/libdrm/distinfo  Sun Sep  8 15:55:04 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.94 2019/09/08 15:43:37 maya Exp $
+$NetBSD: distinfo,v 1.95 2019/09/08 15:55:04 maya Exp $
 
 SHA1 (libdrm-2.4.98.tar.bz2) = 4c8a11870a89f59c294bef0109939a7ffaa1fb26
 RMD160 (libdrm-2.4.98.tar.bz2) = 1896b9e53ca92d61c6aa7dd6b74303b0c794b01c
@@ -8,6 +8,6 @@ SHA1 (patch-ac) = 67c998df7dfc0dabc86320
 SHA1 (patch-include_drm_drm.h) = 48a912f40bf2b2a1c23edbe4446fa7869212f17b
 SHA1 (patch-libkms_vmwgfx.c) = d2204c0b79098c6c36b7f282b486c58c6354bd1d
 SHA1 (patch-libsync.h) = 1e0603e72a54a069fc9d2ab2c9559d22381a69d3
-SHA1 (patch-xf86drm.c) = 58ec3ec995349834ea640b4cd0bf51ad1a2f5185
+SHA1 (patch-xf86drm.c) = 02ef5f5ec351b7f52a97ab80d3d469e854ac957a
 SHA1 (patch-xf86drmMode.c) = 5f66d45a63b0915f22d0abe115aace13c53823a8
 SHA1 (patch-xf86drmMode.h) = a28b02887389be8670193c119f711901af61a6b2

Index: pkgsrc/x11/libdrm/patches/patch-xf86drm.c
diff -u pkgsrc/x11/libdrm/patches/patch-xf86drm.c:1.5 pkgsrc/x11/libdrm/patches/patch-xf86drm.c:1.6
--- pkgsrc/x11/libdrm/patches/patch-xf86drm.c:1.5       Sun Sep  8 15:43:37 2019
+++ pkgsrc/x11/libdrm/patches/patch-xf86drm.c   Sun Sep  8 15:55:04 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-xf86drm.c,v 1.5 2019/09/08 15:43:37 maya Exp $
+$NetBSD: patch-xf86drm.c,v 1.6 2019/09/08 15:55:04 maya Exp $
 
 Implement drmParseSubsystemType, drmParsePciBusInfo for NetBSD
 
@@ -16,10 +16,10 @@ Implement drmParseSubsystemType, drmPars
  #endif
  
  #ifdef __OpenBSD__
-@@ -3031,6 +3034,65 @@ static int drmParseSubsystemType(int maj
-             return bus_types[i].bus_type;
+@@ -3032,6 +3035,65 @@ static int drmParseSubsystemType(int maj
      }
  
+     return -EINVAL;
 +#elif defined(__NetBSD__)
 +    int type, fd;
 +    drmSetVersion sv;
@@ -79,9 +79,9 @@ Implement drmParseSubsystemType, drmPars
 +
 +    /* Success or not, we're done.  */
 +    return ret;
-     return -EINVAL;
  #elif defined(__OpenBSD__) || defined(__DragonFly__)
      return DRM_BUS_PCI;
+ #else
 @@ -3081,6 +3143,73 @@ static int drmParsePciBusInfo(int maj, i
      info->func = func;