Subject: Re: bug#60571: activating tests for skia 2D graphics library

From: Maxim Cournoyer <[email-masked]>
Date: Sat, 02 Sep 2023 09:33:41 -0400

Hi Nicolas,

Nicolas Graves <[email-masked]> writes:

> * gnu/packages/graphics.scm (skia): Update to 110.0.0f3fb7a.
> [arguments](build-phases): Disable newly introduced libraries wuffs (general
> performance) and perfetto (running performance tests).
> ---
>  gnu/packages/graphics.scm | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
> index 207da49e05..9dfd7dd7ed 100644
> --- a/gnu/packages/graphics.scm
> +++ b/gnu/packages/graphics.scm
> @@ -2000,9 +2000,9 @@ (define-public skia
>    ;; https://skia.org/docs/user/release/release_notes/.  The commit used
>    ;; should be the last commit, as recommended at
>    ;; https://skia.org/docs/user/release/.
> -  (let ((version "98")
> +  (let ((version "110")
>          (revision "0")
> -        (commit "55c56abac381e1ae3f0116c410bed81b05e0a38a"))
> +        (commit "0f3fb7a005fb357962e8b948ff4ec6b37f11e01b"))
>      (package
>        (name "skia")
>        (version (git-version version revision commit))
> @@ -2014,7 +2014,7 @@ (define-public skia
>                  (file-name (git-file-name name version))
>                  (sha256
>                   (base32
> -                  "1ldns2j1g2wj2phlxr9zqkdgs5g64pisxhwxcrq9ijn8a3jhafr2"))))
> +                  "1aqdnx3817hzhy60mc72j6iwaywvd3b5fj3ffpjxnnras38x2jvp"))))
>        (build-system gnu-build-system)   ;actually GN + Ninja
>        (arguments
>         (list
> @@ -2045,7 +2045,10 @@ (define-public skia
>                           "extra_ldflags=[\"-Wl,-rpath=" #$output "/lib\"] "
>                           ;; Disabled, otherwise the build system attempts to
>                           ;; download the SDK at build time.
> -                         "skia_use_dng_sdk=false "))))
> +                         "skia_use_dng_sdk=false "
> +                         ;; Wuffs is a google language that may improve performance
> +                         ;; disabled while unpackaged
> +                         "skia_use_wuffs=false "))))
>              (replace 'build
>                (lambda* (#:key parallel-build? #:allow-other-keys)
>                  (let ((job-count (if parallel-build?
> @@ -2124,6 +2127,8 @@ (define-public skia
>                             "--args="
>                             "cc=\"gcc\" "              ;defaults to 'cc'
>                             "skia_compile_sksl_tests=false " ; disable some tests
> +                           "skia_use_perfetto=false " ; disable performance tests
> +                           "skia_use_wuffs=false "  ; missing performance tool
>                             "skia_use_system_expat=true " ; use system expat library
>                             ;; Specify where to locate the includes.
>                             "extra_cflags=["

If you try to rebuild skia's dependent packages, you'll find that the
upgrade breaks python-skia-pathops, which in turns breaks font-amiri,
... gnome.

We should look at what QA says and fix the breakage before merging.

-- 
Thanks,
Maxim