Received: (at 60571) by debbugs.gnu.org; 5 Jan 2023 12:19:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 05 07:19:16 2023
Received: from localhost ([127.0.0.1]:50447 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pDPDI-0002t2-0n
for submit <at> debbugs.gnu.org; Thu, 05 Jan 2023 07:19:16 -0500
Received: from 12.mo582.mail-out.ovh.net ([178.32.125.228]:44285)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1pDPDF-0002ss-HJ
for 60571 <at> debbugs.gnu.org; Thu, 05 Jan 2023 07:19:14 -0500
Received: from director7.ghost.mail-out.ovh.net (unknown [10.108.4.44])
by mo582.mail-out.ovh.net (Postfix) with ESMTP id EC4DE25AFA
for <60571 <at> debbugs.gnu.org>; Thu, 5 Jan 2023 12:19:11 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-ps6sb (unknown [10.110.103.53])
by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 0F88B1FF02;
Thu, 5 Jan 2023 12:19:10 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.108])
by ghost-submission-6684bf9d7b-ps6sb with ESMTPSA
id oa53BD7AtmMhgQAAKOSeTw
(envelope-from <ngraves@HIDDEN>); Thu, 05 Jan 2023 12:19:10 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-108S002913756fe-ae5f-4b1e-80a4-b2599b5f259c,
CCCEE37B4F29B2D663A2C00FBFAE6261951393C8) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 194.57.247.3
From: Nicolas Graves <ngraves@HIDDEN>
To: 60571 <at> debbugs.gnu.org
Subject: [PATCH 4/4] gnu: skia: Activate tests.
Date: Thu, 5 Jan 2023 13:18:42 +0100
Message-Id: <20230105121842.18662-4-ngraves@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20230105121842.18662-1-ngraves@HIDDEN>
References: <20230105121842.18662-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 13852790981114061538
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrjeekgdeflecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpefhieekvddtveevgeeiiefgleelieehvdfghfeuvdevheffveekieettdeuhfeiteenucffohhmrghinhepshhkihgrrdhorhhgnecukfhppeduvdejrddtrddtrddupdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeitdehjeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvpdhmohguvgepshhmthhpohhuth
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 60571
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/graphics.scm (skia): Activate tests.
---
gnu/packages/graphics.scm | 144 ++++++++++++++++++++++++++++++++++----
1 file changed, 132 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index f23fad7c50..2392a63d33 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -80,6 +80,7 @@ (define-module (gnu packages graphics)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
#:use-module (gnu packages haskell-xyz)
+ #:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages image-processing)
#:use-module (gnu packages imagemagick)
@@ -1876,10 +1877,6 @@ (define-public skia
(build-system gnu-build-system) ;actually GN + Ninja
(arguments
(list
- ;; Running the test suite would require 'dm'; unfortunately the tool
- ;; can only be built for debug builds, which require fetching third
- ;; party sources.
- #:tests? #f
#:phases
#~(modify-phases %standard-phases
(replace 'configure
@@ -1944,13 +1941,136 @@ (define skia.pc (string-append #$output
URL: https://skia.org/
Version: ~a
Libs: -L${libdir} -lskia
-Cflags: -I${includedir}~%" #$output #$version))))))))
- (native-inputs (list gn libjpeg-turbo ninja pkg-config python-wrapper))
- (inputs (list expat fontconfig freetype harfbuzz mesa libwebp zlib))
- (home-page "https://skia.org/")
- (synopsis "2D graphics library")
- (description
- "Skia is a 2D graphics library for drawing text, geometries, and images.
+Cflags: -I${includedir}~%" #$output #$version)))))
+ (replace 'check
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (let ((icu #$(this-package-native-input "icu4c-for-skia")))
+ ;; Configure SPIRV-Tools dependency.
+ (substitute* "BUILD.gn"
+ (("deps \\+= \\[ \"\\/\\/third_party\\/externals\\/spirv-tools:spvtools_val\" \\]")
+ "libs += [ \"SPIRV-Tools\" ]"))
+ (substitute* "src/sksl/SkSLCompiler.cpp"
+ (("\"spirv-tools/libspirv.hpp\"")
+ "<libspirv.hpp>"))
+ ;; Configure ICU dependency.
+ (substitute* "third_party/icu/BUILD.gn"
+ (("data_dir = \"\\.\\.\\/externals\\/icu\\/\"")
+ (string-append "data_dir = \"" icu "/share/data/\""))
+ (("script = \"\\.\\.\\/externals\\/icu\\/scripts\\/")
+ (string-append "script = \"" icu "/share/scripts/"))
+ (("\\.\\.\\/externals\\/icu\\/common\\/icudtl.dat")
+ (string-append icu "/share/data/icudtl.dat"))
+ (("sources = icu_sources")
+ "")
+ (("sources \\+= \\[ \"\\$data_assembly\" \\]")
+ "sources = [ \"$data_assembly\" ]"))
+ ;; Enable system libraries without is_official_build=true.
+ ;; Necessary because is_official_build prevents building dm.
+ (for-each
+ (lambda (libname)
+ (let ((snake (string-join (string-split libname #\-) "_")))
+ (substitute*
+ (string-append "third_party/" libname "/BUILD.gn")
+ (((string-append "skia_use_system_"
+ snake
+ " = is_official_build.*"))
+ (string-append "skia_use_system_" snake " = true")))))
+ '("zlib" "libjpeg-turbo" "harfbuzz" "libpng" "libwebp"))
+ ;; Configure with gn.
+ (invoke "gn" "gen" "out/Debug"
+ (string-append
+ "--args="
+ "cc=\"gcc\" " ;defaults to 'cc'
+ "skia_compile_sksl_tests=false " ; disable some tests
+ "skia_use_system_expat=true " ; use system expat library
+ ;; Specify where to locate the includes.
+ "extra_cflags=["
+ (string-join
+ (map
+ (lambda (lib)
+ (string-append
+ "\"-I"
+ (search-input-directory
+ inputs
+ (string-append "include/" lib)) "\""))
+ '("harfbuzz"
+ "freetype2"
+ "spirv-tools"
+ "spirv"
+ "unicode"))
+ ",")
+ "] "
+ ;; Otherwise the validate-runpath phase fails.
+ "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_runtime_icu=true "))
+ ;; Build dm testing tool.
+ (symlink
+ (string-append #$(this-package-native-input "gn") "/bin/gn")
+ "./bin/gn")
+ (invoke "ninja" "-C" "out/Debug" "dm")
+ ;; Test require an X server.
+ (let ((xvfb (search-input-file (or native-inputs inputs)
+ "bin/Xvfb"))
+ (display ":1"))
+ (setenv "DISPLAY" display)
+ (system (string-append xvfb " " display " &")))
+ ;; Run tests.
+ (invoke "out/Debug/dm" "-v"
+ "-w" "dm_output"
+ "--codecWritePath" "dm_output"
+ "--simpleCodec"
+ "--skip"
+ ;; These tests fail with segmentation fault.
+ "_" "_" "_" "Codec_trunc"
+ "_" "_" "_" "AnimCodecPlayer"
+ "_" "_" "_" "Codec_partialAnim"
+ "_" "_" "_" "Codec_InvalidImages"
+ "_" "_" "_" "Codec_GifInterlacedTruncated"
+ "_" "_" "_" "SkText_UnicodeText_Flags"
+ "_" "_" "_" "SkParagraph_FontStyle"
+ "_" "_" "_" "flight_animated_image"
+ ;; These tests fail because of Codec/Sk failure.
+ "_" "_" "_" "AndroidCodec_computeSampleSize"
+ "_" "_" "_" "AnimatedImage_invalidCrop"
+ "_" "_" "_" "AnimatedImage_scaled"
+ "_" "_" "_" "AnimatedImage_copyOnWrite"
+ "_" "_" "_" "AnimatedImage"
+ "_" "_" "_" "BRD_types"
+ "_" "_" "_" "Codec_frames"
+ "_" "_" "_" "Codec_partial"
+ "_" "_" "_" "Codec_partialWuffs"
+ "_" "_" "_" "Codec_requiredFrame"
+ "_" "_" "_" "Codec_rewind"
+ "_" "_" "_" "Codec_incomplete"
+ "_" "_" "_" "Codec_InvalidAnimated"
+ "_" "_" "_" "Codec_ossfuzz6274"
+ "_" "_" "_" "Codec_gif_out_of_palette"
+ "_" "_" "_" "Codec_xOffsetTooBig"
+ "_" "_" "_" "Codec_gif"
+ "_" "_" "_" "Codec_skipFullParse"
+ "_" "_" "_" "AndroidCodec_animated_gif"
+ ;; Other failures
+ "_" "_" "_" "Gif"
+ "_" "_" "_" "Wuffs_seek_and_decode"
+ "_" "_" "_" "Skottie_Shaper_ExplicitFontMgr"
+ "8888" "skp" "_" "_"
+ "8888" "lottie" "_" "_"
+ "gl" "skp" "_" "_"
+ "gl" "lottie" "_" "_"
+ "_" "_" "_" "ES2BlendWithNoTexture")))))))
+ (native-inputs (list gn libjpeg-turbo ninja pkg-config python-wrapper
+ spirv-tools-for-skia spirv-headers-for-skia
+ icu4c-for-skia glu xorg-server-for-tests))
+ (inputs (list expat fontconfig freetype harfbuzz mesa libwebp zlib))
+ (home-page "https://skia.org/")
+ (synopsis "2D graphics library")
+ (description
+ "Skia is a 2D graphics library for drawing text, geometries, and images.
It supports:
@itemize
@item 3x3 matrices with perspective
@@ -1958,7 +2078,7 @@ (define skia.pc (string-append #$output
@item shaders, xfermodes, maskfilters, patheffects
@item subpixel text
@end itemize")
- (license license:bsd-3))))
+ (license license:bsd-3))))
(define-public superfamiconv
(package
--
2.38.1
guix-patches@HIDDEN:bug#60571; Package guix-patches.
Full text available.
Received: (at 60571) by debbugs.gnu.org; 5 Jan 2023 12:19:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 05 07:19:11 2023
Received: from localhost ([127.0.0.1]:50444 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pDPDC-0002sj-Gc
for submit <at> debbugs.gnu.org; Thu, 05 Jan 2023 07:19:10 -0500
Received: from 1.mo550.mail-out.ovh.net ([178.32.127.22]:54967)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1pDPDA-0002sU-Gt
for 60571 <at> debbugs.gnu.org; Thu, 05 Jan 2023 07:19:09 -0500
Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.4.72])
by mo550.mail-out.ovh.net (Postfix) with ESMTP id BA57A250D2
for <60571 <at> debbugs.gnu.org>; Thu, 5 Jan 2023 12:19:05 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-c52db (unknown [10.110.208.177])
by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id C03CC1FF21;
Thu, 5 Jan 2023 12:19:03 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.101])
by ghost-submission-6684bf9d7b-c52db with ESMTPSA
id fEvGMDfAtmPoxwAABnm1Sg
(envelope-from <ngraves@HIDDEN>); Thu, 05 Jan 2023 12:19:03 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-101G004c586ae94-ced5-4bb4-94a6-9e7977fb6e5b,
CCCEE37B4F29B2D663A2C00FBFAE6261951393C8) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 194.57.247.3
From: Nicolas Graves <ngraves@HIDDEN>
To: 60571 <at> debbugs.gnu.org
Subject: [PATCH 3/4] gnu: Add icu4c-for-skia.
Date: Thu, 5 Jan 2023 13:18:41 +0100
Message-Id: <20230105121842.18662-3-ngraves@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20230105121842.18662-1-ngraves@HIDDEN>
References: <20230105121842.18662-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 13851102132087153378
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrjeekgdeflecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpefhjeeuudeihfeijeffkeeiheegkeekgfdugfduledthfffvdduiefhhffhjeduteenucffohhmrghinhepghhoohhglhgvshhouhhrtggvrdgtohhmnecukfhppeduvdejrddtrddtrddupdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeitdehjeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 60571
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/icu4c.scm (icu4c-for-skia): New variable.
---
gnu/packages/icu4c.scm | 99 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 99 insertions(+)
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 1e4f66d956..05911addcd 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -27,14 +27,17 @@
(define-module (gnu packages icu4c)
#:use-module (gnu packages)
+ #:use-module (gnu packages cpio)
#:use-module (gnu packages java)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (guix gexp)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix build-system ant)
#:use-module (guix build-system gnu))
@@ -243,3 +246,99 @@ (define-public java-icu4j
globalisation support for software applications. This package contains the
Java part.")
(license x11)))
+
+(define-public icu4c-for-skia
+ (let ((commit "a0718d4f121727e30b8d52c7a189ebf5ab52421f")
+ (revision "0"))
+ (package
+ (inherit icu4c)
+ (name "icu4c-for-skia")
+ (version "skia")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://chromium.googlesource.com/chromium/deps/icu.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1qxws2p91f6dmhy7d3967r5ygz06r88pkmpm97px067x0zzdz384"))))
+ (native-inputs (list python cpio pkg-config))
+ (arguments
+ (list
+ #:make-flags #~`(,(string-append "DESTDIR=" #$output))
+ #:configure-flags #~'(;;"--enable-shared=no" "--enable-static=yes"
+ "--prefix=" "--exec-prefix=")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'chdir-to-source
+ (lambda _ (chdir "source")))
+ (replace 'configure
+ (lambda* (#:key inputs parallel-build? configure-flags #:allow-other-keys)
+ (let ((bash (search-input-file inputs "/bin/sh")))
+ ;; Replace bash executable.
+ (setenv "CONFIG_SHELL" bash)
+ (substitute* "./configure"
+ (("`/bin/sh")
+ (string-append "`" bash)))
+ ;; Make the static library position-independent.
+ ;; (substitute* "./icudefs.mk.in"
+ ;; (("^CFLAGS = ")
+ ;; "CFLAGS = -fPIC ")
+ ;; (("^CXXFLAGS = ")
+ ;; "CXXFLAGS = -fPIC "))
+ ;; Update runpath.
+ (substitute* "./icudefs.mk.in"
+ (("= -L\\$\\(LIBDIR\\)")
+ (string-append "= -L$(LIBDIR)"
+ " -Wl,-rpath=\"" #$output "/lib\"")))
+ ;; Set prefix and exec-prefix.
+ (substitute* "./runConfigureICU"
+ (("^OPTS=")
+ (string-append "OPTS=\""
+ (string-join configure-flags " ")
+ "\"")))
+ ;; Configure.
+ (invoke "./runConfigureICU" "Linux/gcc"
+ "--disable-layout" "--disable-tests"))))
+ (add-after 'install 'configure-filtered-data
+ (lambda* (#:key make-flags configure-flags #:allow-other-keys)
+ ;; Cleanup.
+ (with-directory-excursion "data"
+ `(,invoke "make" "clean" ,@make-flags))
+ ;; Set prefix and exec-prefix.
+ (substitute* "./runConfigureICU"
+ (("^OPTS=")
+ (string-append
+ "OPTS=\"" (string-join configure-flags " ") "\"")))
+ ;; Configure for common data.
+ (setenv "ICU_DATA_FILTER_FILE"
+ (string-append (getcwd) "/../filters/common.json"))
+ (invoke "./runConfigureICU" "Linux/gcc"
+ "--disable-layout" "--disable-tests")))
+ (add-after 'configure-filtered-data 'build-filtered-data
+ (lambda* (#:key parallel-build? make-flags #:allow-other-keys)
+ (let ((job-count (if parallel-build?
+ (number->string (parallel-job-count))
+ "1")))
+ `(,invoke "make" "-j" ,job-count ,@make-flags)
+ (setenv "DESTDIR" #$output)
+ (invoke "bash" "../scripts/copy_data.sh" "common"))))
+ (add-after 'build-filtered-data 'install-scripts-and-data
+ (lambda _
+ (let* ((share (string-append #$output "/share"))
+ (scripts (string-append share "/scripts"))
+ (data (string-append share "/data/common")))
+ ;; Install scripts.
+ (mkdir-p scripts)
+ (copy-recursively "../scripts/" scripts)
+ ;; Install data.
+ (mkdir-p data)
+ (copy-recursively "./dataout/common/data/out/tmp" data)
+ (symlink (string-append data "/icudt69l.dat")
+ (string-append data "/icudtl.dat")))))
+ (add-before 'check 'disable-failing-uconv-test
+ (lambda _
+ (substitute* "extra/uconv/Makefile.in"
+ (("check: check-local")
+ ""))))))))))
--
2.38.1
guix-patches@HIDDEN:bug#60571; Package guix-patches.
Full text available.
Received: (at 60571) by debbugs.gnu.org; 5 Jan 2023 12:19:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 05 07:19:06 2023
Received: from localhost ([127.0.0.1]:50441 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pDPD8-0002sS-5m
for submit <at> debbugs.gnu.org; Thu, 05 Jan 2023 07:19:06 -0500
Received: from 3.mo576.mail-out.ovh.net ([188.165.52.203]:57181)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1pDPD5-0002s6-6K
for 60571 <at> debbugs.gnu.org; Thu, 05 Jan 2023 07:19:04 -0500
Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.143.201])
by mo576.mail-out.ovh.net (Postfix) with ESMTP id F3F06244E5
for <60571 <at> debbugs.gnu.org>; Thu, 5 Jan 2023 12:19:01 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-m8dkx (unknown [10.110.115.9])
by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7757E1FF6C;
Thu, 5 Jan 2023 12:19:00 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.96])
by ghost-submission-6684bf9d7b-m8dkx with ESMTPSA
id Gcg9IDTAtmPXWgMAu7G/HA
(envelope-from <ngraves@HIDDEN>); Thu, 05 Jan 2023 12:19:00 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-96R001b7bf7139-f308-403d-8a61-cf06633bcf47,
CCCEE37B4F29B2D663A2C00FBFAE6261951393C8) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 194.57.247.3
From: Nicolas Graves <ngraves@HIDDEN>
To: 60571 <at> debbugs.gnu.org
Subject: [PATCH 2/4] gnu: Add spirv-tools-for-skia.
Date: Thu, 5 Jan 2023 13:18:40 +0100
Message-Id: <20230105121842.18662-2-ngraves@HIDDEN>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20230105121842.18662-1-ngraves@HIDDEN>
References: <20230105121842.18662-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 13849976231613031138
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrjeekgdeflecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeffgefhheevuefhvddufeethffhleduiedtledvuefhheelieefheehveevffffteenucffohhmrghinhepghhoohhglhgvshhouhhrtggvrdgtohhmpdhgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddrleeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeitdehjeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeipdhmohguvgepshhmthhpohhuth
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 60571
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/vulkan.scm (spirv-tools-for-skia): New variable.
---
gnu/packages/vulkan.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 8895d8a5cf..231fa2e281 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -120,6 +120,31 @@ (define-public spirv-tools
parser,disassembler, validator, and optimizer for SPIR-V.")
(license license:asl2.0)))
+(define-public spirv-tools-for-skia
+ (let ((commit "4b092d2ab81854e61632bdd1e658907f0071c37e")
+ (revision "0"))
+ (package
+ (inherit spirv-tools)
+ (name "spirv-tools-for-skia")
+ (version "skia")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0dqdybkxkwjiwwhxf0p3p1408wrqvwysymq7c9rzd1a2220y6lry"))))
+ (inputs (list spirv-headers-for-skia))
+ (native-inputs (list pkg-config python-wrapper))
+ (arguments
+ (list
+ #:configure-flags `(list "-DBUILD_SHARED_LIBS=ON"
+ (string-append
+ "-DSPIRV-Headers_SOURCE_DIR="
+ (assoc-ref %build-inputs "spirv-headers-for-skia"))))))))
+
(define-public spirv-cross
(package
(name "spirv-cross")
--
2.38.1
guix-patches@HIDDEN:bug#60571; Package guix-patches.
Full text available.
Received: (at 60571) by debbugs.gnu.org; 5 Jan 2023 12:19:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 05 07:19:05 2023
Received: from localhost ([127.0.0.1]:50439 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pDPD6-0002sF-No
for submit <at> debbugs.gnu.org; Thu, 05 Jan 2023 07:19:05 -0500
Received: from 9.mo576.mail-out.ovh.net ([46.105.56.78]:42225)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1pDPD4-0002rn-8g
for 60571 <at> debbugs.gnu.org; Thu, 05 Jan 2023 07:19:03 -0500
Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.20.179])
by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4977724E47
for <60571 <at> debbugs.gnu.org>; Thu, 5 Jan 2023 12:18:58 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-vcj6j (unknown [10.110.171.249])
by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 59EFD1FF3F;
Thu, 5 Jan 2023 12:18:57 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.109])
by ghost-submission-6684bf9d7b-vcj6j with ESMTPSA
id BRetFjHAtmMtWwMAanWh3Q
(envelope-from <ngraves@HIDDEN>); Thu, 05 Jan 2023 12:18:57 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-109S0032e6a1c6d-4dfa-4520-97fa-d063a3a04a89,
CCCEE37B4F29B2D663A2C00FBFAE6261951393C8) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 194.57.247.3
From: Nicolas Graves <ngraves@HIDDEN>
To: 60571 <at> debbugs.gnu.org
Subject: [PATCH 1/4] gnu: Add spirv-headers-for-skia.
Date: Thu, 5 Jan 2023 13:18:39 +0100
Message-Id: <20230105121842.18662-1-ngraves@HIDDEN>
X-Mailer: git-send-email 2.38.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 13849131806226178786
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrjeekgdeflecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeffhfefieeljeeuveelleeugeetheekffefteekveelfeekgfduffegudfhleffheenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhgohhoghhlvghsohhurhgtvgdrtghomhenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedtheejudesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 60571
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/vulkan.scm (spirv-headers-for-skia): New variable.
---
gnu/packages/vulkan.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index a2db5511d5..8895d8a5cf 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -74,6 +74,23 @@ (define-public spirv-headers
(string-append "https://github.com/KhronosGroup/SPIRV-Headers/blob/"
version "/LICENSE")))))
+(define-public spirv-headers-for-skia
+ (let ((commit "814e728b30ddd0f4509233099a3ad96fd4318c07")
+ (revision "0"))
+ (package
+ (inherit spirv-headers)
+ (name "spirv-headers-for-skia")
+ (version "skia")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0v6ycgfxh9d2gzhxrnxgrn5gyg2cshg55767qdg46px8412j5lbi")))))))
+
(define-public spirv-tools
(package
(name "spirv-tools")
--
2.38.1
guix-patches@HIDDEN:bug#60571; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 5 Jan 2023 10:03:01 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 05 05:03:01 2023 Received: from localhost ([127.0.0.1]:50322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1pDN5R-0005Ds-Dr for submit <at> debbugs.gnu.org; Thu, 05 Jan 2023 05:03:01 -0500 Received: from lists.gnu.org ([209.51.188.17]:58206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1pDN5P-0005Dk-Hi for submit <at> debbugs.gnu.org; Thu, 05 Jan 2023 05:03:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ngraves@HIDDEN>) id 1pDN5P-0003fj-5u for guix-patches@HIDDEN; Thu, 05 Jan 2023 05:02:59 -0500 Received: from 17.mo561.mail-out.ovh.net ([87.98.178.58]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ngraves@HIDDEN>) id 1pDN5N-0002Iy-A0 for guix-patches@HIDDEN; Thu, 05 Jan 2023 05:02:58 -0500 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.16.164]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id E4A0025192 for <guix-patches@HIDDEN>; Thu, 5 Jan 2023 10:02:45 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-kjkrm (unknown [10.110.103.249]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 3F3671FF72 for <guix-patches@HIDDEN>; Thu, 5 Jan 2023 10:02:44 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-6684bf9d7b-kjkrm with ESMTPSA id 34EHE0SgtmO0HwAASFnOuQ (envelope-from <ngraves@HIDDEN>) for <guix-patches@HIDDEN>; Thu, 05 Jan 2023 10:02:44 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R002122cea51-c2af-4f68-8aee-b1f100a55b0d, CCCEE37B4F29B2D663A2C00FBFAE6261951393C8) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 194.57.247.3 From: Nicolas Graves <ngraves@HIDDEN> To: guix-patches@HIDDEN Subject: activating tests for skia 2D graphics library Date: Thu, 05 Jan 2023 11:02:42 +0100 Message-ID: <87pmbtfge5.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 11548636820124918522 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrjeekgdduudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvufffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeujeelieeljeffhfelteejtdeljeehveduffelvefgudefkeehgfdvvdevgeevfeenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiuddpmhhouggvpehsmhhtphhouhht Received-SPF: pass client-ip=87.98.178.58; envelope-from=ngraves@HIDDEN; helo=17.mo561.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) Hi guix! I have a series of patches to activate tests on the SKIA graphics 2D library. Originally my goal was to add skia as a dependency to libreoffice and remove the --without-skia flag, but I didn't want to do that before being able to test the library change. It took me quite a while since google uses its own tools in a way that is hard to package in guix. There are still some disabled tests that I'm not able to fix myself, but at least it's testable for most tests. Help and review welcome, at least one function fails with segmentation fault, but I'm not able to debug it. -- Best regards, Nicolas Graves
Nicolas Graves <ngraves@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#60571; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.