From nobody Fri Dec 01 15:43:28 2023 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 4Shcm04HTPz52mWx; Fri, 1 Dec 2023 15:43:28 +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 4Shcm03lxmz3ShL; Fri, 1 Dec 2023 15:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701445408; 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=I3pJaQjG1gjPnn1uC1F/XGCOqcjMmjWeVzWCdz0uT2s=; b=X+wOzK9CGQ6XF5Xw2dbLSEorRVwsszm4IVTdC1j9HN9VykffWgyqFKiY3Vfifo79X9+zDt qAXagprnyeL7/aS6OlmMVF/wm0UCm2WKJs1g+VxzWSDgTpZOX6urkLiI5pFdjAIc0BeZeO hrLzlx6zXtX4KD+d5IESV4L3TyTe48wp+E922vn+uBzpD4HC59MAfcv1uUhCQ4RZvlsA/2 cQcUCE9H2Mzuf6kDw4+YgUFDhMUlGe3DXV8YJzYaTnwGahahQeGE85PUL9g29smIKlQl63 IMcWPiRQxKDphRIQcdaGLoJ67nputvZ+lI7bAdFtF1ABwtcF61KDfWj2Cm9LlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701445408; 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=I3pJaQjG1gjPnn1uC1F/XGCOqcjMmjWeVzWCdz0uT2s=; b=cA75hMmkmnMl60w/uKfp37l+FhtcxIxoObQaRvdGYidKA7bZRH4wrb87XSsnoFwLUV9eoX 3+ZQ3qR+OVeiGbHObvsKUJLAqsvX8U6fwAJ825w+5gbeww0zLvKBk6ZFXz1dQHActVCutE bqY6gu8BFOG4EByWBtib1C/oksaW0PQMYeHg3QGkO6OVP8piZTOTlXZXFEH7ydMxhL3cGS 6k8+kdPeb3qidn/cDlYmU8OoYKv1P/nIZSjeojPLfgMMKoyICreS7r2E+EvZPkWkMsKUVo tPTx32fmEUgX/4qWz9xj8JQofPAMP0mvzPwSEIGia+54oJjgskiCrpMrcqUw+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701445408; a=rsa-sha256; cv=none; b=qec6gcbjU+ku2zT+1cNva1hfGFhEgSHH4nSDPJ3XAsfO4sto750A+qk7Memay+yRmOotZb nJ/wi9o6WHGBGUzafhT5fJZeE4WDzSF1VmwtDCzkmoAxuHAGZHa6uENNt8DaEdDBNWcK41 nawwGuy4J8jzKnKS6M25aBvEwhQeHFYWpkhe1d3aG89AdnXVmV1tm8lNVGwfmnmVvskXQR Lqo3uidxBXEtmW+T52jSIQZ1mkgZciF+O9+1gmA4+buApupPXC4V3E/ZwcOP5sKys13hir yUAPtVS3g3khoItQwPPVch6ARANBH9JlWSRvmfZqPAhUgWm4BVYCkBVHm+XvQg== 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 4Shcm02pMNzfq5; Fri, 1 Dec 2023 15:43:28 +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 3B1FhSkk078240; Fri, 1 Dec 2023 15:43:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1FhShQ078237; Fri, 1 Dec 2023 15:43:28 GMT (envelope-from git) Date: Fri, 1 Dec 2023 15:43:28 GMT Message-Id: <202312011543.3B1FhShQ078237@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: e18ae97ac384 - main - graphics/mesa*: Update to 23.3.0 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: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e18ae97ac3849f20da681e0f9aa1f01c8a5a717d Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=e18ae97ac3849f20da681e0f9aa1f01c8a5a717d commit e18ae97ac3849f20da681e0f9aa1f01c8a5a717d Author: Emmanuel Vadot AuthorDate: 2023-12-01 14:46:19 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-01 15:43:11 +0000 graphics/mesa*: Update to 23.3.0 Release notes: https://lists.freedesktop.org/archives/mesa-dev/2023-November/226083.html Sponsored by: Beckhoff Automation GmbH & Co. KG --- graphics/mesa-dri/Makefile | 1 - graphics/mesa-dri/Makefile.common | 3 +-- graphics/mesa-dri/distinfo | 8 +++----- .../patch-src_gallium_drivers_llvmpipe_lp__setup__tri.c | 12 ------------ .../files/patch-src_gallium_drivers_zink_zink__screen.c | 12 ++++++++++++ graphics/mesa-dri/files/patch-src_util_u__memory.h | 8 ++++---- 6 files changed, 20 insertions(+), 24 deletions(-) diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile index 96b650db6d07..2f57b3e5c328 100644 --- a/graphics/mesa-dri/Makefile +++ b/graphics/mesa-dri/Makefile @@ -1,6 +1,5 @@ PORTNAME= mesa-dri PORTVERSION= ${MESAVERSION} -PORTREVISION= 2 CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for DRI2+ diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index 1095a78d359c..9c76d24a46a9 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.1.8 +MESABASEVERSION= 23.3.0 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= @@ -24,7 +24,6 @@ MASTER_SITES= https://mesa.freedesktop.org/archive/ \ DISTFILES= mesa-${MESADISTVERSION}${EXTRACT_SUFX} PATCH_SITES= https://gitlab.freedesktop.org/mesa/mesa/-/commit/ -PATCHFILES+= 9ba416cdc67073cdda9a73fe9d37304b82bdd526.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8671 PATCHFILES+= 4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26284 MAINTAINER= x11@FreeBSD.org diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo index de765e7b28f9..839b3ee47f15 100644 --- a/graphics/mesa-dri/distinfo +++ b/graphics/mesa-dri/distinfo @@ -1,7 +1,5 @@ -TIMESTAMP = 1700484156 -SHA256 (mesa-23.1.8.tar.xz) = 45434ff91a709844130a3174d9c0ef39c6b50725b2bb0c13e736f36134db14ad -SIZE (mesa-23.1.8.tar.xz) = 18566724 -SHA256 (9ba416cdc67073cdda9a73fe9d37304b82bdd526.patch) = aac0f0bc9454d177729109103e4e851ee4bc894ba7cc28ea1712ed87b4660e85 -SIZE (9ba416cdc67073cdda9a73fe9d37304b82bdd526.patch) = 1511 +TIMESTAMP = 1701441510 +SHA256 (mesa-23.3.0.tar.xz) = 50f729dd60ed6335b989095baad81ef5edf7cfdd4b4b48b9b955917cb07d69c5 +SIZE (mesa-23.3.0.tar.xz) = 19234688 SHA256 (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 84f18f14788bd8f387e2fc754b945bf30f84b517dd917785ed5d8ef1d594e24a SIZE (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 1626 diff --git a/graphics/mesa-dri/files/patch-src_gallium_drivers_llvmpipe_lp__setup__tri.c b/graphics/mesa-dri/files/patch-src_gallium_drivers_llvmpipe_lp__setup__tri.c deleted file mode 100644 index 98a7bbeb9ac4..000000000000 --- a/graphics/mesa-dri/files/patch-src_gallium_drivers_llvmpipe_lp__setup__tri.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/gallium/drivers/llvmpipe/lp_setup_tri.c.orig 2022-10-11 18:53:31 UTC -+++ src/gallium/drivers/llvmpipe/lp_setup_tri.c -@@ -46,7 +46,9 @@ - #if defined(PIPE_ARCH_SSE) - #include - #elif defined(_ARCH_PWR8) && UTIL_ARCH_LITTLE_ENDIAN -+#undef bool - #include -+#define bool _Bool - #include "util/u_pwr8.h" - #endif - diff --git a/graphics/mesa-dri/files/patch-src_gallium_drivers_zink_zink__screen.c b/graphics/mesa-dri/files/patch-src_gallium_drivers_zink_zink__screen.c new file mode 100644 index 000000000000..2bb9b9119097 --- /dev/null +++ b/graphics/mesa-dri/files/patch-src_gallium_drivers_zink_zink__screen.c @@ -0,0 +1,12 @@ +--- src/gallium/drivers/zink/zink_screen.c.orig 2023-12-01 14:18:25 UTC ++++ src/gallium/drivers/zink/zink_screen.c +@@ -55,7 +55,9 @@ + #include + #include + #include ++#if DETECT_OS_LINUX + #include ++#endif + #endif + + static int num_screens = 0; diff --git a/graphics/mesa-dri/files/patch-src_util_u__memory.h b/graphics/mesa-dri/files/patch-src_util_u__memory.h index 27c553b712a7..fcaec0a4a2d2 100644 --- a/graphics/mesa-dri/files/patch-src_util_u__memory.h +++ b/graphics/mesa-dri/files/patch-src_util_u__memory.h @@ -1,7 +1,7 @@ ---- src/util/u_memory.h.orig 2023-09-06 23:29:52 UTC +--- src/util/u_memory.h.orig 2023-11-29 19:30:57 UTC +++ src/util/u_memory.h -@@ -90,7 +90,7 @@ mem_dup(const void *src, size_t size) - #define Offset(TYPE, MEMBER) ((uintptr_t)&(((TYPE *)NULL)->MEMBER)) +@@ -84,7 +84,7 @@ mem_dup(const void *src, size_t size) + } /* TODO: this could be different on non-x86 architectures. */ -#define CACHE_LINE_SIZE 64 @@ -9,7 +9,7 @@ /** * Declare a variable on its own cache line. -@@ -107,12 +107,12 @@ mem_dup(const void *src, size_t size) +@@ -101,12 +101,12 @@ mem_dup(const void *src, size_t size) * aligned, but we only want to align the field. */ #define EXCLUSIVE_CACHELINE(decl) \