Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / mesa


Commits:
50a69790 by Timo Aaltonen at 2024-08-02T09:57:51+03:00
changelog update

- - - - -
4b961700 by Timo Aaltonen at 2024-08-02T10:16:16+03:00
rules: Fix FTBFS by only cleaning some nvk test binaries if they actually get 
built.

- - - - -
4a538097 by Timo Aaltonen at 2024-08-02T11:11:24+03:00
rules: Add a new NVK_ARCHS which is a subset of RUSTICL_ARCHS, strip powerpc, 
ppc64el and s390x from it.

- - - - -
4e4a7308 by Timo Aaltonen at 2024-08-02T11:24:49+03:00
control: Add lua5.4 to build-depends for arm* in order to work around FTBFS 
caused by setting MESON_PACKAGE_CACHE_DIR for nvk. (Closes: #1077729)

- - - - -
14abd529 by Timo Aaltonen at 2024-08-02T11:27:45+03:00
release to sid

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/control.in
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+mesa (24.1.5-2) unstable; urgency=medium
+
+  [ Adrian Bunk ]
+  * control, rules: mips64el has latest LLVM already for some time
+
+  [ Timo Aaltonen ]
+  * rules: Fix FTBFS by only cleaning some nvk test binaries if they
+    actually get built.
+  * rules: Add a new NVK_ARCHS which is a subset of RUSTICL_ARCHS, strip
+    powerpc, ppc64el and s390x from it.
+  * control: Add lua5.4 to build-depends for arm* in order to work
+    around FTBFS caused by setting MESON_PACKAGE_CACHE_DIR for nvk.
+    (Closes: #1077729)
+
+ -- Timo Aaltonen <tjaal...@debian.org>  Fri, 02 Aug 2024 11:25:02 +0300
+
 mesa (24.1.5-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
@@ -38,6 +38,7 @@ Build-Depends:
  libxshmfence-dev (>= 1.1),
  libxtensor-dev [linux-arm64],
  libzstd-dev,
+ lua5.4 [arm64 armel armhf],
  python3,
  python3-mako,
  python3-ply,


=====================================
debian/control.in
=====================================
@@ -38,6 +38,7 @@ Build-Depends:
  libxshmfence-dev (>= 1.1),
  libxtensor-dev [linux-arm64],
  libzstd-dev,
+ lua5.4 [arm64 armel armhf],
  python3,
  python3-mako,
  python3-ply,


=====================================
debian/rules
=====================================
@@ -46,6 +46,7 @@ confflags_TEFLON = -Dteflon=false
 
 LLVM_ARCHS     = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 
ppc64el riscv64 s390x sparc64 x32
 RUSTICL_ARCHS  = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 
ppc64el riscv64 s390x x32
+NVK_ARCHS      = amd64 arm64 armel armhf i386 loong64 mips64el ppc64 riscv64 
x32
 VALGRIND_ARCHS = amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x
 WINE_ARCHS     = amd64 arm64 armel armhf i386
 
@@ -125,9 +126,12 @@ else
        confflags_GALLIUM += -Dllvm=enabled
        confflags_GALLIUM += -Dgallium-opencl=icd
 
-       # Build rusticl and nvk for archs where rustc is available
+       # Build rusticl for archs where rustc is available
        ifneq (,$(filter $(DEB_HOST_ARCH), $(RUSTICL_ARCHS)))
                confflags_GALLIUM += -Dgallium-rusticl=true
+       endif
+
+       ifneq (,$(filter $(DEB_HOST_ARCH), $(NVK_ARCHS)))
                VULKAN_DRIVERS += nouveau
        endif
 
@@ -253,8 +257,10 @@ override_dh_install:
        rm debian/tmp/usr/lib/*/libglapi.so
        rm debian/tmp/usr/lib/*/libEGL_mesa.so
        rm debian/tmp/usr/lib/*/libGLX_mesa.so
+  ifneq (,$(filter $(DEB_HOST_ARCH), $(NVK_ARCHS)))
        rm debian/tmp/usr/bin/mme_fermi_sim_hw_test
        rm debian/tmp/usr/bin/mme_tu104_sim_hw_test
+  endif
        # use -f here though
        rm -f debian/tmp/usr/lib/*/libgrl.a
 



View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/mesa/-/compare/ab194bbf79ae89c217223743b26ba85f42516a90...14abd5293142a015b1a181934470a31f0b7102e9

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/mesa/-/compare/ab194bbf79ae89c217223743b26ba85f42516a90...14abd5293142a015b1a181934470a31f0b7102e9
You're receiving this email because of your account on salsa.debian.org.


Reply via email to