.gitignore

@@ -1 +1,3 @@
-SOURCES/mesa-21.3.4.tar.xz
+SOURCES/dataclasses-0.8.tar.gz
+SOURCES/mesa-23.1.4.tar.xz
+SOURCES/meson-0.61.4.tar.gz

.mesa.metadata

@@ -1 +1,3 @@
-c18255897b353f259c64e7a864d8505d8b5bf024 SOURCES/mesa-21.3.4.tar.xz
+ef25d3e9e2523805baa314a4adcb915ae901740e SOURCES/dataclasses-0.8.tar.gz
+8a48c0e1fbda2c9563ddcf95b05012ab00a8a692 SOURCES/mesa-23.1.4.tar.xz
+b0ab169abd8ec87ce773a02b2c7d6a8664b8db00 SOURCES/meson-0.61.4.tar.gz

SOURCES/0001-clover-llvm-move-to-modern-pass-manager.patch

@@ -0,0 +1,127 @@
+From 2d4fe5f229791fde52846b3f583c12508b5109d6 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Fri, 25 Aug 2023 12:43:44 +1000
+Subject: [PATCH] clover/llvm: move to modern pass manager.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This seems like it should work, but I haven't tested it yet.
+
+Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24879>
+---
+ .../frontends/clover/llvm/invocation.cpp      | 64 +++++++++++++++----
+ 1 file changed, 51 insertions(+), 13 deletions(-)
+
+diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp
+index 7a50fea3323..43d26fe1abb 100644
+--- a/src/gallium/frontends/clover/llvm/invocation.cpp
++++ b/src/gallium/frontends/clover/llvm/invocation.cpp
+@@ -27,13 +27,17 @@
+ #include <llvm/IR/DiagnosticPrinter.h>
+ #include <llvm/IR/DiagnosticInfo.h>
+ #include <llvm/IR/LLVMContext.h>
++#include <llvm/IR/Module.h>
+ #include <llvm/Support/raw_ostream.h>
+-#include <llvm/Transforms/IPO/PassManagerBuilder.h>
++#include <llvm/Transforms/IPO/Internalize.h>
+ #include <llvm-c/Target.h>
+ #ifdef HAVE_CLOVER_SPIRV
+ #include <LLVMSPIRVLib/LLVMSPIRVLib.h>
+ #endif
+ 
++#include <llvm-c/TargetMachine.h>
++#include <llvm-c/Transforms/PassBuilder.h>
++#include <llvm/Support/CBindingWrapping.h>
+ #include <clang/CodeGen/CodeGenAction.h>
+ #include <clang/Lex/PreprocessorOptions.h>
+ #include <clang/Frontend/TextDiagnosticBuffer.h>
+@@ -439,10 +443,10 @@ clover::llvm::compile_program(const std::string &source,
+ 
+ namespace {
+    void
+-   optimize(Module &mod, unsigned optimization_level,
++   optimize(Module &mod,
++            const std::string& ir_target,
++            unsigned optimization_level,
+             bool internalize_symbols) {
+-      ::llvm::legacy::PassManager pm;
+-
+       // By default, the function internalizer pass will look for a function
+       // called "main" and then mark all other functions as internal.  Marking
+       // functions as internal enables the optimizer to perform optimizations
+@@ -458,19 +462,53 @@ namespace {
+       if (internalize_symbols) {
+          std::vector<std::string> names =
+             map(std::mem_fn(&Function::getName), get_kernels(mod));
+-         pm.add(::llvm::createInternalizePass(
++         internalizeModule(mod,
+                       [=](const ::llvm::GlobalValue &gv) {
+                          return std::find(names.begin(), names.end(),
+                                           gv.getName()) != names.end();
+-                      }));
++                      });
+       }
+ 
+-      ::llvm::PassManagerBuilder pmb;
+-      pmb.OptLevel = optimization_level;
+-      pmb.LibraryInfo = new ::llvm::TargetLibraryInfoImpl(
+-         ::llvm::Triple(mod.getTargetTriple()));
+-      pmb.populateModulePassManager(pm);
+-      pm.run(mod);
++
++      const char *opt_str = NULL;
++      LLVMCodeGenOptLevel level;
++      switch (optimization_level) {
++      case 0:
++      default:
++         opt_str = "default<O0>";
++         level = LLVMCodeGenLevelNone;
++         break;
++      case 1:
++         opt_str = "default<O1>";
++         level = LLVMCodeGenLevelLess;
++         break;
++      case 2:
++         opt_str = "default<O2>";
++         level = LLVMCodeGenLevelDefault;
++         break;
++      case 3:
++         opt_str = "default<O3>";
++         level = LLVMCodeGenLevelAggressive;
++         break;
++      }
++
++      const target &target = ir_target;
++      LLVMTargetRef targ;
++      char *err_message;
++
++      if (LLVMGetTargetFromTriple(target.triple.c_str(), &targ, &err_message))
++         return;
++      LLVMTargetMachineRef tm =
++         LLVMCreateTargetMachine(targ, target.triple.c_str(),
++                                 target.cpu.c_str(), "", level,
++                                 LLVMRelocDefault, LLVMCodeModelDefault);
++
++      if (!tm)
++         return;
++      LLVMPassBuilderOptionsRef opts = LLVMCreatePassBuilderOptions();
++      LLVMRunPasses(wrap(&mod), opt_str, tm, opts);
++
++      LLVMDisposeTargetMachine(tm);
+    }
+ 
+    std::unique_ptr<Module>
+@@ -500,7 +538,7 @@ clover::llvm::link_program(const std::vector<binary> &binaries,
+    auto c = create_compiler_instance(dev, dev.ir_target(), options, r_log);
+    auto mod = link(*ctx, *c, binaries, r_log);
+ 
+-   optimize(*mod, c->getCodeGenOpts().OptimizationLevel, !create_library);
++   optimize(*mod, dev.ir_target(), c->getCodeGenOpts().OptimizationLevel, !create_library);
+ 
+    static std::atomic_uint seq(0);
+    const std::string id = "." + mod->getModuleIdentifier() + "-" +
+-- 
+2.42.0
+

SOURCES/0001-iris-implement-inter-context-busy-tracking.patch

@@ -1,58 +0,0 @@
-From 07dc3d4238e57901ccf98e0b506d9aad2c86b9d9 Mon Sep 17 00:00:00 2001
-From: Paulo Zanoni <paulo.r.zanoni@intel.com>
-Date: Mon, 10 Jan 2022 17:18:05 -0800
-Subject: [PATCH] iris: implement inter-context busy-tracking
-
-Previously, no buffers were ever marked as EXEC_OBJECT_ASYNC so the
-Kernel would ensure dependency tracking for us. After we implemented
-explicit busy tracking in commit 89a34cb8450a, only the external
-objects kept relying on the Kernel's implicit tracking and Iris did
-inter-batch busy tracking, meaning we lost inter-screen and
-inter-context synchronization. This seemed fine to me since, as far as
-I understood, it is the duty of the application to synchronize itself
-against multiple screens and contexts.
-
-The problem here is that applications were actually relying on the old
-behavior where the Kernel guarantees synchronization, so 89a34cb8450a
-can be seen as a regression. This commit addresses the inter-context
-synchronization case.
-
-Cc: mesa-stable
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5731
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5812
-Fixes: 89a34cb8450a ("iris: switch to explicit busy tracking")
-Tested-by: Konstantin Kharlamov <hi-angel@yandex.ru>
-Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
----
- src/gallium/drivers/iris/iris_batch.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
-index b7bde60aae7..1b0c5896d4f 100644
---- a/src/gallium/drivers/iris/iris_batch.c
-+++ b/src/gallium/drivers/iris/iris_batch.c
-@@ -835,6 +835,12 @@ update_bo_syncobjs(struct iris_batch *batch, struct iris_bo *bo, bool write)
-       move_syncobj_to_batch(batch, &deps->write_syncobjs[other_batch_idx],
-                             I915_EXEC_FENCE_WAIT);
- 
-+   /* If it's being written by our screen, wait on it too. This is relevant
-+    * when there are multiple contexts on the same screen. */
-+   if (deps->write_syncobjs[batch_idx])
-+      move_syncobj_to_batch(batch, &deps->write_syncobjs[batch_idx],
-+                            I915_EXEC_FENCE_WAIT);
-+
-    struct iris_syncobj *batch_syncobj = iris_batch_get_signal_syncobj(batch);
- 
-    if (write) {
-@@ -847,6 +853,8 @@ update_bo_syncobjs(struct iris_batch *batch, struct iris_bo *bo, bool write)
- 
-       move_syncobj_to_batch(batch, &deps->read_syncobjs[other_batch_idx],
-                            I915_EXEC_FENCE_WAIT);
-+      move_syncobj_to_batch(batch, &deps->read_syncobjs[batch_idx],
-+                           I915_EXEC_FENCE_WAIT);
- 
-    } else {
-       /* If we're reading, replace the other read from our batch index. */
--- 
-GitLab
-

SOURCES/0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch

@@ -0,0 +1,41 @@
+From 9ba416cdc67073cdda9a73fe9d37304b82bdd526 Mon Sep 17 00:00:00 2001
+From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
+Date: Fri, 12 May 2023 09:58:26 +0200
+Subject: [PATCH] llvmpipe: only include old Transform includes when needed
+
+This fixes building with recent LLVM where these 2 .h files
+were removed.
+
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8671
+Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22980>
+---
+ src/gallium/auxiliary/gallivm/lp_bld_init.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
+index 24d082398e9..9e0d6a5f643 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
++++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
+@@ -42,14 +42,14 @@
+ 
+ #include <llvm/Config/llvm-config.h>
+ #include <llvm-c/Analysis.h>
+-#include <llvm-c/Transforms/Scalar.h>
+-#if LLVM_VERSION_MAJOR >= 7
+-#include <llvm-c/Transforms/Utils.h>
+-#endif
+ #include <llvm-c/BitWriter.h>
+ #if GALLIVM_USE_NEW_PASS == 1
+ #include <llvm-c/Transforms/PassBuilder.h>
+ #elif GALLIVM_HAVE_CORO == 1
++#include <llvm-c/Transforms/Scalar.h>
++#if LLVM_VERSION_MAJOR >= 7
++#include <llvm-c/Transforms/Utils.h>
++#endif
+ #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64)
+ #include <llvm-c/Transforms/IPO.h>
+ #endif
+-- 
+2.42.0
+

SOURCES/Makefile

@@ -1,4 +1,4 @@
-VERSION ?= 21.3.4
+VERSION ?= 23.1.4
 SANITIZE ?= 1
 
 DIRNAME = mesa-${VERSION}

SOURCES/fix-py-ver.patch

@@ -0,0 +1,12 @@
+diff -up mesa-23.1.4/meson.build.dma mesa-23.1.4/meson.build
+--- mesa-23.1.4/meson.build.dma	2023-07-28 10:15:41.807945483 +1000
++++ mesa-23.1.4/meson.build	2023-07-28 10:15:46.465030794 +1000
+@@ -835,7 +835,7 @@ if get_option('allow-kcmp') \
+   pre_args += '-DALLOW_KCMP'
+ endif
+ 
+-prog_python = import('python').find_installation('python3')
++prog_python = import('python').find_installation('python3.6')
+ has_mako = run_command(
+   prog_python, '-c',
+   '''

SOURCES/gnome-shell-glthread-disable.patch

@@ -0,0 +1,11 @@
+diff -up mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf
+--- mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma	2022-11-25 10:32:32.175879868 +1000
++++ mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf	2022-11-25 10:32:43.743067470 +1000
+@@ -653,6 +653,7 @@ TODO: document the other workarounds.
+         <application name="gnome-shell" executable="gnome-shell">
+             <option name="adaptive_sync" value="false" />
+             <option name="v3d_nonmsaa_texture_size_limit" value="true" />
++            <option name="mesa_glthread" value="false"/>
+         </application>
+         <application name="Desktop — Plasma" executable="plasmashell">
+             <option name="adaptive_sync" value="false" />

SOURCES/radeonsi-turn-off-glthread.patch

@@ -0,0 +1,11 @@
+diff -up mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h.dma mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h
+--- mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h.dma	2023-01-25 06:17:54.993167334 +1000
++++ mesa-22.3.3/src/gallium/drivers/radeonsi/driinfo_radeonsi.h	2023-01-25 06:17:57.363203425 +1000
+@@ -1,7 +1,6 @@
+ // DriConf options specific to radeonsi
+ DRI_CONF_SECTION_PERFORMANCE
+ DRI_CONF_ADAPTIVE_SYNC(true)
+-DRI_CONF_MESA_GLTHREAD(true)
+ DRI_CONF_SECTION_END
+ 
+ DRI_CONF_SECTION_DEBUG

SPECS/mesa.spec

@@ -9,10 +9,10 @@
 %endif
 
 %ifarch %{ix86} x86_64
-%define platform_drivers i965
 %define with_vmware 1
 %define with_xa     1
 %define with_iris   1
+%define with_crocus   1
 %endif
 
 %ifarch %{ix86} x86_64
@@ -25,22 +25,20 @@
 %define with_xa        1
 %endif
 
-%global dri_drivers %{?platform_drivers}
-
 %if 0%{?with_vulkan_hw}
-%define vulkan_drivers swrast,intel,amd
+%define vulkan_drivers swrast,intel,intel_hasvk,amd
 %else
 %define vulkan_drivers swrast
 %endif
 
 %global sanitize 0
 
-#global rctag rc2
+#global rctag rc4
 
 Name:           mesa
 Summary:        Mesa graphics libraries
-Version:        21.3.4
-Release:        1%{?rctag:.%{rctag}}%{?dist}
+Version:        23.1.4
+Release:        2%{?rctag:.%{rctag}}%{?dist}
 
 License:        MIT
 URL:            http://www.mesa3d.org
@@ -54,18 +52,24 @@ Source3:        Makefile
 # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
 Source4:        Mesa-MLAA-License-Clarification-Email.txt
 
+# build our own newer meson
+Source5: meson-0.61.4.tar.gz
+Source6: dataclasses-0.8.tar.gz
+
 Patch0:	lavapipe-disable-env-var.patch
 
-# Patches to fix Intel blinking, see:
-# https://gitlab.freedesktop.org/pzanoni/mesa/-/commit/07dc3d4238e57901ccf98e0b506d9aad2c86b9d9
-# https://bugzilla.redhat.com/show_bug.cgi?id=2036600
-# https://bugzilla.redhat.com/show_bug.cgi?id=2040771
-Patch0001: 0001-iris-implement-inter-context-busy-tracking.patch
+Patch1: fix-py-ver.patch
+Patch10: gnome-shell-glthread-disable.patch
+Patch12: radeonsi-turn-off-glthread.patch
+
+# Required to build against LLVM 17
+Patch13: 0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch
+Patch14: 0001-clover-llvm-move-to-modern-pass-manager.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 
-BuildRequires:  meson >= 0.45
+BuildRequires:  meson
 %if %{with_hardware}
 BuildRequires:  kernel-headers
 %endif
@@ -84,6 +88,7 @@ BuildRequires:  libxshmfence-devel
 BuildRequires:  elfutils
 BuildRequires:  python3-devel
 BuildRequires:  gettext
+BuildRequires:  glslang
 BuildRequires: %{llvm_pkg_prefix}llvm-devel >= 3.4-7
 %if 0%{?with_opencl}
 BuildRequires: %{llvm_pkg_prefix}clang-devel >= 3.0
@@ -91,7 +96,7 @@ BuildRequires: %{llvm_pkg_prefix}clang-devel >= 3.0
 BuildRequires: elfutils-libelf-devel
 BuildRequires: libudev-devel
 BuildRequires: bison flex
-BuildRequires: pkgconfig(wayland-client)
+BuildRequires: pkgconfig(wayland-client) >= 1.21.0
 BuildRequires: pkgconfig(wayland-server)
 BuildRequires: pkgconfig(wayland-protocols)
 %if 0%{?with_vdpau}
@@ -159,6 +164,7 @@ Requires:       libglvnd-egl%{?_isa} >= 1:1.2.0-1
 Summary:        Mesa libEGL development package
 Requires:       %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       libglvnd-devel%{?_isa} >= 1:1.2.0-1
+Requires:       libwayland-client >= 1.21.0
 Provides:       libEGL-devel
 Provides:       libEGL-devel%{?_isa}
 
@@ -288,6 +294,7 @@ Requires:       %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release
 %package vulkan-drivers
 Summary:        Mesa Vulkan drivers
 Requires:       vulkan%{_isa}
+Requires:       libwayland-client >= 1.21.0
 
 %description vulkan-drivers
 The drivers with support for the Vulkan API.
@@ -316,27 +323,37 @@ Headers for development with the Vulkan API.
 
 cp %{SOURCE4} docs/
 
+tar -xvf %{SOURCE5}
+tar -xvf %{SOURCE6}
+
 pathfix.py -i %{__python3} -pn bin/*.py src/egl/generate/*.py \
                                src/gallium/tools/trace/*.py \
                                src/compiler/glsl/tests/*.py \
                                src/compiler/glsl/glcpp/tests/*.py
 
 %build
-
+cd meson-0.61.4
+%py3_build
+%py3_install
+cd -
+cd dataclasses-0.8
+%py3_build
+%py3_install
+cd -
 export ASFLAGS="--generate-missing-build-notes=yes"
-%meson -Dcpp_std=gnu++14 \
+%global __meson %{buildroot}/usr/bin/meson
+export PYTHONPATH=/usr/lib/python3.6/site-packages/:%{buildroot}/usr/lib/python3.6/site-packages/
+%meson -Dcpp_std=gnu++17 \
   -Db_ndebug=true \
   -Dplatforms=x11,wayland \
   -Ddri3=enabled \
-  -Ddri-drivers=%{?dri_drivers} \
   -Dosmesa=true \
 %if 0%{?with_hardware}
-  -Dgallium-drivers=swrast%{?with_iris:,iris},virgl,nouveau%{?with_vmware:,svga},radeonsi,r600%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_kmsro:,kmsro} \
+  -Dgallium-drivers=swrast%{?with_crocus:,crocus}%{?with_iris:,iris},virgl,nouveau%{?with_vmware:,svga},radeonsi,r600%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_kmsro:,kmsro} \
 %else
   -Dgallium-drivers=swrast,virgl \
 %endif
-  -Dgallium-vdpau=%{?with_vdpau:true}%{!?with_vdpau:false} \
-  -Dgallium-xvmc=false \
+  -Dgallium-vdpau=%{?with_vdpau:enabled}%{!?with_vdpau:disabled} \
   -Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \
   -Dgallium-va=%{?with_vaapi:true}%{!?with_vaapi:false} \
   -Dgallium-xa=%{?with_xa:true}%{!?with_xa:false} \
@@ -350,7 +367,7 @@ export ASFLAGS="--generate-missing-build-notes=yes"
   -Dopengl=true \
   -Dgbm=enabled \
   -Dglx=dri \
-  -Degl=true \
+  -Degl=enabled \
   -Dglvnd=true \
   -Dmicrosoft-clc=disabled \
   -Dllvm=true \
@@ -358,12 +375,25 @@ export ASFLAGS="--generate-missing-build-notes=yes"
   -Dvalgrind=%{?with_valgrind:true}%{!?with_valgrind:false} \
   -Dbuild-tests=false \
   -Dselinux=true \
+  -Dlibunwind=disabled \
+  -Dlmsensors=disabled \
+  -Dandroid-libbacktrace=disabled \
   %{nil}
 %meson_build
 
 %install
+cd meson-0.61.4
+%py3_install
+cd -
+export PYTHONPATH=%{buildroot}/usr/lib/python3.6/site-packages/
 %meson_install
 
+#nuke the meson install bits
+rm -rf %{buildroot}/usr/lib/python3.6/
+rm -f %{buildroot}/usr/bin/meson
+rm -rf %{buildroot}/usr/share/man/
+rm -f %{buildroot}/usr/share/polkit-1/actions/com.mesonbuild.install.policy
+
 # libvdpau opens the versioned name, don't bother including the unversioned
 rm -vf %{buildroot}%{_libdir}/vdpau/*.so
 # likewise glvnd
@@ -416,7 +446,7 @@ done
 %files libEGL-devel
 %dir %{_includedir}/EGL
 %{_includedir}/EGL/eglmesaext.h
-%{_includedir}/EGL/eglextchromium.h
+%{_includedir}/EGL/eglext_angle.h
 
 %post libglapi -p /sbin/ldconfig
 %postun libglapi -p /sbin/ldconfig
@@ -491,7 +521,7 @@ done
 %{_libdir}/dri/r600_dri.so
 %{_libdir}/dri/radeonsi_dri.so
 %ifarch %{ix86} x86_64
-%{_libdir}/dri/i965_dri.so
+%{_libdir}/dri/crocus_dri.so
 %{_libdir}/dri/iris_dri.so
 %endif
 %if 0%{?with_vc4}
@@ -524,6 +554,7 @@ done
 %endif
 %if 0%{?with_vdpau}
 %files vdpau-drivers
+%{_libdir}/vdpau/libvdpau_virtio_gpu.so.1*
 %{_libdir}/vdpau/libvdpau_nouveau.so.1*
 %{_libdir}/vdpau/libvdpau_r600.so.1*
 %{_libdir}/vdpau/libvdpau_radeonsi.so.1*
@@ -533,12 +564,16 @@ done
 %files vulkan-drivers
 %if 0%{?with_vulkan_hw}
 %{_libdir}/libvulkan_intel.so
+%{_libdir}/libvulkan_intel_hasvk.so
 %{_libdir}/libvulkan_radeon.so
+%{_datadir}/drirc.d/00-radv-defaults.conf
 %ifarch x86_64
 %{_datadir}/vulkan/icd.d/intel_icd.x86_64.json
+%{_datadir}/vulkan/icd.d/intel_hasvk_icd.x86_64.json
 %{_datadir}/vulkan/icd.d/radeon_icd.x86_64.json
 %else
 %{_datadir}/vulkan/icd.d/intel_icd.i686.json
+%{_datadir}/vulkan/icd.d/intel_hasvk_icd.i686.json
 %{_datadir}/vulkan/icd.d/radeon_icd.i686.json
 %endif
 %endif
@@ -552,6 +587,39 @@ done
 %endif
 
 %changelog
+* Thu Nov 23 2023 José Expósito <jexposit@redhat.com> - 23.1.4-2
+- Rebuild against LLVM 17
+
+* Thu Jul 27 2023 Dave Airlie <airlied@redhat.com> - 23.1.4-1
+- Update to 23.1.4
+
+* Mon May 22 2023 Dave Airlie <airlied@redhat.com> - 23.1.0-1
+- Update to 23.1.0
+
+* Fri Jan 27 2023 Dave Airlie <airlied@redhat.com> - 22.3.0-2
+- disable glthread for radeonsi (breaks totem)
+
+* Wed Dec 07 2022 Dave Airlie <airlied@redhat.com> - 22.3.0-1
+- Update to 22.3.0 final + fix mit-shm regression
+
+* Fri Nov 25 2022 Dave Airlie <airlied@redhat.com> - 22.3.0-0.4
+- Disable glthread for gnome-shell
+
+* Thu Nov 24 2022 Dave Airlie <airlied@redhat.com> - 22.3.0-0.3
+- Update to 22.3.0-rc4 + fix wayland dep version
+
+* Wed Nov 23 2022 Dave Airlie <airlied@redhat.com> - 22.3.0-0.2
+- Update to 22.3.0-rc3 + fix glthread regression fix
+
+* Fri Nov 11 2022 Dave Airlie <airlied@redhat.com> - 22.3.0-0.1
+- Update to 22.3.0-rc2
+
+* Tue Aug 09 2022 Dave Airlie <airlied@redhat.com> - 22.1.5-1
+- Update to 22.1.5 - add some crocus and llvmpipe fixes
+
+* Mon Jun 06 2022 Dave Airlie <airlied@redhat.com> - 22.1.1-1
+- Update to 22.1.1 - switch to crocus, drop legacy unused i965 driver.
+
 * Tue Jan 25 2022 Dave Airlie <airlied@redhat.com> - 21.3.4-1
 - Update to 23.1.4 for gbm and leak fixes, add iris regression fix