jbigkit: Updated (1.6 -> 2.0) (see note)

Note:

This update is also replacing the patch for building shared jbig libraries.

graphic/jbigkit/jbigkit.desc

@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../jbigkit/jbigkit.desc
-[COPY] Copyright (C) 2006 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
@@ -34,8 +34,8 @@
 
 [L] GPL
 [S] Stable
-[V] 1.6
+[V] 2.0
 [P] X -----5---9 112.700
 
-[D] 944889749 jbigkit-1.6.tar.gz http://www.cl.cam.ac.uk/~mgk25/download/
+[D] 4247583696 jbigkit-2.0.tar.gz http://www.cl.cam.ac.uk/~mgk25/download/
 

graphic/jbigkit/shared-lib.patch

@@ -0,0 +1,46 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../jbigkit/shared-lib.patch
+# Copyright (C) 2010 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+--- jbigkit/libjbig/Makefile.orig	2008-08-30 19:20:52.000000000 +0200
++++ jbigkit/libjbig/Makefile	2010-08-13 11:05:57.632003425 +0200
+@@ -7,7 +7,13 @@
+ # Options for the compiler: A high optimization level is suggested
+ CFLAGS = -g -O -Wall -ansi -pedantic # --coverage
+ 
+-all: libjbig.a tstcodec tstcodec85
++all: static shared tstbin
++
++static: libjbig.a libjbig85.a
++
++shared: libjbig.so libjbig85.so
++
++tstbin: tstcodec tstcodec85
+ 
+ tstcodec: tstcodec.o jbig.o jbig_ar.o
+ 	$(CC) $(CFLAGS) -o tstcodec $+
+@@ -25,6 +31,12 @@
+ 	ar rc libjbig85.a jbig85.o jbig_ar.o
+ 	-ranlib libjbig85.a
+ 
++libjbig.so: jbig.o jbig_ar.o
++	$(CC) $(CFLAGS) -shared jbig.o jbig_ar.o -o libjbig.so
++
++libjbig85.so: jbig85.o jbig_ar.o
++	$(CC) $(CFLAGS) -shared jbig85.o jbig_ar.o -o libjbig85.so
++
+ jbig.o: jbig.c jbig.h jbig_ar.h
+ jbig85.o: jbig85.c jbig85.h jbig_ar.h
+ jbig_ar.o: jbig_ar.c jbig_ar.h

graphic/jbigkit/shared-variant.patch

@@ -1,50 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../jbigkit/shared-variant.patch
-# Copyright (C) 2004 - 2006 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-I like shared objects ...
-
-  - Rene Rebe <[email protected]>
-
---- jbigkit/libjbig/Makefile	2004-06-08 16:40:06.000000000 +0200
-+++ jbigkit-fixed/libjbig/Makefile	2005-02-23 09:16:22.358023704 +0100
-@@ -5,9 +5,9 @@
- CC = gcc
- 
- # Options for the compiler: A high optimization level is suggested
--CFLAGS = -O -Wall -ansi -pedantic
-+CFLAGS = -O -Wall -ansi -pedantic -fPIC
- 
--all: libjbig.a tstcodec
-+all: libjbig.a libjbig.so tstcodec
- 
- tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
- 	$(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
-@@ -18,6 +18,9 @@
- 	ar rc libjbig.a jbig.o jbig_tab.o
- 	-ranlib libjbig.a
- 
-+libjbig.so: jbig.o jbig_tab.o
-+	$(CC) $(CFLAGS) -shared jbig.o jbig_tab.o -o libjbig.so
-+
- jbig.o: jbig.c jbig.h
- 
- test: tstcodec
-@@ -27,4 +30,4 @@
- 	./tstcodec $@
- 
- clean:
--	rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec t82test.pbm
-+	rm -f *.o *.so *~ core gmon.out dbg_d\=??.pbm tstcodec t82test.pbm