Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1568059710155650"
MIME-Version: 1.0
Date: Mon, 9 Sep 2019 20:08:30 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/devel/wayland
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20190909200830.1FCF5FBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1568059710155650
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Mon Sep  9 20:08:30 UTC 2019

Modified Files:
	pkgsrc/devel/wayland: Makefile distinfo
Added Files:
	pkgsrc/devel/wayland/patches: patch-cursor_wayland-cursor.c

Log Message:
wayland: Disable another unproductive fallocate usage on NetBSD.

Helps SDL2 run.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/wayland/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/wayland/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/wayland/patches/patch-cursor_wayland-cursor.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1568059710155650
Content-Disposition: inline
Content-Length: 2449
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/wayland/Makefile
diff -u pkgsrc/devel/wayland/Makefile:1.2 pkgsrc/devel/wayland/Makefile:1.3
--- pkgsrc/devel/wayland/Makefile:1.2	Mon Aug 19 12:50:23 2019
+++ pkgsrc/devel/wayland/Makefile	Mon Sep  9 20:08:29 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2019/08/19 12:50:23 nia Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/09 20:08:29 nia Exp $
 
 DISTNAME=	wayland-1.17.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://wayland.freedesktop.org/releases/
 EXTRACT_SUFX=	.tar.xz

Index: pkgsrc/devel/wayland/distinfo
diff -u pkgsrc/devel/wayland/distinfo:1.4 pkgsrc/devel/wayland/distinfo:1.5
--- pkgsrc/devel/wayland/distinfo:1.4	Thu Aug 29 12:22:13 2019
+++ pkgsrc/devel/wayland/distinfo	Mon Sep  9 20:08:29 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2019/08/29 12:22:13 nia Exp $
+$NetBSD: distinfo,v 1.5 2019/09/09 20:08:29 nia Exp $
 
 SHA1 (wayland-1.17.0.tar.xz) = 4d9e08a7a4a07fa37a25d7aa3ef83f08edec0600
 RMD160 (wayland-1.17.0.tar.xz) = 635494fb0f5d9eb1e782f98e08c3e0e26ff44268
@@ -7,6 +7,7 @@ Size (wayland-1.17.0.tar.xz) = 437680 by
 SHA1 (patch-Makefile.am) = af2c47eb2e1a4924ea842aeea1d0f00832762ec0
 SHA1 (patch-configure.ac) = df15013a1639d673e5f0a86433a074f6201dbbc4
 SHA1 (patch-cursor_os-compatibility.c) = 9aac1c734199bc7e33e7735356bc8dbc80fba89d
+SHA1 (patch-cursor_wayland-cursor.c) = 81c6896b3a541e662db440d8557c6b3e70fcb580
 SHA1 (patch-src_event-loop.c) = 04d0eed4ba0708518201ec630dab97d52735fb0c
 SHA1 (patch-src_wayland-os.c) = 7297f8259aea9603a7ba20fe58f79e3fd0042990
 SHA1 (patch-src_wayland-os.h) = 1e01dfadb5ed5889d76e024d30537935f33631a3

Added files:

Index: pkgsrc/devel/wayland/patches/patch-cursor_wayland-cursor.c
diff -u /dev/null pkgsrc/devel/wayland/patches/patch-cursor_wayland-cursor.c:1.1
--- /dev/null	Mon Sep  9 20:08:30 2019
+++ pkgsrc/devel/wayland/patches/patch-cursor_wayland-cursor.c	Mon Sep  9 20:08:29 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-cursor_wayland-cursor.c,v 1.1 2019/09/09 20:08:29 nia Exp $
+
+fallocate is currently a no-op on NetBSD.
+
+--- cursor/wayland-cursor.c.orig	2019-03-21 00:55:25.000000000 +0000
++++ cursor/wayland-cursor.c
+@@ -86,7 +86,7 @@ shm_pool_resize(struct shm_pool *pool, i
+ 	if (ftruncate(pool->fd, size) < 0)
+ 		return 0;
+ 
+-#ifdef HAVE_POSIX_FALLOCATE
++#if defined(HAVE_POSIX_FALLOCATE) && !defined(__NetBSD__)
+ 	errno = posix_fallocate(pool->fd, 0, size);
+ 	if (errno != 0)
+ 		return 0;


--_----------=_1568059710155650--