From 9719f061e6d8ec891cec1e4ad5bf20e16a29ac0d Mon Sep 17 00:00:00 2001
From: Jacob Mink <Jacob.Mink@Dell.com>
Date: Thu, 24 Sep 2026 14:05:50 -0500
Subject: [PATCH 1/2] Bump OpenVINO GenAI to 2026.4.0.0

---
 pkgbuilds/openvino-genai/PKGBUILD | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgbuilds/openvino-genai/PKGBUILD b/pkgbuilds/openvino-genai/PKGBUILD
index 41f52cd..c763d2a 100644
--- a/pkgbuilds/openvino-genai/PKGBUILD
+++ b/pkgbuilds/openvino-genai/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Spencer Bull <spencer@omarchy.org>
 
 pkgname=openvino-genai
-pkgver=2026.3.1.0
-pkgrel=3
+pkgver=2026.4.0.0
+pkgrel=1
 pkgdesc="OpenVINO GenAI C and C++ runtime libraries"
 arch=('x86_64')
 url="https://github.com/openvinotoolkit/openvino.genai"
@@ -12,7 +12,7 @@ depends=(
     'gcc-libs'
     'glibc'
     'onetbb'
-    'openvino=2026.3.1' # Includes libopenvino_c.so.
+    'openvino=2026.4.0' # Includes libopenvino_c.so.
 )
 makedepends=(
     'cmake'
@@ -25,24 +25,19 @@ optdepends=(
     'openvino-intel-npu-plugin: inference on Intel NPUs'
 )
 
-_commit=56d9685302da2fc5cc7c9689cfab500fd0660a02
+_commit=7ea2546852a382cd16bd22dea0cfad2db70ed744
 source=(
     "openvino.genai::git+$url.git#commit=$_commit"
     'gcc-16-char8_t.patch'
-    'format-template-linkage.patch::https://github.com/openvinotoolkit/openvino.genai/commit/398fbc1450f7485368edf52dd82f45eba215d6c9.patch'
 )
 sha256sums=(
     'SKIP'
     '6e685c1e45d4b2314fd55e2f791846cc9086413ba62a6bb5e31be5a5878a243c'
-    '8c2a3e4bf1d33e00b780da7bec2d5e40b6fd26a4e518359d6ff7c59ca7f649e3'
 )
 
 prepare() {
     cd openvino.genai
     patch -Np1 -i "$srcdir/gcc-16-char8_t.patch"
-    # Backport upstream 398fbc14: GCC -O3 can otherwise leave format<int>
-    # unresolved in libopenvino_genai.so.
-    patch -Np1 -i "$srcdir/format-template-linkage.patch"
     git submodule update --init --recursive
 }
 

From c330ee34a1521d68f8062a99ace16032dae2b4f1 Mon Sep 17 00:00:00 2001
From: Jacob Mink <Jacob.Mink@Dell.com>
Date: Thu, 24 Sep 2026 14:26:29 -0500
Subject: [PATCH 2/2] Fix OpenVINO GenAI build with GCC 16

---
 pkgbuilds/openvino-genai/PKGBUILD                  |  3 +++
 .../linear-attention-guard-constructor.patch       | 14 ++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgbuilds/openvino-genai/linear-attention-guard-constructor.patch

diff --git a/pkgbuilds/openvino-genai/PKGBUILD b/pkgbuilds/openvino-genai/PKGBUILD
index c763d2a..1b59e77 100644
--- a/pkgbuilds/openvino-genai/PKGBUILD
+++ b/pkgbuilds/openvino-genai/PKGBUILD
@@ -29,15 +29,18 @@ _commit=7ea2546852a382cd16bd22dea0cfad2db70ed744
 source=(
     "openvino.genai::git+$url.git#commit=$_commit"
     'gcc-16-char8_t.patch'
+    'linear-attention-guard-constructor.patch'
 )
 sha256sums=(
     'SKIP'
     '6e685c1e45d4b2314fd55e2f791846cc9086413ba62a6bb5e31be5a5878a243c'
+    '61958d64dd7510ff0cb6da010f26fddba3e5dbc38691828163a63d54951d1b2a'
 )
 
 prepare() {
     cd openvino.genai
     patch -Np1 -i "$srcdir/gcc-16-char8_t.patch"
+    patch -Np1 -i "$srcdir/linear-attention-guard-constructor.patch"
     git submodule update --init --recursive
 }
 
diff --git a/pkgbuilds/openvino-genai/linear-attention-guard-constructor.patch b/pkgbuilds/openvino-genai/linear-attention-guard-constructor.patch
new file mode 100644
index 0000000..5c97188
--- /dev/null
+++ b/pkgbuilds/openvino-genai/linear-attention-guard-constructor.patch
@@ -0,0 +1,14 @@
+diff --git a/src/cpp/src/continuous_batching/pipeline_impl.cpp b/src/cpp/src/continuous_batching/pipeline_impl.cpp
+--- a/src/cpp/src/continuous_batching/pipeline_impl.cpp
++++ b/src/cpp/src/continuous_batching/pipeline_impl.cpp
+@@ -529,6 +529,10 @@ void ContinuousBatchingPipeline::ContinuousBatchingImpl::step() {
+         const Scheduler::Output& m_scheduler_output;
+         bool m_armed = true;
+ 
++        BorrowedLinearAttentionRowsGuard(ContinuousBatchingImpl& impl, const Scheduler::Output& scheduler_output)
++            : m_impl(impl), m_scheduler_output(scheduler_output) {
++        }
++
+         ~BorrowedLinearAttentionRowsGuard() {
+             if (m_armed) {
+                 m_impl._release_linear_attention_borrowed_rows(m_scheduler_output);