guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

26/416: gnu: shaderc: Update to 2022.3.


From: guix-commits
Subject: 26/416: gnu: shaderc: Update to 2022.3.
Date: Fri, 14 Apr 2023 15:25:13 -0400 (EDT)

apteryx pushed a commit to branch master
in repository guix.

commit d158c3a6ad7b2e54dc58c1b1c68f2f26570b0b99
Author: dan <i@dan.games>
AuthorDate: Sat Nov 19 23:02:42 2022 +0800

    gnu: shaderc: Update to 2022.3.
    
    * gnu/packages/vulkan.scm (shaderc): Update to 2022.3.
    
    Signed-off-by: Marius Bakke <marius@gnu.org>
---
 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 c1ecaeed3d..25d9d92718 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -293,7 +293,8 @@ API.")
 (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)
@@ -303,7 +304,7 @@ API.")
        (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
@@ -335,7 +336,16 @@ API.")
                          ,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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]