From 766e8a36f254e19f0d41188a5980edc1f3f0cbed Mon Sep 17 00:00:00 2001 From: Luis Date: Thu, 21 Sep 2023 08:29:22 +0000 Subject: [PATCH 1/2] mesa: update fix build with LLVM 17 --- main/mesa/.checksums | 1 - main/mesa/fix-build-llvm17.patch | 30 ------------------------------ main/mesa/spkgbuild | 12 +++++++----- 3 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 main/mesa/fix-build-llvm17.patch diff --git a/main/mesa/.checksums b/main/mesa/.checksums index b99ee8bbc..d2ad78e31 100644 --- a/main/mesa/.checksums +++ b/main/mesa/.checksums @@ -1,2 +1 @@ -e3318926ad93230d2bef48ac0ab0d8f1 fix-build-llvm17.patch 6c89b2d1335993d708e1810eacfba9e4 mesa-23.1.8.tar.xz diff --git a/main/mesa/fix-build-llvm17.patch b/main/mesa/fix-build-llvm17.patch deleted file mode 100644 index b9d831d8c..000000000 --- a/main/mesa/fix-build-llvm17.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c -index 24d0823..97fcfc1 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_init.c -+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c -@@ -42,19 +42,23 @@ - - #include - #include -+#if LLVM_VERSION_MAJOR < 17 - #include --#if LLVM_VERSION_MAJOR >= 7 -+#endif -+#if LLVM_VERSION_MAJOR >= 7 && LLVM_VERSION_MAJOR < 17 - #include - #endif - #include - #if GALLIVM_USE_NEW_PASS == 1 - #include - #elif GALLIVM_HAVE_CORO == 1 --#if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) -+#if LLVM_VERSION_MAJOR <= 8 && LLVM_VERSION_MAJOR < 17 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) - #include - #endif -+#if LLVM_VERSION_MAJOR < 17 - #include - #endif -+#endif - - unsigned gallivm_perf = 0; - diff --git a/main/mesa/spkgbuild b/main/mesa/spkgbuild index a7a1e3ead..2fcd64e37 100644 --- a/main/mesa/spkgbuild +++ b/main/mesa/spkgbuild @@ -5,19 +5,21 @@ name=mesa version=23.1.8 release=1 -source="https://mesa.freedesktop.org/archive/$name-$version.tar.xz - fix-build-llvm17.patch" +source="https://mesa.freedesktop.org/archive/$name-$version.tar.xz" build() { - # Fix build with LLVM 17 - patch -d $name-$version -Np1 -i $SRC/fix-build-llvm17.patch + cd $name-$version + + # Remove two unneeded references to LLVM headers to avoid a build failure with LLVM 17 or later: + sed '/Scalar.h/d;/Utils.h/d' \ + -i src/gallium/auxiliary/gallivm/lp_bld_init.c scratch isinstalled vulkan-icd-loader && OPT_MESA_GALLIUM='zink,' scratch isinstalled libvdpau && OPT_MESA_VDPAU='-D gallium-vdpau=enabled' || OPT_MESA_VDPAU='-D gallium-vdpau=disabled' scratch isinstalled libva && OPT_MESA_VAAPI='-D gallium-va=enabled' || OPT_MESA_VAAPI='-D gallium-va=disabled' scratch isinstalled wayland-protocols && OPT_MESA_PLATFORMS='wayland,x11' || OPT_MESA_PLATFORMS='x11' - venom-meson $name-$version build \ + venom-meson build \ -D dri3=enabled \ -D egl=enabled \ -D llvm=enabled \ From 4a10553cb0fbdf984558ec0f9c41e782dc2185a2 Mon Sep 17 00:00:00 2001 From: Luis Date: Thu, 21 Sep 2023 09:05:28 +0000 Subject: [PATCH 2/2] mesa-32: update fix build with LLVM 17 --- multilib/mesa-32/.checksums | 1 - multilib/mesa-32/fix-build-llvm17.patch | 30 ------------------------- multilib/mesa-32/spkgbuild | 12 +++++----- 3 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 multilib/mesa-32/fix-build-llvm17.patch diff --git a/multilib/mesa-32/.checksums b/multilib/mesa-32/.checksums index 838b0fcee..8adf82853 100644 --- a/multilib/mesa-32/.checksums +++ b/multilib/mesa-32/.checksums @@ -1,3 +1,2 @@ 0d813aebb105e917340897eecd6010f7 crossfile -e3318926ad93230d2bef48ac0ab0d8f1 fix-build-llvm17.patch 6c89b2d1335993d708e1810eacfba9e4 mesa-23.1.8.tar.xz diff --git a/multilib/mesa-32/fix-build-llvm17.patch b/multilib/mesa-32/fix-build-llvm17.patch deleted file mode 100644 index b9d831d8c..000000000 --- a/multilib/mesa-32/fix-build-llvm17.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c -index 24d0823..97fcfc1 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_init.c -+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c -@@ -42,19 +42,23 @@ - - #include - #include -+#if LLVM_VERSION_MAJOR < 17 - #include --#if LLVM_VERSION_MAJOR >= 7 -+#endif -+#if LLVM_VERSION_MAJOR >= 7 && LLVM_VERSION_MAJOR < 17 - #include - #endif - #include - #if GALLIVM_USE_NEW_PASS == 1 - #include - #elif GALLIVM_HAVE_CORO == 1 --#if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) -+#if LLVM_VERSION_MAJOR <= 8 && LLVM_VERSION_MAJOR < 17 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) - #include - #endif -+#if LLVM_VERSION_MAJOR < 17 - #include - #endif -+#endif - - unsigned gallivm_perf = 0; - diff --git a/multilib/mesa-32/spkgbuild b/multilib/mesa-32/spkgbuild index 4795f39fd..451e21cc5 100644 --- a/multilib/mesa-32/spkgbuild +++ b/multilib/mesa-32/spkgbuild @@ -6,12 +6,14 @@ name=mesa-32 version=23.1.8 release=1 source="https://mesa.freedesktop.org/archive/${name%-*}-$version.tar.xz - crossfile - fix-build-llvm17.patch" + crossfile" build() { - # Fix build with LLVM 17 - patch -d ${name%-*}-$version -Np1 -i $SRC/fix-build-llvm17.patch + cd ${name%-*}-$version + +# Remove two unneeded references to LLVM headers to avoid a build failure with LLVM 17 or later: + sed '/Scalar.h/d;/Utils.h/d' \ + -i src/gallium/auxiliary/gallivm/lp_bld_init.c export CC="gcc -m32" export CXX="g++ -m32" @@ -21,7 +23,7 @@ build() { scratch isinstalled vulkan-icd-loader-32 && OPT_MESA_GALLIUM='zink,' scratch isinstalled wayland-protocols && OPT_MESA_PLATFORMS='wayland,x11' || OPT_MESA_PLATFORMS='x11' - venom-meson ${name%-*}-$version build \ + venom-meson build \ --sysconfdir=/etc \ --libdir=/usr/lib32 \ --native-file $SRC/crossfile \