cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to jbigkit 1.6

Browse Source
This commit is contained in:
brad 2005-12-26 18:00:15 +00:00
parent 03e21da48f
commit c113aa3490
4 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/jbigkit/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.28 2005/12/26 15:49:48 steven Exp $
# $OpenBSD: Makefile,v 1.29 2005/12/26 18:00:15 brad Exp $
COMMENT= "lossless image compression library"
DISTNAME= jbigkit-1.5
SHARED_LIBS= jbig 1.2
DISTNAME= jbigkit-1.6
SHARED_LIBS= jbig 2.0
CATEGORIES= graphics
MASTER_SITES= http://www.cl.cam.ac.uk/~mgk25/download/

8
graphics/jbigkit/distinfo
View File

@ -1,4 +1,4 @@
MD5 (jbigkit-1.5.tar.gz) = d54f65825be7a28728f251b6d4922e07
RMD160 (jbigkit-1.5.tar.gz) = 4fe880a1a764bc1f50bf3bc6aecf2241c30b82d5
SHA1 (jbigkit-1.5.tar.gz) = 6fbe5e585224bf3d6c4a8d7cf6f470fb479e15c1
SIZE (jbigkit-1.5.tar.gz) = 404760
MD5 (jbigkit-1.6.tar.gz) = ce196e45f293d40ba76af3dc981ccfd7
RMD160 (jbigkit-1.6.tar.gz) = c412bf5a665ee98026eaa4162a9d623dcf0d1b98
SHA1 (jbigkit-1.6.tar.gz) = f401df793d91a1cc123bbf1387d39d4f0e73b272
SIZE (jbigkit-1.6.tar.gz) = 405712

8
graphics/jbigkit/patches/patch-Makefile
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile,v 1.2 2004/02/25 20:31:01 brad Exp $
--- Makefile.orig 2003-06-11 12:55:50.000000000 -0400
+++ Makefile 2004-02-25 15:19:19.000000000 -0500
$OpenBSD: patch-Makefile,v 1.3 2005/12/26 18:00:16 brad Exp $
--- Makefile.orig Fri Jun 11 14:05:26 2004
+++ Makefile Mon Dec 26 12:53:54 2005
@@ -13,22 +13,22 @@ CFLAGS = $(CCFLAGS) -I../libjbig
VERSION=1.5
VERSION=1.6
all: lib pbm
- @echo "Enter 'make test' in order to start some automatic tests."

23
graphics/jbigkit/patches/patch-libjbig_Makefile
View File

@ -1,19 +1,19 @@
$OpenBSD: patch-libjbig_Makefile,v 1.2 2004/02/25 20:31:01 brad Exp $
--- libjbig/Makefile.orig 2003-06-11 12:57:56.000000000 -0400
+++ libjbig/Makefile 2004-02-25 15:01:50.000000000 -0500
@@ -7,16 +7,31 @@ CC = gcc
$OpenBSD: patch-libjbig_Makefile,v 1.3 2005/12/26 18:00:16 brad Exp $
--- libjbig/Makefile.orig Tue Jun 8 10:40:06 2004
+++ libjbig/Makefile Mon Dec 26 12:53:54 2005
@@ -7,17 +7,32 @@ CC = gcc
# Options for the compiler: A high optimization level is suggested
CFLAGS = -O -Wall -ansi -pedantic
-all: libjbig.a tstcodec
+PICFLAG= -fpic
+
+.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes"
+all: libjbig.a
+.else
+all: libjbig.a libjbig.so.$(VERSION)
+.endif
+
tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
$(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
jbig_tab.o
@ -25,7 +25,7 @@ $OpenBSD: patch-libjbig_Makefile,v 1.2 2004/02/25 20:31:01 brad Exp $
+ rm -f ${.TARGET}
+ ar rc ${.TARGET} ${.ALLSRC}
+ ranlib ${.TARGET}
+
+libjbig.so.$(VERSION): jbig.so jbig_tab.so
+ rm -f ${.TARGET}
+ ${CC} -shared $(PICFLAG) -o ${.TARGET} ${.ALLSRC}
@ -34,12 +34,13 @@ $OpenBSD: patch-libjbig_Makefile,v 1.2 2004/02/25 20:31:01 brad Exp $
+
+.c.so:
+ ${CC} ${CFLAGS} $(PICFLAG) -c ${.IMPSRC} -o ${.TARGET}
+
jbig.o: jbig.c jbig.h
@@ -24,4 +39,4 @@ test: tstcodec
./tstcodec
test: tstcodec
@@ -27,4 +42,4 @@ t82test.pbm: tstcodec
./tstcodec $@
clean:
- rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec
- rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec t82test.pbm
+ rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec libjbig.so.$(VERSION) libjbig.a