From nobody Thu Aug 18 08:24:00 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M7dFr6RKSz4Ypwx; Thu, 18 Aug 2022 08:24:00 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M7dFr5s4Fz3Kvn; Thu, 18 Aug 2022 08:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660811040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j1k4apG08hVUI5hBs9jS5o5Y6H4FuLQx5063lgPgguA=; b=pe0z+T0tRRZs1/nQ22BzPPk8rlFkD/t++sBLAq07tcUwbvObVdPR0u+XDwaqfOpxJoqZHv 7djQmkVTHvZpyRqSZALb1ck80SOUeCYbYGAHYbBmksb3rIyGF2qz2nSuUoSLqD6iZmNPxi 3Zedp54TgzvMKODwZm3BvKpcEWqGhfsLcmiLfCUmRv1lzHH56f80MEtV4cSqst/w089Tc5 P9lIWA9lcnge8pBZuJ9EwjO7k7nwdfKulp9U4MLBmJM2m+gVFzZtTUNHuefeP/BgLIhls+ yb1iL4YEjjKUhD5X14o0PYnoLz6Ev51zsaQR93S/BzcExoDr2BD7d7yk97hCjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M7dFr4tdVz1Lv4; Thu, 18 Aug 2022 08:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27I8O0Gw057108; Thu, 18 Aug 2022 08:24:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27I8O0hx057107; Thu, 18 Aug 2022 08:24:00 GMT (envelope-from git) Date: Thu, 18 Aug 2022 08:24:00 GMT Message-Id: <202208180824.27I8O0hx057107@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: fc9d9b0c38a1 - main - graphics/qt5-wayland: use memfd_create() on 13+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc9d9b0c38a1296a7d6cc7675412128a224659ae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660811040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j1k4apG08hVUI5hBs9jS5o5Y6H4FuLQx5063lgPgguA=; b=YDIw1nffN5Iftx9ItCNZBqcUXF3c4PrIqvY/1Emay8qxV4H0XH3uH6UGJIKj7+HJo6F+HX sbKO9A23T2bKudPt3ppLJBvFsT/t8fOZPOXbR777vQBzgt0ssu7QW+Eit3viy855MhuaHP D+ji1tbsQNPI6cnwywj7VKaEVAvvbQhHh9EsG919hTqPesk1POYFbz8gw2zO7VoQ/QSDFd /8tMCt+ppueFwWuWIdNTqFLWEyxpFwcL5Sr4vf+526ri/+TOcQ0Caj52mGpZq1o9ONa0OX wecGFM5fZL8LiX/qippAxLrHaID1JqV6L1ZqijSeOGqsxxoIfaC+uXaDUno4KQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660811040; a=rsa-sha256; cv=none; b=j2aAPndeQdXHwwnt5Si5ZcOdVOrqeyy7p6pld4Ctag11ALEaQjGCcW5MPi6pJWCW4Rlu+Y yDLJ6qRbNJzUdf25sebalTNJycWdPQM/3Ek5E5a4zVDQnX/9wOWZqO7Og8mb/LiNUU21+C kV8aY/R8KWmkxARgBH28J/nGXJQ9523JrbRh/IMGj5Qky5nJZF6dF69qnvC7djFcXJrMIS H249YWlk5k2OyXLJZp0o+fqo27B+BnM2GOl5nVof1fI03WhTziw4XY1WcoS1STUv0TGV66 hNzAAp+QvOcuj2zzAxcn9BhuASNbK1/1EOzMKGGFl0+ig8xgN6oj8XndmhSFcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc9d9b0c38a1296a7d6cc7675412128a224659ae commit fc9d9b0c38a1296a7d6cc7675412128a224659ae Author: Adriaan de Groot AuthorDate: 2022-08-17 23:43:24 +0000 Commit: Adriaan de Groot CommitDate: 2022-08-18 08:23:58 +0000 graphics/qt5-wayland: use memfd_create() on 13+ On 13+, the memfd_create() syscall can create anonymous shared- memory areas that behaves like a file. This is used upstream (not in Qt, but in KDE) when possible. Use it when relevant, since it avoids creating temporary files. While here, freshen-up the other patches. PR: 259035 --- graphics/qt5-wayland/Makefile | 1 + graphics/qt5-wayland/files/patch-qtwayland.pro | 4 ++-- .../files/patch-src_client_qwaylandshmbackingstore.cpp | 11 +++++++++++ ...egration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h | 4 ++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/graphics/qt5-wayland/Makefile b/graphics/qt5-wayland/Makefile index 3159908f0b67..93ffcacbfa27 100644 --- a/graphics/qt5-wayland/Makefile +++ b/graphics/qt5-wayland/Makefile @@ -1,5 +1,6 @@ PORTNAME= wayland PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} +PORTREVISION= 1 CATEGORIES= graphics wayland PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-wayland/files/patch-qtwayland.pro b/graphics/qt5-wayland/files/patch-qtwayland.pro index e321fa2fd586..01c983412049 100644 --- a/graphics/qt5-wayland/files/patch-qtwayland.pro +++ b/graphics/qt5-wayland/files/patch-qtwayland.pro @@ -1,7 +1,7 @@ ---- qtwayland.pro.orig 2017-06-23 10:50:50 UTC +--- qtwayland.pro.orig 2022-06-20 20:17:21 UTC +++ qtwayland.pro @@ -1,3 +1,4 @@ --requires(linux:!android) +-requires(linux:!android|macos|qnx) +requires(!android) +requires(linux|freebsd) requires(qtHaveModule(gui)) diff --git a/graphics/qt5-wayland/files/patch-src_client_qwaylandshmbackingstore.cpp b/graphics/qt5-wayland/files/patch-src_client_qwaylandshmbackingstore.cpp new file mode 100644 index 000000000000..2980795536e9 --- /dev/null +++ b/graphics/qt5-wayland/files/patch-src_client_qwaylandshmbackingstore.cpp @@ -0,0 +1,11 @@ +--- src/client/qwaylandshmbackingstore.cpp.orig 2022-06-20 20:17:21 UTC ++++ src/client/qwaylandshmbackingstore.cpp +@@ -76,6 +76,8 @@ QWaylandShmBuffer::QWaylandShmBuffer(QWaylandDisplay * + + #ifdef SYS_memfd_create + fd = syscall(SYS_memfd_create, "wayland-shm", MFD_CLOEXEC); ++#elif defined(__FreeBSD__) && __FreeBSD_version >= 1300048 ++ fd = memfd_create("wayland-shm", MFD_CLOEXEC); + #endif + + QScopedPointer filePointer; diff --git a/graphics/qt5-wayland/files/patch-src_hardwareintegration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h b/graphics/qt5-wayland/files/patch-src_hardwareintegration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h index eae8123a0da4..a33cb765c388 100644 --- a/graphics/qt5-wayland/files/patch-src_hardwareintegration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h +++ b/graphics/qt5-wayland/files/patch-src_hardwareintegration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h @@ -1,6 +1,6 @@ ---- src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h.orig 2020-10-27 08:02:11 UTC +--- src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h.orig 2022-06-20 20:17:21 UTC +++ src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h -@@ -44,6 +44,8 @@ +@@ -46,6 +46,8 @@ #include #include