diff --git a/debian-11-mesa/suite/bullseye/debian/changelog b/debian-11-mesa/suite/bullseye/debian/changelog
index b5a5dda0d1212de926f403ddb2cb41e361cc948a..04e7f3ea10c6c1529448f8d279201522fa81f2f2 100644
--- a/debian-11-mesa/suite/bullseye/debian/changelog
+++ b/debian-11-mesa/suite/bullseye/debian/changelog
@@ -1,8 +1,51 @@
-mesa (22.0.0-1rcnee0~bullseye+20220315) bullseye; urgency=low
+mesa (22.1.0-1rcnee0~bullseye+20220601) bullseye; urgency=low
* Rebuild for repos.rcn-ee.com
- -- Robert Nelson <robertcnelson@gmail.com> Tue, 15 Mar 2022 08:48:11 -0500
+ -- Robert Nelson <robertcnelson@gmail.com> Wed, 01 Jun 2022 14:46:21 -0500
+
+mesa (22.1.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * mesa-vulkan-drivers.install: Fix installing layers.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 25 May 2022 15:10:32 +0300
+
+mesa (22.1.0~rc5-1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * rules: Fix enabling intel-nullhw, reorganize setting vulkan-layers.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Fri, 13 May 2022 12:09:18 +0300
+
+mesa (22.1.0~rc3-1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * rules: Clean all python build cruft.
+ * rules: Add intel-nullhw to vulkan confflags. (part of #1009027)
+
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 03 May 2022 13:08:46 +0300
+
+mesa (22.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Fri, 22 Apr 2022 08:50:14 +0300
+
+mesa (22.0.1-2) experimental; urgency=medium
+
+ * Migrate to llvm-14.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Mon, 04 Apr 2022 12:40:09 +0300
+
+mesa (22.0.1-1) experimental; urgency=medium
+
+ * New upstream release.
+ * rules: Disable lto as suggested by upstream.
+ * revert-enabling-tlsdesc-support.diff: Revert a commit that's causing
+ apps to crash. (LP: #1966221)
+
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 30 Mar 2022 11:47:25 +0300
mesa (22.0.0-1) experimental; urgency=medium
@@ -18,6 +61,29 @@ mesa (22.0.0~rc2-1) experimental; urgency=medium
-- Timo Aaltonen <tjaalton@debian.org> Thu, 17 Feb 2022 22:04:03 +0200
+mesa (21.3.8-1) unstable; urgency=medium
+
+ * New upstream release.
+ * rules: Drop kmsro option, which was removed upstream.
+ * install: Add radv defaults dri conf.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Sun, 10 Apr 2022 10:18:19 +0300
+
+mesa (21.3.7-1) unstable; urgency=medium
+
+ * New upstream release.
+ * rules: Disable sse2 on i386. (Closes: #1002872)
+
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 02 Mar 2022 12:42:09 +0200
+
+mesa (21.3.5-1) unstable; urgency=medium
+
+ * New upstream release.
+ * iris-inter-context-busy-tracking.diff: Fix a regression causing
+ flickering and corruption on Intel. (Closes: #1003987)
+
+ -- Timo Aaltonen <tjaalton@debian.org> Fri, 28 Jan 2022 15:49:51 +0200
+
mesa (21.3.4-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian-11-mesa/suite/bullseye/debian/control b/debian-11-mesa/suite/bullseye/debian/control
index 8b64f20ecf70b82466e76b206ac56a78900320ef..b2127caf902cbbb6516c4f0c59a31822d73b0fcb 100644
--- a/debian-11-mesa/suite/bullseye/debian/control
+++ b/debian-11-mesa/suite/bullseye/debian/control
@@ -43,10 +43,10 @@ Build-Depends:
libelf-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
libwayland-dev (>= 1.15.0) [linux-any],
libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
- llvm-13-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
- libclang-13-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
- libclang-cpp13-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
- libclc-13-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+ llvm-14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+ libclang-14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+ libclang-cpp14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+ libclc-14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
wayland-protocols (>= 1.9),
zlib1g-dev,
libglvnd-core-dev (>= 1.3.2),
diff --git a/debian-11-mesa/suite/bullseye/debian/mesa-vulkan-drivers.install b/debian-11-mesa/suite/bullseye/debian/mesa-vulkan-drivers.install
index bf77235dd1133b917a0fc64e83a2feb0c2c88a25..1ad9e2b6c57cc83e21e0bf89dac8a4ee823d350e 100644
--- a/debian-11-mesa/suite/bullseye/debian/mesa-vulkan-drivers.install
+++ b/debian-11-mesa/suite/bullseye/debian/mesa-vulkan-drivers.install
@@ -1,7 +1,8 @@
usr/bin/mesa-overlay-control.py
+usr/share/drirc.d/00-radv-defaults.conf
usr/share/vulkan/explicit_layer.d/*.json
usr/share/vulkan/icd.d/*.json
usr/share/vulkan/implicit_layer.d/*.json
usr/lib/*/libvulkan_*.so
-usr/lib/*/libVkLayer_MESA_device_select.so
-usr/lib/*/libVkLayer_MESA_overlay.so
+usr/lib/*/libVkLayer_*.so
+usr/lib/*/libpowervr_rogue.so
diff --git a/debian-11-mesa/suite/bullseye/debian/patches/series b/debian-11-mesa/suite/bullseye/debian/patches/series
index 00f74717aad78ac99649c9fcdb60073197eabcdc..927c432629d6ef12c5f3c7cd511a9f09cefc3959 100644
--- a/debian-11-mesa/suite/bullseye/debian/patches/series
+++ b/debian-11-mesa/suite/bullseye/debian/patches/series
@@ -1,3 +1,4 @@
07_gallium-fix-build-failure-on-powerpcspe.diff
path_max.diff
src_glx_dri_common.h.diff
+revert-enabling-tlsdesc-support.diff
diff --git a/debian-11-mesa/suite/bullseye/debian/rules b/debian-11-mesa/suite/bullseye/debian/rules
old mode 100644
new mode 100755
index 6add506e30ff016255eec0dd9168edc2fa09a2a1..16af8eb112df86628bba70fbf9373af113a9d718
--- a/debian-11-mesa/suite/bullseye/debian/rules
+++ b/debian-11-mesa/suite/bullseye/debian/rules
@@ -13,7 +13,9 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
# for finding the correct llvm-config when meson doesn't know about it yet
-export PATH:=/usr/lib/llvm-13/bin/:$(PATH)
+export PATH:=/usr/lib/llvm-14/bin/:$(PATH)
+
+export DEB_BUILD_MAINT_OPTIONS=optimize=-lto
ifeq (,$(filter $(DEB_HOST_ARCH), armhf ppc64el sh3 sh4))
buildflags = \
@@ -39,6 +41,7 @@ endif
EGL_PLATFORMS = x11
GALLIUM_DRIVERS = swrast
VULKAN_DRIVERS =
+VULKAN_LAYERS =
confflags_DRI3 = -Ddri3=disabled
confflags_OSMESA = -Dosmesa=true
@@ -73,10 +76,10 @@ else
GALLIUM_DRIVERS += freedreno
endif
- # etnaviv, kmsro, tegra, vc4 and v3d kernel support are only available on armhf and arm64
+ # etnaviv, tegra, vc4 and v3d kernel support are only available on armhf and arm64
ifneq (,$(filter $(DEB_HOST_ARCH), armhf arm64))
- GALLIUM_DRIVERS += etnaviv kmsro lima panfrost tegra vc4 v3d
- VULKAN_DRIVERS += broadcom freedreno
+ GALLIUM_DRIVERS += etnaviv lima panfrost tegra vc4 v3d
+ VULKAN_DRIVERS += broadcom freedreno imagination-experimental
endif
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
@@ -124,7 +127,7 @@ else
# build vulkan layers where Vulkan loader is available
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32))
GALLIUM_DRIVERS += zink
- confflags_VULKAN += -Dvulkan-layers="device-select, overlay"
+ VULKAN_LAYERS += device-select overlay
endif
ifeq (,$(filter pkg.mesa.nolibva,$(DEB_BUILD_PROFILES)))
@@ -143,6 +146,8 @@ GALLIUM_DRIVERS := $(patsubst %,'%',$(GALLIUM_DRIVERS))
GALLIUM_DRIVERS_LIST := $(subst $(space),$(comma),$(GALLIUM_DRIVERS))
VULKAN_DRIVERS := $(patsubst %,'%',$(VULKAN_DRIVERS))
VULKAN_DRIVERS_LIST := $(subst $(space),$(comma),$(VULKAN_DRIVERS))
+VULKAN_LAYERS := $(patsubst %,'%',$(VULKAN_LAYERS))
+VULKAN_LAYERS_LIST := $(subst $(space),$(comma),$(VULKAN_LAYERS))
confflags_EGL = -Dplatforms="$(EGL_PLATFORMS)"
confflags_GLES = -Dgles1=disabled -Dgles2=enabled
@@ -152,12 +157,14 @@ confflags += \
-Ddri-drivers-path=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
-Ddri-search-path='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
-Dvulkan-drivers="[$(VULKAN_DRIVERS_LIST)]" \
+ -Dvulkan-layers="[$(VULKAN_LAYERS_LIST)]" \
-Dglvnd=true \
-Dshared-glapi=enabled \
-Dgallium-xvmc=disabled \
-Dgallium-omx=disabled \
-Db_ndebug=true \
-Dbuild-tests=true \
+ -Dimagination-srv=true \
$(confflags_DIRECT_RENDERING) \
$(confflags_GBM) \
$(confflags_DRI3) \
@@ -166,8 +173,7 @@ confflags += \
$(confflags_GLES) \
$(confflags_OSMESA) \
$(confflags_SSE2) \
- $(confflags_VALGRIND) \
- $(confflags_VULKAN)
+ $(confflags_VALGRIND)
override_dh_clean:
rm -rf .pc
@@ -176,14 +182,8 @@ override_dh_clean:
rm -rf $$(find -name Makefile.in)
rm -rf bin/install-sh bin/ltmain.sh
for file in debian/*.in; do rm -f $${file%%.in}; done
- rm -rf src/amd/compiler/__pycache__/ src/amd/registers/__pycache__
- rm -rf src/amd/vulkan/*.pyc src/amd/vulkan/__pycache__/
- rm -rf src/compiler/nir/*.pyc src/compiler/nir/__pycache__/
- rm -rf src/egl/generate/*.pyc src/egl/generate/__pycache__/
- rm -rf src/gallium/auxiliary/util/*.pyc src/gallium/auxiliary/util/__pycache__/
- rm -rf src/intel/vulkan/*.pyc src/intel/vulkan/__pycache__/
- rm -rf src/mapi/glapi/gen/*.pyc src/mapi/glapi/gen/__pycache__/ src/mapi/new/__pycache__/
- rm -rf src/mesa/main/*.pyc src/mesa/main/__pycache__/
+ find -name '*.pyc' -delete
+ find -name '__pycache__' -delete
dh_clean
override_dh_auto_configure:
diff --git a/debian-11-mesa/version.sh b/debian-11-mesa/version.sh
index d369f5c044ef9acb38716c6bbb4ea9c2a3abbabf..f4bb464d2a94044a087888af3c559e0d96e18202 100644
--- a/debian-11-mesa/version.sh
+++ b/debian-11-mesa/version.sh
@@ -4,7 +4,7 @@ mirror="http://http.debian.net/debian"
package_name="mesa"
debian_pkg_name="${package_name}"
-package_version="22.0.0"
+package_version="22.1.0"
package_source="${debian_pkg_name}_${package_version}.orig.tar.gz"
src_dir="${package_name}-${package_version}"
@@ -18,4 +18,4 @@ debian_untar=""
debian_patch="${package_name}_${debian_version}.diff.gz"
local_patch="rcnee0"
-bullseye_version="~bullseye+20220315"
+bullseye_version="~bullseye+20220601"
diff --git a/git-mesa/suite/bullseye/debian/changelog b/git-mesa/suite/bullseye/debian/changelog
index 6931e1552bdb13dea3c4dc963e1d2b158e790ee0..2a8a05e51ead87cb44486dd80bd195d4f86bc43a 100644
--- a/git-mesa/suite/bullseye/debian/changelog
+++ b/git-mesa/suite/bullseye/debian/changelog
@@ -1,20 +1,9 @@
-mesa (22.1.0-git20210518.1-0~bullseye+20220520) bullseye; urgency=low
+mesa (22.1.0-1) experimental; urgency=medium
- * Rebuild for repos.rcn-ee.com
-
- -- Robert Nelson <robertcnelson@gmail.com> Fri, 20 May 2022 09:42:21 -0500
-
-mesa (22.1.0-git20210518.0-0~bullseye+20220520) bullseye; urgency=low
-
- * Rebuild for repos.rcn-ee.com
-
- -- Robert Nelson <robertcnelson@gmail.com> Fri, 20 May 2022 08:41:28 -0500
-
-mesa (22.1.0-git20210510.1-0~bullseye+20220513) bullseye; urgency=low
-
- * Rebuild for repos.rcn-ee.com
+ * New upstream release.
+ * mesa-vulkan-drivers.install: Fix installing layers.
- -- Robert Nelson <robertcnelson@gmail.com> Fri, 13 May 2022 20:43:31 -0500
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 25 May 2022 15:10:32 +0300
mesa (22.1.0~rc5-1) experimental; urgency=medium