GNU bug report logs - #59386
[PATCH staging 00/11] Update vulkan-sdk packages to sdk-1.3.231.1.

Previous Next

Full log

View this message in rfc822 format

From: dan <i <at> dan.games>
To: 59386 <at> debbugs.gnu.org
Subject: [bug#59386] [PATCH 05/11] gnu: shaderc: Update to 2022.3.
Date: Sat, 19 Nov 2022 23:02:42 +0800

* gnu/packages/vulkan.scm (shaderc): Update to 2022.3.
---
 gnu/packages/vulkan.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 5a2294d6bc..3440c671dc 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -296,7 +296,8 @@ (define-public vulkan-tools
 (define-public shaderc
   (package
     (name "shaderc")
-    (version "2021.3")
+    ;; shaderc doesn't follow the versioning scheme of vulkan sdk
+    (version "2022.3")
     (source
      (origin
        (method git-fetch)
@@ -306,7 +307,7 @@ (define-public shaderc
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0qjwixcx74dvx68jl51x2mp2q1346hvhwxr8w3wk36nzla62k2s6"))))
+         "0sdbfi66zmqj0c5q5yv2zvcvry7557yzgxk2mwflyjgqh7kdhb8d"))))
     (build-system cmake-build-system)
     (arguments
      `(;; FIXME: Skip most of the tests, because enabling system gtest breaks
@@ -338,7 +339,16 @@ (define-public shaderc
                          ,version
                          ,(package-version spirv-tools)
                          ,(package-version glslang))))
-             #t)))))
+             #t))
+         ;; see: https://github.com/google/shaderc/pull/1276
+         (add-after 'do-not-look-for-bundled-sources 'drop-additional-glslang-deps
+           (lambda _
+             (substitute* "glslc/CMakeLists.txt"
+               (("OSDependent OGLCompiler") ""))
+             (substitute* "libshaderc/CMakeLists.txt"
+               (("OSDependent OGLCompiler") ""))
+             (substitute* "libshaderc_util/CMakeLists.txt"
+               (("OSDependent OGLCompiler") "")))))))
     (inputs
      (list glslang python spirv-headers spirv-tools))
     (native-inputs
-- 
2.38.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.