| 1 |
ssuominen 10/02/28 11:21:39 |
| 2 |
|
| 3 |
Added: jbigkit-2.0-build.patch |
| 4 |
Log: |
| 5 |
Version bump wrt #307131, thanks to Michael C. Ferguson for reporting. |
| 6 |
(Portage version: 2.2_rc63/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-libs/jbigkit/files/jbigkit-2.0-build.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/jbigkit/files/jbigkit-2.0-build.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/jbigkit/files/jbigkit-2.0-build.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: jbigkit-2.0-build.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur jbigkit.orig/libjbig/Makefile jbigkit/libjbig/Makefile |
| 17 |
--- jbigkit.orig/libjbig/Makefile 2008-08-30 20:20:52.000000000 +0300 |
| 18 |
+++ jbigkit/libjbig/Makefile 2010-02-28 13:12:41.000000000 +0200 |
| 19 |
@@ -1,29 +1,54 @@ |
| 20 |
# Unix makefile for the JBIG-KIT library |
| 21 |
# $Id: jbigkit-2.0-build.patch,v 1.1 2010/02/28 11:21:39 ssuominen Exp $ |
| 22 |
|
| 23 |
-# Select an ANSI/ISO C compiler here, GNU gcc is recommended |
| 24 |
-CC = gcc |
| 25 |
+AR ?= ar |
| 26 |
+CC ?= gcc |
| 27 |
+RANLIB ?= ranlib |
| 28 |
+ |
| 29 |
+CFLAGS += -Wall -ansi -pedantic |
| 30 |
+ |
| 31 |
+ifeq ($(USERLAND),Darwin) |
| 32 |
+ SONAME = dylib |
| 33 |
+else |
| 34 |
+ SONAME = so |
| 35 |
+endif |
| 36 |
|
| 37 |
-# Options for the compiler: A high optimization level is suggested |
| 38 |
-CFLAGS = -g -O -Wall -ansi -pedantic # --coverage |
| 39 |
- |
| 40 |
-all: libjbig.a tstcodec tstcodec85 |
| 41 |
+all: libjbig.a libjbig.$(SONAME) libjbig85.a libjbig85.$(SONAME) tstcodec tstcodec85 |
| 42 |
|
| 43 |
tstcodec: tstcodec.o jbig.o jbig_ar.o |
| 44 |
- $(CC) $(CFLAGS) -o tstcodec $+ |
| 45 |
+ $(CC) $(LDFLAGS) $(CFLAGS) -o tstcodec $+ |
| 46 |
|
| 47 |
tstcodec85: tstcodec85.o jbig85.o jbig_ar.o |
| 48 |
- $(CC) $(CFLAGS) -o tstcodec85 $+ |
| 49 |
+ $(CC) $(LDFLAGS) $(CFLAGS) -o tstcodec85 $+ |
| 50 |
|
| 51 |
libjbig.a: jbig.o jbig_ar.o |
| 52 |
rm -f libjbig.a |
| 53 |
- ar rc libjbig.a jbig.o jbig_ar.o |
| 54 |
- -ranlib libjbig.a |
| 55 |
+ $(AR) rc libjbig.a jbig.o jbig_ar.o |
| 56 |
+ -$(RANLIB) libjbig.a |
| 57 |
+ |
| 58 |
+SOBJS = jbig.lo jbig_ar.lo |
| 59 |
+ |
| 60 |
+libjbig.so: $(SOBJS) |
| 61 |
+ $(CC) -shared $(LDFLAGS) -o $@ -Wl,-soname -Wl,$@ $(SOBJS) |
| 62 |
+ |
| 63 |
+libjbig.dylib: $(SOBJS) |
| 64 |
+ $(CC) -dynamic $(LDFLAGS) -o $@ -dynamiclib -install_name $@ $(SOBJS) |
| 65 |
+ |
| 66 |
+SOBJS85 = jbig85.lo jbig_ar.lo |
| 67 |
+ |
| 68 |
+libjbig85.so: $(SOBJS85) |
| 69 |
+ $(CC) -shared $(LDFLAGS) -o $@ -Wl,-soname -Wl,$@ $(SOBJS85) |
| 70 |
+ |
| 71 |
+libjbig85.dylib: $(SOBJS85) |
| 72 |
+ $(CC) -dynamic $(LDFLAGS) -o $@ -dynamiclib -install_name $@ $(SOBJS85) |
| 73 |
+ |
| 74 |
+%.lo: %.c jbig.h jbig85.h jbig_ar.h |
| 75 |
+ $(CC) $(CFLAGS) -fPIC -c $< -o $@ |
| 76 |
|
| 77 |
libjbig85.a: jbig85.o jbig_ar.o |
| 78 |
rm -f libjbig85.a |
| 79 |
- ar rc libjbig85.a jbig85.o jbig_ar.o |
| 80 |
- -ranlib libjbig85.a |
| 81 |
+ $(AR) rc libjbig85.a jbig85.o jbig_ar.o |
| 82 |
+ -$(RANLIB) libjbig85.a |
| 83 |
|
| 84 |
jbig.o: jbig.c jbig.h jbig_ar.h |
| 85 |
jbig85.o: jbig85.c jbig85.h jbig_ar.h |
| 86 |
diff -ur jbigkit.orig/Makefile jbigkit/Makefile |
| 87 |
--- jbigkit.orig/Makefile 2008-08-30 23:40:22.000000000 +0300 |
| 88 |
+++ jbigkit/Makefile 2010-02-28 12:59:07.000000000 +0200 |
| 89 |
@@ -1,34 +1,25 @@ |
| 90 |
# Unix makefile for JBIG-KIT |
| 91 |
# $Id: jbigkit-2.0-build.patch,v 1.1 2010/02/28 11:21:39 ssuominen Exp $ |
| 92 |
|
| 93 |
-# Select an ANSI/ISO C compiler here, GNU gcc is recommended |
| 94 |
-CC = gcc |
| 95 |
- |
| 96 |
-# Options for the compiler: A high optimization level is suggested |
| 97 |
-CCFLAGS = -O2 -W |
| 98 |
-#CCFLAGS = -O -g -W -Wall -ansi -pedantic #-DDEBUG # developer only |
| 99 |
- |
| 100 |
-CFLAGS = $(CCFLAGS) -I../libjbig |
| 101 |
- |
| 102 |
VERSION=2.0 |
| 103 |
|
| 104 |
all: lib pbm |
| 105 |
- @echo "Enter 'make test' in order to start some automatic tests." |
| 106 |
+ @echo "Enter '$(MAKE) test' in order to start some automatic tests." |
| 107 |
|
| 108 |
lib: |
| 109 |
- (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)") |
| 110 |
+ (cd libjbig; $(MAKE)) |
| 111 |
|
| 112 |
pbm: lib |
| 113 |
- (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)") |
| 114 |
+ (cd pbmtools; $(MAKE)) |
| 115 |
|
| 116 |
test: lib pbm |
| 117 |
- (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) |
| 118 |
- (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) |
| 119 |
+ (cd libjbig; $(MAKE) test) |
| 120 |
+ (cd pbmtools; $(MAKE) test) |
| 121 |
|
| 122 |
clean: |
| 123 |
rm -f *~ core |
| 124 |
- (cd libjbig; make clean) |
| 125 |
- (cd pbmtools; make clean) |
| 126 |
+ (cd libjbig; $(MAKE) clean) |
| 127 |
+ (cd pbmtools; $(MAKE) clean) |
| 128 |
|
| 129 |
distribution: clean |
| 130 |
rm -f libjbig/libjbig*.a |
| 131 |
diff -ur jbigkit.orig/pbmtools/Makefile jbigkit/pbmtools/Makefile |
| 132 |
--- jbigkit.orig/pbmtools/Makefile 2008-08-26 01:26:39.000000000 +0300 |
| 133 |
+++ jbigkit/pbmtools/Makefile 2010-02-28 13:01:19.000000000 +0200 |
| 134 |
@@ -2,10 +2,10 @@ |
| 135 |
# $Id: jbigkit-2.0-build.patch,v 1.1 2010/02/28 11:21:39 ssuominen Exp $ |
| 136 |
|
| 137 |
# Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended |
| 138 |
-CC = gcc |
| 139 |
+CC ?= gcc |
| 140 |
|
| 141 |
# Options for the compiler |
| 142 |
-CFLAGS = -g -Wall -ansi -pedantic -I../libjbig # --coverage |
| 143 |
+CFLAGS += -Wall -ansi -pedantic -I../libjbig |
| 144 |
|
| 145 |
.SUFFIXES: .1 .5 .txt $(SUFFIXES) |
| 146 |
|
| 147 |
@@ -13,16 +13,16 @@ |
| 148 |
pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt |
| 149 |
|
| 150 |
pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a |
| 151 |
- $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig |
| 152 |
+ $(CC) $(LDFLAGS) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig |
| 153 |
|
| 154 |
jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a |
| 155 |
- $(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig |
| 156 |
+ $(CC) $(LDFLAGS) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig |
| 157 |
|
| 158 |
pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a |
| 159 |
- $(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85 |
| 160 |
+ $(CC) $(LDFLAGS) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85 |
| 161 |
|
| 162 |
jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.a |
| 163 |
- $(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85 |
| 164 |
+ $(CC) $(LDFLAGS) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85 |
| 165 |
|
| 166 |
jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h |
| 167 |
pbmtojbg.o: pbmtojbg.c ../libjbig/jbig.h |
| 168 |
@@ -31,31 +31,31 @@ |
| 169 |
|
| 170 |
../libjbig/libjbig.a: ../libjbig/jbig.c ../libjbig/jbig.h \ |
| 171 |
../libjbig/jbig_ar.c ../libjbig/jbig_ar.h |
| 172 |
- make -C ../libjbig libjbig.a |
| 173 |
+ $(MAKE) -C ../libjbig libjbig.a |
| 174 |
|
| 175 |
../libjbig/libjbig85.a: ../libjbig/jbig85.c ../libjbig/jbig85.h \ |
| 176 |
../libjbig/jbig_ar.c ../libjbig/jbig_ar.h |
| 177 |
- make -C ../libjbig libjbig85.a |
| 178 |
+ $(MAKE) -C ../libjbig libjbig85.a |
| 179 |
|
| 180 |
test: test82 test85 |
| 181 |
|
| 182 |
test82: pbmtojbg jbgtopbm |
| 183 |
- make IMG=ccitt1 OPTIONSP= dotest1 |
| 184 |
- make IMG=ccitt2 OPTIONSP= dotest1 |
| 185 |
- make IMG=ccitt3 OPTIONSP= dotest1 |
| 186 |
- make IMG=xvlogo "OPTIONSP=-d 3" dotest1 |
| 187 |
- make IMG=sandra OPTIONSP= OPTIONSJ= dotest2g |
| 188 |
- make IMG=sandra OPTIONSP=-b OPTIONSJ=-b dotest2g |
| 189 |
- make IMG=sandra OPTIONSP=-q OPTIONSJ= dotest2g |
| 190 |
- make IMG=sandra "OPTIONSP=-o 0" OPTIONSJ= dotest2g |
| 191 |
- make IMG=sandra "OPTIONSP=-o 2" OPTIONSJ= dotest2g |
| 192 |
- make IMG=multi OPTIONSP= OPTIONSJ= dotest2g |
| 193 |
- make IMG=multi OPTIONSP=-b OPTIONSJ=-b dotest2g |
| 194 |
- make IMG=mx "OPTIONSP=-q -s 3 -m 128" dotest1 |
| 195 |
- make IMG=mx "OPTIONSP=-q -s 3 -m 128" dotest2b |
| 196 |
- make IMG=mx "OPTIONSP=-q -s 3 -m 128 -p 92" dotest2b |
| 197 |
- make IMG=mx "OPTIONSP=-q -Y -1" dotest2b |
| 198 |
- make IMG=mx "OPTIONSP=-Y -1" dotest2b |
| 199 |
+ $(MAKE) IMG=ccitt1 OPTIONSP= dotest1 |
| 200 |
+ $(MAKE) IMG=ccitt2 OPTIONSP= dotest1 |
| 201 |
+ $(MAKE) IMG=ccitt3 OPTIONSP= dotest1 |
| 202 |
+ $(MAKE) IMG=xvlogo "OPTIONSP=-d 3" dotest1 |
| 203 |
+ $(MAKE) IMG=sandra OPTIONSP= OPTIONSJ= dotest2g |
| 204 |
+ $(MAKE) IMG=sandra OPTIONSP=-b OPTIONSJ=-b dotest2g |
| 205 |
+ $(MAKE) IMG=sandra OPTIONSP=-q OPTIONSJ= dotest2g |
| 206 |
+ $(MAKE) IMG=sandra "OPTIONSP=-o 0" OPTIONSJ= dotest2g |
| 207 |
+ $(MAKE) IMG=sandra "OPTIONSP=-o 2" OPTIONSJ= dotest2g |
| 208 |
+ $(MAKE) IMG=multi OPTIONSP= OPTIONSJ= dotest2g |
| 209 |
+ $(MAKE) IMG=multi OPTIONSP=-b OPTIONSJ=-b dotest2g |
| 210 |
+ $(MAKE) IMG=mx "OPTIONSP=-q -s 3 -m 128" dotest1 |
| 211 |
+ $(MAKE) IMG=mx "OPTIONSP=-q -s 3 -m 128" dotest2b |
| 212 |
+ $(MAKE) IMG=mx "OPTIONSP=-q -s 3 -m 128 -p 92" dotest2b |
| 213 |
+ $(MAKE) IMG=mx "OPTIONSP=-q -Y -1" dotest2b |
| 214 |
+ $(MAKE) IMG=mx "OPTIONSP=-Y -1" dotest2b |
| 215 |
rm -f test-*.jbg test-*.pbm test-*.pgm |
| 216 |
./jbgtopbm ../examples/ccitt1.jbg | ./pbmtojbg > test-ccitt1.jbg |
| 217 |
cmp ../examples/ccitt1.jbg test-ccitt1.jbg |
| 218 |
@@ -91,24 +91,24 @@ |
| 219 |
cmp test-$(IMG).pgm ../examples/$(IMG).pgm |
| 220 |
|
| 221 |
test85: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 test-t82.pbm |
| 222 |
- make IMG=t82 "OPTIONSP=-p 0" dotest85 |
| 223 |
- make IMG=t82 "OPTIONSP=-p 8" dotest85 |
| 224 |
- make IMG=t82 "OPTIONSP=-p 8 -r" dotest85b |
| 225 |
- make IMG=t82 "OPTIONSP=-p 64" dotest85 |
| 226 |
- make IMG=t82 "OPTIONSP=-p 72" dotest85 |
| 227 |
- make IMG=t82 "OPTIONSP=-s 2 -C c" dotest85 |
| 228 |
- make IMG=t82 "OPTIONSP=-s 99999" dotest85 |
| 229 |
- make IMG=t82 "OPTIONSP=-Y 9999 0" dotest85 |
| 230 |
- make IMG=t82 "OPTIONSP=-Y 1951 0" dotest85 |
| 231 |
- make IMG=t82 "OPTIONSP=-Y -1 127" dotest85 |
| 232 |
- make IMG=t82 "OPTIONSP=-Y -1 128" dotest85 |
| 233 |
- make IMG=t82 "OPTIONSP=-Y -1 1919" dotest85 |
| 234 |
- make IMG=t82 "OPTIONSP=-Y -1 1920" dotest85 |
| 235 |
- make IMG=t82 "OPTIONSP=-Y -1 1949" dotest85 |
| 236 |
- make IMG=t82 "OPTIONSP=-Y -1 1950" dotest85 |
| 237 |
- make IMG=ccitt1 dotest85 |
| 238 |
- make IMG=ccitt2 dotest85 |
| 239 |
- make IMG=ccitt3 dotest85 |
| 240 |
+ $(MAKE) IMG=t82 "OPTIONSP=-p 0" dotest85 |
| 241 |
+ $(MAKE) IMG=t82 "OPTIONSP=-p 8" dotest85 |
| 242 |
+ $(MAKE) IMG=t82 "OPTIONSP=-p 8 -r" dotest85b |
| 243 |
+ $(MAKE) IMG=t82 "OPTIONSP=-p 64" dotest85 |
| 244 |
+ $(MAKE) IMG=t82 "OPTIONSP=-p 72" dotest85 |
| 245 |
+ $(MAKE) IMG=t82 "OPTIONSP=-s 2 -C c" dotest85 |
| 246 |
+ $(MAKE) IMG=t82 "OPTIONSP=-s 99999" dotest85 |
| 247 |
+ $(MAKE) IMG=t82 "OPTIONSP=-Y 9999 0" dotest85 |
| 248 |
+ $(MAKE) IMG=t82 "OPTIONSP=-Y 1951 0" dotest85 |
| 249 |
+ $(MAKE) IMG=t82 "OPTIONSP=-Y -1 127" dotest85 |
| 250 |
+ $(MAKE) IMG=t82 "OPTIONSP=-Y -1 128" dotest85 |
| 251 |
+ $(MAKE) IMG=t82 "OPTIONSP=-Y -1 1919" dotest85 |
| 252 |
+ $(MAKE) IMG=t82 "OPTIONSP=-Y -1 1920" dotest85 |
| 253 |
+ $(MAKE) IMG=t82 "OPTIONSP=-Y -1 1949" dotest85 |
| 254 |
+ $(MAKE) IMG=t82 "OPTIONSP=-Y -1 1950" dotest85 |
| 255 |
+ $(MAKE) IMG=ccitt1 dotest85 |
| 256 |
+ $(MAKE) IMG=ccitt2 dotest85 |
| 257 |
+ $(MAKE) IMG=ccitt3 dotest85 |
| 258 |
rm -f test-*.jbg test-*.jbg85 test-*.pbm |
| 259 |
@echo |
| 260 |
@echo "The T.85 pbmtools have PASSED the functional tests. Good!" |
| 261 |
@@ -142,7 +142,7 @@ |
| 262 |
./jbgtopbm $< $@ |
| 263 |
|
| 264 |
test-t82.pbm: |
| 265 |
- make -C ../libjbig tstcodec |
| 266 |
+ $(MAKE) -C ../libjbig tstcodec |
| 267 |
../libjbig/tstcodec $@ |
| 268 |
|
| 269 |
.1.txt .5.txt: |
Archives