From nobody Thu Aug 29 00:56:34 2024 X-Original-To: dev-commits-ports-branches@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 4WvNC630Nsz5PYMM; Thu, 29 Aug 2024 00:56:34 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WvNC628ktz4LQY; Thu, 29 Aug 2024 00:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724892994; 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=0eY5Ru0jgSm14YaOLcur14VAr37jVvMfcaWEx3Z0xgw=; b=Thv4WXpdJhCj5swlcGbA1qObIyp4kBoBbCZlLkhAaCeh2bx8dgvuer8+rjJeKOzdQmHSZ4 ikqn50kU0e0mk4jqSgmG4t6WxZVQFurlmYLp4P49Tr0w7ClhhgnnL0QSyfqWjqxA5vwCdW AgLU2KFiVOS04HkHHy0YZAtH0n5+NabJuFb5FB0pzlOpaFtFprzKqwjJL3b2TO6wF15/qi q0BB17ORLf5dFqtSl4MELXMgVSY1bJaT5VsaaL59CjdkI8ETqCXyctt0n1kxnXiGLxpVpF WjE4ITMKxeawr/PyX7PH/7FvSijH4aD/nU1N+0O0TbpKuNyjWS3U7UYMSu1JbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724892994; a=rsa-sha256; cv=none; b=QT9XUW3Xx7/LCOUIzbFZaFy6JBDvwvAWNt607O2d8/bHhN9swogbDexrlIgWEITLvBpyf+ mkIV49AGB13/3ZlW26aMG/MU/B+tNm1lgM6jTqAoimSE5UYWuDsMcai270Sp9EC0f+K8wU TATd1jUGES+zrP2tpXItyBHeiTFaIvTL/o4JvAYNzHVgx+MPCyNif2qB3dkftgp46O5+Hf eUUkhYJm4mUM5JslcngZXHOsgEG23wbcptSkAgd3bRPfWV2iro/8F/vocnyBIKsuLuDBLv agHGX1/9IWmwZjY5ijzFP8kZ0Wd1ggcwSLX/deYdmYmiUWl3ILofv1KjU7wVgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724892994; 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=0eY5Ru0jgSm14YaOLcur14VAr37jVvMfcaWEx3Z0xgw=; b=sqt/sHiDB3az5T6dt8xcKKQL/YwlXJPOUP2TLlAk7Wd8QD4CmRtzeFyyhPlqnNRBnh3JsB udSfm4y0cwoqAYHF7i0WtCBrfUC3aOVsDGiBWXuiWdrZTr9NW2iEIEkkg5GePcbQ6xtqdI sMwlgir5ni2aL0K1JrtnveF4dsRUc6hZWcS3yN4ttLSB4vAhppBTqqg8kX4MZAAzPfkixB ju7slN3orCIKV3SBDyD1PxtUBtZj9zqVxFKYxBZJ4ENpl4S83SsBfyDoUULYt5zz31QBtA he1d+DjhdYxNoQVKnggeNw1RPa2W7xtODTP4My3XTzbipuaGLEFmNrs51IWpAw== 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 4WvNC61hYlzvty; Thu, 29 Aug 2024 00:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47T0uYJc035261; Thu, 29 Aug 2024 00:56:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47T0uYug035258; Thu, 29 Aug 2024 00:56:34 GMT (envelope-from git) Date: Thu, 29 Aug 2024 00:56:34 GMT Message-Id: <202408290056.47T0uYug035258@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 1d5af0b2f979 - 2024Q3 - x11-toolkits/gtk40: enable DMABUF support after 5d5b000e62a6 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 1d5af0b2f979ca1e6894130be975710be38e9cb1 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d5af0b2f979ca1e6894130be975710be38e9cb1 commit 1d5af0b2f979ca1e6894130be975710be38e9cb1 Author: Vasily Postnikov AuthorDate: 2024-08-27 18:37:53 +0000 Commit: Jan Beich CommitDate: 2024-08-29 00:55:09 +0000 x11-toolkits/gtk40: enable DMABUF support after 5d5b000e62a6 PR: 281107 (cherry picked from commit 16e7d54a12bf07b70eff31fa44bbfd9001f9965c) --- x11-toolkits/gtk40/Makefile | 4 +- x11-toolkits/gtk40/files/patch-dmabuf | 70 +++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/x11-toolkits/gtk40/Makefile b/x11-toolkits/gtk40/Makefile index 04ebc8e3351e..679f7e153da2 100644 --- a/x11-toolkits/gtk40/Makefile +++ b/x11-toolkits/gtk40/Makefile @@ -1,5 +1,6 @@ PORTNAME= gtk PORTVERSION= 4.14.4 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME PKGNAMESUFFIX= 4 @@ -13,7 +14,8 @@ LICENSE= LGPL20 PORTSCOUT= limit:1,even -BUILD_DEPENDS= sassc>0:textproc/sassc +BUILD_DEPENDS= ${LOCALBASE}/include/libdrm/drm_fourcc.h:graphics/libdrm \ + sassc>0:textproc/sassc LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ diff --git a/x11-toolkits/gtk40/files/patch-dmabuf b/x11-toolkits/gtk40/files/patch-dmabuf new file mode 100644 index 000000000000..b1fa7e5a1c85 --- /dev/null +++ b/x11-toolkits/gtk40/files/patch-dmabuf @@ -0,0 +1,70 @@ +--- dma-buf-compat.h.orig 2024-08-27 18:15:44 UTC ++++ dma-buf-compat.h +@@ -0,0 +1,22 @@ ++#ifdef __linux__ ++#include ++#else ++typedef uint64_t __u64; ++ ++// From https://github.com/evadot/drm-subtree or https://reviews.freebsd.org/D23085 ++struct dma_buf_sync ++{ ++ __u64 flags; ++}; ++ ++#define DMA_BUF_SYNC_READ (1 << 0) ++#define DMA_BUF_SYNC_WRITE (2 << 0) ++#define DMA_BUF_SYNC_RW (DMA_BUF_SYNC_READ | DMA_BUF_SYNC_WRITE) ++#define DMA_BUF_SYNC_START (0 << 2) ++#define DMA_BUF_SYNC_END (1 << 2) ++#define DMA_BUF_SYNC_VALID_FLAGS_MASK \ ++ (DMA_BUF_SYNC_RW | DMA_BUF_SYNC_END) ++ ++#define DMA_BUF_BASE 'b' ++#define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) ++#endif +--- gdk/gdkdmabuf.c.orig 2024-08-27 18:17:03 UTC ++++ gdk/gdkdmabuf.c +@@ -28,8 +28,8 @@ + #ifdef HAVE_DMABUF + #include + #include +-#include + #include ++#include "../dma-buf-compat.h" + + typedef struct _GdkDrmFormatInfo GdkDrmFormatInfo; + +--- gsk/gpu/gskgpudownloadop.c.orig 2024-08-27 18:18:39 UTC ++++ gsk/gpu/gskgpudownloadop.c +@@ -16,7 +16,7 @@ + #include "gdk/gdkglcontextprivate.h" + + #ifdef HAVE_DMABUF +-#include ++#include "../../dma-buf-compat.h" + #endif + + typedef struct _GskGpuDownloadOp GskGpuDownloadOp; +--- gsk/gpu/gskvulkanimage.c.orig 2024-08-27 18:18:26 UTC ++++ gsk/gpu/gskvulkanimage.c +@@ -15,7 +15,7 @@ + #include + #include + #ifdef HAVE_DMABUF +-#include ++#include <../../dma-buf-compat.h> + #endif + + struct _GskVulkanImage +--- meson.build.orig 2024-08-27 18:19:59 UTC ++++ meson.build +@@ -636,7 +636,7 @@ cdata.set('HAVE_DRM_FOURCC_H', libdrm_dep.found()) + libdrm_dep = libdrm_dep.partial_dependency(includes: true, compile_args: true) + cdata.set('HAVE_DRM_FOURCC_H', libdrm_dep.found()) + +-cdata.set('HAVE_DMABUF', cc.has_header('linux/dma-buf.h')) ++cdata.set('HAVE_DMABUF', true) + + cloudproviders_dep = dependency('cloudproviders', + required: get_option('cloudproviders'),