From patchwork Mon Sep 18 20:04:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendursaga X-Patchwork-Id: 54047 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 5E7D627BBE9; Mon, 18 Sep 2023 21:06:26 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED 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 D028027BBE2 for ; Mon, 18 Sep 2023 21:06:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiKVJ-0001SW-Dr; Mon, 18 Sep 2023 16:05:57 -0400 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 ) id 1qiKVG-0001S6-VW for guix-patches@gnu.org; Mon, 18 Sep 2023 16:05:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiKVG-0002Lx-NT for guix-patches@gnu.org; Mon, 18 Sep 2023 16:05:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiKVO-0005j2-J4 for guix-patches@gnu.org; Mon, 18 Sep 2023 16:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66094] [PATCH] gnu: vips: Update to 8.14.5. Resent-From: Hendursaga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 20:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66094 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66094@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169506750821933 (code B ref -1); Mon, 18 Sep 2023 20:06:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Sep 2023 20:05:08 +0000 Received: from localhost ([127.0.0.1]:54587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiKUW-0005hg-47 for submit@debbugs.gnu.org; Mon, 18 Sep 2023 16:05:08 -0400 Received: from lists.gnu.org ([2001:470:142::17]:47090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiKUR-0005h6-5u for submit@debbugs.gnu.org; Mon, 18 Sep 2023 16:05:06 -0400 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 ) id 1qiKUC-0001Ot-QU for guix-patches@gnu.org; Mon, 18 Sep 2023 16:04:49 -0400 Received: from sonic316-21.consmr.mail.ne1.yahoo.com ([66.163.187.147]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiKUA-0001vc-0M for guix-patches@gnu.org; Mon, 18 Sep 2023 16:04:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1695067482; bh=nVfzoihz9AD5RxbwTAck9wS2hBLtrGmZ6OquHmTHkHA=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=Mql9B1ZFa2M23xBDbeE2W9/+w00o2JJtCCpD42B15W0cqf1txhfXCObg1DoUCRTAASqtsbqZoIbVOUYGgkfRiEtCSbU5QiOQ3M5gh/PleQhRiEoJcmqlqwVCqUO8Qh/ZXy1fnCZ1xgBIGWs+aVvsnrVswi91muWjxavorPZg3a/ShDW6EElD/2Q1Y2wD+pM24OI28NBpYnBjRKi6DhITDFbqHqIHhEWgr3pN1AtKOQ7iSez41uFkftX9bkVY5iEWl1hx0GGCjaKiECzmv0RDsvDyRyx8wavgLhZ9ab8es35attHJ2AGqFe5wIDhgDVb0fpbY7ZBkWJQ+QgBQMZ/irg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1695067482; bh=VQRLt3LPfDw9mFu9SmCEVqrVzQWrH2X+xi23CdKVgPc=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=KwnDeGGEAMz80aPbT/FZQKu6aTXoR457SchSMxCC/Xs1M2Men06yoPY08BELWyqz8xB8gJqgvMoHATG4gJnnwXUHiPjG3mvRYItrMvYKt1GlK6GUhXhdgWZixjuUTLSe4pE3DGXIjxT0TIuIKGL5hV/XWV6j29+9q4Gl9uxFgGayCpi3+ZdO8GT6b+Smk90NTMKhMO2RIVsW047lteEWKexlsHohk4aLCChg+pdchNRbr2wPgOxp6/4nQA/Doufbt0LiTFGE+Dmj8wFTTYs71s+ZjykhVWluw7rv/EQmMWE5iQ+Utta7v8oFmNwMOlwiV82lfxSNln7x+iksJjfvPg== X-YMail-OSG: Oi8Yw50VM1ns4hUjQP5LAVs6YjjNIqpSou7iyVv5dmASMSxB1vgskzYQ8HC4lfw VN4_erlOpzXsKmYNE.4y0aZfBzo5RP742CU88DWPvn4pIB.MaYnGz_t6qbNQv47O47LIy_QUC8iW iAmdyFP9ahtN3o0WJhsXY8fXdhife47qD3xgAeddswpLmD9cru2bWwt.vrWN5P_ejWEOrMCPvbHc dezbb7Co95XtR2SyzD1c9quhRLLq9_uEXTIx9e.AGrIRju6imXgXuNhTeaVxR3pCOE9UYEGGY4dW YOPiJKMWPBnOvgLOwkjjGIuYzqLRV4yrXyhRPZ2q_i9lVzVXpCeJezUsRN9aZopekgSaBKEGsW8_ FaFNUD4UWrFRsbrabx4VSDvqoZebu1TjIVHeDIFzxc79byk.E_pILwV7anvavBgkdxULxGXorJy0 qs5KFDsaWL_hKUrrr9dtfFuIYp7f5HjgBZ2FjgjqarJm5awwYR3WMd9Go7fUKq1DBvaXIPgFBM12 8VqhwAqiLgJDPoESv4XayiJ4gjyUfSqyCReiQrpYs9Jp.yyJ51Y9CK5O5Ih800KO0z0P08J5AZdF puwm097p54UMaTqUrSHg_d8DVscL8viPs4Yp4ivfZPKyvs9WFL6iVZYiG05RlG5O9AdoGr6WNHjA PwMMvDtSUw3mhgXOjlTMbxNRPClViCtiUrngzRxyPMlyYNGylh7EXNm3QWTTbl6X59FHbUTOaTGB 69N4QG05TF77oMOUuASjduUkGUpaO3oYrsUBhBUw26lqYjxsXnJ4iiOO3AGTRGXsQeZ_DZqCBn86 NUs6BuQyYuu3Aw9q0xlcRAzqRW6YVVe.4qaoscwcrBIg1mZ3dxQ.qFDwk9VrQ67a.dvU2NKJwvsi 6gzqxwLN7Mq4W4WdYgRBxlI_OyE7MdfeKnhfUKgnkhckRFfK_79ozQoBL.shB868o5i8vlx8bDlm OqxQHNUdm4GjgwLQs1SIWyKFxgQJSNbojpnvR7i7mUImt_6VyXgxfKQHiTWqtL6gA5qfo3PKbU3T lrEKxWrNOb7LiqdTwhbvKaphkCN1cG3ZkHLzRo12XV1AgaTn6MCsL7ygNt0NYfd3IWEZ6nOlMdvi PgOm3Kh41KROnWy22rQ_czSAApXziBbedp7xVU2ncFUBQQduwfAPT6d0auOT2BGrUxL.BGjKyqCr JsdeXMaIZq40nL3gkaa.ioT74TVQrcruQg1JEAOyRYkYi05vmkkWAthzXOetvv0WgT3b.NO4xlcH HCFpBNXVfCWjdO08ZqWi.9bYhOMTQ6Y2Tj0oEVuHgt_JhZBdK_Q7FmOGc9OnRNmo80kJCf4OmxI2 s5UjS.90SEnzO0Z5.YHamQvESG0UeIn8LSEkiDJb68DIbvEmjJc7NmnbZDSTcLrgXCLsDBjOODVh tv4dPsV.d34pYTUJFWw8_.nXIjl8OUceGSin29GEBVtfYeO2hDfl_Q5JSXqCeoSASgU9KsznqMUD 4YQlg42S9R5_kyoo40WeSugpzHeOIbvno7dty78vBXoyK_i3oKnGGaYRKW.JUOjaT25c76msmShM Agbu8YrjUSsdEhWM47kM6IOF3f79cAZBkJY.cO4k31lMhbTKdguDbTyQUz_markiBg2Y9qyGseRQ jsVI7OCmJrqSGcLr188U3MDyoOHgQ3POj4Prfvsm4_8lAb_e63CsY5TKv8r84YUqkWuxod6OYCs5 19Nmt1L5gQihwu.JvA1acYUVgdFPleWezNijpjPSzRCAjhEbjIm4OPWJj7Q7q5Xzwct18I29HrH9 bfkvfeRDSGw7zSM95d892svUXUN2gsZH4EbVyJFBOvkBGSPIYrYPtpjcqNovSAem3ybsGIiA0gMd HwubPbYqzPeEcNtZ_sQOwUXDCEEu7jg36W7IfvhzBpIhQE.Uif1eyy7zJvmCVF8n5tqQ2iPJ.VNK ZHy_F3CRUXyXiQKS73MqkyE58PAQPl.LzMmg8SgwdxKeob.IfluFAzc3fy136MXhXlTIqWL1EkRn zoJiXIK96xV1uoLmXHpCWiZq4cSqMczFnMMYms_mCvEtFZMLwXiwMQF.r2CG3RJGKcH6wwYMCUTT _q9ZOdvD3HN36eTcZrPf1xxXDMkdsIPobaKK9PhJxoZ7SoxmPojTdJr_bF0xQ.F83luv4KEwiN4M a3i3E8E8ZPkByOZSECJSYFJDXfqwCS2LdzEJRTkEK2os3FSH9YJRv1UJ85zmrQnxgnTY- X-Sonic-MF: X-Sonic-ID: 2bbbdd76-f825-4298-8f7d-16f1cd519bd2 Received: from sonic.gate.mail.ne1.yahoo.com by sonic316.consmr.mail.ne1.yahoo.com with HTTP; Mon, 18 Sep 2023 20:04:42 +0000 Received: by hermes--production-ne1-6cbd549489-fvhzw (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID d1e2fec417d5656d44da767c77ac9089; Mon, 18 Sep 2023 20:04:37 +0000 (UTC) Date: Mon, 18 Sep 2023 16:04:20 -0400 Message-Id: <1f13ccf386121689ba5be643290293a5769b21e5.1695066872.git.hendursaga@aol.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 References: <1f13ccf386121689ba5be643290293a5769b21e5.1695066872.git.hendursaga.ref@aol.com> Received-SPF: pass client-ip=66.163.187.147; envelope-from=hendursaga@aol.com; helo=sonic316-21.consmr.mail.ne1.yahoo.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: Hendursaga X-ACL-Warn: , Hendursaga via Guix-patches X-Patchwork-Original-From: Hendursaga via Guix-patches via From: Hendursaga Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/image-processing.scm (vips): Update to 8.14.5. [source]: Switch to git-fetch. [build-system]: Switch to meson-build-system. [arguments]: Build all available docs, fix finding niftilib headers. [native-inputs]: Add doxygen, font-liberation, gettext-minimal, glib:bin, graphviz, gtk-doc, and pandoc, for building docs. [inputs]: Add additional dependencies cfitsio, fontconfig, libheif, libimagequant, libjxl, and openjpeg. [home-page]: Update URL. --- gnu/packages/image-processing.scm | 103 ++++++++++++++++++++---------- 1 file changed, 68 insertions(+), 35 deletions(-) base-commit: 3d9ebc7b2ed24312fd6a0916c203f7b86d57753d diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 8fc93a8842..ee73260fb7 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -49,9 +49,11 @@ (define-module (gnu packages image-processing) #:use-module (guix build-system qt) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages astronomy) #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages check) @@ -61,11 +63,13 @@ (define-module (gnu packages image-processing) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) + #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages game-development) #:use-module (gnu packages gcc) #:use-module (gnu packages gd) #:use-module (gnu packages geo) + #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gimp) #:use-module (gnu packages gl) @@ -75,6 +79,7 @@ (define-module (gnu packages image-processing) #:use-module (gnu packages graphviz) #: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 imagemagick) @@ -748,41 +753,69 @@ (define-public opencv (define-public vips (package (name "vips") - (version "8.13.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://github.com/libvips/libvips/releases/download/v" - version "/vips-" version ".tar.gz")) - (sha256 - (base32 "00kp3439jcqv9l2gcjg88xzvlq8clv54z1m3x66i3chvarz7ndxd")))) - (build-system gnu-build-system) - (native-inputs - (list gobject-introspection pkg-config)) - (inputs - (list expat - fftw - giflib - glib - hdf5 - imagemagick - lcms - libexif - libgsf - libjpeg-turbo - libpng - (librsvg-for-system) - libtiff - libxml2 - libwebp - matio - niftilib - openexr-2 - orc - pango - poppler)) - (home-page "https://libvips.github.io/libvips/") + (version "8.14.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libvips/libvips") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "020hksb5c3xmx30xg65csph0vyxjvxf3ijspdxc9njnkmih9ffsg")))) + (build-system meson-build-system) + (arguments + (list #:configure-flags #~(list "-Ddoxygen=true" "-Dgtk_doc=true" + (string-append "-Dnifti-prefix-dir=" + #$(this-package-input + "niftilib"))) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'set-home-directory + (lambda _ + ;; Prevent fontconfig (via Graphviz) complaining + ;; about no writable cache directories. + (setenv "HOME" "/tmp"))) + (add-after 'unpack 'fix-nifti-include + (lambda _ + (substitute* "meson.build" + ((" / 'nifti'") + ""))))))) + (native-inputs (list doxygen + font-liberation ;a URW Type 1 font, for Graphviz + gettext-minimal + gobject-introspection + (list glib "bin") ;glib-mkenums + graphviz ;full install needed due to pango + gtk-doc + pandoc ;convert markdown to DocBook for gtk-doc + pkg-config)) + (inputs (list cfitsio + expat + fftw + fontconfig + giflib + hdf5 + imagemagick + lcms + libexif + libgsf + libheif + libimagequant + libjpeg-turbo + libjxl + libpng + (librsvg-for-system) + libtiff + libxml2 + libwebp + matio + niftilib + openexr-2 + openjpeg + orc + pango + poppler)) + (home-page "https://www.libvips.org/") (synopsis "Multithreaded image processing system with low memory needs") (description "VIPS is a demand-driven, horizontally threaded image processing library.