OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 12-Dec-2009 13:01:14
Branch: HEAD Handle: 2009121212011301
Modified files:
openpkg-src/netpbm netpbm.patch netpbm.spec
Log:
upgrading package: netpbm 10.26.63 -> 10.35.71
Summary:
Revision Changes Path
1.5 +69 -20 openpkg-src/netpbm/netpbm.patch
1.118 +2 -2 openpkg-src/netpbm/netpbm.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/netpbm/netpbm.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 netpbm.patch
--- openpkg-src/netpbm/netpbm.patch 24 Oct 2006 06:21:11 -0000 1.4
+++ openpkg-src/netpbm/netpbm.patch 12 Dec 2009 12:01:13 -0000 1.5
@@ -1,29 +1,29 @@
Index: converter/other/jpeg2000/jpeg2ktopam.c
---- converter/other/jpeg2000/jpeg2ktopam.c.orig 2005-05-19 17:29:47
+0200
-+++ converter/other/jpeg2000/jpeg2ktopam.c 2006-10-24 08:07:49 +0200
-@@ -9,7 +9,6 @@
-
*****************************************************************************/
+--- 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 */
--#define _XOPEN_SOURCE 500 /* 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 2005-02-21 04:56:41
+0100
-+++ converter/other/jpeg2000/pamtojpeg2k.c 2006-10-24 08:07:49 +0200
-@@ -9,7 +9,6 @@
-
*****************************************************************************/
+--- 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 */
--#define _XOPEN_SOURCE 500 /* 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 2004-11-20 17:55:27 +0100
-+++ lib/libpm.c 2006-10-24 08:07:49 +0200
-@@ -617,7 +617,7 @@
+--- 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;
@@ -32,7 +32,7 @@
f = stdin;
else {
#ifndef VMS
-@@ -639,7 +639,7 @@
+@@ -691,7 +691,7 @@
pm_openw(const char * const name) {
FILE* f;
@@ -42,18 +42,18 @@
else {
#ifndef VMS
Index: lib/pm_gamma.h
---- lib/pm_gamma.h.orig 2004-06-13 00:53:25 +0200
-+++ lib/pm_gamma.h 2006-10-24 08:18:26 +0200
-@@ -5,7 +5,7 @@
-
- #include <math.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
-@@ -34,7 +34,7 @@
+@@ -41,7 +41,7 @@
@@ -62,3 +62,52 @@
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 @@
+ 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 2009-09-18 21:04:37 +0200
++++ converter/other/Makefile 2009-12-12 12:54:11 +0100
+@@ -27,7 +27,6 @@
+ endif
+ endif
+
+-ifeq ($(shell libpng-config --version),)
+ ifneq ($(PNGLIB),NONE)
+ HAVE_PNGLIB = Y
+ ifneq ($(PNGHDR_DIR)x,x)
+@@ -37,10 +36,6 @@
+ INCLUDES += -I$(ZHDR_DIR)
+ endif
+ endif
+-else
+- HAVE_PNGLIB = Y
+- INCLUDES += $(shell libpng-config --cflags)
+-endif
+
+ ifneq ($(JPEGLIB),NONE)
+ ifneq ($(JPEGHDR_DIR)x,x)
+@@ -148,11 +143,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
+
+ pngtopnm: %: %.o $(NETPBMLIB) $(LIBOPT)
+ $(LD) -o $@ $...@.o \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/netpbm/netpbm.spec
============================================================================
$ cvs diff -u -r1.117 -r1.118 netpbm.spec
--- openpkg-src/netpbm/netpbm.spec 2 Jul 2009 16:11:48 -0000 1.117
+++ openpkg-src/netpbm/netpbm.spec 12 Dec 2009 12:01:14 -0000 1.118
@@ -31,8 +31,8 @@
Class: BASE
Group: Graphics
License: MIT-style
-Version: 10.26.63
-Release: 20090702
+Version: 10.35.71
+Release: 20091212
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/netpbm/netpbm-%{version}.tgz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
