diff --git a/git-mesa/suite/bullseye/debian/changelog b/git-mesa/suite/bullseye/debian/changelog
index 555ab0d12282ca3b707d0bfa8d6d2b4756372d89..4fe63030a5d7980dca95b7c6361fcf29cfb1c9d0 100644
--- a/git-mesa/suite/bullseye/debian/changelog
+++ b/git-mesa/suite/bullseye/debian/changelog
@@ -1,20 +1,14 @@
-mesa (22.1.0-git20210411.0-0~bullseye+20220411) bullseye; urgency=low
+mesa (22.1.0-git20210413.0-0~bullseye+20220413) bullseye; urgency=low
* Rebuild for repos.rcn-ee.com
- -- Robert Nelson <robertcnelson@gmail.com> Mon, 11 Apr 2022 10:26:49 -0500
+ -- Robert Nelson <robertcnelson@gmail.com> Wed, 13 Apr 2022 07:43:36 -0500
-mesa (22.1.0-git20210407.0-0~bullseye+20220407) bullseye; urgency=low
+mesa (22.0.1-2) experimental; urgency=medium
- * Rebuild for repos.rcn-ee.com
-
- -- Robert Nelson <robertcnelson@gmail.com> Thu, 07 Apr 2022 08:34:44 -0500
-
-mesa (22.1.0-git20210405.0-0~bullseye+20220405) bullseye; urgency=low
-
- * Rebuild for repos.rcn-ee.com
+ * Migrate to llvm-14.
- -- Robert Nelson <robertcnelson@gmail.com> Tue, 05 Apr 2022 12:41:08 -0500
+ -- Timo Aaltonen <tjaalton@debian.org> Mon, 04 Apr 2022 12:40:09 +0300
mesa (22.0.1-1) experimental; urgency=medium
diff --git a/git-mesa/suite/bullseye/debian/control b/git-mesa/suite/bullseye/debian/control
index 8b64f20ecf70b82466e76b206ac56a78900320ef..b2127caf902cbbb6516c4f0c59a31822d73b0fcb 100644
--- a/git-mesa/suite/bullseye/debian/control
+++ b/git-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/git-mesa/suite/bullseye/debian/rules b/git-mesa/suite/bullseye/debian/rules
index 6dbc75577813c02c231e3026eda3e28c75c0fa52..03ec107181a2101b2dd38afcac7669f714b09792 100644
--- a/git-mesa/suite/bullseye/debian/rules
+++ b/git-mesa/suite/bullseye/debian/rules
@@ -13,7 +13,7 @@ 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
@@ -44,7 +44,6 @@ VULKAN_DRIVERS =
confflags_DRI3 = -Ddri3=disabled
confflags_OSMESA = -Dosmesa=true
-confflags_SSE2 = -Dsse2=true
# hurd doesn't do direct rendering
ifeq ($(DEB_HOST_ARCH_OS), hurd)
@@ -134,9 +133,6 @@ else
endif
endif
-ifeq ($(DEB_HOST_ARCH), i386)
- confflags_SSE2 = -Dsse2=false
-endif
empty:=
space := $(empty) $(empty)
@@ -168,7 +164,6 @@ confflags += \
$(confflags_GALLIUM) \
$(confflags_GLES) \
$(confflags_OSMESA) \
- $(confflags_SSE2) \
$(confflags_VALGRIND) \
$(confflags_VULKAN)
diff --git a/git-mesa/version.sh b/git-mesa/version.sh
index f5788f68f41875acff7d598366707ac3ba0c060c..9117974605fa2640bdd2ed57d37a58c4ae061d5f 100644
--- a/git-mesa/version.sh
+++ b/git-mesa/version.sh
@@ -4,12 +4,12 @@ mirror="http://http.debian.net/debian"
package_name="mesa"
debian_pkg_name="${package_name}"
-package_version="22.1.0-git20210411.0"
+package_version="22.1.0-git20210413.0"
package_source="${debian_pkg_name}_${package_version}.orig.tar.xz"
src_dir="${package_name}_${package_version}"
git_repo="https://gitlab.freedesktop.org/mesa/mesa"
-git_sha="809dc312235166fe517fc50c79f22cca7fb5c000"
+git_sha="e11bedb9f5d758d6ccc16eb8b02be8d7498a31db"
reprepro_dir="m/${package_name}"
dl_path=""
@@ -17,4 +17,4 @@ debian_version="${package_version}-0"
debian_patch=""
debian_diff=""
-bullseye_version="~bullseye+20220411"
+bullseye_version="~bullseye+20220413"