aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-04-17 15:44:50 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-05-02 00:38:52 +0200
commitde1b5e4959bb3c499cde5bae14f8ec6a0c85630c (patch)
tree781f520caf1da036cbc8dcf09519b5c0b326c237
parent50943b4878623f17c688766b8ff72d9f3ce7ffb0 (diff)
downloadguix-de1b5e4959bb3c499cde5bae14f8ec6a0c85630c.tar
guix-de1b5e4959bb3c499cde5bae14f8ec6a0c85630c.tar.gz
gnu: openjpeg: Incorporate grafted changes.
* gnu/packages/image.scm (openjpeg): Update to 2.3.1. [replacement]: Remove. [source]: Change to GIT-FETCH.
-rw-r--r--gnu/packages/image.scm36
1 files changed, 10 insertions, 26 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 08b4be5148..6c0ae474e8 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -580,18 +580,16 @@ work.")
(define-public openjpeg
(package
(name "openjpeg")
- (version "2.3.0")
- (replacement openjpeg-2.3.1)
- (source
- (origin
- (method url-fetch)
- (uri
- (string-append "https://github.com/uclouvain/openjpeg/archive/v"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "06npqzkg20avnygdwaqpap91r7qpdqgrn39adj2bl8v0pg0qgirx"))))
+ (version "2.3.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/uclouvain/openjpeg")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "openjpeg" version))
+ (sha256
+ (base32
+ "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb"))))
(build-system cmake-build-system)
(arguments
;; Trying to run `$ make check' results in a no rule fault.
@@ -615,20 +613,6 @@ error-resilience, a Java-viewer for j2k-images, ...")
(home-page "https://github.com/uclouvain/openjpeg")
(license license:bsd-2)))
-(define-public openjpeg-2.3.1
- (package
- (inherit openjpeg)
- (version "2.3.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/uclouvain/openjpeg")
- (commit (string-append "v" version))))
- (file-name (git-file-name "openjpeg" version))
- (sha256
- (base32
- "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb"))))))
-
(define-public openjpeg-1
(package (inherit openjpeg)
(name "openjpeg")