[pkgsrc/trunk]: pkgsrc/graphics/MesaLib Unbreak on FreeBSD by also ensuring t...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/78dd48c16a50
branches:  trunk
changeset: 650960:78dd48c16a50
user:      sevan <sevan%pkgsrc.org@localhost>
date:      Wed Apr 29 14:12:54 2015 +0000

description:
Unbreak on FreeBSD by also ensuring that ERSTART is defined and set to the
expected value for it.

Reviewed by bsiegert@

diffstat:

 graphics/MesaLib/distinfo                                                       |   4 +-
 graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c |  12 ++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r 5250de81a75e -r 78dd48c16a50 graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Wed Apr 29 14:11:25 2015 +0000
+++ b/graphics/MesaLib/distinfo Wed Apr 29 14:12:54 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.90 2015/04/25 11:19:18 tnn Exp $
+$NetBSD: distinfo,v 1.91 2015/04/29 14:12:54 sevan Exp $
 
 SHA1 (mesa-10.5.3.tar.xz) = 16ae80abe85b29fa118e1910a224c883964ae6c0
 RMD160 (mesa-10.5.3.tar.xz) = 017492351cb3956d3b36eb7c22ad99846b77f7a2
@@ -16,7 +16,7 @@
 SHA1 (patch-src_gallium_targets_dri_Makefile.in) = a9a8265d97297040a3e3260b362ca920ec852280
 SHA1 (patch-src_gallium_winsys_radeon_drm_radeon__drm__winsys.c) = 2358b7d5ea89e28cb3ac07a408b18e8bf55e057a
 SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen.c) = 4b2ae565377b1a0396c8bf6b2663c261592b8e5e
-SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c) = 2cc53b390af6ba71dc6b5acaf30c158729e0a784
+SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c) = f889b19d2ef080a82502fffc4da87fbe7d079745
 SHA1 (patch-src_gbm_main_gbm.c) = 70225ab7352f123c9efc68b6d4ff0d9675b6f9dc
 SHA1 (patch-src_glsl_ralloc.c) = 7443d00ff05ee1e1dcfa2b76972b55abadebcad8
 SHA1 (patch-src_mapi_entry__x86-64__tls.h) = c722ce4a22911d9a3d04e1a4fd6ab1a5ddd81cf0
diff -r 5250de81a75e -r 78dd48c16a50 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   Wed Apr 29 14:11:25 2015 +0000
+++ b/graphics/MesaLib/patches/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c   Wed Apr 29 14:12:54 2015 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c,v 1.1 2015/04/25 11:19:18 tnn Exp $
+$NetBSD: patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c,v 1.2 2015/04/29 14:12:54 sevan 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
-@@ -48,6 +48,13 @@
+@@ -48,6 +48,21 @@
  
  #include "os/os_mman.h"
  
@@ -15,6 +15,14 @@
 +#define ERESTART -3
 +#endif
 +#endif
++
++#if defined(__FreeBSD__)
++#include <errno.h>
++#if !defined(ERESTART)
++#define ERESTART -1
++#endif
++#endif
++
  #include <errno.h>
  #include <unistd.h>