From owner-dev-commits-ports-main@freebsd.org Wed Jul 21 11:21:50 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 057D4661757; Wed, 21 Jul 2021 11:21:50 +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 4GVCpP6YDNz3hwS; Wed, 21 Jul 2021 11:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C7E281CEE9; Wed, 21 Jul 2021 11:21:49 +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 16LBLnkO088870; Wed, 21 Jul 2021 11:21:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16LBLnoc088869; Wed, 21 Jul 2021 11:21:49 GMT (envelope-from git) Date: Wed, 21 Jul 2021 11:21:49 GMT Message-Id: <202107211121.16LBLnoc088869@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 588ce0d6f952 - main - graphics/mesa-dri: fix build on powerpc64le MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 588ce0d6f952d06fab4406f2f58b99a33d321660 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jul 2021 11:21:50 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=588ce0d6f952d06fab4406f2f58b99a33d321660 commit 588ce0d6f952d06fab4406f2f58b99a33d321660 Author: Piotr Kubaj AuthorDate: 2021-07-21 11:21:44 +0000 Commit: Piotr Kubaj CommitDate: 2021-07-21 11:21:44 +0000 graphics/mesa-dri: fix build on powerpc64le n file included from ../src/gallium/drivers/llvmpipe/lp_setup_tri.c:50: /usr/lib/clang/11.0.1/include/altivec.h:55:19: error: unknown type name 'vector' static __inline__ vector bool char __ATTRS_o_ai ^ /usr/lib/clang/11.0.1/include/altivec.h:56:10: error: unknown type name 'vector' vec_perm(vector bool char __a, vector bool char __b, vector unsigned char __c); ^ /usr/lib/clang/11.0.1/include/altivec.h:56:32: error: unknown type name 'vector' vec_perm(vector bool char __a, vector bool char __b, vector unsigned char __c); ^ /usr/lib/clang/11.0.1/include/altivec.h:66:19: error: unknown type name 'vector' static __inline__ vector bool short __ATTRS_o_ai vec_perm( ^ /usr/lib/clang/11.0.1/include/altivec.h:67:5: error: unknown type name 'vector' vector bool short __a, vector bool short __b, vector unsigned char __c); ^ /usr/lib/clang/11.0.1/include/altivec.h:67:28: error: unknown type name 'vector' vector bool short __a, vector bool short __b, vector unsigned char __c); ^ /usr/lib/clang/11.0.1/include/altivec.h:80:19: error: unknown type name 'vector' static __inline__ vector bool int __ATTRS_o_ai ^ /usr/lib/clang/11.0.1/include/altivec.h:81:10: error: unknown type name 'vector' vec_perm(vector bool int __a, vector bool int __b, vector unsigned char __c); ^ /usr/lib/clang/11.0.1/include/altivec.h:81:31: error: unknown type name 'vector' vec_perm(vector bool int __a, vector bool int __b, vector unsigned char __c); ^ /usr/lib/clang/11.0.1/include/altivec.h:96:19: error: unknown type name 'vector' static __inline__ vector bool long long __ATTRS_o_ai ^ /usr/lib/clang/11.0.1/include/altivec.h:97:10: error: unknown type name 'vector' vec_perm(vector bool long long __a, vector bool long long __b, ^ /usr/lib/clang/11.0.1/include/altivec.h:97:37: error: unknown type name 'vector' vec_perm(vector bool long long __a, vector bool long long __b, ^ /usr/lib/clang/11.0.1/include/altivec.h:203:9: error: unknown type name 'vector' vec_add(vector bool char __a, vector signed char __b) { ^ /usr/lib/clang/11.0.1/include/altivec.h:208:33: error: unknown type name 'vector' vec_add(vector signed char __a, vector bool char __b) { ^ /usr/lib/clang/11.0.1/include/altivec.h:218:9: error: unknown type name 'vector' vec_add(vector bool char __a, vector unsigned char __b) { ^ /usr/lib/clang/11.0.1/include/altivec.h:223:35: error: unknown type name 'vector' vec_add(vector unsigned char __a, vector bool char __b) { ^ /usr/lib/clang/11.0.1/include/altivec.h:232:53: error: unknown type name 'vector' static __inline__ vector short __ATTRS_o_ai vec_add(vector bool short __a, ^ /usr/lib/clang/11.0.1/include/altivec.h:238:53: error: unknown type name 'vector' vector bool short __b) { ^ /usr/lib/clang/11.0.1/include/altivec.h:248:9: error: unknown type name 'vector' vec_add(vector bool short __a, vector unsigned short __b) { ^ fatal error: too many errors emitted, stopping now [-ferror-limit=] 20 errors generated. Additionally, fix packaging failure on all powerpc*, since llvmpipe is now used. --- graphics/mesa-dri/Makefile | 2 +- .../files/patch-src_gallium_drivers_llvmpipe_lp__rast__tri.c | 12 ++++++++++++ .../patch-src_gallium_drivers_llvmpipe_lp__setup__tri.c | 12 ++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile index c0ce8fb7e6af..c612fc0e7f39 100644 --- a/graphics/mesa-dri/Makefile +++ b/graphics/mesa-dri/Makefile @@ -39,7 +39,7 @@ DRI_DRIVERS+= R100 .endif .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 \ - || ${ARCH} == powerpc || ${ARCH} == powerpc64 + || ${ARCH:Mpowerpc*} DRI_DRIVERS+= R100 R200 GALLIUM_DRIVERS+= R300 R600 RADEONSI VULKAN_DRIVERS+= AMD diff --git a/graphics/mesa-dri/files/patch-src_gallium_drivers_llvmpipe_lp__rast__tri.c b/graphics/mesa-dri/files/patch-src_gallium_drivers_llvmpipe_lp__rast__tri.c new file mode 100644 index 000000000000..c4a658ce2c62 --- /dev/null +++ b/graphics/mesa-dri/files/patch-src_gallium_drivers_llvmpipe_lp__rast__tri.c @@ -0,0 +1,12 @@ +--- src/gallium/drivers/llvmpipe/lp_rast_tri.c.orig 2021-07-21 11:06:08 UTC ++++ src/gallium/drivers/llvmpipe/lp_rast_tri.c +@@ -465,7 +465,9 @@ lp_rast_triangle_32_3_4(struct lp_rasterizer_task *tas + + #if defined(_ARCH_PWR8) && UTIL_ARCH_LITTLE_ENDIAN + ++#undef bool + #include ++#define bool _Bool + #include "util/u_pwr8.h" + + static inline void 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 new file mode 100644 index 000000000000..8d9f88e80e1d --- /dev/null +++ b/graphics/mesa-dri/files/patch-src_gallium_drivers_llvmpipe_lp__setup__tri.c @@ -0,0 +1,12 @@ +--- src/gallium/drivers/llvmpipe/lp_setup_tri.c.orig 2021-07-21 11:05:23 UTC ++++ src/gallium/drivers/llvmpipe/lp_setup_tri.c +@@ -47,7 +47,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 +