Sun Apr 12 19:41:21 2020 UTC ()
Avoid using common symbols.


(joerg)
diff -r1.96 -r1.97 pkgsrc/x11/libdrm/distinfo
diff -r0 -r1.1 pkgsrc/x11/libdrm/patches/patch-nouveau_private.h

cvs diff -r1.96 -r1.97 pkgsrc/x11/libdrm/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/libdrm/distinfo 2019/10/18 09:04:16 1.96
+++ pkgsrc/x11/libdrm/distinfo 2020/04/12 19:41:21 1.97
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.96 2019/10/18 09:04:16 nia Exp $ 1$NetBSD: distinfo,v 1.97 2020/04/12 19:41:21 joerg Exp $
2 2
3SHA1 (libdrm-2.4.100.tar.gz) = 2097f0b98deaff16b8f3b93cedcb5cd35291a3c1 3SHA1 (libdrm-2.4.100.tar.gz) = 2097f0b98deaff16b8f3b93cedcb5cd35291a3c1
4RMD160 (libdrm-2.4.100.tar.gz) = 03d8b8b8a416988932c05f81f9f495505b44ceea 4RMD160 (libdrm-2.4.100.tar.gz) = 03d8b8b8a416988932c05f81f9f495505b44ceea
5SHA512 (libdrm-2.4.100.tar.gz) = b61835473c77691c4a8e67b32b9df420661e8bf8700507334b58bde5e6a402dee4aea2bec1e5b83343dd28fcb6cf9fd084064d437332f178df81c4780552595b 5SHA512 (libdrm-2.4.100.tar.gz) = b61835473c77691c4a8e67b32b9df420661e8bf8700507334b58bde5e6a402dee4aea2bec1e5b83343dd28fcb6cf9fd084064d437332f178df81c4780552595b
6Size (libdrm-2.4.100.tar.gz) = 1149132 bytes 6Size (libdrm-2.4.100.tar.gz) = 1149132 bytes
7SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea 7SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea
8SHA1 (patch-include_drm_drm.h) = 48a912f40bf2b2a1c23edbe4446fa7869212f17b 8SHA1 (patch-include_drm_drm.h) = 48a912f40bf2b2a1c23edbe4446fa7869212f17b
9SHA1 (patch-libkms_vmwgfx.c) = d2204c0b79098c6c36b7f282b486c58c6354bd1d 9SHA1 (patch-libkms_vmwgfx.c) = d2204c0b79098c6c36b7f282b486c58c6354bd1d
10SHA1 (patch-libsync.h) = 1e0603e72a54a069fc9d2ab2c9559d22381a69d3 10SHA1 (patch-libsync.h) = 1e0603e72a54a069fc9d2ab2c9559d22381a69d3
 11SHA1 (patch-nouveau_private.h) = fe347abfaed3b37ef8fee645a388e19ca1e97552
11SHA1 (patch-xf86drm.c) = 02ef5f5ec351b7f52a97ab80d3d469e854ac957a 12SHA1 (patch-xf86drm.c) = 02ef5f5ec351b7f52a97ab80d3d469e854ac957a
12SHA1 (patch-xf86drmMode.c) = 5f66d45a63b0915f22d0abe115aace13c53823a8 13SHA1 (patch-xf86drmMode.c) = 5f66d45a63b0915f22d0abe115aace13c53823a8
13SHA1 (patch-xf86drmMode.h) = a28b02887389be8670193c119f711901af61a6b2 14SHA1 (patch-xf86drmMode.h) = a28b02887389be8670193c119f711901af61a6b2

File Added: pkgsrc/x11/libdrm/patches/Attic/patch-nouveau_private.h
$NetBSD: patch-nouveau_private.h,v 1.1 2020/04/12 19:41:21 joerg Exp $

--- nouveau/private.h.orig	2020-04-03 13:19:12.748087044 +0000
+++ nouveau/private.h
@@ -10,7 +10,7 @@
 #include "nouveau.h"
 
 #ifdef DEBUG
-drm_private uint32_t nouveau_debug;
+extern drm_private uint32_t nouveau_debug;
 #define dbg_on(lvl) (nouveau_debug & (1 << lvl))
 #define dbg(lvl, fmt, args...) do {                                            \
 	if (dbg_on((lvl)))                                                     \