GNU bug report logs - #60571
activating tests for skia 2D graphics library

Previous Next

Full log

Message #38 received at 60571 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Nicolas Graves <ngraves <at> ngraves.fr>
Cc: 60571 <at> debbugs.gnu.org
Subject: Re: [PATCH v2 1/4] gnu: Add spirv-headers-for-skia.
Date: Mon, 28 Aug 2023 11:27:42 -0400

Hi,

Nicolas Graves <ngraves <at> ngraves.fr> writes:

> * gnu/packages/vulkan.scm (spirv-headers-for-skia): New variable.
> (%vulkan-sdk-skia-version): New variable.
> ---
>  gnu/packages/vulkan.scm | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
>
> diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
> index 1d2e58f1d4..da83417dba 100644
> --- a/gnu/packages/vulkan.scm
> +++ b/gnu/packages/vulkan.scm
> @@ -46,6 +46,9 @@ (define-module (gnu packages vulkan)
>  
>  ;; Note: Remember to change vulkan-loader version when bumping this.
>  (define %vulkan-sdk-version "sdk-1.3.231.1")
> +;; Note: The current skia version is lagging behind vulkan's.
> +;; Use this variable until it has catched up.

"caught up".

> +(define %vulkan-sdk-skia-version "sdk-1.2.198.0")
>  
>  (define-public spirv-headers
>    (package
> @@ -79,6 +82,21 @@ (define-public spirv-headers
>                (string-append "https://github.com/KhronosGroup/SPIRV-Headers/blob/"
>                               version "/LICENSE")))))
>  
> +(define-public spirv-headers-for-skia
> +  (package
> +    (inherit spirv-headers)
> +    (name "spirv-headers-for-skia")
> +    (version %vulkan-sdk-skia-version)
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git")
> +             (commit version)))

This like busts the 80 characters limit.  You can break it with a
backslash (\) followed by a newline, e.g.

--8<---------------cut here---------------start------------->8---
                (url "https://skia.googlesource.com/external/github.com\
/KhronosGroup/SPIRV-Headers.git")
--8<---------------cut here---------------end--------------->8---

I think 'guix lint' warns about this.

-- 
Thanks,
Maxim

Previous Next

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