mesa (24.2.2-1bbbio0)

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

debian-12-mesa/suite/bookworm/debian/changelog

-mesa (24.1.6-1bbbio0~bookworm+20240819) bookworm; urgency=low
+mesa (24.2.2-1bbbio0~bookworm+20240906) bookworm; urgency=low
 
-  * Rebuild mesa_24.1.6-1 for repos.rcn-ee.com
+  * Rebuild mesa_24.2.2-1 for repos.rcn-ee.com
 
- -- Robert Nelson <robertcnelson@gmail.com>  Mon, 19 Aug 2024 10:58:03 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Fri, 06 Sep 2024 15:14:43 -0500
+
+mesa (24.2.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * patches: dril fixes dropped, upstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 06 Sep 2024 07:13:53 +0300
+
+mesa (24.2.1-4) unstable; urgency=medium
+
+  * patches: Add patches to fix autopkgtest regressions in dril.
+  * rules: Enable softpipe everywhere again. (Closes: #1080475)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 05 Sep 2024 11:49:34 +0300
+
+mesa (24.2.1-3) unstable; urgency=medium
+
+  * rules: Set MESON_PACKAGE_CACHE_DIR only for archs where nvk is
+    built, fixes armel build.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 29 Aug 2024 10:54:30 +0300
+
+mesa (24.2.1-2) unstable; urgency=medium
+
+  [ WANG Xuerui ]
+  * rules: disable TLSDESC for loong64 for now
+
+  [ Fabio Pedretti ]
+  * removed unused lua5.4 dependency
+
+  [ Timo Aaltonen ]
+  * Add upstream metadata, drop old git url from d/watch.
+  * New upstream release.
+  * control: Bump librust-syn-dev build-dep.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 29 Aug 2024 09:42:42 +0300
+
+mesa (24.2.0-2) experimental; urgency=medium
+
+  * control, rules: Drop armel, mips64el, loong64 from NVK_ARCHS (FTBFS).
+  * rules: ORCJIT is enabled by default now, so don't force draw-use-
+    llvm=false on riscv64.
+  * rules: Fix m68k build, and rework setting buildflags. (Closes:
+    #1067207)
+  * rules: Really drop ppc64el from optimization workaround, drop sh3 as
+    it's an obsolete arch, and for sh4 limit it to just setting a single
+    flag.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 15 Aug 2024 09:14:51 +0300
+
+mesa (24.2.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * rules: Build llvmpipe only where llvm is enabled.
+  * rules: Build softpipe or llvmpipe depending on the arch, not both.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 14 Aug 2024 22:13:47 +0300
+
+mesa (24.2.0~rc4-1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * control: Add python3-yaml to build-depends.
+  * control: Move libclc-NN dependency to LLVM_ARCHS.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 07 Aug 2024 16:34:17 +0300
+
+mesa (24.2.0~rc3-2) experimental; urgency=medium
+
+  * Add ldconfig trigger for mesa-drm-shim.
+  * control: Bump libdrm-dev build-dep.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 05 Aug 2024 09:38:13 +0300
+
+mesa (24.2.0~rc3-1) experimental; urgency=medium
+
+  [ Timo Aaltonen ]
+  * New upstream release candidate.
+  * control: Migrate to pkgconf.
+  * Add some lintian-overrides.
+  * control: Fix drm-shim description.
+  * control, rules: Bump llvm to 18. (Closes: #1072901)
+
+  [ Simon McVittie ]
+  * d/rules: Replace deprecated swrast with softpipe and llvmpipe
+  * d/rules: Replace deprecated glvnd=true with glvnd=enabled
+  * libglx-mesa0.symbols: Update for new symbols
+  * Add a new private shared library package for libgallium.so
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 02 Aug 2024 11:53:58 +0300
 
 mesa (24.1.6-1) unstable; urgency=medium
 

debian-12-mesa/suite/bookworm/debian/control

@@ -11,7 +11,7 @@ Build-Depends:
  glslang-tools [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
  meson (>= 1.2.3),
  quilt (>= 0.63-8.2~),
- pkg-config,
+ pkgconf,
  libdrm-dev (>= 2.4.119),
  libx11-dev,
  libxxf86vm-dev,
@@ -38,10 +38,10 @@ Build-Depends:
  libxshmfence-dev (>= 1.1),
  libxtensor-dev [linux-arm64],
  libzstd-dev,
- lua5.4 [arm64 armel armhf],
  python3,
  python3-mako,
  python3-ply,
+ python3-yaml,
  python3-pycparser [arm64 armhf],
  python3-setuptools,
  flex,
@@ -53,16 +53,19 @@ Build-Depends:
  libclang-17-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
  libclang-cpp17-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
  libclc-17-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
+ libclc-17 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
  wayland-protocols (>= 1.34),
  zlib1g-dev,
  libglvnd-core-dev (>= 1.3.2),
  valgrind [amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x],
  rustc [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
+ rustfmt [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
  bindgen (>= 0.60.1~) [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
  cbindgen [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
  llvm-spirv-17 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
- libclc-17 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
  libllvmspirvlib-17-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
+ librust-paste-dev [amd64 arm64 armhf i386 ppc64 riscv64 x32],
+ librust-syn-dev [amd64 arm64 armhf i386 ppc64 riscv64 x32],
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
 Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa
@@ -134,6 +137,7 @@ Architecture: linux-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+ mesa-libgallium (= ${binary:Version}),
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: generic buffer management API -- runtime
@@ -165,6 +169,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  libgbm1 (= ${binary:Version}) [!hurd-any],
+ mesa-libgallium (= ${binary:Version}),
 Provides: libegl-vendor
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
@@ -223,6 +228,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  libgl1-mesa-dri,
+ mesa-libgallium (= ${binary:Version}),
 Provides: libglx-vendor
 Breaks:
  libopengl-perl (<< 0.6704+dfsg-2),
@@ -292,6 +298,19 @@ Description: Developer documentation for Mesa
  extensions, the complete set of release notes and the development header
  files common to all Mesa packages.
 
+Package: mesa-libgallium
+Section: libs
+Architecture: linux-any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: shared infrastructure for Mesa drivers
+ This package contains libgallium, a private library shared between
+ multiple Mesa drivers. This library is an implementation detail of Mesa
+ and should not be used directly by user code.
+
 Package: libosmesa6
 Section: libs
 Architecture: any
@@ -421,7 +440,7 @@ Depends:
  ${misc:Depends},
 Multi-Arch: same
 Description: DRM shim libraries
- This package provides drm-shim libraries which can be used for testing DRM drivers when
- none exists on the host
+ This package provides drm-shim libraries which can be used for testing DRM
+ drivers when none exists on the host.
 
 # vim: tw=0

debian-12-mesa/suite/bookworm/debian/control.in

@@ -11,7 +11,7 @@ Build-Depends:
  glslang-tools [@LLVM_ARCHS@],
  meson (>= 1.2.3),
  quilt (>= 0.63-8.2~),
- pkg-config,
+ pkgconf,
  libdrm-dev (>= 2.4.119),
  libx11-dev,
  libxxf86vm-dev,
@@ -38,10 +38,10 @@ Build-Depends:
  libxshmfence-dev (>= 1.1),
  libxtensor-dev [linux-arm64],
  libzstd-dev,
- lua5.4 [arm64 armel armhf],
  python3,
  python3-mako,
  python3-ply,
+ python3-yaml,
  python3-pycparser [arm64 armhf],
  python3-setuptools,
  flex,
@@ -53,16 +53,19 @@ Build-Depends:
  libclang-@LLVM_VERSION@-dev [@LLVM_ARCHS@],
  libclang-cpp@LLVM_VERSION@-dev [@LLVM_ARCHS@],
  libclc-@LLVM_VERSION@-dev [@LLVM_ARCHS@],
+ libclc-@LLVM_VERSION@ [@LLVM_ARCHS@],
  wayland-protocols (>= 1.34),
  zlib1g-dev,
  libglvnd-core-dev (>= 1.3.2),
  valgrind [@VALGRIND_ARCHS@],
  rustc [@RUSTICL_ARCHS@],
+ rustfmt [@RUSTICL_ARCHS@],
  bindgen (>= 0.60.1~) [@RUSTICL_ARCHS@],
  cbindgen [@RUSTICL_ARCHS@],
  llvm-spirv-@LLVM_VERSION@ [@RUSTICL_ARCHS@],
- libclc-@LLVM_VERSION@ [@RUSTICL_ARCHS@],
  libllvmspirvlib-@LLVM_VERSION@-dev [@LLVM_ARCHS@],
+ librust-paste-dev [@NVK_ARCHS@],
+ librust-syn-dev [@NVK_ARCHS@],
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
 Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa
@@ -134,6 +137,7 @@ Architecture: linux-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+ mesa-libgallium (= ${binary:Version}),
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: generic buffer management API -- runtime
@@ -165,6 +169,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  libgbm1 (= ${binary:Version}) [!hurd-any],
+ mesa-libgallium (= ${binary:Version}),
 Provides: libegl-vendor
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
@@ -223,6 +228,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  libgl1-mesa-dri,
+ mesa-libgallium (= ${binary:Version}),
 Provides: libglx-vendor
 Breaks:
  libopengl-perl (<< 0.6704+dfsg-2),
@@ -292,6 +298,19 @@ Description: Developer documentation for Mesa
  extensions, the complete set of release notes and the development header
  files common to all Mesa packages.
 
+Package: mesa-libgallium
+Section: libs
+Architecture: linux-any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: shared infrastructure for Mesa drivers
+ This package contains libgallium, a private library shared between
+ multiple Mesa drivers. This library is an implementation detail of Mesa
+ and should not be used directly by user code.
+
 Package: libosmesa6
 Section: libs
 Architecture: any
@@ -421,7 +440,7 @@ Depends:
  ${misc:Depends},
 Multi-Arch: same
 Description: DRM shim libraries
- This package provides drm-shim libraries which can be used for testing DRM drivers when
- none exists on the host
+ This package provides drm-shim libraries which can be used for testing DRM
+ drivers when none exists on the host.
 
 # vim: tw=0

debian-12-mesa/suite/bookworm/debian/libgbm1.lintian-overrides

-symbols-declares-dependency-on-other-package libgbm1-private
+symbols-declares-dependency-on-other-package libgbm1-private (libgbm.so.1) [symbols]

debian-12-mesa/suite/bookworm/debian/libglx-mesa0.symbols

@@ -1001,6 +1001,8 @@ libGLX_mesa.so.0 libglx-mesa0
  glTexImage3D@Base 0
  glTexImage3DEXT@Base 0
  glTexImage3DMultisample@Base 0
+ glTexStorageAttribs2DEXT@Base 24.2.0~rc1
+ glTexStorageAttribs3DEXT@Base 24.2.0~rc1
  glTexParameterIiv@Base 0
  glTexParameterIivEXT@Base 0
  glTexParameterIuiv@Base 0

debian-12-mesa/suite/bookworm/debian/mesa-drm-shim.lintian-overrides

+package-name-doesnt-match-sonames libamdgpu-noop-drm-shim libnouveau-noop-drm-shim libradeon-noop-drm-shim
+shared-library-lacks-version usr/lib/x86_64-linux-gnu/libamdgpu_noop_drm_shim.so libamdgpu_noop_drm_shim.so
+shared-library-lacks-version usr/lib/x86_64-linux-gnu/libnouveau_noop_drm_shim.so libnouveau_noop_drm_shim.so
+shared-library-lacks-version usr/lib/x86_64-linux-gnu/libradeon_noop_drm_shim.so libradeon_noop_drm_shim.so

debian-12-mesa/suite/bookworm/debian/mesa-drm-shim.triggers

+activate-noawait ldconfig

debian-12-mesa/suite/bookworm/debian/mesa-libgallium.install

+usr/lib/*/libgallium-*.so

debian-12-mesa/suite/bookworm/debian/mesa-libgallium.lintian-overrides

+package-name-doesnt-match-sonames libgallium-*

debian-12-mesa/suite/bookworm/debian/mesa-opencl-icd.lintian-overrides

-package-name-doesnt-match-sonames libMesaOpenCL1
-package-name-doesnt-match-sonames libRusticlOpenCL
+link-to-shared-library-in-wrong-package usr/lib/*/libMesaOpenCL.so.1.0.0 [usr/lib/*/libMesaOpenCL.so]
+link-to-shared-library-in-wrong-package usr/lib/*/libRusticlOpenCL.so.1.0.0 [usr/lib/*/libRusticlOpenCL.so]
+package-name-doesnt-match-sonames libMesaOpenCL1 libRusticlOpenCL1
+shared-library-lacks-prerequisites [usr/lib/x86_64-linux-gnu/gallium-pipe/pipe_i915.so]

debian-12-mesa/suite/bookworm/debian/mesa-vulkan-drivers.lintian-overrides

-package-name-doesnt-match-sonames libvulkan-intel libvulkan-radeon
+no-manual-page [usr/bin/mesa-overlay-control.py]
+package-name-doesnt-match-sonames libVkLayer-INTEL-nullhw libVkLayer-MESA-device-select libVkLayer-MESA-overlay libvulkan-intel libvulkan-intel-hasvk libvulkan-lvp libvulkan-nouveau libvulkan-radeon libvulkan-virtio
+script-with-language-extension [usr/bin/mesa-overlay-control.py]
+shared-library-lacks-version usr/lib/x86_64-linux-gnu/libVkLayer_INTEL_nullhw.so libVkLayer_INTEL_nullhw.so
+shared-library-lacks-version usr/lib/x86_64-linux-gnu/libVkLayer_MESA_device_select.so libVkLayer_MESA_device_select.so
+shared-library-lacks-version usr/lib/x86_64-linux-gnu/libVkLayer_MESA_overlay.so libVkLayer_MESA_overlay.so
+shared-library-lacks-version usr/lib/x86_64-linux-gnu/libvulkan_intel_hasvk.so libvulkan_intel_hasvk.so
+shared-library-lacks-version usr/lib/x86_64-linux-gnu/libvulkan_lvp.so libvulkan_lvp.so
+shared-library-lacks-version usr/lib/x86_64-linux-gnu/libvulkan_nouveau.so libvulkan_nouveau.so
+shared-library-lacks-version usr/lib/x86_64-linux-gnu/libvulkan_virtio.so libvulkan_virtio.so
 shlib-without-versioned-soname usr/lib/*/libvulkan_intel.so libvulkan_intel.so
 shlib-without-versioned-soname usr/lib/*/libvulkan_radeon.so libvulkan_radeon.so

debian-12-mesa/suite/bookworm/debian/rules

@@ -17,25 +17,33 @@ LLVM_VERSION = 17
 export PATH:=/usr/lib/llvm-$(LLVM_VERSION)/bin/:$(PATH)
 
 export DEB_BUILD_MAINT_OPTIONS=optimize=-lto
-export MESON_PACKAGE_CACHE_DIR=/usr/share/cargo/registry/
 
-ifeq (,$(filter $(DEB_HOST_ARCH), armhf ppc64el sh3 sh4))
-buildflags = \
-	$(shell DEB_CFLAGS_MAINT_APPEND=-Wall DEB_CXXFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
-else
-  ifneq (,$(filter $(DEB_HOST_ARCH), armhf))
+DEB_CFLAGS_MAINT_APPEND := -Wall
+DEB_CXXFLAGS_MAINT_APPEND := -Wall
+ifneq (,$(filter $(DEB_HOST_ARCH), armhf))
   # Workaround for a variant of LP: #725126
-  buildflags = \
-	$(shell DEB_CFLAGS_MAINT_APPEND="-Wall -fno-optimize-sibling-calls" DEB_CXXFLAGS_MAINT_APPEND="-Wall -fno-optimize-sibling-calls" dpkg-buildflags --export=configure)
-  else
-    # Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83143
-    buildflags = \
-	$(shell DEB_CFLAGS_MAINT_APPEND="-Wall -O1" DEB_CXXFLAGS_MAINT_APPEND="-Wall -O1" dpkg-buildflags --export=configure)
-  endif
+  DEB_CFLAGS_MAINT_APPEND += -fno-optimize-sibling-calls
+  DEB_CXXFLAGS_MAINT_APPEND += -fno-optimize-sibling-calls
+else ifneq (,$(filter $(DEB_HOST_ARCH), loong64))
+  # Workaround loong64 BFD linker crash related to TLSDESC
+  DEB_CFLAGS_MAINT_APPEND += -mtls-dialect=trad
+  DEB_CXXFLAGS_MAINT_APPEND += -mtls-dialect=trad
+else ifneq (,$(filter $(DEB_HOST_ARCH), m68k))
+  # This library has huge jump tables: Debian #1067207
+  DEB_CFLAGS_MAINT_APPEND += -mlong-jump-table-offsets
+  DEB_CXXFLAGS_MAINT_APPEND += -mlong-jump-table-offsets
+else ifneq (,$(filter $(DEB_HOST_ARCH), sh4))
+  # Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83143
+  DEB_CFLAGS_MAINT_APPEND += -freorder-blocks-algorithm=simple
+  DEB_CXXFLAGS_MAINT_APPEND += -freorder-blocks-algorithm=simple
 endif
+buildflags = $(shell \
+	DEB_CFLAGS_MAINT_APPEND='$(DEB_CFLAGS_MAINT_APPEND)' \
+	DEB_CXXFLAGS_MAINT_APPEND='$(DEB_CXXFLAGS_MAINT_APPEND)' \
+	dpkg-buildflags --export=configure)
 
 EGL_PLATFORMS = x11
-GALLIUM_DRIVERS = swrast
+GALLIUM_DRIVERS = softpipe
 VULKAN_DRIVERS =
 VULKAN_LAYERS =
 
@@ -46,7 +54,7 @@ confflags_TEFLON = -Dteflon=false
 
 LLVM_ARCHS     = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
 RUSTICL_ARCHS  = amd64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32
-NVK_ARCHS      = amd64 armel armhf i386 loong64 mips64el ppc64 riscv64 x32
+NVK_ARCHS      = amd64 armhf i386 ppc64 riscv64 x32
 VALGRIND_ARCHS = amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x
 WINE_ARCHS     = amd64 arm64 armel armhf i386
 
@@ -107,19 +115,13 @@ else
   # LLVM is required for building r300g, radeonsi and llvmpipe drivers.
   # It's also required for building OpenCL support.
   ifneq (,$(filter $(DEB_HOST_ARCH), $(LLVM_ARCHS)))
-	GALLIUM_DRIVERS += radeonsi zink
+	GALLIUM_DRIVERS += radeonsi zink llvmpipe
 
-	# Only enable amd on riscv64, swrast needs CPU JIT support which doesn't work properly yet
-	ifneq (,$(filter $(DEB_HOST_ARCH), riscv64))
-		VULKAN_DRIVERS += amd
-		confflags_GALLIUM += -Ddraw-use-llvm=false
-	else
-	  # drop virtio from armel, it doesn't build
-	  ifneq (,$(filter $(DEB_HOST_ARCH), armel))
+	# drop virtio from armel, it doesn't build
+	ifneq (,$(filter $(DEB_HOST_ARCH), armel))
 		VULKAN_DRIVERS += amd swrast
-	  else
+	else
 		VULKAN_DRIVERS += amd swrast virtio
-	  endif
 	endif
 
 	VULKAN_LAYERS += device-select intel-nullhw overlay
@@ -132,6 +134,7 @@ else
 	endif
 
 	ifneq (,$(filter $(DEB_HOST_ARCH), $(NVK_ARCHS)))
+		export MESON_PACKAGE_CACHE_DIR=/usr/share/cargo/registry/
 		VULKAN_DRIVERS += nouveau
 	endif
 
@@ -179,7 +182,7 @@ confflags += \
 	-Dplatforms="[$(EGL_PLATFORMS_LIST)]" \
 	-Dvulkan-drivers="[$(VULKAN_DRIVERS_LIST)]" \
 	-Dvulkan-layers="[$(VULKAN_LAYERS_LIST)]" \
-	-Dglvnd=true \
+	-Dglvnd=enabled \
 	-Dshared-glapi=enabled \
 	-Dgallium-omx=disabled \
 	-Db_ndebug=true \
@@ -196,6 +199,16 @@ confflags += \
 	$(confflags_VALGRIND) \
 	$(confflags_TEFLON)
 
+
+rewrite_wrap_files:
+	cp -r subprojects subprojects-save
+	for crate in paste proc-macro2 quote syn unicode-ident; \
+	do \
+		export crate_namever=`basename $$MESON_PACKAGE_CACHE_DIR/$$crate-*`; \
+		sed -e"/source.*/d" -e"s,$${crate}-.*,$${crate_namever}," -i subprojects/$${crate}.wrap; \
+	done
+	touch subprojects/rewrite
+
 override_dh_clean: regen_control
 	dpkg-parsechangelog | awk '/^Version:/ {print $$2}' | sed 's/-.*//;s/~/-/' > VERSION
 	rm -rf .pc
@@ -203,12 +216,18 @@ override_dh_clean: regen_control
 	rm -rf configure bin/config.guess bin/config.sub config.h.in
 	rm -rf $$(find -name Makefile.in)
 	rm -rf bin/install-sh bin/ltmain.sh
+	rm -rf src/intel/vulkan/grl/parser.out
+	rm -rf src/intel/vulkan/grl/parsetab.py
 	for file in debian/*.links.in; do rm -f $${file%%.in}; done
 	find -name '*.pyc' -delete
 	find -name '__pycache__' -delete
+	if [ -f subprojects/rewrite ]; then \
+		rm -rf subprojects; \
+		mv subprojects-save subprojects; \
+	fi
 	dh_clean
 
-override_dh_auto_configure:
+override_dh_auto_configure: rewrite_wrap_files
 	dpkg-parsechangelog | awk '/^Version:/ {print $$2}' > VERSION
 	$(buildflags) dh_auto_configure -- \
 		$(confflags)

debian-12-mesa/suite/bookworm/debian/watch

-#git=git://anongit.freedesktop.org/mesa/mesa
 version=3
 opts="uversionmangle=s/-rc/~rc/,dversionmangle=s/\+repack//,pgpsigurlmangle=s/$/.sig/,pasv" \
 https://mesa.freedesktop.org/archive/mesa-(.*)\.tar\.xz

debian-12-mesa/version.sh

@@ -5,7 +5,7 @@ mirror="http://http.debian.net/debian"
 
 package_name="mesa"
 debian_pkg_name="${package_name}"
-package_version="24.1.6"
+package_version="24.2.2"
 package_source="${debian_pkg_name}_${package_version}.orig.tar.xz"
 src_dir="${package_name}-${package_version}"
 #src_dir="mesa-24.1.0-rc3"
@@ -20,4 +20,4 @@ debian_untar="${package_name}_${debian_version}.debian.tar.xz"
 debian_patch=""
 local_patch="bbbio0"
 
-bookworm_version="~bookworm+20240819"
+bookworm_version="~bookworm+20240906"