aboutsummaryrefslogtreecommitdiff
path: root/graphics/wayland
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2020-02-24 20:01:28 +0000
committerJan Beich <jbeich@FreeBSD.org>2020-02-24 20:01:28 +0000
commitd128d6e9e20573608cf6e25399706e438dcf1138 (patch)
treec480cd4eb82cc56ddc37cec06aa0d948b4c8ee02 /graphics/wayland
parentdd106cd09b70566a2f407a7891f090a86dfbe8db (diff)
downloadports-d128d6e9e20573608cf6e25399706e438dcf1138.tar.gz
ports-d128d6e9e20573608cf6e25399706e438dcf1138.zip
graphics/wayland: replace posix_fallocate hack with a proper fix
PR: 224226 Approved by: x11 (manu, zeising) Differential Revision: https://reviews.freebsd.org/D23696
Notes
Notes: svn path=/head/; revision=527045
Diffstat (limited to 'graphics/wayland')
-rw-r--r--graphics/wayland/Makefile9
-rw-r--r--graphics/wayland/distinfo6
2 files changed, 10 insertions, 5 deletions
diff --git a/graphics/wayland/Makefile b/graphics/wayland/Makefile
index 3f4cfd444fa5..fb0253475b39 100644
--- a/graphics/wayland/Makefile
+++ b/graphics/wayland/Makefile
@@ -3,12 +3,15 @@
PORTNAME= wayland
PORTVERSION= 1.18.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics wayland
MASTER_SITES= https://wayland.freedesktop.org/releases/
PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/commit/
PATCHFILES+= 0fc00fff3015.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/60
+PATCHFILES+= 1283d54dac97.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61
+PATCHFILES+= 3a3dd0820de3.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61
+PATCHFILES+= 230885ebb40b.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61
MAINTAINER= x11@FreeBSD.org
COMMENT= Wayland composite "server"
@@ -27,8 +30,4 @@ USE_GNOME= libxslt:build
USE_LDCONFIG= yes
MESON_ARGS= -Ddocumentation=false
-post-patch:
-# posix_fallocate returns EINVAL on ZFS since FreeBSD 12.0
- @${REINPLACE_CMD} '/posix_fallocate/d' ${WRKSRC}/meson.build
-
.include <bsd.port.mk>
diff --git a/graphics/wayland/distinfo b/graphics/wayland/distinfo
index db0a21dc2903..66adb8b8562b 100644
--- a/graphics/wayland/distinfo
+++ b/graphics/wayland/distinfo
@@ -3,3 +3,9 @@ SHA256 (wayland-1.18.0.tar.xz) = 4675a79f091020817a98fd0484e7208c8762242266967f5
SIZE (wayland-1.18.0.tar.xz) = 453968
SHA256 (0fc00fff3015.patch) = 5e36dc6d5b28bb2062afe8e66e8069555701b3bbf4c7e233903761346e8b3432
SIZE (0fc00fff3015.patch) = 3868
+SHA256 (1283d54dac97.patch) = cb4964907e84c53adac5d2024251da67a269524cb64778f89c892d52e3307bc6
+SIZE (1283d54dac97.patch) = 1179
+SHA256 (3a3dd0820de3.patch) = 09e2a61b17dbceebda7ce9903af800a8c7badca3f850210f903455a7157f7153
+SIZE (3a3dd0820de3.patch) = 1138
+SHA256 (230885ebb40b.patch) = f1bed7c43f1761c0247fb5e6f8e798d8eaad6172c3107c1701905208df2bced1
+SIZE (230885ebb40b.patch) = 2705