openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrade to latest 10.49 snapshot to fix building against PNG 1.4

master
Dr. Ralf S. Engelschall 16 years ago
parent
3a0f780e0a
commit
c32f69ee3a
2 changed files with 65 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 137
      netpbm/netpbm.patch
  2. 15
      netpbm/netpbm.spec

137
netpbm/netpbm.patch
Unescape View File

@ -1,71 +1,7 @@
Index: converter/other/jpeg2000/jpeg2ktopam.c
--- converter/other/jpeg2000/jpeg2ktopam.c.orig 2007-12-27 23:32:59 +0100
+++ converter/other/jpeg2000/jpeg2ktopam.c 2009-09-28 17:42:28 +0200
@@ -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 "pam.h"
Index: converter/other/jpeg2000/pamtojpeg2k.c
--- converter/other/jpeg2000/pamtojpeg2k.c.orig 2007-12-27 23:32:59 +0100
+++ converter/other/jpeg2000/pamtojpeg2k.c 2009-09-28 17:42:41 +0200
@@ -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 "pam.h"
Index: lib/libpm.c
--- lib/libpm.c.orig 2006-08-19 05:12:28 +0200
+++ lib/libpm.c 2009-09-28 17:41:00 +0200
@@ -669,7 +669,7 @@
pm_openr(const char * const name) {
FILE* f;
- if (strcmp(name, "-") == 0)
+ if (name == NULL || strcmp(name, "-") == 0)
f = stdin;
else {
#ifndef VMS
@@ -691,7 +691,7 @@
pm_openw(const char * const name) {
FILE* f;
- if (strcmp(name, "-") == 0)
+ if (name == NULL || strcmp(name, "-") == 0)
f = stdout;
else {
#ifndef VMS
Index: lib/pm_gamma.h
--- lib/pm_gamma.h.orig 2006-08-19 05:12:28 +0200
+++ lib/pm_gamma.h 2009-09-28 17:41:00 +0200
@@ -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 */
Index: GNUmakefile
--- GNUmakefile.orig 2008-09-27 03:37:09 +0200
+++ GNUmakefile 2009-12-12 12:46:13 +0100
@@ -263,11 +263,7 @@
--- GNUmakefile.orig 2010-01-11 14:43:07 +0100
+++ GNUmakefile 2010-01-11 14:47:59 +0100
@@ -270,11 +270,7 @@
MERGELIBS += $(X11LIB)
endif
@ -78,9 +14,9 @@ Index: GNUmakefile
ifeq ($(shell xml2-config --version),)
XML2LD=
Index: converter/other/Makefile
--- converter/other/Makefile.orig 2009-09-18 21:04:37 +0200
+++ converter/other/Makefile 2009-12-12 12:54:11 +0100
@@ -27,7 +27,6 @@
--- 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
@ -88,18 +24,18 @@ Index: converter/other/Makefile
ifneq ($(PNGLIB),NONE)
HAVE_PNGLIB = Y
ifneq ($(PNGHDR_DIR)x,x)
@@ -37,10 +36,6 @@
INCLUDES += -I$(ZHDR_DIR)
@@ -36,10 +35,6 @@
EXTERN_INCLUDES += -I$(ZHDR_DIR)
endif
endif
-else
- HAVE_PNGLIB = Y
- INCLUDES += $(shell libpng-config --cflags)
- EXTERN_INCLUDES += $(shell libpng-config --cflags)
-endif
ifneq ($(JPEGLIB),NONE)
ifneq ($(JPEGHDR_DIR)x,x)
@@ -148,11 +143,7 @@
@@ -153,11 +148,7 @@
$(LD) -o $@ $@.o tiff.o \
$(LIBOPTS_TIFF) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD)
@ -109,12 +45,34 @@ Index: converter/other/Makefile
- PNGLIB_LIBOPTS = $(shell libpng-config --ldflags)
-endif
pngtopnm: %: %.o $(NETPBMLIB) $(LIBOPT)
$(LD) -o $@ $@.o \
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 2009-12-29 21:46:34 +0100
+++ lib/libsystem.c 2009-12-30 09:41:53 +0100
@@ -216,8 +216,10 @@
--- 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";
@ -125,3 +83,24 @@ Index: lib/libsystem.c
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 */

15
netpbm/netpbm.spec
Unescape View File

@ -31,11 +31,11 @@ Distribution: OpenPKG Community
Class: BASE
Group: Graphics
License: MIT-style
Version: 10.35.72
Release: 20091230
Version: 10.49.20100111
Release: 20100111
# list of sources
Source0: http://switch.dl.sourceforge.net/sourceforge/netpbm/netpbm-%{version}.tgz
Source0: http://download.openpkg.org/components/versioned/netpbm/netpbm-%{version}.tar.gz
Patch0: netpbm.patch
# build information
@ -62,11 +62,11 @@ AutoReqProv: no
}
%prep
%setup -q
%setup -q -n netpbm
%patch -p0
%build
( cat Makefile.config.in
( cat config.mk.in
echo ""
echo "DEFAULT_TARGET = nonmerge"
echo "NETPBMLIBTYPE=unixstatic"
@ -89,7 +89,7 @@ AutoReqProv: no
case "%{l_platform -t}" in
*-sunos* ) echo "NETWORKLD = -lsocket -lnsl" ;;
esac
) >Makefile.config
) >config.mk
%{l_make} %{l_mflags} -f GNUmakefile
%install
@ -111,12 +111,11 @@ AutoReqProv: no
$RPM_BUILD_ROOT%{l_prefix}/bin/ppmrainbow \
$RPM_BUILD_ROOT%{l_prefix}/bin/ppmshadow
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
rm -f $RPM_BUILD_ROOT%{l_prefix}/config_template
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/doc.url
rm -f $RPM_BUILD_ROOT%{l_prefix}/pkginfo
rm -f $RPM_BUILD_ROOT%{l_prefix}/README
rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/web
mv $RPM_BUILD_ROOT%{l_prefix}/include/*.h \
$RPM_BUILD_ROOT%{l_prefix}/include/netpbm/
mv $RPM_BUILD_ROOT%{l_prefix}/misc/* \
$RPM_BUILD_ROOT%{l_prefix}/share/netpbm/
rm -rf $RPM_BUILD_ROOT%{l_prefix}/misc

Write Preview
Loading…
Cancel
Save