Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/libdrm/dist include sys/param.h for MIN/MAX, ...
details: https://anonhg.NetBSD.org/xsrc/rev/5fef0dd28dda
branches: trunk
changeset: 9989:5fef0dd28dda
user: maya <maya%NetBSD.org@localhost>
date: Sun Sep 09 03:58:37 2018 +0000
description:
include sys/param.h for MIN/MAX, needed when building in pkgsrc
tolerate set version failing in another location too.
this now works well enough for mesa 18.2.0 to display glxgears followed
soon by X crashing and refusing to start again until the machine is
rebooted, at least in my case.
PR pkg/51795, pkg/51786
diffstat:
external/mit/libdrm/dist/xf86drm.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diffs (24 lines):
diff -r a70891afd641 -r 5fef0dd28dda external/mit/libdrm/dist/xf86drm.c
--- a/external/mit/libdrm/dist/xf86drm.c Sun Sep 09 03:24:46 2018 +0000
+++ b/external/mit/libdrm/dist/xf86drm.c Sun Sep 09 03:58:37 2018 +0000
@@ -89,6 +89,7 @@
#ifdef __NetBSD__
#undef DRM_MAJOR
#define DRM_MAJOR 180
+#include <sys/param.h>
#include <dev/pci/pcireg.h>
#include <pci.h>
#endif
@@ -3128,8 +3129,10 @@
sv.drm_dd_major = -1;
sv.drm_dd_minor = -1;
if (drmSetInterfaceVersion(fd, &sv)) {
- (void)close(fd);
- return -ENODEV;
+ /*
+ * We're probably not the master. Hope the master already
+ * set the version to >=1.1 so that we can get the busid.
+ */
}
}
Home |
Main Index |
Thread Index |
Old Index