Re: [PATCH 1/3]: Add jbig2dec

["Dušan Xmetov" <merkur32@gmail.com>]

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

A fixed-up version, thanks to Alex Kost.

[-- Attachment #2: jbig2dec.patch --]
[-- Type: application/octet-stream, Size: 3502 bytes --]

From e3c00e88444596ac78d9a374e27aa96dceeaeb53 Mon Sep 17 00:00:00 2001
From: Marek Benc <merkur32@gmail.com>
Date: Mon, 15 Sep 2014 07:51:01 +0200
Subject: [PATCH] gnu: Add jbig2dec

* gnu/packages/image.scm (jbig2dec): New variable.
* gnu/packages/patches/jbig2dec-ignore-testtest.patch: New file.
* gnu-system.am (dist_patch_DATA): Added the above patch.
---
 gnu-system.am                                      |  1 +
 gnu/packages/image.scm                             | 29 ++++++++++++++++++++++
 .../patches/jbig2dec-ignore-testtest.patch         | 14 +++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 gnu/packages/patches/jbig2dec-ignore-testtest.patch

diff --git a/gnu-system.am b/gnu-system.am
index d5d509e..bf896bf 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -350,6 +350,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/hop-bigloo-4.0b.patch			\
   gnu/packages/patches/icu4c-test-date-format.patch		\
   gnu/packages/patches/inkscape-stray-comma.patch               \
+  gnu/packages/patches/jbig2dec-ignore-testtest.patch		\
   gnu/packages/patches/kmod-module-directory.patch		\
   gnu/packages/patches/libbonobo-activation-test-race.patch	\
   gnu/packages/patches/libevent-dns-tests.patch			\
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 1536378..d163d70 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -156,3 +156,32 @@ the W3C's XML-based Scaleable Vector Graphic (SVG) format.")
 
     ;; 'COPYING' is the GPLv2, but file headers say LGPLv2.0+.
     (license license:lgpl2.0+)))
+
+(define-public jbig2dec
+  (package
+    (name "jbig2dec")
+    (version "0.11")
+    (source
+      (origin
+        (method url-fetch)
+        (uri             ;; The link on the homepage is dead.
+          (string-append "http://distfiles.gentoo.org/distfiles/" name "-"
+                          version ".tar.gz"))
+        (sha256
+          (base32 "1ffhgmf2fqzk0h4k736pp06z7q5y4x41fg844bd6a9vgncq86bby"))
+        (patches (list (search-patch "jbig2dec-ignore-testtest.patch")))))
+
+    (build-system gnu-build-system)
+    (synopsis "Decoder of the JBIG2 image compression format")
+    (description
+      "JBIG2 is designed for lossy or lossless encoding of 'bilevel'
+(1-bit monochrome) images at moderately high resolution, and in
+particular scanned paper documents.  In this domain it is very
+efficient, offering compression ratios on the order of 100:1.
+
+This is a decoder only implementation, and currently is in the alpha
+stage, meaning it doesn't completely work yet.  However, it is
+maintaining parity with available encoders, so it is useful for real
+work.")
+    (home-page "http://jbig2dec.sourceforge.net/")
+    (license license:gpl2+)))
diff --git a/gnu/packages/patches/jbig2dec-ignore-testtest.patch b/gnu/packages/patches/jbig2dec-ignore-testtest.patch
new file mode 100644
index 0000000..1bf8f7a
--- /dev/null
+++ b/gnu/packages/patches/jbig2dec-ignore-testtest.patch
@@ -0,0 +1,14 @@
+Do not run the "testtest script", it doesn't seem to do anything and reports
+failiute. TODO: Actually fix the test instead of ignoring it.
+
+--- a/Makefile.in	2010-02-02 20:13:56.000000000 +0100
++++ b/Makefile.in	2014-09-13 17:50:10.957816767 +0200
+@@ -181,7 +181,7 @@
+ 
+ MAINTAINERCLEANFILES = config_types.h.in
+ 
+-TESTS = test_sha1 test_jbig2dec.py test_huffman test_arith
++TESTS = test_sha1 test_huffman test_arith
+ 
+ test_sha1_SOURCES = sha1.c sha1.h
+ test_sha1_CFLAGS = -DTEST
-- 
1.8.4