From patchwork Tue Jun 14 19:20:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 40010 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 966AC27BBEA; Tue, 14 Jun 2022 20:21:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 04DD927BBE9 for ; Tue, 14 Jun 2022 20:21:32 +0100 (BST) Received: from localhost ([::1]:44066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1C6V-0008Ix-5N for patchwork@mira.cbaines.net; Tue, 14 Jun 2022 15:21:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1C63-0008Gv-ED for guix-patches@gnu.org; Tue, 14 Jun 2022 15:21:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o1C62-0000JM-7B for guix-patches@gnu.org; Tue, 14 Jun 2022 15:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o1C62-0008CK-4C for guix-patches@gnu.org; Tue, 14 Jun 2022 15:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55982] [PATCH 2/2] gnu: libjxl: Update to 0.6.1-0.b7076f18. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Jun 2022 19:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55982 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55982@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 55982-submit@debbugs.gnu.org id=B55982.165523443831454 (code B ref 55982); Tue, 14 Jun 2022 19:21:02 +0000 Received: (at 55982) by debbugs.gnu.org; 14 Jun 2022 19:20:38 +0000 Received: from localhost ([127.0.0.1]:35830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1C5d-0008BA-Nd for submit@debbugs.gnu.org; Tue, 14 Jun 2022 15:20:38 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:33624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1C5c-0008Ap-BB for 55982@debbugs.gnu.org; Tue, 14 Jun 2022 15:20:36 -0400 Received: by mail-qt1-f178.google.com with SMTP id i25so6863785qtq.0 for <55982@debbugs.gnu.org>; Tue, 14 Jun 2022 12:20:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RJHhQr1UsX92a+htpH4LjCt2GBzgp2VMi0om8f2sN7s=; b=dVRf9i0NGuzdpLJr76VH+Xss8G2cVCJMdKXvVrpfMmDbe8lKo4nms5sdVWu6DIGWQ6 1BZ9Wo8khKOYBsz/9FwMLVOlXe3C8RwLu/8krnEPkNRBQQ20B2YsKVZgKfAPMlIqeVOU lCRci+YfsoFOTY2T5H7VPTxO9a71Kr04RfHoCshJa16Z1P0hWXZOyn0AwgG3XhSB4v8H wM+VnPWwJiW4328E/p8+DbK574+Voaaa2Ne+8s2Zt7J+O29iu4rdqXrsVUVM1g3zdQNf bpWaKYdF7JIOUqyziinUcKR8dcrgu9fz679/u2AyU4xdHReYUwGmcWldOX1r4qAbMQRf sT8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RJHhQr1UsX92a+htpH4LjCt2GBzgp2VMi0om8f2sN7s=; b=hERsqm3xblQ4oEtoOom0EehmBJDfwqvcBKpuja1N/BekiJFRbaFdEkajp8ZP69c5DI UJ2vS45o1zVTu+6rtJ8i0dhUlI6roZfqxZ37cPAOMFGRoGAPtUXzAAPysBwxYLCMR2IX mpoPp7DqRPtTzoNu6r7fRnECYtM+B5Myb0+cm6x9BV7GN39lGfwLR0UTE8BPzU1eF1he OfTBWSenFCgQLc5b1ZoDKxZtjW8VyRKrSyKEqk4647YiWo/Iqt5dyVp5HBRd8hbBzy0s Zo1caDctXX3S4aoPb8aNu0KciEgVuq8G7Drbph9/8C1RJHDQRZFOWl976jtvHiOMYfNi E/DQ== X-Gm-Message-State: AOAM531+NlW/J6F3N7Cv95gTrXpkIgiKzJGnDhEBYhGbcujmZXQPuAsv chxJCsHGZxxvXSN6svy6tkDTz4I/oGZYkFht X-Google-Smtp-Source: ABdhPJyVOnpBQQCi6nXjiAZt6aCr/vgsTQdv4CJNIEWj22/KkE34vRTC23stdZHkZ9//zsnFJbJ6rA== X-Received: by 2002:a05:622a:14cf:b0:304:c54b:5f60 with SMTP id u15-20020a05622a14cf00b00304c54b5f60mr5702057qtx.147.1655234430716; Tue, 14 Jun 2022 12:20:30 -0700 (PDT) Received: from ip-10-114-89-138.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id s32-20020a05622a1aa000b00304e4bbc369sm7823879qtc.10.2022.06.14.12.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jun 2022 12:20:30 -0700 (PDT) From: Greg Hogan Date: Tue, 14 Jun 2022 19:20:28 +0000 Message-Id: <503147c80552e0f4720460e542002f5720033a44.1655233921.git.code@greghogan.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/image.scm (libjxl): Update to 0.6.1-0.b7076f18. [inputs]: Add gflags. --- gnu/packages/image.scm | 100 +++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 5a13ce56b3..a09e27088b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -80,6 +80,7 @@ (define-module (gnu packages image) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages photo) + #:use-module (gnu packages popt) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -2232,56 +2233,57 @@ (define-public libheif (license license:lgpl3+))) (define-public libjxl - (package - (name "libjxl") - (version "0.6.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libjxl/libjxl") - (commit (string-append "v" version)) - (recursive? #t))) - (file-name (git-file-name name version)) - (sha256 - (base32 "17pvc5zgm9az5hfg2p80325f42w3dqspyb03iakrwg9x4n3vjckx")) - (modules '((guix build utils))) - (snippet - ;; Delete the bundles that will not be used. libjxl bundles LCMS - ;; which is in Guix but there is no option to use the system package. - ;; This option will be introduced after version 0.6.1 and then we - ;; probably won't need to download the submodules. - '(begin - (for-each (lambda (directory) - (delete-file-recursively - (string-append "third_party/" directory))) - '("brotli" "googletest" "highway")))))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags - (list "-DJPEGXL_FORCE_SYSTEM_GTEST=true" - "-DJPEGXL_FORCE_SYSTEM_BROTLI=true" - ;; "-DJPEGXL_FORCE_SYSTEM_LCMS2=true" ; next version after 0.6.1 - "-DJPEGXL_FORCE_SYSTEM_HWY=true"))) - (native-inputs - (list asciidoc doxygen googletest pkg-config python)) - (inputs - (list freeglut - giflib - google-brotli - google-highway - imath - ;; lcms ; next version after 0.6.1 - libavif - libjpeg-turbo - libpng - libwebp - openexr)) - (home-page "https://github.com/libjxl/libjxl") - (synopsis "JPEG XL image format reference implementation") - (description "This package contains a reference implementation of JPEG XL + (let ((commit "b7076f1869914eee47b3eae107750f3a3ce43a76") + (revision "0")) + (package + (name "libjxl") + (version (git-version "0.6.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libjxl/libjxl") + (commit commit) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jx0hkd2nk15mmnzlk7y7fp644w336il7nsnp5yhf14j8zfaiqz8")) + (modules '((guix build utils))) + (snippet + ;; Delete the bundles that will not be used. libjxl bundles LCMS, + ;; which is in Guix, but a newer version is required. + '(begin + (for-each (lambda (directory) + (delete-file-recursively + (string-append "third_party/" directory))) + '("brotli" "googletest" "highway")))))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list "-DJPEGXL_FORCE_SYSTEM_GTEST=true" + "-DJPEGXL_FORCE_SYSTEM_BROTLI=true" + ;; "-DJPEGXL_FORCE_SYSTEM_LCMS2=true" ; requires lcms@2.13 + "-DJPEGXL_FORCE_SYSTEM_HWY=true"))) + (native-inputs + (list asciidoc doxygen googletest pkg-config python)) + (inputs + (list freeglut + gflags + giflib + google-brotli + google-highway + imath + ;; lcms ; requires lcms@2.13 + libavif + libjpeg-turbo + libpng + libwebp + openexr)) + (home-page "https://github.com/libjxl/libjxl") + (synopsis "JPEG XL image format reference implementation") + (description "This package contains a reference implementation of JPEG XL (encoder and decoder).") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public mtpaint (package