[PATCH 0/3]: openjpeg and poppler

[PATCH 0/3]: openjpeg and poppler

[Ricardo Wurmus]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

This patch series

- fixes the home page URL for openjpeg
- adds openjpeg 1.5 (inheriting from openjpeg 2)
- updates poppler to build with openjpeg 1.5 and lcms
- updates openjpeg 2.0.0 to 2.0.1

Best,
Ricardo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-openjpeg-update-home-page-URL.patch --]
[-- Type: text/x-patch, Size: 962 bytes --]

From 753d468222253596b59df1759ed6adfc2c8d6d8c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Wed, 7 Jan 2015 17:34:08 +0100
Subject: [PATCH 1/4] gnu: openjpeg: update home page URL.

* gnu/packages/image.scm (openjpeg)[home-page]: Update URL.
---
 gnu/packages/image.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 7a22bf4..7dc706f 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -217,7 +217,7 @@ In addition to the basic codec, various other features are under
 development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats,
 an indexing tool useful for the JPIP protocol, JPWL-tools for
 error-resilience, a Java-viewer for j2k-images, ...")
-    (home-page "http://jbig2dec.sourceforge.net/")
+    (home-page "https://code.google.com/p/openjpeg/")
     (license license:bsd-2)))
 
 (define-public giflib
-- 
1.9.3


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-Add-openjpeg-1.patch --]
[-- Type: text/x-patch, Size: 1101 bytes --]

From a6c478860bacfefd239575786dd3c09f8d24cde7 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Wed, 7 Jan 2015 17:40:13 +0100
Subject: [PATCH 2/4] gnu: Add openjpeg-1.

* gnu/packages/image.scm (openjpeg-1): New variable.
---
 gnu/packages/image.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 7dc706f..a62429c 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -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-1
+  (package (inherit openjpeg)
+    (name "openjpeg")
+    (version "1.5.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://sourceforge/openjpeg.mirror/" name "-"
+                       version ".tar.gz"))
+       (sha256
+        (base32 "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm"))))))
+
 (define-public giflib
   (package
     (name "giflib")
-- 
1.9.3


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-poppler-build-with-openjpeg-and-lcms.patch --]
[-- Type: text/x-patch, Size: 1856 bytes --]

From d3978d8a8d97a99a8b6514b2a06a8a51cbbf9187 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Wed, 7 Jan 2015 17:43:18 +0100
Subject: [PATCH 3/4] gnu: poppler: build with openjpeg and lcms

* gnu/packages/pdf.scm (poppler): build poppler with openjpeg 1.5 and lcms.
---
 gnu/packages/pdf.scm | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 7d5100a..600abdf 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -55,12 +55,13 @@
    ;;    introspection:    no
    ;;  use gtk-doc:        no
    ;;  use libcurl:        no
-   ;;  use libopenjpeg:    no
    (inputs `(("fontconfig" ,fontconfig)
              ("freetype" ,freetype)
              ("libjpeg-8" ,libjpeg-8)
              ("libpng" ,libpng)
              ("libtiff" ,libtiff)
+             ("lcms" ,lcms)
+             ("openjpeg-1" ,openjpeg-1)
              ("zlib" ,zlib)
 
              ;; To build poppler-glib (as needed by Evince), we need Cairo and
@@ -75,8 +76,18 @@
    (arguments
     `(#:tests? #f ; no test data provided with the tarball
       #:configure-flags
-       '("--enable-xpdf-headers" ; to install header files
-         "--enable-zlib")))
+      '("--enable-libopenjpeg"
+        "--enable-xpdf-headers" ; to install header files
+        "--enable-zlib")
+      #:phases
+      (alist-cons-before
+       'configure 'setenv
+       (lambda _
+         (setenv "CPATH"
+                 (string-append (assoc-ref %build-inputs "openjpeg-1")
+                                "/include/openjpeg-1.5"
+                                ":" (or (getenv "CPATH") ""))))
+        %standard-phases)))
    (synopsis "PDF rendering library")
    (description
     "Poppler is a PDF rendering library based on the xpdf-3.0 code base.")
-- 
1.9.3


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0004-gnu-openjpeg-Update-to-2.0.1.patch --]
[-- Type: text/x-patch, Size: 1262 bytes --]

From 8591e9979a59d52a2aa21cd8ffa0b47b8386cd40 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Wed, 7 Jan 2015 17:47:37 +0100
Subject: [PATCH 4/4] gnu: openjpeg: Update to 2.0.1.

* gnu/packages/image.scm (openjpeg): Update to 2.0.1.
---
 gnu/packages/image.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index a62429c..63c16a8 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -187,16 +187,15 @@ work.")
 (define-public openjpeg
   (package
     (name "openjpeg")
-    (version "2.0.0")
+    (version "2.0.1")
     (source
       (origin
         (method url-fetch)
         (uri
-          (string-append "http://openjpeg.googlecode.com/files/" name "-"
-                         version ".tar.gz"))
+         (string-append "mirror://sourceforge/openjpeg.mirror/" name "-"
+                        version ".tar.gz"))
         (sha256
-          (base32 "1n05yrmscpgksrh2kfh12h18l0lw9j03mgmvwcg3hm8m0lwgak9k"))))
-
+         (base32 "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z"))))
     (build-system cmake-build-system)
     (arguments
       ;; Trying to run `$ make check' results in a no rule fault.
-- 
1.9.3

Re: [PATCH 0/3]: openjpeg and poppler

[Ludovic Courtès]

Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> skribis:

> This patch series
>
> - fixes the home page URL for openjpeg
> - adds openjpeg 1.5 (inheriting from openjpeg 2)
> - updates poppler to build with openjpeg 1.5 and lcms
> - updates openjpeg 2.0.0 to 2.0.1

All looks good to me!

Please make sure to add a copyright line for you in these two files.

Thanks,
Ludo’.

Re: [PATCH 0/3]: openjpeg and poppler

[Ricardo Wurmus]

>> This patch series
>>
>> - fixes the home page URL for openjpeg
>> - adds openjpeg 1.5 (inheriting from openjpeg 2)
>> - updates poppler to build with openjpeg 1.5 and lcms
>> - updates openjpeg 2.0.0 to 2.0.1
>
> All looks good to me!
>
> Please make sure to add a copyright line for you in these two files.

Thanks for the review!

I updated the patches to include the copyright lines and pushed the
commits.

-- Ricardo