From nobody Thu Aug 29 00:54:30 2024 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 4WvN8l0nHBz5PY2y; Thu, 29 Aug 2024 00:54:31 +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 4WvN8l05Hqz4Kfq; Thu, 29 Aug 2024 00:54:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724892871; 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=aTvHsv/0twlSXOYFe+KcLpWj0wTdsQCZzSNIN0q0mCc=; b=S6ZQICgNw6KFYqh8exqsJveGxvOgCLcHXhrcXGb3WUjFN/DJMa7e/GcmnqGRJqTqWR8Y4c RtqRFtRENtvAebx75K++TQxQQhxiwn1hLvJPzgbwyhWXS0ROBaMu08se75BfqJmNdyIQma /ZHZ6DeV6KdxMSQRIPe1qQWIVDSkj3M+PTzX03S81p39FluJBu+sOXLQGPWh/s6X6P66CZ mH1s43Klie21HCsgarvUqGMDeGGNxfT5HnNsioU+5oCLgv1xBm1tanQIJsqqfdHSSQIudf oLccG3rzX/kvIwhNXnuey2AhUQyYOVS4RXjNqrAeetN7/6yvflGU/RG8rW5SJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724892871; a=rsa-sha256; cv=none; b=HJ46TEiNefGVcNi4z95DYgXF17360eAG3YlvzoVE5eQUxzFXKznSG6lbaPWxfcloDlYEAo G4l8pdtV7ZKS6bXGFFIoELfVR/3oc6JKUsFhHQaESCOJLUKYrn3XUU0PSEDJroytHIATgk jYYPk7C4dS1G4wAuyW7b4HG5I3je0SeC6wUqjAswu+C+ateVU98YqKdUZvOLO8jlai1qkI MiLQsAx7CPXTI3AixYHLe4QIbzET5nSxwKw731Ud8k/cJPWXeGW7kXWF8n24WEz4SkCDnc FH07NtVmkTAN9ZrLfFeyJOM+Dc8kErY9cHo+fzauMQLhnlXCqzwcQWktUEwNeA== 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=1724892871; 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=aTvHsv/0twlSXOYFe+KcLpWj0wTdsQCZzSNIN0q0mCc=; b=gFP2vb/8J37q5SEEKp189YXUyIpk4tpVQgc1rLi++KGbx66CGE/OksmcLC5FTk0l74T+wd YdItQ3XP0jQ+wgLYMriB7ZUUNKGh7Xj/0rLUwkXN9I84nqdC7Ha2NIkeaDu3xuywENvjrD xUMrcMqDCkOzc3IgtjcoxPYAhl7Wd7YYmF6sy9TH8nP1WN05QjV4hNcou5r4KnX4B2rGh6 ciDZHdR93tDW35QN49V8EPSmqrn+QDhMR3X0xkSHovZkcfw8hEjuATyAX4UPRw5v93XoQu 4zVJitb1GQTsAY3jkfGGGT7PxeXU9xxHVH8coIO6R+wP6cl5wdT1L4dJDZGgqA== 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 4WvN8k6pWyzwFY; Thu, 29 Aug 2024 00:54:30 +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 47T0sUuG034600; Thu, 29 Aug 2024 00:54:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47T0sUK9034597; Thu, 29 Aug 2024 00:54:30 GMT (envelope-from git) Date: Thu, 29 Aug 2024 00:54:30 GMT Message-Id: <202408290054.47T0sUK9034597@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 16e7d54a12bf - main - x11-toolkits/gtk40: enable DMABUF support after 5d5b000e62a6 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 16e7d54a12bf07b70eff31fa44bbfd9001f9965c Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=16e7d54a12bf07b70eff31fa44bbfd9001f9965c commit 16e7d54a12bf07b70eff31fa44bbfd9001f9965c Author: Vasily Postnikov AuthorDate: 2024-08-27 18:37:53 +0000 Commit: Jan Beich CommitDate: 2024-08-29 00:53:34 +0000 x11-toolkits/gtk40: enable DMABUF support after 5d5b000e62a6 PR: 281107 --- 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'),