From nobody Tue Jan 18 09:40:02 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 122921951438; Tue, 18 Jan 2022 09:40:03 +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 4JdNzQ6LPXz4mbW; Tue, 18 Jan 2022 09:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642498803; 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=hWg0qkLvT3ziUx8HpvHmL14he8e40iBfehLdmZ0fYzo=; b=oSczjt5yXclYqZ1ymHajJ50m+C7itt9iQ0udRkzbdRujIT0AaIlbPLJU59h7ui/3zcgz/Z RfulLI5VJ3IucE/2Is67/uDWddCl0fdjER1mgUgkIb7fqCKqJJMWgvcv9MhXChe3N++Mtl lmu0b5dJ9pINWocMt2phxsW/2C76E1L/W9rPsfMCpVPO7FBUL4iIYZUFteEdehjT1OI5YC stRYz/bbVoN832OxaYDnQgiCciV5pqYVpnWOY9ksP+01J7dc8a/i+N9x1H8S4bH/dmLddx 6u9mAPI0GugjNar3Keg8X18E6Lb7jXKD6TonojYmPHVwBDAziJ41bdT6L6upyg== 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 9A5D61F07E; Tue, 18 Jan 2022 09:40:02 +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 20I9e2N6098750; Tue, 18 Jan 2022 09:40:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20I9e2pL098747; Tue, 18 Jan 2022 09:40:02 GMT (envelope-from git) Date: Tue, 18 Jan 2022 09:40:02 GMT Message-Id: <202201180940.20I9e2pL098747@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 1a2ce15bded2 - 2022Q1 - graphics/mesa: Update to 21.3.4 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/2022Q1 X-Git-Reftype: branch X-Git-Commit: 1a2ce15bded2c84d58ccf63553b8703daae7b594 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642498803; 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=hWg0qkLvT3ziUx8HpvHmL14he8e40iBfehLdmZ0fYzo=; b=k+7oKkyeiREW3KptXmrPZ4bcI/Otr0NOb44vNXQA8L/Edfh7yRqpqn+9O2m00ciEJB7hfC riegsVA/aeZ081wiRP0orWHelboAOcInoy3PBXmcP8B/rQ0yh02lRiIvopT/JSrt4zSQa/ p0OvybO4xYHR8eDCnFzBf+xwYkDEPdX52asUi1E1DXvYNkTm5vFB8pKZ/++KDsUAzVo+lZ ljcgolkjF7/khtNt+XpjLdPToXQ2Fn5zbl1I87qmY3xYIMEJALFe9y9r6v8wspZ48U8wvo wEkuyqkeZdS4aExI2Omr3JbokH00PZHuCYGXESnM6J0Wz5/D8JrqAS6DElt6BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642498803; a=rsa-sha256; cv=none; b=OfdB6U/64rukqGA7QHYwvbwIejQK6ybhSg2oyMDFWudVeDw8jOdW/UsaSyY3iUusvA7MBO 7Ngd+5cw68RrA2FIJKI2HEvsJT51EHAqUyo3FbTV1P6SM6osoUBgJj/vpKYk5ybm3obAzL VjIKTTr4rdqDBBdIwHmcrWoRXfv3qaGmNRT07gtRbkXoZ1LmIzU9jtKGMHqE0vVJOV7uSG 5caiMc6Wa9+jeTCTlF3KEn19tYcpSwmNbMxVodZPJzCAx1ECLCod46DbKJny80ruy9ncEA 0gDpk8ybVEQyupsu+QfLJJLnxOPZtXxSH6Mmia52ITEBCjYy8k9J3iHTj34r7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=1a2ce15bded2c84d58ccf63553b8703daae7b594 commit 1a2ce15bded2c84d58ccf63553b8703daae7b594 Author: Emmanuel Vadot AuthorDate: 2021-12-08 06:58:34 +0000 Commit: Emmanuel Vadot CommitDate: 2022-01-18 09:39:54 +0000 graphics/mesa: Update to 21.3.4 This is the last mesa release with DRI drivers, next one will only have the gallium drivers. Release notes for 21.2.0: https://lists.freedesktop.org/archives/mesa-dev/2021-August/225459.html Release notes for 21.2.1: https://lists.freedesktop.org/archives/mesa-dev/2021-September/225480.html Release notes for 21.2.2: https://lists.freedesktop.org/archives/mesa-dev/2021-September/225490.html Release notes for 21.2.3: https://lists.freedesktop.org/archives/mesa-dev/2021-September/225495.html Release notes for 21.2.4: https://lists.freedesktop.org/archives/mesa-dev/2021-October/225532.html Release notes for 21.2.5: https://lists.freedesktop.org/archives/mesa-dev/2021-October/225555.html Release notes for 21.2.6: https://lists.freedesktop.org/archives/mesa-dev/2021-November/225580.html Release notes for 21.3.0: https://lists.freedesktop.org/archives/mesa-dev/2021-November/225574.html Release notes for 21.3.1: https://lists.freedesktop.org/archives/mesa-dev/2021-December/225581.html Release notes for 21.3.2: https://lists.freedesktop.org/archives/mesa-dev/2021-December/225603.html Release notes for 21.3.3: https://lists.freedesktop.org/archives/mesa-dev/2021-December/225612.html Release notes for 21.3.4: https://lists.freedesktop.org/archives/mesa-dev/2022-January/225635.html MFH: 2022Q1 Reviewed by: zeising (privately) Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33332 (cherry picked from commit e9669c2a0b41e5b3506300c241f4c2e6f6f8f739) --- graphics/mesa-dri/Makefile | 4 ++-- graphics/mesa-dri/Makefile.common | 7 ++++-- graphics/mesa-dri/distinfo | 6 ++--- graphics/mesa-dri/files/patch-meson.build | 28 ---------------------- .../patch-src_gallium_include_pipe_p__compiler.h | 11 +++++++++ ...intel_compiler_brw__nir__lower__shader__calls.c | 15 ------------ .../mesa-dri/files/patch-src_loader_meson.build | 11 --------- graphics/mesa-dri/files/patch-src_util_macros.h | 10 ++++++++ graphics/mesa-dri/files/patch-src_util_os__file.c | 11 --------- graphics/mesa-dri/pkg-plist | 2 ++ 10 files changed, 33 insertions(+), 72 deletions(-) diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile index c01e8185e1d6..a0a05046c388 100644 --- a/graphics/mesa-dri/Makefile +++ b/graphics/mesa-dri/Makefile @@ -29,7 +29,7 @@ ZSTD_MESON_ENABLED= zstd .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" ALL_DRI_DRIVERS= I915 I965 R100 R200 -ALL_GALLIUM_DRIVERS= IRIS R300 R600 RADEONSI SVGA SWRAST +ALL_GALLIUM_DRIVERS= CROCUS IRIS R300 R600 RADEONSI SVGA SWRAST ALL_VULKAN_DRIVERS= INTEL AMD GALLIUM_DRIVERS+= SWRAST # llvmpipe @@ -50,7 +50,7 @@ MESON_ARGS+= -Dgallium-xvmc=enabled .endif .if ${ARCH} == amd64 || ${ARCH} == i386 DRI_DRIVERS+= I915 I965 -GALLIUM_DRIVERS+= IRIS SVGA +GALLIUM_DRIVERS+= CROCUS IRIS SVGA VULKAN_DRIVERS+= INTEL .endif diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index 16ef1037c66d..bcd60d0b2e72 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= 21.1.8 +MESABASEVERSION= 21.3.4 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= @@ -25,6 +25,9 @@ DISTFILES= mesa-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER= x11@FreeBSD.org +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/docs/license.rst + COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//} BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs \ @@ -85,7 +88,7 @@ PKGDEINSTALL= ${.CURDIR}/pkg-deinstall BINARY_ALIAS+= python3=${PYTHON_VERSION} -LLVM_DEFAULT= 12 +LLVM_DEFAULT= 13 BUILD_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} .if ${COMPONENT} != libs RUN_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo index a4fd71f1c57b..cf2d8d9fc7f1 100644 --- a/graphics/mesa-dri/distinfo +++ b/graphics/mesa-dri/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633514529 -SHA256 (mesa-21.1.8.tar.xz) = 5cd32f5d089dca75300578a3d771a656eaed652090573a2655fe4e7022d56bfc -SIZE (mesa-21.1.8.tar.xz) = 15410504 +TIMESTAMP = 1642339994 +SHA256 (mesa-21.3.4.tar.xz) = 77104fd4a93bce69da3b0982f8ee88ba7c4fb98cfc491a669894339cdcd4a67d +SIZE (mesa-21.3.4.tar.xz) = 16497248 diff --git a/graphics/mesa-dri/files/patch-meson.build b/graphics/mesa-dri/files/patch-meson.build deleted file mode 100644 index 9cad06faaead..000000000000 --- a/graphics/mesa-dri/files/patch-meson.build +++ /dev/null @@ -1,28 +0,0 @@ ---- meson.build.orig 2021-06-30 18:18:55 UTC -+++ meson.build -@@ -161,7 +161,7 @@ if dri_drivers.contains('auto') - if system_has_kms_drm - # TODO: PPC, Sparc - if ['x86', 'x86_64'].contains(host_machine.cpu_family()) -- dri_drivers = ['i915', 'i965', 'r100', 'r200', 'nouveau'] -+ dri_drivers = ['i915', 'i965', 'r100', 'r200'] - elif ['arm', 'aarch64'].contains(host_machine.cpu_family()) - dri_drivers = [] - elif ['mips', 'mips64'].contains(host_machine.cpu_family()) -@@ -193,7 +193,7 @@ if gallium_drivers.contains('auto') - # TODO: PPC, Sparc - if ['x86', 'x86_64'].contains(host_machine.cpu_family()) - gallium_drivers = [ -- 'r300', 'r600', 'radeonsi', 'nouveau', 'virgl', 'svga', 'swrast', -+ 'r300', 'r600', 'radeonsi', 'virgl', 'svga', 'swrast', - 'iris' - ] - elif ['arm', 'aarch64'].contains(host_machine.cpu_family()) -@@ -1041,7 +1041,6 @@ else - '-Werror=incompatible-pointer-types', - '-Werror=int-conversion', - '-Wimplicit-fallthrough', -- '-Werror=thread-safety', - '-Wno-missing-field-initializers', - '-Wno-format-truncation', - '-fno-math-errno', diff --git a/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__compiler.h b/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__compiler.h new file mode 100644 index 000000000000..a67d3f974320 --- /dev/null +++ b/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__compiler.h @@ -0,0 +1,11 @@ +--- src/gallium/include/pipe/p_compiler.h.orig 2022-01-16 11:29:08 UTC ++++ src/gallium/include/pipe/p_compiler.h +@@ -170,7 +170,7 @@ typedef unsigned char boolean; + * aligned, but we only want to align the field. + */ + #define EXCLUSIVE_CACHELINE(decl) \ +- union { char __cl_space[CACHE_LINE_SIZE]; \ ++ union { char __cl_space[MESA_CACHE_LINE_SIZE]; \ + decl; } + + #if defined(__GNUC__) diff --git a/graphics/mesa-dri/files/patch-src_intel_compiler_brw__nir__lower__shader__calls.c b/graphics/mesa-dri/files/patch-src_intel_compiler_brw__nir__lower__shader__calls.c deleted file mode 100644 index f68c1e1acf18..000000000000 --- a/graphics/mesa-dri/files/patch-src_intel_compiler_brw__nir__lower__shader__calls.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/intel/compiler/brw_nir_lower_shader_calls.c.orig 2021-06-30 18:18:55 UTC -+++ src/intel/compiler/brw_nir_lower_shader_calls.c -@@ -151,6 +151,12 @@ instr_is_shader_call(nir_instr *instr) - intrin->intrinsic == nir_intrinsic_execute_callable; - } - -+#ifdef __FreeBSD__ -+/* brw_nir_rt.h -> glthread.h -> u_thread.h -> pthread_np.h -> sys/cpuset.h -> sys/_bitset.h -+ * - defines `struct bitset` which clashes with the following -+ */ -+#define bitset mesa_bitset -+#endif - struct bitset { - BITSET_WORD *set; - unsigned size; diff --git a/graphics/mesa-dri/files/patch-src_loader_meson.build b/graphics/mesa-dri/files/patch-src_loader_meson.build deleted file mode 100644 index 14ef872d46f4..000000000000 --- a/graphics/mesa-dri/files/patch-src_loader_meson.build +++ /dev/null @@ -1,11 +0,0 @@ ---- src/loader/meson.build.orig 2020-12-03 18:59:28.209491000 +0100 -+++ src/loader/meson.build 2020-12-03 18:59:40.685431000 +0100 -@@ -41,7 +41,7 @@ - '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path), - ] - --if with_gallium_iris and get_option('prefer-iris') -+if get_option('prefer-iris') - loader_c_args += ['-DPREFER_IRIS'] - endif - diff --git a/graphics/mesa-dri/files/patch-src_util_macros.h b/graphics/mesa-dri/files/patch-src_util_macros.h new file mode 100644 index 000000000000..5038dc8ea935 --- /dev/null +++ b/graphics/mesa-dri/files/patch-src_util_macros.h @@ -0,0 +1,10 @@ +--- src/util/macros.h.orig 2022-01-16 11:28:56 UTC ++++ src/util/macros.h +@@ -478,6 +478,6 @@ typedef int lock_cap_t; + #endif + + /* TODO: this could be different on non-x86 architectures. */ +-#define CACHE_LINE_SIZE 64 ++#define MESA_CACHE_LINE_SIZE 64 + + #endif /* UTIL_MACROS_H */ 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 fce8aaa4bcd9..000000000000 --- a/graphics/mesa-dri/files/patch-src_util_os__file.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/util/os_file.c.orig 2021-06-30 18:18:56 UTC -+++ src/util/os_file.c -@@ -89,7 +89,7 @@ typedef ptrdiff_t ssize_t; - static ssize_t - readN(int fd, char *buf, size_t len) - { -- int err = -ENODATA; -+ int err = -1; - size_t total = 0; - do { - ssize_t ret = read(fd, buf + total, len - total); diff --git a/graphics/mesa-dri/pkg-plist b/graphics/mesa-dri/pkg-plist index 78a86779e6fe..4929d30a859e 100644 --- a/graphics/mesa-dri/pkg-plist +++ b/graphics/mesa-dri/pkg-plist @@ -4,6 +4,8 @@ include/GL/internal/dri_interface.h @comment include/KHR/khrplatform.h @comment include/gbm.h +%%CROCUS_GDRIVER%%lib/dri/crocus_dri.so +%%I915_DRIVER%%lib/dri/i830_dri.so %%I915_DRIVER%%lib/dri/i915_dri.so %%I965_DRIVER%%lib/dri/i965_dri.so %%IRIS_GDRIVER%%lib/dri/iris_dri.so