OpenPKG Specs / annotate

netpbm/netpbm.patch@a2c6460cfb16 (annotated)

netpbm/netpbm.patch

Mon, 28 Jan 2013 17:37:18 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Mon, 28 Jan 2013 17:37:18 +0100
changeset 758
a2c6460cfb16
parent 54
f012bbb2a542
permissions
-rw-r--r--

Correct socket error reporting improvement with IPv6 portable code,
after helpful recommendation by Saúl Ibarra Corretgé on OSips devlist.

michael@54 1 Index: converter/other/jpeg2000/jpeg2ktopam.c
michael@54 2 --- converter/other/jpeg2000/jpeg2ktopam.c.orig 2005-05-19 17:29:47 +0200
michael@54 3 +++ converter/other/jpeg2000/jpeg2ktopam.c 2006-10-24 08:07:49 +0200
michael@54 4 @@ -9,7 +9,6 @@
michael@54 5 *****************************************************************************/
michael@54 6
michael@54 7 #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */
michael@54 8 -#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */
michael@54 9 #include <string.h>
michael@54 10
michael@54 11 #include "pam.h"
michael@54 12 Index: converter/other/jpeg2000/pamtojpeg2k.c
michael@54 13 --- converter/other/jpeg2000/pamtojpeg2k.c.orig 2005-02-21 04:56:41 +0100
michael@54 14 +++ converter/other/jpeg2000/pamtojpeg2k.c 2006-10-24 08:07:49 +0200
michael@54 15 @@ -9,7 +9,6 @@
michael@54 16 *****************************************************************************/
michael@54 17
michael@54 18 #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */
michael@54 19 -#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */
michael@54 20 #include <string.h>
michael@54 21
michael@54 22 #include "pam.h"
michael@54 23 Index: lib/libpm.c
michael@54 24 --- lib/libpm.c.orig 2004-11-20 17:55:27 +0100
michael@54 25 +++ lib/libpm.c 2006-10-24 08:07:49 +0200
michael@54 26 @@ -617,7 +617,7 @@
michael@54 27 pm_openr(const char * const name) {
michael@54 28 FILE* f;
michael@54 29
michael@54 30 - if (strcmp(name, "-") == 0)
michael@54 31 + if (name == NULL || strcmp(name, "-") == 0)
michael@54 32 f = stdin;
michael@54 33 else {
michael@54 34 #ifndef VMS
michael@54 35 @@ -639,7 +639,7 @@
michael@54 36 pm_openw(const char * const name) {
michael@54 37 FILE* f;
michael@54 38
michael@54 39 - if (strcmp(name, "-") == 0)
michael@54 40 + if (name == NULL || strcmp(name, "-") == 0)
michael@54 41 f = stdout;
michael@54 42 else {
michael@54 43 #ifndef VMS
michael@54 44 Index: lib/pm_gamma.h
michael@54 45 --- lib/pm_gamma.h.orig 2004-06-13 00:53:25 +0200
michael@54 46 +++ lib/pm_gamma.h 2006-10-24 08:18:26 +0200
michael@54 47 @@ -5,7 +5,7 @@
michael@54 48
michael@54 49 #include <math.h>
michael@54 50
michael@54 51 -static __inline__ float
michael@54 52 +static float
michael@54 53 pm_gamma709(float const intensity) {
michael@54 54
michael@54 55 /* Here are parameters of the gamma transfer function
michael@54 56 @@ -34,7 +34,7 @@
michael@54 57
michael@54 58
michael@54 59
michael@54 60 -static __inline__ float
michael@54 61 +static float
michael@54 62 pm_ungamma709(float const brightness) {
michael@54 63
michael@54 64 /* These are the same parameters as in pm_gamma, above */
michael@55 65 Index: converter/other/Makefile
michael@55 66 --- converter/other/Makefile.orig 2005-02-05 18:48:28.000000000 +0100
michael@55 67 +++ converter/other/Makefile 2009-01-09 00:54:13.704466003 +0100
michael@55 68 @@ -111,29 +111,29 @@
michael@55 69 endif
michael@55 70
michael@55 71 tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o $(NETPBMLIB) $(LIBOPT)
michael@55 72 - $(LD) $(LDFLAGS) -o $@ $@.o \
michael@55 73 + $(LD) -o $@ $@.o \
michael@55 74 `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(TIFFLIB) $(TIFFLIB_EXTRALIBS)` \
michael@55 75 - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
michael@55 76 + $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
michael@55 77
michael@55 78 pngtopnm: %: %.o $(NETPBMLIB) $(LIBOPT)
michael@55 79 - $(LD) $(LDFLAGS) -o $@ $@.o \
michael@55 80 + $(LD) -o $@ $@.o \
michael@55 81 `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(PNGLIB) $(ZLIB)` \
michael@55 82 - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
michael@55 83 + $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
michael@55 84
michael@55 85 pnmtopng: %: %.o pngtxt.o $(NETPBMLIB) $(LIBOPT)
michael@55 86 - $(LD) $(LDFLAGS) -o $@ $@.o pngtxt.o \
michael@55 87 + $(LD) -o $@ $@.o pngtxt.o \
michael@55 88 `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(PNGLIB) $(ZLIB)` \
michael@55 89 - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
michael@55 90 + $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
michael@55 91
michael@55 92 jpegtopnm: %: %.o jpegdatasource.o exif.o $(NETPBMLIB) $(LIBOPT)
michael@55 93 - $(LD) $(LDFLAGS) -o $@ $< jpegdatasource.o exif.o \
michael@55 94 + $(LD) -o $@ $< jpegdatasource.o exif.o \
michael@55 95 `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIB)` \
michael@55 96 - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
michael@55 97 + $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
michael@55 98
michael@55 99 pnmtojpeg: %: %.o $(NETPBMLIB) $(LIBOPT)
michael@55 100 - $(LD) $(LDFLAGS) -o $@ $@.o \
michael@55 101 + $(LD) -o $@ $@.o \
michael@55 102 `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIB)` \
michael@55 103 - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
michael@55 104 + $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
michael@55 105
michael@55 106 # If URTLIB is BUNDLED_URTLIB, then we're responsible for building it, which
michael@55 107 # means it needs to be a dependency:
michael@55 108 @@ -142,13 +142,13 @@
michael@55 109 endif
michael@55 110
michael@55 111 rletopnm pnmtorle: %: %.o $(NETPBMLIB) $(URTLIBDEP) $(LIBOPT)
michael@55 112 - $(LD) $(LDFLAGS) -o $@ $@.o \
michael@55 113 - `$(LIBOPT) $(NETPBMLIB) $(URTLIB)` $(MATHLIB) $(LDLIBS) \
michael@55 114 + $(LD) -o $@ $@.o \
michael@55 115 + `$(LIBOPT) $(NETPBMLIB) $(URTLIB)` $(LDFLAGS) $(MATHLIB) $(LDLIBS) \
michael@55 116 $(RPATH) $(LADD)
michael@55 117
michael@55 118 pnmtorast rasttopnm: %: %.o rast.o $(NETPBMLIB) $(LIBOPT)
michael@55 119 - $(LD) $(LDFLAGS) -o $@ $@.o rast.o \
michael@55 120 - `$(LIBOPT) $(NETPBMLIB)` $(MATHLIB) $(LDLIBS) \
michael@55 121 + $(LD) -o $@ $@.o rast.o \
michael@55 122 + `$(LIBOPT) $(NETPBMLIB)` $(LDFLAGS) $(MATHLIB) $(LDLIBS) \
michael@55 123 $(RPATH) $(LADD)
michael@55 124
michael@55 125 install.bin: install.bin.local

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial