Date: Tue, 13 Aug 2019 18:13:24 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r508842 - in branches/2019Q3/graphics/glfw: . files Message-ID: <201908131813.x7DIDOVx012244@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Tue Aug 13 18:13:24 2019 New Revision: 508842 URL: https://svnweb.freebsd.org/changeset/ports/508842 Log: MFH: r508841 - address WAYLAND build PR: 238085 Submitted by: list1@gjunka.com Approved by: neel@neelc.org (maintainer) Approved by: ports-secteam (with hat) Added: branches/2019Q3/graphics/glfw/files/patch-src-wl_init.c - copied unchanged from r508841, head/graphics/glfw/files/patch-src-wl_init.c Modified: branches/2019Q3/graphics/glfw/Makefile Directory Properties: branches/2019Q3/ (props changed) Modified: branches/2019Q3/graphics/glfw/Makefile ============================================================================== --- branches/2019Q3/graphics/glfw/Makefile Tue Aug 13 18:08:40 2019 (r508841) +++ branches/2019Q3/graphics/glfw/Makefile Tue Aug 13 18:13:24 2019 (r508842) @@ -3,6 +3,7 @@ PORTNAME= glfw PORTVERSION= 3.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF Copied: branches/2019Q3/graphics/glfw/files/patch-src-wl_init.c (from r508841, head/graphics/glfw/files/patch-src-wl_init.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q3/graphics/glfw/files/patch-src-wl_init.c Tue Aug 13 18:13:24 2019 (r508842, copy of r508841, head/graphics/glfw/files/patch-src-wl_init.c) @@ -0,0 +1,26 @@ +--- src/wl_init.c.orig 2019-08-03 17:40:05 UTC ++++ src/wl_init.c +@@ -29,7 +29,6 @@ + #include <assert.h> + #include <errno.h> + #include <limits.h> +-#include <linux/input.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +@@ -37,6 +36,15 @@ + #include <sys/timerfd.h> + #include <unistd.h> + #include <wayland-client.h> ++#ifdef __has_include ++#if __has_include(<linux/input.h>) ++#include <linux/input.h> ++#elif __has_include(<dev/evdev/input.h>) ++#include <dev/evdev/input.h> ++#endif ++#else ++#include <linux/input.h> ++#endif + + + static inline int min(int n1, int n2)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908131813.x7DIDOVx012244>