diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2007-05-19 23:18:24 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2007-05-19 23:18:24 +0000 |
| commit | 98b6df269de094538c7a40184c9d5a0951d0360f (patch) | |
| tree | e4b555d13a26704256e575ce151b95306234edef /media-libs/jbigkit/files | |
| parent | stable amd64, bug 178768 (diff) | |
| download | historical-98b6df269de094538c7a40184c9d5a0951d0360f.tar.gz historical-98b6df269de094538c7a40184c9d5a0951d0360f.tar.bz2 historical-98b6df269de094538c7a40184c9d5a0951d0360f.zip | |
Updated patch to fix broken makefile (thanks to flameeyes for the update)
Package-Manager: portage-2.1.2.6
Diffstat (limited to 'media-libs/jbigkit/files')
| -rw-r--r-- | media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch | 55 |
1 files changed, 53 insertions, 2 deletions
diff --git a/media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch b/media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch index 46d4107a5690..d7834e3e92de 100644 --- a/media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch +++ b/media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch @@ -2,8 +2,12 @@ Index: jbigkit/Makefile =================================================================== --- jbigkit.orig/Makefile +++ jbigkit/Makefile -@@ -16,19 +16,19 @@ all: lib pbm - @echo "Enter 'make test' in order to start some automatic tests." +@@ -13,22 +13,22 @@ CFLAGS = $(CCFLAGS) -I../libjbig + VERSION=1.6 + + all: lib pbm +- @echo "Enter 'make test' in order to start some automatic tests." ++ @echo "Enter '$(MAKE) test' in order to start some automatic tests." lib: - (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)") @@ -28,3 +32,50 @@ Index: jbigkit/Makefile distribution: clean rm -f libjbig/libjbig.a +Index: jbigkit/pbmtools/Makefile +=================================================================== +--- jbigkit.orig/pbmtools/Makefile ++++ jbigkit/pbmtools/Makefile +@@ -21,25 +21,25 @@ jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h + pbmtojbg.o: pbmtojbg.c ../libjbig/jbig.h + + ../libjbig/libjbig.a: ../libjbig/jbig.c ../libjbig/jbig.h +- cd ../libjbig ; make libjbig.a ++ cd ../libjbig ; $(MAKE) libjbig.a + + test: pbmtojbg jbgtopbm +- make IMG=ccitt1 OPTIONSJ= OPTIONSP= dotest1 +- make IMG=ccitt2 OPTIONSJ= OPTIONSP= dotest1 +- make IMG=ccitt3 OPTIONSJ= OPTIONSP= dotest1 +- make IMG=xvlogo OPTIONSJ= "OPTIONSP=-d 3" dotest1 +- make IMG=sandra OPTIONSP= OPTIONSJ= dotest2g +- make IMG=sandra OPTIONSP=-b OPTIONSJ=-b dotest2g +- make IMG=sandra OPTIONSP=-q OPTIONSJ= dotest2g +- make IMG=sandra "OPTIONSP=-o 0" OPTIONSJ= dotest2g +- make IMG=sandra "OPTIONSP=-o 2" OPTIONSJ= dotest2g +- make IMG=multi OPTIONSP= OPTIONSJ= dotest2g +- make IMG=multi OPTIONSP=-b OPTIONSJ=-b dotest2g +- make IMG=mx "OPTIONSP=-q -s 3 -m 128" dotest1 +- make IMG=mx "OPTIONSP=-q -s 3 -m 128" dotest2b +- make IMG=mx "OPTIONSP=-q -s 3 -m 128 -p 92" dotest2b +- make IMG=mx "OPTIONSP=-q -Y -1" dotest2b +- make IMG=mx "OPTIONSP=-Y -1" dotest2b ++ $(MAKE) IMG=ccitt1 OPTIONSJ= OPTIONSP= dotest1 ++ $(MAKE) IMG=ccitt2 OPTIONSJ= OPTIONSP= dotest1 ++ $(MAKE) IMG=ccitt3 OPTIONSJ= OPTIONSP= dotest1 ++ $(MAKE) IMG=xvlogo OPTIONSJ= "OPTIONSP=-d 3" dotest1 ++ $(MAKE) IMG=sandra OPTIONSP= OPTIONSJ= dotest2g ++ $(MAKE) IMG=sandra OPTIONSP=-b OPTIONSJ=-b dotest2g ++ $(MAKE) IMG=sandra OPTIONSP=-q OPTIONSJ= dotest2g ++ $(MAKE) IMG=sandra "OPTIONSP=-o 0" OPTIONSJ= dotest2g ++ $(MAKE) IMG=sandra "OPTIONSP=-o 2" OPTIONSJ= dotest2g ++ $(MAKE) IMG=multi OPTIONSP= OPTIONSJ= dotest2g ++ $(MAKE) IMG=multi OPTIONSP=-b OPTIONSJ=-b dotest2g ++ $(MAKE) IMG=mx "OPTIONSP=-q -s 3 -m 128" dotest1 ++ $(MAKE) IMG=mx "OPTIONSP=-q -s 3 -m 128" dotest2b ++ $(MAKE) IMG=mx "OPTIONSP=-q -s 3 -m 128 -p 92" dotest2b ++ $(MAKE) IMG=mx "OPTIONSP=-q -Y -1" dotest2b ++ $(MAKE) IMG=mx "OPTIONSP=-Y -1" dotest2b + rm -f test-*.jbg test-*.pbm test-*.pgm + ./jbgtopbm ../examples/ccitt1.jbg | ./pbmtojbg > test-ccitt1.jbg + cmp ../examples/ccitt1.jbg test-ccitt1.jbg |