Github messages for voidlinux
 help / color / mirror / Atom feed
From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] mesa: fix softpipe/non llvmpipe build
Date: Fri, 10 Jan 2025 22:38:28 +0100	[thread overview]
Message-ID: <20250110213828.DAB0720283@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-53922@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1332 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages mesa
https://github.com/void-linux/void-packages/pull/53922

mesa: fix softpipe/non llvmpipe build
lavapipe/swrast vk hard depends on llvmpipe and does not work with
softpipe

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/53922.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-53922.patch --]
[-- Type: text/x-diff, Size: 1927 bytes --]

From f79cc4ee96137fd9c8f573e567856814c14ffe5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 10 Jan 2025 22:17:19 +0100
Subject: [PATCH] mesa: fix softpipe/non llvmpipe build

lavapipe/swrast vk hard depends on llvmpipe and does not work with
softpipe
---
 srcpkgs/mesa/template | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 85f030b489fc8c..a8538d69cc3dc3 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -35,8 +35,9 @@ build_options_default="wayland"
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*|aarch64*|ppc64le*|arm*) ;;
-	*) configure_args+=" -Ddraw-use-llvm=false" ;;
+	i686*|x86_64*|aarch64*|ppc64le*|arm*|riscv64*)
+		_have_llvmpipe=yes
+		;;
 esac
 
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
@@ -51,8 +52,7 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
 
 # swrast always present
 _gallium_drivers=" -Dgallium-drivers=swrast"
-_vulkan_drivers=" -Dvulkan-drivers=swrast"
-subpackages+=" mesa-vulkan-lavapipe"
+_vulkan_drivers=" -Dvulkan-drivers="
 
 # amd and nvidia drivers on all platforms except where it makes no sense
 # amd implicitly enables clover opencl, also enable hwdec and virgl too
@@ -79,6 +79,13 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+if [ "$_have_llvmpipe" ]; then
+	subpackages+=" mesa-vulkan-lavapipe"
+	_vulkan_drivers+=",swrast"
+else
+	configure_args+=" -Ddraw-use-llvm=false"
+fi
+
 if [ "$_have_amd" ]; then
 	# amd cards can use clover
 	_have_opencl=yes
@@ -217,6 +224,7 @@ post_install() {
 		ppc64) oarchs="ppc";;
 		ppcle) oarchs="ppc64le";;
 		ppc) oarchs="ppc64";;
+		riscv64) oarchs="riscv64";;
 		*) ;; # no counterparts
 	esac
 	for oarch in $oarchs; do

  parent reply	other threads:[~2025-01-10 21:38 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-10 21:28 [PR PATCH] " Johnnynator
2025-01-10 21:28 ` [PR PATCH] [Updated] " Johnnynator
2025-01-10 21:29 ` Johnnynator
2025-01-10 21:31 ` Johnnynator
2025-01-10 21:38 ` Johnnynator [this message]
2025-01-11 12:37 ` [PR PATCH] [Merged]: " Johnnynator

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250110213828.DAB0720283@inbox.vuxu.org \
    --to=johnnynator@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).