diff options
Diffstat (limited to 'graphics/netpbm/files/patch-bg')
| -rw-r--r-- | graphics/netpbm/files/patch-bg | 94 |
1 files changed, 53 insertions, 41 deletions
diff --git a/graphics/netpbm/files/patch-bg b/graphics/netpbm/files/patch-bg index 87b21255dd36..ca7b74c90719 100644 --- a/graphics/netpbm/files/patch-bg +++ b/graphics/netpbm/files/patch-bg @@ -1,24 +1,32 @@ ---- ppm/Makefile.orig Tue Apr 4 04:53:40 2000 -+++ ppm/Makefile Sat Apr 15 08:00:00 2000 -@@ -19,8 +19,15 @@ +--- ppm/Makefile.orig Sat May 6 12:57:43 2000 ++++ ppm/Makefile Mon May 8 00:00:00 2000 +@@ -3,7 +3,7 @@ + + LIBROOT = ppm + LIBPPM = lib$(LIBROOT).$(NETPBMLIBSUFFIX) +-MAJ = 9 ++MAJ = 1 + MIN = 1 + + PGMDIR = $(SRCDIR)/pgm +@@ -19,12 +19,13 @@ endif NETPBMLIBS = $(LIBPPM) $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM) +NETPBMLD = -L. -lppm -L$(PBMDIR) -lpbm -L$(PGMDIR) -lpgm LIBLIBS = $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM) -+ifeq ($(JPEGLIB_DIR),NONE) -+ JPEGLD = -+else -+ JPEGLD = -L$(JPEGLIB_DIR) -ljpeg -+endif -+ PORTBINARIES = bmptoppm eyuvtoppm gouldtoppm hpcdtoppm ilbmtoppm imgtoppm \ mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \ pjtoppm \ -@@ -34,12 +41,13 @@ +- ppm3d ppmbrighten ppmchange ppmcolormask \ ++ ppm3d ppmbrighten ppmchange \ + ppmdim ppmdist ppmdither \ + ppmflash ppmhist ppmmake ppmmix ppmnorm \ + ppmquant ppmrelief ppmshift ppmspread ppmtoacad \ +@@ -34,19 +35,20 @@ ppmtotga ppmtouil ppmtoxpm ppmtoyuv \ - ppmtoyuvsplit \ + ppmtoyuvsplit ppmtv \ qrttoppm rawtoppm rgb3toppm sldtoppm spctoppm \ - sputoppm tgatoppm ximtoppm xpmtoppm xvminitoppm \ + sputoppm xpmtoppm xvminitoppm \ @@ -27,19 +35,28 @@ # We don't build vidtoppm by default, because it requires special libraries # and there is no known requirement for vidtoppm. -+NOMERGEBINARIES = tgatoppm ximtoppm ++NOMERGEBINARIES = ppmcolormask ppmntsc tgatoppm ximtoppm ifneq ($(JPEGLIB_DIR), NONE) ifneq ($(JPEGHDR_DIR), NONE) NOMERGEBINARIES += ppmtojpeg -@@ -55,6 +63,7 @@ + endif + endif + +-MATHBINARIES = ppmcie ppmforge ppmlabel ppmntsc ppmpat ppmqvga ppmtomap ++MATHBINARIES = ppmcie ppmforge ppmlabel ppmpat ppmqvga ppmtomap + BINARIES = $(PORTBINARIES) $(NOMERGEBINARIES) $(MATHBINARIES) + SCRIPTS = ppmquantall ppmshadow ppmfade + +@@ -55,6 +57,8 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(PORTBINARIES) $(MATHBINARIES)) LIBOBJECTS = libppm1.o libppm2.o libppm3.o libppm4.o libppm5.o bitio.o +LIBSOBJECTS = libppm1.so libppm2.so libppm3.so libppm4.so libppm5.so bitio.so ++LIBOBJECTS_X = $(SRCDIR)/shhopt/libshhopt.a MANUALS1 = $(BINARIES) $(SCRIPTS) MANUALS3 = libppm -@@ -62,7 +71,7 @@ +@@ -62,7 +66,7 @@ MERGENAME= ppmmerge @@ -48,7 +65,7 @@ .PHONY: all all: $(BINARIES) -@@ -72,29 +81,35 @@ +@@ -72,16 +76,23 @@ # Rules for plain programs. $(PORTBINARIES): %: %.o $(NETPBMLIBS) @@ -60,35 +77,30 @@ $(MATHBINARIES): %: %.o $(NETPBMLIBS) - $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG) + $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG) ++ ++ppmcolormask tgatoppm ximtoppm: %: %.o $(NETPBMLIBS) $(LIBOBJECTS_X) ++ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \ ++ $(LIBOBJECTS_X) $(CDEBUG) ++ ++ppmntsc: %: %.o $(NETPBMLIBS) $(LIBOBJECTS_X) ++ $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) \ ++ $(LIBOBJECTS_X) $(CDEBUG) --ppmtojpeg: %: %.o $(NETPBMLIBS) + ppmtojpeg: %: %.o $(NETPBMLIBS) - $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) \ -- -L $(JPEGLIB_DIR) -ljpeg $(CDEBUG) -+tgatoppm ximtoppm: %: %.o $(NETPBMLIBS) ../shhopt/libshhopt.a -+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) ../shhopt/libshhopt.a \ -+ $(CDEBUG) -+ -+ppmtojpeg: %: %.o $(NETPBMLIBS) ../shhopt/libshhopt.a -+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) ../shhopt/libshhopt.a \ -+ $(JPEGLD) $(CDEBUG) +- -L$(JPEGLIB_DIR) -ljpeg $(CDEBUG) ++ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \ ++ $(LIBOBJECTS_X) -L$(JPEGLIB_DIR) -ljpeg $(CDEBUG) - # Rule for objects. - $(OBJECTS) $(LIBOBJECTS): %.o: %.c - $(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $< + # And libraries. + $(PBMDIR)/$(LIBPBM): FORCE +@@ -96,6 +107,9 @@ + install.lib: install.lib.common -+$(LIBSOBJECTS): %.so: %.c -+ $(CC) -c -fpic -DPIC $(CFLAGS) $(INCLUDE) -o $@ $< + include $(SRCDIR)/Makefile.common + - $(MERGE_OBJECTS): %.o2: %.c - $(CC) -c $(CFLAGS) $(INCLUDE) "-Dmain=$*_main" -o $@ $< ++$(SRCDIR)/shhopt/libshhopt.a: ++ cd ../shhopt; $(MAKE) libshhopt.a - # And libraries. - $(PBMDIR)/$(LIBPBM): FORCE -- cd $(PBMDIR) ; make $(LIBPBM) -+ cd $(PBMDIR) ; $(MAKE) $(LIBPBM) - $(PGMDIR)/$(LIBPGM): FORCE -- cd $(PGMDIR) ; make $(LIBPGM) -+ cd $(PGMDIR) ; $(MAKE) $(LIBPGM) - - .PHONY: install.bin - install.bin: install.bin.common + .PHONY: clean + clean: |