CVS commit: pkgsrc/x11/libdrm

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Jan 18 23:09:56 UTC 2019

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

Log Message:
libdrm: remove a patch from xsrc that is wrong

See: https://mail-index.netbsd.org/tech-x11/2019/01/18/msg001895.html
Fixes DRM crashes with radeon on Linux.

Bump PKGREVSION.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/x11/libdrm/Makefile
cvs rdiff -u -r1.89 -r1.90 pkgsrc/x11/libdrm/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/libdrm/patches/patch-radeon_radeon__bo__gem.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.88 pkgsrc/x11/libdrm/Makefile:1.89
--- pkgsrc/x11/libdrm/Makefile:1.88     Sun Jan  6 02:23:00 2019
+++ pkgsrc/x11/libdrm/Makefile  Fri Jan 18 23:09:55 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.88 2019/01/06 02:23:00 tnn Exp $
+# $NetBSD: Makefile,v 1.89 2019/01/18 23:09:55 tnn Exp $
 
 DISTNAME=              libdrm-2.4.96
-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.89 pkgsrc/x11/libdrm/distinfo:1.90
--- pkgsrc/x11/libdrm/distinfo:1.89     Sun Jan  6 02:23:00 2019
+++ pkgsrc/x11/libdrm/distinfo  Fri Jan 18 23:09:55 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.89 2019/01/06 02:23:00 tnn Exp $
+$NetBSD: distinfo,v 1.90 2019/01/18 23:09:55 tnn Exp $
 
 SHA1 (libdrm-2.4.96.tar.bz2) = 51eb4c248a437b3f200bd1cd84461d3e0b60d71e
 RMD160 (libdrm-2.4.96.tar.bz2) = 8e13f0edf61bb0b59aaaf3cdbaadf20916782fe8
@@ -8,7 +8,7 @@ SHA1 (patch-ac) = 67c998df7dfc0dabc86320
 SHA1 (patch-include_drm_drm.h) = 48a912f40bf2b2a1c23edbe4446fa7869212f17b
 SHA1 (patch-libkms_vmwgfx.c) = d2204c0b79098c6c36b7f282b486c58c6354bd1d
 SHA1 (patch-libsync.h) = 51623bae547e7a0c3e41fa282964b2361b1c34ab
-SHA1 (patch-radeon_radeon__bo__gem.c) = 4924fde172b2a2a713d47bf7b60a6b52851d7a8f
+SHA1 (patch-radeon_radeon__bo__gem.c) = f21a669218cefb7ce9e230fd0e53548cbf16c94f
 SHA1 (patch-radeon_radeon__cs__gem.c) = 516b5dd6408c10a4f33f2815b3719e34a16d863a
 SHA1 (patch-xf86drm.c) = ae371519320eb513f38d6856ad617dff5d05278b
 SHA1 (patch-xf86drmMode.c) = 7a0d8ea4a0110b295d8cb4fe870ee523d420ea6b

Index: pkgsrc/x11/libdrm/patches/patch-radeon_radeon__bo__gem.c
diff -u pkgsrc/x11/libdrm/patches/patch-radeon_radeon__bo__gem.c:1.1 pkgsrc/x11/libdrm/patches/patch-radeon_radeon__bo__gem.c:1.2
--- pkgsrc/x11/libdrm/patches/patch-radeon_radeon__bo__gem.c:1.1        Sun Oct 26 10:20:10 2014
+++ pkgsrc/x11/libdrm/patches/patch-radeon_radeon__bo__gem.c    Fri Jan 18 23:09:55 2019
@@ -1,18 +1,7 @@
-$NetBSD: patch-radeon_radeon__bo__gem.c,v 1.1 2014/10/26 10:20:10 wiz Exp $
+$NetBSD: patch-radeon_radeon__bo__gem.c,v 1.2 2019/01/18 23:09:55 tnn Exp $
 
 --- radeon/radeon_bo_gem.c.orig        2014-09-28 16:19:54.000000000 +0000
 +++ radeon/radeon_bo_gem.c
-@@ -178,8 +178,8 @@ static int bo_map(struct radeon_bo_int *
-                 boi, boi->handle, r);
-         return r;
-     }
--    ptr = drm_mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED, boi->bom->fd, args.addr_ptr);
--    if (ptr == MAP_FAILED)
-+    r = drmMap(boi->bom->fd, args.addr_ptr, args.size, &ptr);
-+    if (r)
-         return -errno;
-     bo_gem->priv_ptr = ptr;
- wait:
 @@ -252,9 +252,10 @@ static int bo_set_tiling(struct radeon_b
  static int bo_get_tiling(struct radeon_bo_int *boi, uint32_t *tiling_flags,
                           uint32_t *pitch)