From db75c856b7397133bebb76b9ba795838b3a234df122b7c392dc28e7ff26b4b5f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 14 Oct 2021 19:18:31 +0000 Subject: [PATCH] - u_fix-build-on-ppc64le.patch * fixes build on ppc64le (boo#1191569) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1064 --- Mesa-drivers.changes | 4 ++-- Mesa-drivers.spec | 4 +--- Mesa.changes | 4 ++-- Mesa.spec | 4 +--- ...on-ppc64le.patch => u_fix-build-on-ppc64le.patch | 13 ------------- 5 files changed, 6 insertions(+), 23 deletions(-) rename try-to-fix-build-on-ppc64le.patch => u_fix-build-on-ppc64le.patch (61%) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 32299a5..744c6b7 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Thu Oct 14 10:30:57 UTC 2021 - Stefan Dirsch -- try-to-fix-build-on-ppc64le.patch - * trying to fix build on ppc64le (boo#1191569) +- u_fix-build-on-ppc64le.patch + * fixes build on ppc64le (boo#1191569) ------------------------------------------------------------------- Mon Oct 4 20:05:50 UTC 2021 - Aaron Puchert diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 7071fae..1a2b362 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -135,7 +135,7 @@ Patch58: u_dep_xcb.patch Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch Patch101: U_gallivm-add-new-wrapper-around-Module.patch Patch102: U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch -Patch200: try-to-fix-build-on-ppc64le.patch +Patch200: u_fix-build-on-ppc64le.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -771,9 +771,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch100 -p1 %patch101 -p1 %patch102 -p1 -%ifarch ppc64le %patch200 -p1 -%endif # Remove requires to vulkan libs from baselibs.conf on platforms # where vulkan build is disabled; ugly ... diff --git a/Mesa.changes b/Mesa.changes index 32299a5..744c6b7 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Thu Oct 14 10:30:57 UTC 2021 - Stefan Dirsch -- try-to-fix-build-on-ppc64le.patch - * trying to fix build on ppc64le (boo#1191569) +- u_fix-build-on-ppc64le.patch + * fixes build on ppc64le (boo#1191569) ------------------------------------------------------------------- Mon Oct 4 20:05:50 UTC 2021 - Aaron Puchert diff --git a/Mesa.spec b/Mesa.spec index c30e39e..8d10672 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -134,7 +134,7 @@ Patch58: u_dep_xcb.patch Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch Patch101: U_gallivm-add-new-wrapper-around-Module.patch Patch102: U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch -Patch200: try-to-fix-build-on-ppc64le.patch +Patch200: u_fix-build-on-ppc64le.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -770,9 +770,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch100 -p1 %patch101 -p1 %patch102 -p1 -%ifarch ppc64le %patch200 -p1 -%endif # Remove requires to vulkan libs from baselibs.conf on platforms # where vulkan build is disabled; ugly ... diff --git a/try-to-fix-build-on-ppc64le.patch b/u_fix-build-on-ppc64le.patch similarity index 61% rename from try-to-fix-build-on-ppc64le.patch rename to u_fix-build-on-ppc64le.patch index 2e0a4b6..82aed40 100644 --- a/try-to-fix-build-on-ppc64le.patch +++ b/u_fix-build-on-ppc64le.patch @@ -1,16 +1,3 @@ -diff -u -r mesa-21.2.3.orig/include/CL/cl_platform.h mesa-21.2.3/include/CL/cl_platform.h ---- mesa-21.2.3.orig/include/CL/cl_platform.h 2021-10-14 12:26:03.866376943 +0200 -+++ mesa-21.2.3/include/CL/cl_platform.h 2021-10-14 20:37:44.557384820 +0200 -@@ -356,7 +356,9 @@ - /* Define basic vector types */ - #if defined( __VEC__ ) - #if !defined(__clang__) -+ #ifndef __cplusplus - #include /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ -+ #endif - #endif - typedef __vector unsigned char __cl_uchar16; - typedef __vector signed char __cl_char16; diff -u -r mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_rast_tri.c mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_rast_tri.c --- mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_rast_tri.c 2021-10-14 12:26:04.058380655 +0200 +++ mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_rast_tri.c 2021-10-14 20:38:55.478734888 +0200