From 9587f57c6958897b55dc6b3f4d90345339629132 Mon Sep 17 00:00:00 2001 From: SpidFightFR Date: Fri, 16 Aug 2024 21:44:16 +0200 Subject: [PATCH] mesa: update to 24.2.2 --- .../mesa/patches/megadriver-symlinks.patch | 25 ------------------- srcpkgs/mesa/template | 7 +++--- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.patch diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch deleted file mode 100644 index c19c42719422cd..00000000000000 --- a/srcpkgs/mesa/patches/megadriver-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -This converts megadriver installation to use symlinks so that we do -not have to deal with skipping the strip stage for some files, as -a result simplifying our template greatly. - ---- a/bin/install_megadrivers.py -+++ b/bin/install_megadrivers.py -@@ -56,7 +56,7 @@ def main(): - if os.path.lexists(abs_driver): - os.unlink(abs_driver) - print('installing {} to {}'.format(args.megadriver, abs_driver)) -- os.link(master, abs_driver) -+ os.symlink(os.path.basename(master), abs_driver) - - try: - ret = os.getcwd() -@@ -71,8 +71,7 @@ def main(): - finally: - os.chdir(ret) - -- # Remove meson-created master .so and symlinks -- os.unlink(master) -+ # Remove meson-created symlinks - name, ext = os.path.splitext(master) - while ext != '.so': - if os.path.lexists(name): diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 9a3eb404d0ce31..423bd91e1c3531 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,6 +1,6 @@ # Template file for 'mesa' pkgname=mesa -version=24.1.5 +version=24.2.2 revision=1 build_style=meson _llvmver=18 @@ -10,7 +10,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland) -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17" hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver} - $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser" + $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml" makedepends="elfutils-devel expat-devel libXdamage-devel libXxf86vm-devel libdrm-devel libffi-devel libva-devel libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel @@ -24,7 +24,7 @@ license="MIT, LGPL-2.1-or-later" homepage="https://www.mesa3d.org/" changelog="https://docs.mesa3d.org/relnotes.html" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" -checksum=02761ffd965dd64b95421ebfca1191d73724aba00f30034009237564f34cf976 +checksum=fd077d3104edbe459e2b8597d2757ec065f9bd2d620b8c0b9cc88c2bf9891d02 build_options="wayland" build_options_default="wayland" @@ -111,7 +111,6 @@ fi if [ "$_have_arm" ]; then _have_vulkan=yes - _gallium_drivers+=",kmsro" _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost" _vulkan_drivers+=",broadcom,freedreno" subpackages+=" mesa-vulkan-broadcom mesa-vulkan-freedreno"