diff options
author | Eric Bavier <bavier@member.fsf.org> | 2015-02-02 13:02:47 -0600 |
---|---|---|
committer | Eric Bavier <bavier@member.fsf.org> | 2015-02-02 13:03:42 -0600 |
commit | ca4077561f074b839ad45b4b213f82b853b989e3 (patch) | |
tree | 812f51b005a612d05de78b69d2f6b2c219586786 | |
parent | 288084d5355232be11c98945c507d0639bf5bc40 (diff) | |
download | guix-ca4077561f074b839ad45b4b213f82b853b989e3.tar guix-ca4077561f074b839ad45b4b213f82b853b989e3.tar.gz |
gnu: openjpeg: Upgrade to 2.1.0.
* gnu/packages/image.scm (openjpeg): Upgrade to 2.1.0.
(openjpeg-2.0): New variable.
* gnu/packages/pdf.scm (mupdf)[inputs]: Use openjpeg-2.0.
-rw-r--r-- | gnu/packages/image.scm | 17 | ||||
-rw-r--r-- | gnu/packages/pdf.scm | 2 |
2 files changed, 16 insertions, 3 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 07669a1803..a71465dc12 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -188,7 +188,7 @@ work.") (define-public openjpeg (package (name "openjpeg") - (version "2.0.1") + (version "2.1.0") (source (origin (method url-fetch) @@ -196,7 +196,7 @@ work.") (string-append "mirror://sourceforge/openjpeg.mirror/" name "-" version ".tar.gz")) (sha256 - (base32 "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z")))) + (base32 "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj")))) (build-system cmake-build-system) (arguments ;; Trying to run `$ make check' results in a no rule fault. @@ -220,6 +220,19 @@ error-resilience, a Java-viewer for j2k-images, ...") (home-page "https://code.google.com/p/openjpeg/") (license license:bsd-2))) +(define-public openjpeg-2.0 + (package (inherit openjpeg) + (name "openjpeg") + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://sourceforge/openjpeg.mirror/" name "-" + version ".tar.gz")) + (sha256 + (base32 "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z")))))) + (define-public openjpeg-1 (package (inherit openjpeg) (name "openjpeg") diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 02b55aca9b..ce81b7409c 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -206,7 +206,7 @@ extracting content or merging files.") ("libjpeg" ,libjpeg) ("libx11" ,libx11) ("libxext" ,libxext) - ("openjpeg" ,openjpeg) + ("openjpeg" ,openjpeg-2.0) ("openssl" ,openssl) ("zlib" ,zlib))) (native-inputs |