From 88629b46b5f91cbe2327ffc49a9fc57a0b607b87 Mon Sep 17 00:00:00 2001
From: Scott Jones <scottajones@gmail.com>
Date: Sat, 26 Sep 2026 10:44:18 -0400
Subject: [PATCH] Match Hyprland software renderer names case-insensitively

Refresh the #16343 backport to carry the upstream follow-up that
matches llvmpipe/softpipe/Software Rasterizer with ASCII
case-insensitive, string_view-based matching.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
---
 pkgbuilds/hyprland/PKGBUILD                |  2 +-
 pkgbuilds/hyprland/software-renderer.patch | 41 ++++++++++++++++++----
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/pkgbuilds/hyprland/PKGBUILD b/pkgbuilds/hyprland/PKGBUILD
index 884e606..c03e578 100644
--- a/pkgbuilds/hyprland/PKGBUILD
+++ b/pkgbuilds/hyprland/PKGBUILD
@@ -68,7 +68,7 @@ _archive="${pkgname^}-$pkgver"
 source=("$_archive.tar.gz::$url/releases/download/v$pkgver/source-v$pkgver.tar.gz"
         software-renderer.patch)
 sha256sums=('03ad3f5ef152ff44116ffd56fcf808486211ecabf4f0ba567108ee746ba5cd2e'
-            'a703e36333087efdcd1ff9e077e039ba9020d26d20c8cfacc07192f3e7505f9e')
+            '380bb6d61c36d6c68bcccf242131f5b259734e8570ea39b3bc519b9ed137eddd')
 
 prepare() {
 	ln -sf hyprland-source "$_archive"
diff --git a/pkgbuilds/hyprland/software-renderer.patch b/pkgbuilds/hyprland/software-renderer.patch
index fbb8d32..2b800de 100644
--- a/pkgbuilds/hyprland/software-renderer.patch
+++ b/pkgbuilds/hyprland/software-renderer.patch
@@ -2,26 +2,53 @@ From: Scott Jones <scottajones@gmail.com>
 Subject: [PATCH] render: detect software rendering from the GL renderer (0.56.2 backport)
 
 Backport-of: 61d0ff60a7547d49229714a68b7ca9c0b6658727
+Backport-of: c3dcabc15ba7b71bd1bcd880e9f543909dd9372d
 Upstream-PR: https://github.com/hyprwm/Hyprland/pull/16343
 Co-authored-by: Eryk Wieliczko <44800858+erykwieliczko@users.noreply.github.com>
 
 Adapt constructor and logger-context differences against v0.56.2 while
-preserving the original GL classification behavior. Remove this backport
-once the packaged upstream version includes this behavior.
+preserving the GL classification behavior. v0.56.2 has no
+StringUtils.hpp, so the ASCII case-insensitive matcher lives as a
+file-local helper in GLRenderer.cpp. Remove this backport once the
+packaged upstream version includes this behavior.
 
 --- a/src/render/GLRenderer.cpp
 +++ b/src/render/GLRenderer.cpp
-@@ -36,7 +36,14 @@
+@@ -22,6 +22,7 @@
+ #include "./gl/GLTexture.hpp"
+ 
+ #include <cstdint>
++#include <string_view>
+ #include <hyprutils/memory/SharedPtr.hpp>
+ #include <hyprutils/memory/UniquePtr.hpp>
+ #include <hyprutils/utils/ScopeGuard.hpp>
+@@ -36,7 +37,30 @@ extern "C" {
  #include <xf86drm.h>
  }
  
 -CHyprGLRenderer::CHyprGLRenderer() : IHyprRenderer(), m_elementRenderer(makeUnique<CGLElementRenderer>()) {}
++// Whether haystack contains needle, ignoring ASCII case only; all other bytes must match exactly.
++static bool containsCaseInsensitive(const std::string_view haystack, const std::string_view needle) {
++    const auto lower = [](const unsigned char c) { return c >= 'A' && c <= 'Z' ? c + ('a' - 'A') : c; };
++
++    for (size_t i = 0; i + needle.size() <= haystack.size(); ++i) {
++        size_t j = 0;
++        while (j < needle.size() && lower(haystack[i + j]) == lower(needle[j]))
++            ++j;
++
++        if (j == needle.size())
++            return true;
++    }
++
++    return false;
++}
++
 +CHyprGLRenderer::CHyprGLRenderer() : IHyprRenderer(), m_elementRenderer(makeUnique<CGLElementRenderer>()) {
 +    // KMS can be display-only; classify the active GL renderer instead of the DRM driver.
 +    g_pHyprOpenGL->makeEGLCurrent();
 +    if (const auto* renderer = rc<const char*>(glGetString(GL_RENDERER))) {
-+        const std::string name{renderer};
-+        m_software = name.contains("llvmpipe") || name.contains("softpipe") || name.contains("Software Rasterizer");
++        const std::string_view name{renderer};
++        m_software = containsCaseInsensitive(name, "llvmpipe") || containsCaseInsensitive(name, "softpipe") || containsCaseInsensitive(name, "Software Rasterizer");
 +    }
 +}
  
@@ -29,7 +56,7 @@ once the packaged upstream version includes this behavior.
      return RT_GL;
 --- a/src/render/Renderer.cpp
 +++ b/src/render/Renderer.cpp
-@@ -104,8 +104,6 @@
+@@ -104,8 +104,6 @@ IHyprRenderer::IHyprRenderer() {
                  m_nvidia = true;
              else if (name.contains("i915"))
                  m_intel = true;
@@ -38,7 +65,7 @@ once the packaged upstream version includes this behavior.
  
              Log::logger->log(Log::DEBUG, "DRM driver information: {} v{}.{}.{} from {} description {}", name, DRMV->version_major, DRMV->version_minor, DRMV->version_patchlevel,
                               std::string{DRMV->date, DRMV->date_len}, std::string{DRMV->desc, DRMV->desc_len});
-@@ -126,8 +124,6 @@
+@@ -126,8 +124,6 @@ IHyprRenderer::IHyprRenderer() {
                  m_nvidia = true;
              else if (name.contains("i915"))
                  m_intel = true;