You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
106 lines
2.9 KiB
106 lines
2.9 KiB
Index: GNUmakefile |
|
--- GNUmakefile.orig 2010-01-11 14:43:07 +0100 |
|
+++ GNUmakefile 2010-01-11 14:47:59 +0100 |
|
@@ -270,11 +270,7 @@ |
|
MERGELIBS += $(X11LIB) |
|
endif |
|
|
|
-ifeq ($(shell libpng-config --version),) |
|
PNGLD = $(shell $(LIBOPT) $(LIBOPTR) $(PNGLIB) $(ZLIB)) |
|
-else |
|
- PNGLD = $(shell libpng-config --ldflags) |
|
-endif |
|
|
|
ifeq ($(shell xml2-config --version),) |
|
XML2LD= |
|
Index: converter/other/Makefile |
|
--- converter/other/Makefile.orig 2010-01-11 14:42:51 +0100 |
|
+++ converter/other/Makefile 2010-01-11 14:48:33 +0100 |
|
@@ -26,7 +26,6 @@ |
|
endif |
|
endif |
|
|
|
-ifeq ($(shell libpng-config --version),) |
|
ifneq ($(PNGLIB),NONE) |
|
HAVE_PNGLIB = Y |
|
ifneq ($(PNGHDR_DIR)x,x) |
|
@@ -36,10 +35,6 @@ |
|
EXTERN_INCLUDES += -I$(ZHDR_DIR) |
|
endif |
|
endif |
|
-else |
|
- HAVE_PNGLIB = Y |
|
- EXTERN_INCLUDES += $(shell libpng-config --cflags) |
|
-endif |
|
|
|
ifneq ($(JPEGLIB),NONE) |
|
ifneq ($(JPEGHDR_DIR)x,x) |
|
@@ -153,11 +148,7 @@ |
|
$(LD) -o $@ $@.o tiff.o \ |
|
$(LIBOPTS_TIFF) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) |
|
|
|
-ifeq ($(shell libpng-config --version),) |
|
PNGLIB_LIBOPTS = $(shell $(LIBOPT) $(LIBOPTR) $(PNGLIB) $(ZLIB)) |
|
-else |
|
- PNGLIB_LIBOPTS = $(shell libpng-config --ldflags) |
|
-endif |
|
|
|
pngtopam: %: %.o pngx.o $(NETPBMLIB) $(LIBOPT) |
|
$(LD) -o $@ $@.o pngx.o \ |
|
Index: converter/other/jpeg2000/jpeg2ktopam.c |
|
--- converter/other/jpeg2000/jpeg2ktopam.c.orig 2010-01-11 14:42:31 +0100 |
|
+++ converter/other/jpeg2000/jpeg2ktopam.c 2010-01-11 14:47:59 +0100 |
|
@@ -10,7 +10,6 @@ |
|
|
|
#define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ |
|
/* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */ |
|
-#define _XOPEN_SOURCE 600 |
|
#include <string.h> |
|
|
|
#include "pm_c_util.h" |
|
Index: converter/other/jpeg2000/pamtojpeg2k.c |
|
--- converter/other/jpeg2000/pamtojpeg2k.c.orig 2010-01-11 14:42:31 +0100 |
|
+++ converter/other/jpeg2000/pamtojpeg2k.c 2010-01-11 14:47:59 +0100 |
|
@@ -10,7 +10,6 @@ |
|
|
|
#define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ |
|
/* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */ |
|
-#define _XOPEN_SOURCE 600 |
|
#include <string.h> |
|
|
|
#include "pm_c_util.h" |
|
Index: lib/libsystem.c |
|
--- lib/libsystem.c.orig 2010-01-11 14:42:10 +0100 |
|
+++ lib/libsystem.c 2010-01-11 14:47:59 +0100 |
|
@@ -246,8 +246,10 @@ |
|
return "SIGWINCH"; |
|
case SIGIO: |
|
return "SIGIO"; |
|
+#ifdef SIGPWR |
|
case SIGPWR: |
|
return "SIGPWR"; |
|
+#endif |
|
case SIGSYS: |
|
return "SIGSYS"; |
|
default: |
|
Index: lib/pm_gamma.h |
|
--- lib/pm_gamma.h.orig 2010-01-11 14:42:10 +0100 |
|
+++ lib/pm_gamma.h 2010-01-11 14:47:59 +0100 |
|
@@ -12,7 +12,7 @@ |
|
} /* to fake out automatic code indenters */ |
|
#endif |
|
|
|
-static __inline__ float |
|
+static float |
|
pm_gamma709(float const intensity) { |
|
|
|
/* Here are parameters of the gamma transfer function |
|
@@ -41,7 +41,7 @@ |
|
|
|
|
|
|
|
-static __inline__ float |
|
+static float |
|
pm_ungamma709(float const brightness) { |
|
|
|
/* These are the same parameters as in pm_gamma, above */
|
|
|