diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2010-08-04 21:19:03 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2010-08-04 21:19:03 +0000 |
commit | 2133f1c1d532e9eb08269e584dbae0248b3dffac (patch) | |
tree | 163e21b406204b91db3ff54cc6c1ba866e9fad54 /graphics/jbig2dec/files | |
parent | 762214a0af2c8ad7a8d6b5ec6f3187eac5351ba4 (diff) | |
download | ports-2133f1c1d532e9eb08269e584dbae0248b3dffac.tar.gz ports-2133f1c1d532e9eb08269e584dbae0248b3dffac.zip |
- Add SF to MASTER_SITES
- Mark MAKE_JOBS_SAFE
- Use FreeBSD's SHA1-implementation
- Add TESTS option default to off
Submitted by: Mikhail T. <mi+thun _at_ aldan.algebra.com> by email
Approved by: tabthorpe@ (co-mentor)
Notes
Notes:
svn path=/head/; revision=258793
Diffstat (limited to 'graphics/jbig2dec/files')
-rw-r--r-- | graphics/jbig2dec/files/patch-native-sha | 52 | ||||
-rw-r--r-- | graphics/jbig2dec/files/patch-tests | 8 | ||||
-rw-r--r-- | graphics/jbig2dec/files/simpler-test-patch | 12 |
3 files changed, 72 insertions, 0 deletions
diff --git a/graphics/jbig2dec/files/patch-native-sha b/graphics/jbig2dec/files/patch-native-sha new file mode 100644 index 000000000000..883868c06f32 --- /dev/null +++ b/graphics/jbig2dec/files/patch-native-sha @@ -0,0 +1,52 @@ +--- Makefile.in 2010-02-02 14:13:56.000000000 -0500 ++++ Makefile.in 2010-08-03 13:47:07.000000000 -0400 +@@ -214,8 +214,8 @@ + PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) + +-am_jbig2dec_OBJECTS = jbig2dec.$(OBJEXT) sha1.$(OBJEXT) ++am_jbig2dec_OBJECTS = jbig2dec.$(OBJEXT) + jbig2dec_OBJECTS = $(am_jbig2dec_OBJECTS) + jbig2dec_DEPENDENCIES = libjbig2dec.la @LIBOBJS@ +-jbig2dec_LDFLAGS = ++jbig2dec_LDFLAGS = -lmd + am_test_arith_OBJECTS = test_arith-jbig2_arith.$(OBJEXT) + test_arith_OBJECTS = $(am_test_arith_OBJECTS) +@@ -228,5 +228,5 @@ + am_test_sha1_OBJECTS = test_sha1-sha1.$(OBJEXT) + test_sha1_OBJECTS = $(am_test_sha1_OBJECTS) +-test_sha1_LDADD = $(LDADD) ++test_sha1_LDADD = -lmd + test_sha1_DEPENDENCIES = + test_sha1_LDFLAGS = +--- jbig2dec.c 2010-02-02 14:02:55.000000000 -0500 ++++ jbig2dec.c 2010-08-03 13:36:41.000000000 -0400 +@@ -37,5 +37,8 @@ + + #include "os_types.h" +-#include "sha1.h" ++#include <sha.h> ++#ifndef SHA1_DIGEST_SIZE ++# define SHA1_DIGEST_SIZE 20 ++#endif + + #include "jbig2.h" +--- sha1.c 2009-07-16 00:44:49.000000000 -0400 ++++ sha1.c 2010-08-03 13:45:09.000000000 -0400 +@@ -87,4 +87,11 @@ + + #include "os_types.h" ++ ++#include <sha.h> ++#ifndef SHA1_DIGEST_SIZE ++# define SHA1_DIGEST_SIZE 20 ++#endif ++ ++#if 0 + #include "sha1.h" + +@@ -261,5 +268,4 @@ + /*************************************************************/ + +-#if 0 + int main(int argc, char** argv) + { diff --git a/graphics/jbig2dec/files/patch-tests b/graphics/jbig2dec/files/patch-tests new file mode 100644 index 000000000000..17d3e19cf343 --- /dev/null +++ b/graphics/jbig2dec/files/patch-tests @@ -0,0 +1,8 @@ +--- test_jbig2dec.py 2009-07-16 00:44:49.000000000 -0400 ++++ test_jbig2dec.py 2010-08-03 14:59:23.000000000 -0400 +@@ -53,4 +53,5 @@ + else: + self.stream.write('PASSED all %d tests\n' % len(self.tests)) ++ return 1 + + class KnownFileHash(SelfTest): diff --git a/graphics/jbig2dec/files/simpler-test-patch b/graphics/jbig2dec/files/simpler-test-patch new file mode 100644 index 000000000000..aaf8328ca22f --- /dev/null +++ b/graphics/jbig2dec/files/simpler-test-patch @@ -0,0 +1,12 @@ +The test_jbig2dec.py requires Python and thus not be +suitable for some installations. + +--- Makefile.in 2010-02-02 14:13:56.000000000 -0500 ++++ Makefile.in 2010-08-03 13:47:07.000000000 -0400 +@@ -182,5 +182,5 @@ + 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 |