[PR PATCH] mesa: fix softpipe/non llvmpipe build

[PR PATCH] mesa: fix softpipe/non llvmpipe build

[Johnnynator]

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

There is a new 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: 1702 bytes --]

From 82842a7ee21bb0184528af935abc3d2978ff0c82 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 | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 85f030b489fc8c..b8a2f024649eb1 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*|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,12 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+if [ "$_have_llvmpipe" ]; then
+	subpackages+=" mesa-vulkan-lavapipe"
+	configure_args+=" -Ddraw-use-llvm=false"
+	_vulkan_drivers+=",swrast"
+fi
+
 if [ "$_have_amd" ]; then
 	# amd cards can use clover
 	_have_opencl=yes

Re: [PR PATCH] [Updated] mesa: fix softpipe/non llvmpipe build

[Johnnynator]

[-- 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: 1711 bytes --]

From 339d7d4af51d5b2fa7ab054dd8934a80bba17561 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 | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 85f030b489fc8c..694031d7488347 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*|ppc64le*|aarch64*|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,12 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+if [ "$_have_llvmpipe" ]; then
+	subpackages+=" mesa-vulkan-lavapipe"
+	configure_args+=" -Ddraw-use-llvm=false"
+	_vulkan_drivers+=",swrast"
+fi
+
 if [ "$_have_amd" ]; then
 	# amd cards can use clover
 	_have_opencl=yes

Re: [PR PATCH] [Updated] mesa: fix softpipe/non llvmpipe build

[Johnnynator]

[-- 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: 1711 bytes --]

From 9688e3e4c913a321dd7dc20991adc62fe85d5adb 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 | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 85f030b489fc8c..463d6e43c1cac2 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,12 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+if [ "$_have_llvmpipe" ]; then
+	subpackages+=" mesa-vulkan-lavapipe"
+	configure_args+=" -Ddraw-use-llvm=false"
+	_vulkan_drivers+=",swrast"
+fi
+
 if [ "$_have_amd" ]; then
 	# amd cards can use clover
 	_have_opencl=yes

Re: [PR PATCH] [Updated] mesa: fix softpipe/non llvmpipe build

[Johnnynator]

[-- 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: 1718 bytes --]

From 123569dbc2a5dedfd07b4b751207d2ec74ad98fb 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 | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 85f030b489fc8c..6d5e99a911acb3 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

Re: [PR PATCH] [Updated] mesa: fix softpipe/non llvmpipe build

[Johnnynator]

[-- 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

Re: [PR PATCH] [Merged]: mesa: fix softpipe/non llvmpipe build

[Johnnynator]

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

There's a merged pull request on the void-packages repository

mesa: fix softpipe/non llvmpipe build
https://github.com/void-linux/void-packages/pull/53922

Description:
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
-->