mesa: Bump to 22.3.1

* Separate osmesa as a subpackage

packages/mesa/build.sh

@@ -3,13 +3,12 @@ TERMUX_PKG_DESCRIPTION="An open-source implementation of the OpenGL specificatio
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_LICENSE_FILE="docs/license.rst"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=22.3.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=22.3.1
 TERMUX_PKG_SRCURL=https://archive.mesa3d.org/mesa-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=644bf936584548c2b88762111ad58b4aa3e4688874200e5a4eb74e53ce301746
+TERMUX_PKG_SHA256=3c9cd611c0859d307aba0659833386abdca4c86162d3c275ba5be62d16cf31eb
 TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libdrm, libexpat, libx11, libxext, libxfixes, libxshmfence, libxxf86vm, ncurses, zlib, zstd"
 TERMUX_PKG_SUGGESTS="mesa-dev"
-TERMUX_PKG_BUILD_DEPENDS="libdrm, libllvm-static, libxrandr, llvm, llvm-tools, mlir, xorgproto"
+TERMUX_PKG_BUILD_DEPENDS="libllvm-static, libxrandr, llvm, llvm-tools, mlir, xorgproto"
 TERMUX_PKG_CONFLICTS="libmesa, ndk-sysroot (<= 25b)"
 TERMUX_PKG_REPLACES="libmesa"
 

packages/mesa/mesa-22.2.0-llvm-15.patch

@@ -2,11 +2,11 @@ https://gitlab.freedesktop.org/mesa/mesa/-/issues/6505
 
 --- a/meson.build
 +++ b/meson.build
-@@ -1733,6 +1733,7 @@
+@@ -1749,6 +1749,7 @@ draw_with_llvm = get_option('draw-use-ll
  if draw_with_llvm
    llvm_modules += 'native'
  endif
 +llvm_modules += 'passes'
  
- if with_amd_vk or with_gallium_radeonsi
-   _llvm_version = '>= 11.0.0'
+ if with_intel_clc
+   _llvm_version = '>= 13.0.0'

packages/mesa/osmesa.subpackage.sh

@@ -0,0 +1,8 @@
+TERMUX_SUBPKG_INCLUDE="
+include/GL/osmesa.h
+lib/libOSMesa.so
+lib/pkgconfig/osmesa.pc
+"
+TERMUX_SUBPKG_DESCRIPTION="Mesa Off-screen Rendering Library"
+TERMUX_SUBPKG_BREAKS="mesa (<< 22.3.1)"
+TERMUX_SUBPKG_REPLACES="mesa (<< 22.3.1)"