From nobody Sat Feb 17 14:54:17 2024 X-Original-To: dev-commits-ports-main@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 4TcWzG08zSz5BCQc; Sat, 17 Feb 2024 14:54:18 +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 4TcWzF6Rk4z4WdS; Sat, 17 Feb 2024 14:54:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708181657; 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=G2xd26nsc2ikFc2fXU5Val5+I+y1HGbXEyLwTbYy3tk=; b=IIBtW0ZYwuJROZlOCGhsHtSDp7yfacYfj8xnvT6ml4eiBSDGpmI528xi/cLSFmc1zcKLsj NMGWENvloCAU6E4gVxLGwCGu3ZfXPFPVovhjAXkrZoSNOMONWQjQtNuLYcksOeSDwqkhD1 E1UOnHUCd3+APSVbUFnPZeqRmwC5fyeIAlB0EUdkLHHBm6eg+quJdzp/mKz3k+s4LwlUQS oOsF16Nr6rnUgECjNDEr+xF/9EQSWr7GuRfKf+1z15lNPy1wjnRNLLKOPkzO7B8YyEwME7 Or7kEPYMwlkUYb3TeCI2o6bbJoEX/ZosCzr9NzAWcfTVkU6og0GrGyYZrJ6Irg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708181657; 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=G2xd26nsc2ikFc2fXU5Val5+I+y1HGbXEyLwTbYy3tk=; b=HOt7y+FsaqMVw1zzSorZ/+cbga0nbV8SJsRoyTmTLHjnTkbPMhfxltepaEkAiwYBbWBq3/ CVkV0ht3dVmSm2rjiUDx6nWKgUlY+pmignjii1MKzgEmwqih2l7Hj5TWnOthuYr9HGtfpL cppdEzXc8tJVXHNRfpCr1PyrWmtPzC5YALqH5gUTMLo8Xi+yuxIj//oCMsnn+j0dICWmVx XfQb2KYymCtQURL4m37c5Tv2fTF31E054N9FA7qG+ln5bhDfd+vA06aF26gPti8pv1JjEI MwmnGAngCFvQc/u1FlUqLEf/HFMLtofoKlaqf7sEwSBRw+Xv1uE0cs7lYPioUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708181657; a=rsa-sha256; cv=none; b=EH+rXDzaICFKh/SgOn/+X7pPCCCcPVVwsEKDPvoDFsMkcr2PXQuZdNvKWTI0QPOaGxhSep bbS6+paaC0/j2zAOG5zhb9nmr3nfTqQURWZhfu8w5f6qz2SgoWPtJ2xmMbzHCIU7pEI93j jvoc6sq05lvGl47IB3/aSzm7jxj08Vny28QDzlSdGxlXE8rCMzfnBqjaxmCLtsO4AK69ow 4oeKD7Fxu6l+md+mimuSnBcuE2BblV7BLSYd/G8QYmrVs7cus5CKjt28b8b6RjQ/arf2b9 0FuW9F5ICZqeInBRSos1WMTrHeoxa4JLzdJOIzP15RPEBi39J3gAaV4xX9A/Ww== 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 4TcWzF5Vjwz1BxF; Sat, 17 Feb 2024 14:54:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HEsHf9045520; Sat, 17 Feb 2024 14:54:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HEsHBv045517; Sat, 17 Feb 2024 14:54:17 GMT (envelope-from git) Date: Sat, 17 Feb 2024 14:54:17 GMT Message-Id: <202402171454.41HEsHBv045517@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 6e197c6c59f3 - main - graphics/mesa: Update to 24.0.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e197c6c59f37a2b2369c90dc460fb94a8355056 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e197c6c59f37a2b2369c90dc460fb94a8355056 commit 6e197c6c59f37a2b2369c90dc460fb94a8355056 Author: Emmanuel Vadot AuthorDate: 2024-02-15 17:58:22 +0000 Commit: Emmanuel Vadot CommitDate: 2024-02-17 14:53:56 +0000 graphics/mesa: Update to 24.0.1 Release notes (24.0.0): https://lists.freedesktop.org/archives/mesa-dev/2024-February/226138.html Release notes (24.0.1): https://lists.freedesktop.org/archives/mesa-dev/2024-February/226151.html Sponsored by: Beckhoff Automation GmbH & Co. KG --- graphics/mesa-dri/Makefile.common | 2 +- graphics/mesa-dri/distinfo | 6 +++--- ...atch-src_gallium_winsys_amdgpu_drm_amdgpu__bo.c | 11 +++++++++++ graphics/mesa-dri/files/patch-src_util_os__file.c | 22 ---------------------- lang/clover/Makefile | 4 ++++ 5 files changed, 19 insertions(+), 26 deletions(-) diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index 0b7ba5f94e36..6adb4b342a9e 100644 --- a/graphics/mesa-dri/Makefile.common +++ b/graphics/mesa-dri/Makefile.common @@ -12,7 +12,7 @@ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} -MESABASEVERSION= 23.3.5 +MESABASEVERSION= 24.0.1 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo index 3ce2f6c01bb1..5ebb8c423aae 100644 --- a/graphics/mesa-dri/distinfo +++ b/graphics/mesa-dri/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1706768999 -SHA256 (mesa-23.3.5.tar.xz) = 69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f -SIZE (mesa-23.3.5.tar.xz) = 19429564 +TIMESTAMP = 1708019786 +SHA256 (mesa-24.0.1.tar.xz) = f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613 +SIZE (mesa-24.0.1.tar.xz) = 19950992 SHA256 (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 84f18f14788bd8f387e2fc754b945bf30f84b517dd917785ed5d8ef1d594e24a SIZE (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 1626 SHA256 (7c565db35d39bdbf4e4f867ea19f78b97c8c126f.patch) = 5af88a22abfadb91f6626c9244ed2a365e2bb283e0a42399082d1e909136d5f3 diff --git a/graphics/mesa-dri/files/patch-src_gallium_winsys_amdgpu_drm_amdgpu__bo.c b/graphics/mesa-dri/files/patch-src_gallium_winsys_amdgpu_drm_amdgpu__bo.c new file mode 100644 index 000000000000..75994a00618e --- /dev/null +++ b/graphics/mesa-dri/files/patch-src_gallium_winsys_amdgpu_drm_amdgpu__bo.c @@ -0,0 +1,11 @@ +--- src/gallium/winsys/amdgpu/drm/amdgpu_bo.c.orig 2024-02-16 16:21:40 UTC ++++ src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +@@ -709,7 +709,7 @@ struct pb_slab *amdgpu_bo_slab_alloc(void *priv, unsig + slab_bo->slab.group_index = group_index; + slab_bo->slab.entry_size = entry_size; + slab_bo->entries = os_malloc_aligned(slab_bo->slab.num_entries * sizeof(*slab_bo->entries), +- CACHE_LINE_SIZE); ++ MESA_CACHE_LINE_SIZE); + if (!slab_bo->entries) + goto fail; + diff --git a/graphics/mesa-dri/files/patch-src_util_os__file.c b/graphics/mesa-dri/files/patch-src_util_os__file.c deleted file mode 100644 index f1bb54593c5a..000000000000 --- a/graphics/mesa-dri/files/patch-src_util_os__file.c +++ /dev/null @@ -1,22 +0,0 @@ ---- src/util/os_file.c.orig 2024-01-25 12:45:07 UTC -+++ src/util/os_file.c -@@ -207,13 +207,19 @@ os_same_file_description(int fd1, int fd2) - int - os_same_file_description(int fd1, int fd2) - { -+#ifdef SYS_kcmp - pid_t pid = getpid(); -+#endif - - /* Same file descriptor trivially implies same file description */ - if (fd1 == fd2) - return 0; - -+#ifdef SYS_kcmp - return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2); -+#else -+ return -1; -+#endif - } - - #else diff --git a/lang/clover/Makefile b/lang/clover/Makefile index 4b5b41604d07..cb318016c189 100644 --- a/lang/clover/Makefile +++ b/lang/clover/Makefile @@ -12,8 +12,10 @@ ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le ONLY_FOR_ARCHS_REASON= needs a GPU supported by the AMDGPU KMS driver BUILD_DEPENDS= libclc>=0.3.0:devel/libclc \ + spirv-tools>=0:graphics/spirv-tools \ opencl>=0:devel/opencl LIB_DEPENDS= libOpenCL.so:devel/ocl-icd \ + libLLVMSPIRVLib.so.${LLVM_VERSION}:devel/spirv-llvm-translator@${LLVM_PORT:T} \ libzstd.so:archivers/zstd RUN_DEPENDS= libclc>=0.3.0:devel/libclc \ opencl>=0:devel/opencl @@ -48,6 +50,8 @@ MESON_ARGS+= -Dplatforms="" \ LDFLAGS_i386= -Wl,-znotext +CONFIGURE_ENV+= PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig" + .include "${MASTERDIR}/Makefile.targets" pre-patch: