Re: CVS commit: pkgsrc/x11/libdrm

[Thomas Klausner <wiz%NetBSD.org@localhost>]

On Mon, Aug 13, 2012 at 02:12:47PM +0900, OBATA Akio wrote:
> Failed to build on NetBSD-5.1.2-i386:
> 
> Making all in intel
>   CC     intel_bufmgr_gem.lo
> intel_bufmgr_gem.c: In function 'drm_intel_gem_bo_reference':
> intel_bufmgr_gem.c:392: warning: pointer targets in passing argument 1 of 
> 'atomic_inc_uint' differ in signedness
> intel_bufmgr_gem.c: In function 'drm_intel_gem_bo_unreference_locked_timed':
> intel_bufmgr_gem.c:1111: warning: pointer targets in passing argument 1 of 
> 'atomic_dec_uint_nv' differ in signedness
> intel_bufmgr_gem.c: In function 'drm_intel_gem_bo_unreference':
> intel_bufmgr_gem.c:1120: warning: pointer targets in passing argument 1 of 
> 'atomic_dec_uint_nv' differ in signedness
> intel_bufmgr_gem.c: In function 'drm_intel_bo_gem_export_to_prime':
> intel_bufmgr_gem.c:2479: error: 'O_CLOEXEC' undeclared (first use in this 
> function)
> intel_bufmgr_gem.c:2479: error: (Each undeclared identifier is reported only 
> once
> intel_bufmgr_gem.c:2479: error: for each function it appears in.)
> *** Error code 1

Does the attached patch fix the problem for you?
 Thomas

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libdrm/distinfo,v
retrieving revision 1.22
diff -u -r1.22 distinfo
--- distinfo    13 Aug 2012 07:02:00 -0000      1.22
+++ distinfo    13 Aug 2012 07:02:16 -0000
@@ -6,5 +6,6 @@
 SHA1 (patch-ab) = 66dadd3244bfa9c69be0982fd2108deb94483de2
 SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea
 SHA1 (patch-ad) = ea3ef8de8db782ddab23f182f1e6bd9d8f612a78
+SHA1 (patch-include_drm_drm.h) = d370e83da5c39f0e49094787c5f4580758c911b0
 SHA1 (patch-intel_intel__bufmgr__gem.c) = 
418d00f24344b7abaa86d3b3d10817314ce70175
 SHA1 (patch-libkms_linux.c) = 737d0a8e7b742ee9d24fec94c72de6b4915dd675
Index: patches/patch-include_drm_drm.h
===================================================================
RCS file: patches/patch-include_drm_drm.h
diff -N patches/patch-include_drm_drm.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-include_drm_drm.h     13 Aug 2012 07:02:16 -0000
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Fix compilation on systems that don't provide O_CLOEXEC.
+
+--- include/drm/drm.h.orig     2012-08-11 18:49:45.000000000 +0000
++++ include/drm/drm.h
+@@ -618,7 +618,11 @@ struct drm_get_cap {
+       __u64 value;
+ };
+ 
++#ifdef O_CLOEXEC
+ #define DRM_CLOEXEC O_CLOEXEC
++#else
++#define DRM_CLOEXEC 0
++#endif
+ struct drm_prime_handle {
+       __u32 handle;
+