From 271f27864096728ebd05b61d2015ef3fade1dde6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 00:40:37 +0200 Subject: gnu: LibRaw: Update to 0.20.0 [fixes CVE-2020-15503]. * gnu/packages/photo.scm (libraw): Update to 0.20.0. * gnu/packages/image.scm (freeimage)[source](patches): Add LibRaw compatibility patch. --- gnu/packages/image.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 3fdc6db8a1..c6af458286 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1030,7 +1030,19 @@ supplies a generic doubly-linked list and some string functions.") (delete-file-recursively (string-append "Source/" dir))) '("LibJPEG" "LibOpenJPEG" "LibPNG" "LibRawLite" "LibJXR" "LibWebP" "OpenEXR" "ZLib")))) - (patches (search-patches "freeimage-unbundle.patch")))) + (patches + (append + (search-patches "freeimage-unbundle.patch") + ;; Take one patch from Arch Linux that adds LibRaw 0.20 compatibility. + (list (origin + (method url-fetch) + (uri "https://raw.githubusercontent.com/archlinux\ +/svntogit-community/ca3e6a52f5a46dec87cbf85e9d84fe370e282c8c/trunk\ +/freeimage-libraw-0.20.patch") + (file-name "freeimage-libraw-compat.patch") + (sha256 + (base32 + "0cwjxjz0f4gs6igvwqg0p99mnrsrwzkal1l2n08yvz2xq9s5khki")))))))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 630b75f76a1a296ff3e513c05dcd2dbf8e53f15e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 00:45:37 +0200 Subject: gnu: exiv2: Update to 0.27.3. * gnu/packages/image.scm (exiv2): Update to 0.27.3. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index c6af458286..f216815ddf 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1271,14 +1271,14 @@ channels.") (define-public exiv2 (package (name "exiv2") - (version "0.27.2") + (version "0.27.3") (source (origin (method url-fetch) (uri (string-append "https://www.exiv2.org/builds/exiv2-" version "-Source.tar.gz")) (sha256 - (base32 "0gqminvj14xm3rgbnydbywf22608js80rp7nmxxk4497j5mzali6")))) + (base32 "0y77wfadjsrcxijdqgkr3q88b6mm9y3rg8kqsmaig8iah49md7x7")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no test suite (propagated-inputs -- cgit v1.2.3 From ae383cdfc6628947937f2af34bb13402fcc3dc71 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 26 Jul 2020 06:05:38 +0200 Subject: gnu: jasper: Update to 2.0.17. * gnu/packages/image.scm (jasper): Update to 2.0.17. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index f216815ddf..c4651d7ee5 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1365,7 +1365,7 @@ convert, manipulate, filter and display a wide variety of image formats.") (define-public jasper (package (name "jasper") - (version "2.0.16") + (version "2.0.17") (source (origin (method git-fetch) (uri (git-reference @@ -1374,7 +1374,7 @@ convert, manipulate, filter and display a wide variety of image formats.") (file-name (git-file-name name version)) (sha256 (base32 - "05l75yd1zsxwv25ykwwwjs8961szv7iywf16nc6vc6qpby27ckv6")))) + "01jxvbz0gziflana8ic6cx735y2480scnnxgc10ykcqyvpkz3bjm")))) (build-system cmake-build-system) (inputs `(("libjpeg" ,libjpeg-turbo))) (synopsis "JPEG-2000 library") -- cgit v1.2.3 From ab10e460d6769481a30bdd5a0a2c1959ef56bac0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Jul 2020 13:07:01 +0200 Subject: gnu: jasper: Update to 2.0.19. * gnu/packages/image.scm (jasper): Update to 2.0.19. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index c4651d7ee5..ac523172de 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1365,7 +1365,7 @@ convert, manipulate, filter and display a wide variety of image formats.") (define-public jasper (package (name "jasper") - (version "2.0.17") + (version "2.0.19") (source (origin (method git-fetch) (uri (git-reference @@ -1374,7 +1374,7 @@ convert, manipulate, filter and display a wide variety of image formats.") (file-name (git-file-name name version)) (sha256 (base32 - "01jxvbz0gziflana8ic6cx735y2480scnnxgc10ykcqyvpkz3bjm")))) + "036rcr0wkz9gzmvk1jb96piznk0c0bwxgf31z1zrlg8js4zl1n84")))) (build-system cmake-build-system) (inputs `(("libjpeg" ,libjpeg-turbo))) (synopsis "JPEG-2000 library") -- cgit v1.2.3 From 03c0a7cd900bb9380468ae7253446e838fbf6781 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 3 Aug 2020 16:00:30 -0400 Subject: gnu: Remove libjpeg@8d. This version of ijg-libjpeg contains security vulnerabilities and is not used by any other package in Guix. * gnu/packages/image.scm (ijg-libjpeg-8): Remove variable. --- gnu/packages/image.scm | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index ac523172de..e6fc798bbb 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -398,16 +398,6 @@ lossless JPEG manipulations such as rotation, scaling or cropping: (license license:ijg) (home-page "https://www.ijg.org/"))) -(define-public ijg-libjpeg-8 - (package (inherit ijg-libjpeg) - (version "8d") - (source (origin - (method url-fetch) - (uri (string-append "https://www.ijg.org/files/jpegsrc.v" - version ".tar.gz")) - (sha256 (base32 - "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0")))))) - (define-public libjxr (package (name "libjxr") -- cgit v1.2.3 From 3883fad295f3e3c387fe3fa540e8a1613cedd9bc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 3 Aug 2020 16:16:53 -0400 Subject: gnu: libjpeg: Update to 9d [security fixes]. Includes fixes for CVE-2020-13790 and CVE-2020-14152. * gnu/packages/image.scm (ijg-libjpeg): Update to 9d. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e6fc798bbb..20dcfe1cf1 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -372,13 +372,13 @@ Features: (define-public ijg-libjpeg (package (name "libjpeg") - (version "9c") + (version "9d") (source (origin (method url-fetch) (uri (string-append "https://www.ijg.org/files/jpegsrc.v" version ".tar.gz")) (sha256 (base32 - "08kixcf3a7s9x91174abjnk1xbvj4v8crdc73zi4k9h3jfbm00k5")))) + "0clwys9lcqlxqgcw8s1gwfm5ix2zjlqpklmd3mbvqmj5ibj51jwr")))) (build-system gnu-build-system) (synopsis "Library for handling JPEG files") (description -- cgit v1.2.3 From 4fe1b2e69ee29f707b1b33957c570b515928c783 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 3 Aug 2020 16:25:55 -0400 Subject: gnu: libjpeg-turbo: Replace with 2.0.5 [fixes CVE-2020-13790]. * gnu/packages/image.scm (libjpeg-turbo/fixed): New variable. (libjpeg-turbo)[replacement]: New field. --- gnu/packages/image.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 20dcfe1cf1..4d443f820f 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1580,6 +1580,7 @@ is hereby granted.")))) (package (name "libjpeg-turbo") (version "2.0.4") + (replacement libjpeg-turbo/fixed) (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libjpeg-turbo/" @@ -1636,6 +1637,18 @@ and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).") license:ijg ;the libjpeg library and associated tools license:zlib)))) ;the libjpeg-turbo SIMD extensions +(define libjpeg-turbo/fixed + (package + (inherit libjpeg-turbo) + (version "2.0.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/libjpeg-turbo/" + version "/libjpeg-turbo-" version ".tar.gz")) + (sha256 + (base32 + "0pbv6pc97kbj7ib31qcwi7lnmm9xg5y3b11aasmkhfjvf7rgdy0n")))))) + (define-deprecated libjpeg libjpeg-turbo) (export libjpeg) -- cgit v1.2.3 From caf4df50b1f971eb7e825a50d96b13daab17c354 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Aug 2020 20:41:41 +0200 Subject: gnu: grim: Update to 1.3.1. * gnu/packages/image.scm (grim): Update to 1.3.1. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 4d443f820f..3061d19797 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1874,7 +1874,7 @@ identical visual appearance.") (define-public grim (package (name "grim") - (version "1.2.0") + (version "1.3.1") (source (origin (method git-fetch) @@ -1883,7 +1883,7 @@ identical visual appearance.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0brljl4zfbn5mh9hkfrfkvd27c5y9vdkgap9r1hrfy9r1x20sskn")))) + (base32 "0fjmjq0ws9rlblkcqxxw2lv7zvvyi618jqzlnz5z9zb477jwdfib")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("scdoc" ,scdoc))) -- cgit v1.2.3 From c42526e9473d6f78e029b6e3061938fb9d40f7e5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 3 Jul 2020 12:08:33 -0400 Subject: gnu: Add iqa. * gnu/packages/image.scm (iqa): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/image.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 3061d19797..2f354974d2 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -94,6 +94,38 @@ #:use-module (guix deprecation) #:use-module (srfi srfi-1)) +(define-public iqa + (package + (name "iqa") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri + (string-append "https://sourceforge.net/projects/iqa/files/" + "1.1.2%20Release/iqa_1.1.2_src.tar.gz/download")) + (sha256 + (base32 "00mgwy031ammab6bwmd1whhvqv3fxy1cs1igabq0n3ag12zhjs77")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + (install-file "build/debug/libiqa.a" lib) + #t)))))) + (synopsis "Image Quality Assessment") + (description "IQA is a C library for objectively measuring image/video +quality. It implements many popular algorithms, such as MS-SSIM, MS-SSIM*, +SIMM, MSE, and PSNR. It is designed to be fast, accurate, and reliable. All +code is Valgrind-clean and unit tested.") + (home-page "https://sourceforge.net/projects/iqa/") + (license license:bsd-4))) + (define-public libpng (package (name "libpng") -- cgit v1.2.3 From 3f03bd372871a95e2ebb50197172f7a95329feed Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 10 Jul 2020 15:57:04 -0400 Subject: gnu: Add openjpeg-data. * gnu/packages/image.scm (openjpeg-data): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/image.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 2f354974d2..6604ac5359 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -781,6 +781,28 @@ images of initially unknown height.") (license (list license:isc ; pbmtools/p?m.5 license:gpl2+)))) ; the rest +(define-public openjpeg-data + (package + (name "openjpeg-data") + (version "2020.05.19") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/uclouvain/openjpeg-data.git") + (commit "c5c4a8c"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jp84gbhw8q5b8mhc322ql9410hjf32w9hg10x4isfa9j59mnncb")))) + (build-system copy-build-system) + (synopsis "Test files for OpenJPEG") + (description "OpenJPEG-Data contains all files required to run the openjpeg +test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC +15444-4 procedures), non-regression tests and unit tests.") + (home-page "https://github.com/uclouvain/openjpeg-data") + (license license:bsd-2))) + (define-public openjpeg (package (name "openjpeg") -- cgit v1.2.3