[pkgsrc/trunk]: pkgsrc/graphics/MesaLib Moved define of _KERNEL_STRUCTURES to...

[nros <nros%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6baf9e9013f3
branches:  trunk
changeset: 651843:6baf9e9013f3
user:      nros <nros%pkgsrc.org@localhost>
date:      Fri May 15 14:27:42 2015 +0000

description:
Moved define of _KERNEL_STRUCTURES to patch instead of setting
it in the Makefile.

diffstat:

 graphics/MesaLib/Makefile                                                       |   5 +----
 graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c |  10 +++++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (47 lines):

diff -r d85d3921a57b -r 6baf9e9013f3 graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Fri May 15 10:59:25 2015 +0000
+++ b/graphics/MesaLib/Makefile Fri May 15 14:27:42 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2015/05/12 17:10:30 nros Exp $
+# $NetBSD: Makefile,v 1.103 2015/05/15 14:27:42 nros Exp $
 
 DISTNAME=      mesa-10.5.5
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
@@ -77,9 +77,6 @@
 CPPFLAGS+=     -Dexp2f\(x\)=expf\(\(x\)\*M_LN2\)
 .endif
 
-#Needed to get ERESTART from errno.h on DragonFlyBSD
-CPPFLAGS.DragonFly+=-D_KERNEL_STRUCTURES
-
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
diff -r d85d3921a57b -r 6baf9e9013f3 graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c
--- a/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c   Fri May 15 10:59:25 2015 +0000
+++ b/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c   Fri May 15 14:27:42 2015 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c,v 1.2 2015/04/29 14:12:54 sevan Exp $
+$NetBSD: patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c,v 1.3 2015/05/15 14:27:42 nros Exp $
 
 Make sure ERESTART gets defined.
 
---- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c.orig        2015-03-21 00:51:18.000000000 +0000
+--- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c.orig        2015-04-24 21:09:35.000000000 +0000
 +++ src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
-@@ -48,6 +48,21 @@
+@@ -48,6 +48,25 @@
  
  #include "os/os_mman.h"
  
@@ -23,6 +23,10 @@
 +#endif
 +#endif
 +
++#if defined(__DragonFly__)
++#define _KERNEL_STRUCTURES 1
++#endif
++
  #include <errno.h>
  #include <unistd.h>