diff options
| author | tnn <tnn@pkgsrc.org> | 2019-01-18 23:09:55 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2019-01-18 23:09:55 +0000 |
| commit | 2592b0e8ca56d58fa4a9ffe4170873081389cf23 (patch) | |
| tree | 70a30563e8da2a3c02c39f56b4a2c3fcf348c4d1 /x11/libdrm | |
| parent | 993f6f03ec165f7ec5c49c9c06f130e301d764a4 (diff) | |
| download | pkgsrc-2592b0e8ca56d58fa4a9ffe4170873081389cf23.tar.gz | |
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.
Diffstat (limited to 'x11/libdrm')
| -rw-r--r-- | x11/libdrm/Makefile | 4 | ||||
| -rw-r--r-- | x11/libdrm/distinfo | 4 | ||||
| -rw-r--r-- | x11/libdrm/patches/patch-radeon_radeon__bo__gem.c | 13 |
3 files changed, 5 insertions, 16 deletions
diff --git a/x11/libdrm/Makefile b/x11/libdrm/Makefile index 2516b629d33..c7197fd51d2 100644 --- a/x11/libdrm/Makefile +++ b/x11/libdrm/Makefile @@ -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 diff --git a/x11/libdrm/distinfo b/x11/libdrm/distinfo index c37cc9daaa8..47700c7df76 100644 --- a/x11/libdrm/distinfo +++ b/x11/libdrm/distinfo @@ -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) = 67c998df7dfc0dabc86320ea6d015cede3e464ea 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 diff --git a/x11/libdrm/patches/patch-radeon_radeon__bo__gem.c b/x11/libdrm/patches/patch-radeon_radeon__bo__gem.c index 977864f3e03..945041570ff 100644 --- a/x11/libdrm/patches/patch-radeon_radeon__bo__gem.c +++ b/x11/libdrm/patches/patch-radeon_radeon__bo__gem.c @@ -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) |