diff options
author | adam <adam@pkgsrc.org> | 2006-02-27 22:01:16 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2006-02-27 22:01:16 +0000 |
commit | bf1c4d50032dee82d38dbe1e805e08beeeec62f2 (patch) | |
tree | 79bd4923f41046e942476396a62681c21f6bfa38 /graphics/netpbm/patches | |
parent | d8fc2e4c5905fde6cee801bd3f570e9efc374b06 (diff) | |
download | pkgsrc-bf1c4d50032dee82d38dbe1e805e08beeeec62f2.tar.gz |
Changes 10.32:
* Add rlatopam.
* Add pgmmake.
* bmptopnm: Understands RLE4/RLE8 compressed BMP.
* pnmgamma: Add -bt709tosrgb -srgbtobt709, -bt709tolinear,
-lineartobt709, -gamma, -rgamma, -ggamma, -bgamma (gammma
values were formerly specified as parameters).
* pnmgamma: Rename -cieramp to -bt709ramp.
* ppmdraw: work on multi-image streams.
* anytopnm: add mime time image/x-ms-bmp for BMP
* pamchannel: works on multi-image streams.
* pamstack: works on multi-image streams.
* Convert pnmdepth to pamdepth. Add multi-image stream
capability.
* pamcut: works on multi-image streams.
* pnmtops: allow -flate and -rle together.
* pnmtops: overhaul of -psfilter output.
* pnmrotate: fine adjustment to arithmetic (rounding,
pixel quantization).
* pbmtopsg3: Put currentfile ... in exec block.
* pbmtopsg3: Add missing /EndOfBlock.
* pnmtops: Don't claim EPSF if using setpagedevice.
* giftopnm: do "reading image sequence N" message only if
being verbose.
* ppmtobmp, bmptopnm: major speed improvement for PBM.
* other
Diffstat (limited to 'graphics/netpbm/patches')
-rw-r--r-- | graphics/netpbm/patches/patch-aa | 22 | ||||
-rw-r--r-- | graphics/netpbm/patches/patch-ab | 16 | ||||
-rw-r--r-- | graphics/netpbm/patches/patch-ag | 22 | ||||
-rw-r--r-- | graphics/netpbm/patches/patch-ai | 13 |
4 files changed, 19 insertions, 54 deletions
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa index 8b85122c41f..14309465732 100644 --- a/graphics/netpbm/patches/patch-aa +++ b/graphics/netpbm/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $ +$NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $ ---- Makefile.config.in.orig 2005-12-10 18:19:13.000000000 +0100 +--- Makefile.config.in.orig 2006-01-03 01:15:17.000000000 +0100 +++ Makefile.config.in @@ -24,7 +24,7 @@ DEFAULT_TARGET = nonmerge # and skip it on those systems unless you want to debug it and fix it. @@ -51,7 +51,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $ # Solaris: # LEX = flex -e # Or just skip parts that need Lex: -@@ -217,7 +219,7 @@ EXE = +@@ -219,7 +221,7 @@ EXE = # Here, $(SONAME) resolves to the soname for the shared library being created. # The following are gcc options. This works on GNU libc systems. @@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $ # You need -nostart instead of -shared on BeOS. Though the BeOS compiler is # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc # documentation and doesn't exist in at least one non-BeOS installation. -@@ -250,6 +252,18 @@ LDRELOC = NONE +@@ -252,6 +254,18 @@ LDRELOC = NONE #LDRELOC = ld --reloc #LDRELOC = ld -r @@ -79,7 +79,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $ # On older systems, you have to make shared libraries out of position # independent code, so you need -fpic or fPIC here. (The rule is: if -@@ -272,11 +286,23 @@ LDRELOC = NONE +@@ -274,11 +288,23 @@ LDRELOC = NONE CFLAGS_SHLIB = # Solaris or SunOS with gcc, and NetBSD: #CFLAGS_SHLIB = -fpic @@ -104,7 +104,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $ # SHLIB_CLIB is the link option to include the C library in a shared library, # normally "-lc". On typical systems, this serves no purpose. On some, # though, it causes information about which C library to use to be recorded -@@ -345,8 +371,8 @@ TIFFHDR_DIR = +@@ -347,8 +373,8 @@ TIFFHDR_DIR = #TIFFLIB = libtiff.so #TIFFHDR_DIR = /usr/include/libtiff #NetBSD: @@ -115,7 +115,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $ # OSF, Tru64: #TIFFLIB = /usr/local1/DEC/lib/libtiff.so #TIFFHDR_DIR = /usr/local1/DEC/include -@@ -376,8 +402,8 @@ JPEGHDR_DIR = +@@ -378,8 +404,8 @@ JPEGHDR_DIR = #JPEGLIB = libjpeg.so #JPEGHDR_DIR = /usr/include/jpeg # Netbsd: @@ -126,7 +126,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $ # OSF, Tru64: #JPEGLIB = /usr/local1/DEC/libjpeg.so #JPEGHDR_DIR = /usr/local1/DEC/include -@@ -401,8 +427,8 @@ PNGVER = +@@ -403,8 +429,8 @@ PNGVER = #PNGLIB = libpng$(PNGVER).so #PNGHDR_DIR = /usr/include/libpng$(PNGVER) # NetBSD: @@ -137,7 +137,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $ # OSF/Tru64: #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so #PNGHDR_DIR = /usr/local1/DEC/include -@@ -412,8 +438,8 @@ PNGVER = +@@ -414,8 +440,8 @@ PNGVER = # NONE for the PNG library, it doesn't matter what you specify here -- # it won't get used. @@ -148,7 +148,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $ #ZLIB = libz.so # The JBIG lossless image compression library (aka JBIG-KIT): -@@ -422,8 +448,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb +@@ -424,8 +450,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig # The Jasper JPEG-2000 image compression library (aka JasPer): @@ -159,7 +159,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $ # JASPERDEPLIBS is the libraries (-l options or file names) on which # The Jasper library depends -- i.e. what you have to link into any # executable that links in the Jasper library. -@@ -459,7 +485,7 @@ OMIT_NETWORK = +@@ -461,7 +487,7 @@ OMIT_NETWORK = # built into the standard C library, so this can be null. This is irrelevant # if OMIT_NETWORK is "y". diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab index 0ca08971bf3..edb42533900 100644 --- a/graphics/netpbm/patches/patch-ab +++ b/graphics/netpbm/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.18 2006/01/16 15:17:02 adam Exp $ +$NetBSD: patch-ab,v 1.19 2006/02/27 22:01:16 adam Exp $ ---- converter/other/Makefile.orig 2005-12-03 18:16:27.000000000 +0100 +--- converter/other/Makefile.orig 2006-02-25 20:15:20.000000000 +0100 +++ converter/other/Makefile -@@ -113,6 +113,13 @@ HEADERLINKS = pm_config.h pm_c_util.h \ +@@ -108,6 +108,13 @@ all: $(BINARIES) $(SUBDIRS:%=%/all) include $(SRCDIR)/Makefile.common -+# XXX sparc64 gcc 3.3.x toolchain bug means we must compile exif.o without -+# optimisation -+EXIF_CFLAGS=$(CFLAGS:-O2=) ++# XXX sparc64 gcc 3.3.x toolchain bug; compile exif.o without optimisation ++ifeq ($(MACHINE),sparc64) +exif.o: exif.c -+ $(CC) -c -I$(SRCDIR)/$(SUBDIR) -I. $(INCLUDES) \ -+ $(EXIF_CFLAGS) $(CADD) -o $@ $< ++ $(CC) -c $(INCLUDES2) -DNDEBUG \ ++ $(CPPFLAGS) $(CFLAGS:-O2=) $(CFLAGS_PERSONAL) $(CADD) -o $@ $< ++endif + ifeq ($(NEED_RUNTIME_PATH),Y) LIBOPTR = -runtime diff --git a/graphics/netpbm/patches/patch-ag b/graphics/netpbm/patches/patch-ag deleted file mode 100644 index 9f2f31a5eac..00000000000 --- a/graphics/netpbm/patches/patch-ag +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ag,v 1.12 2006/02/02 17:01:17 joerg Exp $ - ---- converter/other/pnmtopng.c.orig 2006-02-02 16:52:10.000000000 +0000 -+++ converter/other/pnmtopng.c -@@ -267,7 +267,7 @@ parseCommandLine (int argc, char ** argv - unsigned int option_def_index; - - unsigned int alphaSpec, transparentSpec, backgroundSpec; -- unsigned int textSpec, ztxtSpec, modtimeSpec, paletteSpec; -+ unsigned int textSpec, ztxtSpec, paletteSpec; - unsigned int filterSpec; - - unsigned int nofilter, sub, up, avg, paeth, filter; -@@ -296,7 +296,7 @@ parseCommandLine (int argc, char ** argv - OPTENT3(0, "ztxt", OPT_STRING, &cmdlineP->ztxt, - &ztxtSpec, 0); - OPTENT3(0, "modtime", OPT_STRING, &modtime, -- &modtimeSpec, 0); -+ &cmdlineP->modtimeSpec, 0); - OPTENT3(0, "palette", OPT_STRING, &cmdlineP->palette, - &paletteSpec, 0); - OPTENT3(0, "compression", OPT_UINT, diff --git a/graphics/netpbm/patches/patch-ai b/graphics/netpbm/patches/patch-ai deleted file mode 100644 index 0c757176573..00000000000 --- a/graphics/netpbm/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.7 2006/02/23 17:37:01 wiz Exp $ - ---- converter/other/xwdtopnm.c.orig 2005-12-15 03:45:59.000000000 +0000 -+++ converter/other/xwdtopnm.c -@@ -988,7 +988,7 @@ getpix(pixelReader * const rdrP) { - (rdrP->itemBuffer >> nBitsToLeave) & bitsToTakeMask; - } else { - bitsToTake = rdrP->itemBuffer & bitsToTakeMask; -- bitsToTake >>= nBitsToTake; -+ rdrP->itemBuffer >>= nBitsToTake; - } - /* Shift the bits into the right end of the accumulator */ - pixel <<= nBitsToTake; |