diff options
| author | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:21:47 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:49:06 +0100 |
| commit | ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe (patch) | |
| tree | 4ab573cee33f277828ad553a22579175b1dda22d /gnu/packages/image.scm | |
| parent | 098bd280f82350073e8280e37d56a14162eed09c (diff) | |
| parent | f80215c7c4ae5ea0c316f4766e6c05ae4218ede3 (diff) | |
| download | guix-ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/image.scm')
| -rw-r--r-- | gnu/packages/image.scm | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 9f14a06e89..949dbfe902 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in> -;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2020, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego@posteo.net> @@ -656,6 +656,39 @@ scale and pixel depth, and pixelwise masking, blending, enhancement, and arithmetic ops.") (license license:bsd-2))) +(define-public leptonica-1.80 + (package + (inherit leptonica) + (name "leptonica") + (version "1.80.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DanBloomberg/leptonica") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12ddln72z5l3icz0i9rpsfkg5xik8fcwcn8lb0cp3jigjxi8gvkg")))) + (arguments + (substitute-keyword-arguments (package-arguments leptonica) + ((#:tests? _ #t) + ;; The pngio_reg test fails, probably because the libpng used is + ;; newer. + #f) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (replace 'provide-absolute-giflib-reference + (lambda _ + (let ((giflib #$(this-package-input "giflib"))) + ;; Add an absolute reference to giflib to avoid propagation. + ;; This is the same as for the parent package, but at that + ;; time the file name was 'liblept.la, not libleptonica.la. + (with-directory-excursion (string-append #$output "/lib") + (substitute* '("liblept.la" "pkgconfig/lept.pc") + (("-lgif") + (string-append "-L" giflib "/lib -lgif"))))))))))))) + (define-public jbig2dec (package (name "jbig2dec") |