From owner-svn-ports-head@freebsd.org Fri Feb 28 10:23:26 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5E18825F9F5; Fri, 28 Feb 2020 10:23:26 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48TQbx6lpxz4810; Fri, 28 Feb 2020 10:23:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 627D31F5; Fri, 28 Feb 2020 10:23:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01SANPRn073244; Fri, 28 Feb 2020 10:23:25 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01SANPkH073242; Fri, 28 Feb 2020 10:23:25 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202002281023.01SANPkH073242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 28 Feb 2020 10:23:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527326 - in head/graphics/wayland: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/graphics/wayland: . files X-SVN-Commit-Revision: 527326 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Feb 2020 10:23:26 -0000 Author: jbeich Date: Fri Feb 28 10:23:24 2020 New Revision: 527326 URL: https://svnweb.freebsd.org/changeset/ports/527326 Log: graphics/wayland: disable posix_fallocate on FreeBSD < 13 after r527045 On FreeBSD < 13 neither memfd_create exists nor posix_fallocate works with file descriptors returned by shm_open. As SHM_ANON code wasn't upstreamed and is not used on FreeBSD 13 just disable posix_fallocate without version checks. Reported by: Pete Wright, raichoo Tested by: Pete Wright, raichoo Approved by: zeising (x11), Greg V Differential Revision: https://reviews.freebsd.org/D23856 Modified: head/graphics/wayland/Makefile (contents, props changed) head/graphics/wayland/files/patch-cursor_os-compatibility.c (contents, props changed) Modified: head/graphics/wayland/Makefile ============================================================================== --- head/graphics/wayland/Makefile Fri Feb 28 09:31:50 2020 (r527325) +++ head/graphics/wayland/Makefile Fri Feb 28 10:23:24 2020 (r527326) @@ -3,7 +3,7 @@ PORTNAME= wayland PORTVERSION= 1.18.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics wayland MASTER_SITES= https://wayland.freedesktop.org/releases/ Modified: head/graphics/wayland/files/patch-cursor_os-compatibility.c ============================================================================== --- head/graphics/wayland/files/patch-cursor_os-compatibility.c Fri Feb 28 09:31:50 2020 (r527325) +++ head/graphics/wayland/files/patch-cursor_os-compatibility.c Fri Feb 28 10:23:24 2020 (r527326) @@ -9,11 +9,13 @@ #include #endif -@@ -132,6 +132,9 @@ os_create_anonymous_file(off_t size) +@@ -131,6 +131,11 @@ os_create_anonymous_file(off_t size) */ fcntl(fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_SEAL); } else +#elif defined(__FreeBSD__) ++/* posix_fallocate returns ENODEV before https://svnweb.freebsd.org/changeset/base/356512 */ ++#undef HAVE_POSIX_FALLOCATE + fd = shm_open(SHM_ANON, O_CREAT | O_RDWR | O_CLOEXEC, 0600); // shm_open is always CLOEXEC + if (fd < 0) #endif