diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2019-09-10 18:14:18 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2019-09-10 18:14:18 +0000 |
| commit | fd3050edeed5a4848cfadd484c3ee43a60b9d820 (patch) | |
| tree | 3840ddcd05d0e83fca7e2b578ca1847cb1782c80 | |
| parent | a7cfd1381adcc52ef1aeef7ccea7bbb819420d59 (diff) | |
| download | pkgsrc-fd3050edeed5a4848cfadd484c3ee43a60b9d820.tar.gz | |
Pullup ticket #6051 - requested by maya
x11/libdrm: Linux build fix
Revisions pulled up:
- x11/libdrm/Makefile 1.93-1.94
- x11/libdrm/distinfo 1.94-1.95
- x11/libdrm/patches/patch-xf86drm.c 1.5-1.6
---
Module Name: pkgsrc
Committed By: maya
Date: Sun Sep 8 15:43:37 UTC 2019
Modified Files:
pkgsrc/x11/libdrm: Makefile distinfo
pkgsrc/x11/libdrm/patches: patch-xf86drm.c
Log Message:
libdrm: restore "return 0;" for linux drmParsePciBusInfo.
It was lost in a patching accident.
From Yosuke Kawasaki in PR pkg/54534
Bump PKGREVISION
---
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
| -rw-r--r-- | x11/libdrm/Makefile | 3 | ||||
| -rw-r--r-- | x11/libdrm/distinfo | 4 | ||||
| -rw-r--r-- | x11/libdrm/patches/patch-xf86drm.c | 18 |
3 files changed, 13 insertions, 12 deletions
diff --git a/x11/libdrm/Makefile b/x11/libdrm/Makefile index c31d2e7a34a..a48a9a79524 100644 --- a/x11/libdrm/Makefile +++ b/x11/libdrm/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.92 2019/04/23 09:51:47 wiz Exp $ +# $NetBSD: Makefile,v 1.92.2.1 2019/09/10 18:14:18 bsiegert Exp $ DISTNAME= libdrm-2.4.98 +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 c8617c6759b..ac650ce97d0 100644 --- a/x11/libdrm/distinfo +++ b/x11/libdrm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.93 2019/04/23 09:51:47 wiz Exp $ +$NetBSD: distinfo,v 1.93.2.1 2019/09/10 18:14:18 bsiegert Exp $ SHA1 (libdrm-2.4.98.tar.bz2) = 4c8a11870a89f59c294bef0109939a7ffaa1fb26 RMD160 (libdrm-2.4.98.tar.bz2) = 1896b9e53ca92d61c6aa7dd6b74303b0c794b01c @@ -8,6 +8,6 @@ SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea SHA1 (patch-include_drm_drm.h) = 48a912f40bf2b2a1c23edbe4446fa7869212f17b SHA1 (patch-libkms_vmwgfx.c) = d2204c0b79098c6c36b7f282b486c58c6354bd1d SHA1 (patch-libsync.h) = 1e0603e72a54a069fc9d2ab2c9559d22381a69d3 -SHA1 (patch-xf86drm.c) = 7519074f23f308e806274e003a68e66e8c01e8fc +SHA1 (patch-xf86drm.c) = 02ef5f5ec351b7f52a97ab80d3d469e854ac957a SHA1 (patch-xf86drmMode.c) = 5f66d45a63b0915f22d0abe115aace13c53823a8 SHA1 (patch-xf86drmMode.h) = a28b02887389be8670193c119f711901af61a6b2 diff --git a/x11/libdrm/patches/patch-xf86drm.c b/x11/libdrm/patches/patch-xf86drm.c index b7f3720bc3f..b1e8d838345 100644 --- a/x11/libdrm/patches/patch-xf86drm.c +++ b/x11/libdrm/patches/patch-xf86drm.c @@ -1,8 +1,8 @@ -$NetBSD: patch-xf86drm.c,v 1.4 2019/01/22 21:50:47 wiz Exp $ +$NetBSD: patch-xf86drm.c,v 1.4.4.1 2019/09/10 18:14:18 bsiegert Exp $ Implement drmParseSubsystemType, drmParsePciBusInfo for NetBSD ---- xf86drm.c.orig 2019-01-22 16:32:41.000000000 +0000 +--- xf86drm.c.orig 2019-04-19 15:52:29.000000000 +0000 +++ xf86drm.c @@ -86,7 +86,10 @@ #endif @@ -16,10 +16,10 @@ Implement drmParseSubsystemType, drmParsePciBusInfo for NetBSD #endif #ifdef __OpenBSD__ -@@ -3013,6 +3016,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,13 +79,13 @@ Implement drmParseSubsystemType, drmParsePciBusInfo for NetBSD + + /* Success or not, we're done. */ + return ret; - return -EINVAL; #elif defined(__OpenBSD__) || defined(__DragonFly__) return DRM_BUS_PCI; -@@ -3062,6 +3124,73 @@ static int drmParsePciBusInfo(int maj, i - info->dev = dev; + #else +@@ -3081,6 +3143,73 @@ static int drmParsePciBusInfo(int maj, i info->func = func; + return 0; +#elif defined(__NetBSD__) + int type, fd; + drmSetVersion sv; @@ -153,10 +153,10 @@ Implement drmParseSubsystemType, drmParsePciBusInfo for NetBSD + + /* Success! */ + return 0; - return 0; #elif defined(__OpenBSD__) || defined(__DragonFly__) struct drm_pciinfo pinfo; -@@ -3229,6 +3358,48 @@ static int drmParsePciDeviceInfo(int maj + int fd, type; +@@ -3247,6 +3376,48 @@ static int drmParsePciDeviceInfo(int maj return parse_config_sysfs_file(maj, min, device); return 0; |