diff options
| author | nros <nros> | 2015-05-15 14:27:42 +0000 |
|---|---|---|
| committer | nros <nros> | 2015-05-15 14:27:42 +0000 |
| commit | a493da7917d02b734cc5b6ebc347b68ebd63628e (patch) | |
| tree | fe8712f948cb6f708d7919bb21af41312029ac12 /graphics | |
| parent | 8ea9e6aea53e2264c2047f5475c234fc05e80943 (diff) | |
| download | pkgsrc-a493da7917d02b734cc5b6ebc347b68ebd63628e.tar.gz | |
Moved define of _KERNEL_STRUCTURES to patch instead of setting
it in the Makefile.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/MesaLib/Makefile | 5 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 1f9049c9569..4eb03737d0e 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -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+= -Dexp2\(x\)=exp\(\(x\)\*M_LN2\) 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 --git a/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c b/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c index 017f9978993..93b1be2f1a0 100644 --- a/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c +++ b/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c @@ -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 @@ Make sure ERESTART gets defined. +#endif +#endif + ++#if defined(__DragonFly__) ++#define _KERNEL_STRUCTURES 1 ++#endif ++ #include <errno.h> #include <unistd.h> |