From d376f64e62a076985d5919ffc152496c4d7fce811978cb37dfa0b2e8e43000ca Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 14 Oct 2021 10:33:03 +0000 Subject: [PATCH] - try-to-fix-build-on-ppc64le.patch * trying to fix build on ppc64le (boo#1191569) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1062 --- Mesa-drivers.changes | 6 ++++++ Mesa-drivers.spec | 4 ++++ Mesa.changes | 6 ++++++ Mesa.spec | 4 ++++ try-to-fix-build-on-ppc64le.patch | 22 ++++++++++++++++++++++ 5 files changed, 42 insertions(+) create mode 100644 try-to-fix-build-on-ppc64le.patch diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 03fd140..32299a5 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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) + ------------------------------------------------------------------- Mon Oct 4 20:05:50 UTC 2021 - Aaron Puchert diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index f34618e..7071fae 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -135,6 +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 BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -770,6 +771,9 @@ 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 03fd140..32299a5 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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) + ------------------------------------------------------------------- Mon Oct 4 20:05:50 UTC 2021 - Aaron Puchert diff --git a/Mesa.spec b/Mesa.spec index 8f4c387..c30e39e 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -134,6 +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 BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -769,6 +770,9 @@ 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/try-to-fix-build-on-ppc64le.patch new file mode 100644 index 0000000..f50bee5 --- /dev/null +++ b/try-to-fix-build-on-ppc64le.patch @@ -0,0 +1,22 @@ +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 12:27:31.348068610 +0200 +@@ -465,7 +465,6 @@ + + #if defined(_ARCH_PWR8) && UTIL_ARCH_LITTLE_ENDIAN + +-#include + #include "util/u_pwr8.h" + + static inline void +diff -u -r mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_setup_tri.c mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_setup_tri.c +--- mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_setup_tri.c 2021-10-14 12:26:04.058380655 +0200 ++++ mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_setup_tri.c 2021-10-14 12:27:14.355740030 +0200 +@@ -47,7 +47,6 @@ + #if defined(PIPE_ARCH_SSE) + #include + #elif defined(_ARCH_PWR8) && UTIL_ARCH_LITTLE_ENDIAN +-#include + #include "util/u_pwr8.h" + #endif +