diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-12-10 23:03:57 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-12-10 23:03:57 -0500 |
| commit | d94691e0c21440657ad198b03145743d4a876829 (patch) | |
| tree | 20dd105c352c117244eed15f6ffcc3ea3ba43b00 /gnu/packages/image.scm | |
| parent | 72c0b687800a617b891565f5a85bb06c1e1ba015 (diff) | |
| parent | edd1652e0a66c7d0713c810c1e3711840d5ab8bc (diff) | |
| download | patches-d94691e0c21440657ad198b03145743d4a876829.tar patches-d94691e0c21440657ad198b03145743d4a876829.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/image.scm')
| -rw-r--r-- | gnu/packages/image.scm | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 7bf330be30..9c8a3fcde6 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -425,6 +425,7 @@ work.") (define-public openjpeg (package (name "openjpeg") + (replacement openjpeg/fixed) (version "2.1.1") (source (origin @@ -461,9 +462,21 @@ error-resilience, a Java-viewer for j2k-images, ...") (home-page "https://github.com/uclouvain/openjpeg") (license license:bsd-2))) +(define openjpeg/fixed + (package + (inherit openjpeg) + (source + (origin + (inherit (package-source openjpeg)) + (patches + (append + (origin-patches (package-source openjpeg)) + (search-patches "openjpeg-CVE-2016-9850-CVE-2016-9851.patch"))))))) + (define-public openjpeg-1 (package (inherit openjpeg) (name "openjpeg") + (replacement #f) (version "1.5.2") (source (origin @@ -860,14 +873,14 @@ convert, manipulate, filter and display a wide variety of image formats.") (define-public jasper (package (name "jasper") - (version "2.0.0") + (version "2.0.6") (source (origin (method url-fetch) (uri (string-append "https://www.ece.uvic.ca/~frodo/jasper" "/software/jasper-" version ".tar.gz")) (sha256 (base32 - "1kg5yrdwgazhbczybyx4548m0ijssabcp8hl5l87w78z833vikks")))) + "0g6fl8rrbspa9vpswixmpxrg71l19kqgc2b5cak7vmwxphj01wbk")))) (build-system cmake-build-system) (inputs `(("libjpeg" ,libjpeg))) (synopsis "JPEG-2000 library") |