This commit was generated by cvs2svn to compensate for changes in r29107,

which included commits to RCS files with non-trunk default branches.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/png/pngnow.png b/src/png/pngnow.png
index 174b5fa057f0e755d9d68f07d6ae385e387d5a95..82793ebddb7863266a66ffc6ab2c01ca32100808 100644 (file)
Binary files a/src/png/pngnow.png and b/src/png/pngnow.png differ

diff --git a/src/png/pngtest.png b/src/png/pngtest.png
index ebea081c56302df0c23fb3a8224d48d9a5d29101..f3a6df4483fc9d020c028d4e4f417767bfa72877 100644 (file)
Binary files a/src/png/pngtest.png and b/src/png/pngtest.png differ

diff --git a/src/png/scripts/libpng-config-head.in b/src/png/scripts/libpng-config-head.in
index 1e0766f38c8ecdbc0e0c364cdfdd0900cf068ade..d9d8e891e0b88d3bc1778eb76f46b810d8225862 100755 (executable)
--- a/src/png/scripts/libpng-config-head.in
+++ b/src/png/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
 
 # Modeled after libxml-config.
 
-version=1.2.6
+version=1.2.7
 prefix=""
 libdir=""
 libs=""

diff --git a/src/png/scripts/libpng.pc.in b/src/png/scripts/libpng.pc.in
index 4d4f0b7321307c110658738c1191b5537077c407..556a343387a42c3c0124b47be06a1869d2909c8d 100644 (file)
--- a/src/png/scripts/libpng.pc.in
+++ b/src/png/scripts/libpng.pc.in
@@ -6,6 +6,6 @@ includedir=${exec_prefix}/include
 
 Name: libpng12
 Description: Loads and saves PNG files
-Version: 1.2.6
+Version: 1.2.7
 Libs: -L${libdir} -lpng12 -lz -lm
 Cflags: -I${includedir}/libpng12

diff --git a/src/png/scripts/makefile.32sunu b/src/png/scripts/makefile.32sunu
index bda63ad7f19e7879084a064c4ec90b9c32881fe0..2ace57fb44ba56be7b5dc8c16c92f7fcd8e3ad3b 100644 (file)
--- a/src/png/scripts/makefile.32sunu
+++ b/src/png/scripts/makefile.32sunu
@@ -33,7 +33,7 @@ RANLIB=echo
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
@@ -183,7 +183,17 @@ install-config: libpng-config
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) $(SUN_CC_FLAGS) -I$(DI) -I$(ZLIBINC) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/libpng12-config --ldflags` \
+          $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
+       ./pngtestd pngtest.png
 
 test-installed:
        echo

diff --git a/src/png/scripts/makefile.64sunu b/src/png/scripts/makefile.64sunu
index 91ab35990024ef3403d7d32d7ca3f95272cc5f3c..8ee4d56576fb1a7be73e110b727a835c27911532 100644 (file)
--- a/src/png/scripts/makefile.64sunu
+++ b/src/png/scripts/makefile.64sunu
@@ -33,7 +33,7 @@ RANLIB=echo
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
@@ -184,7 +184,17 @@ install-config: libpng-config
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) $(SUN_CC_FLAGS) -I$(DI) -I$(ZLIBINC) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/libpng12-config --ldflags` \
+          $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
+       ./pngtestd pngtest.png
 
 test-installed:
        echo

diff --git a/src/png/scripts/makefile.aix b/src/png/scripts/makefile.aix
index 029ca44c0daaf513ec0d34a0f94bdae2ae744c9c..a1e474d14db805f2c8374eb40dd322c4925d87dc 100644 (file)
--- a/src/png/scripts/makefile.aix
+++ b/src/png/scripts/makefile.aix
@@ -18,7 +18,7 @@ RM = rm -f
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 prefix=/usr/local

diff --git a/src/png/scripts/makefile.beos b/src/png/scripts/makefile.beos
index 73aff60ea6c1f8f3eb8396afebde0ef4009c440f..0e842bd73c4e00a4644a2269f705b0ce85392030 100644 (file)
--- a/src/png/scripts/makefile.beos
+++ b/src/png/scripts/makefile.beos
@@ -12,7 +12,7 @@ ZLIBLIB=/usr/local/lib
 ZLIBINC=/usr/local/include
 
 PNGMAJ = 0
-PNGMIN = 1.2.6
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 ALIGN=
@@ -165,7 +165,17 @@ install-config: libpng-config
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) -I$(DI) $(CFLAGS) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -L$(DL) -L$(ZLIBLIB) -W1,-rpath $(ZLIBLIB):$(DL) \
+          -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+       ./pngtestd pngtest.png
 
 test-installed:
        $(CC) $(CFLAGS) \

diff --git a/src/png/scripts/makefile.cygwin b/src/png/scripts/makefile.cygwin
index a5fa3546ca9e152c4450b07e30cb19290c625156..bb0d7b62959cd595f83fb1a463b18b59e04c03e5 100644 (file)
--- a/src/png/scripts/makefile.cygwin
+++ b/src/png/scripts/makefile.cygwin
@@ -79,7 +79,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 CYGDLL = 12
-PNGMIN = 1.2.6
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 SHAREDLIB=cygpng$(CYGDLL).dll
@@ -176,7 +176,7 @@ $(STATLIB): $(OBJS)
        ar rc $@ $(OBJS)
        $(RANLIB) $@
 
-$(SHAREDDEF): projects/msvc/png32ms.def
+$(SHAREDDEF): scripts/png32ms.def
        cat $< | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \
        sed -e 's/\([^;]*\);/;/' > $@
 
@@ -260,7 +260,17 @@ test-config-install: $(DB)/libpng-config
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) -I$(DI) $(CFLAGS) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -L$(DL) -L$(ZLIBLIB) \
+          -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+       ./pngtestd pngtest.png
 
 test-installed:
        $(CC) $(CFLAGS) \

diff --git a/src/png/scripts/makefile.darwin b/src/png/scripts/makefile.darwin
index 924eca2a4e947c14936278492ec4cd5f7e8e8344..935eb98f416ba4d5d0fd17a8635a5a7555aa8e49 100644 (file)
--- a/src/png/scripts/makefile.darwin
+++ b/src/png/scripts/makefile.darwin
@@ -23,7 +23,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
 RANLIB=ranlib
 
 PNGMAJ = 0
-PNGMIN = 1.2.6
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -167,7 +167,17 @@ install-config: libpng-config
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) -I$(DI) -I$(ZLIBINC) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -L$(DL) -L$(ZLIBLIB) \
+          -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+       ./pngtestd pngtest.png
 
 test-installed:
        $(CC) $(CFLAGS) \

diff --git a/src/png/scripts/makefile.dec b/src/png/scripts/makefile.dec
index ac37fae29e60b8c27e06439fc93ab8c31b30bcef..09b51587eb6ae22a8cbef962bff424bc2bac81b6 100644 (file)
--- a/src/png/scripts/makefile.dec
+++ b/src/png/scripts/makefile.dec
@@ -32,7 +32,7 @@ ZLIBLIB=../zlib
 ZLIBINC=../zlib
 
 PNGMAJ = 0
-PNGMIN = 1.2.6
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -148,7 +148,17 @@ install-config: libpng-config
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) -w1 -I$(DI) -I$(ZLIBINC) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -L$(DL) -L$(ZLIBLIB)  -R$(ZLIBLIB) -R$(DL) \
+          -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+       ./pngtestd pngtest.png
 
 test-installed:
        echo

diff --git a/src/png/scripts/makefile.gcmmx b/src/png/scripts/makefile.gcmmx
index 2cb712513590645b5d528693294b06b0d6517704..fc4b797ca33c7d931d8112c0385c6527834e8540 100644 (file)
--- a/src/png/scripts/makefile.gcmmx
+++ b/src/png/scripts/makefile.gcmmx
@@ -15,7 +15,7 @@
 
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 CC=gcc
@@ -212,7 +212,17 @@ install-config: libpng-config
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) -I$(DI) -I$(ZLIBINC) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -L$(DL) -L$(ZLIBLIB) -W1, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
+          -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+       ./pngtestd pngtest.png
 
 test-installed:
        $(CC) -I$(ZLIBINC) \

diff --git a/src/png/scripts/makefile.hpgcc b/src/png/scripts/makefile.hpgcc
index 03027156ffdfa2365359035733cc22a354cc3056..fd79e1bf3db175ca2295c2f4c84bc1460b535248 100644 (file)
--- a/src/png/scripts/makefile.hpgcc
+++ b/src/png/scripts/makefile.hpgcc
@@ -41,7 +41,7 @@ RANLIB=ranlib
 #RANLIB=echo
 
 PNGMAJ = 0
-PNGMIN = 1.2.6
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -176,7 +176,17 @@ install-config: libpng-config
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) -I$(DI) -I$(ZLIBINC) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -L$(DL) -L$(ZLIBLIB) -W1,-rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
+          -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+       ./pngtestd pngtest.png
 
 test-installed:
        echo

diff --git a/src/png/scripts/makefile.hpux b/src/png/scripts/makefile.hpux
index 6a8a2d7ac43cb8696fea45b2fc426651934bd4f1..53f99b5100b42bd03256ed3e1358bfce3b79100e 100644 (file)
--- a/src/png/scripts/makefile.hpux
+++ b/src/png/scripts/makefile.hpux
@@ -24,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 RANLIB=ranlib
 
 PNGMAJ = 0
-PNGMIN = 1.2.6
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -162,7 +162,17 @@ install-config: libpng-config
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) -I$(DI) -I$(ZLIBINC) $(CCFLAGS) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -L$(DL) -L$(ZLIBLIB) \
+          -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+       ./pngtestd pngtest.png
 
 test-installed:
        echo

diff --git a/src/png/scripts/makefile.linux b/src/png/scripts/makefile.linux
index 3eba565b0077b03d49f8adea7bf34d86bac7f6e5..67edfd977a40b5adb49d1aa7843c00e1e903420a 100644 (file)
--- a/src/png/scripts/makefile.linux
+++ b/src/png/scripts/makefile.linux
@@ -5,7 +5,7 @@
 
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 CC=gcc
@@ -184,7 +184,17 @@ install-config: libpng-config
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) -I$(DI) -I$(ZLIBINC) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -L$(DL) -L$(ZLIBLIB) -W1, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
+          -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+       ./pngtestd pngtest.png
 
 test-installed:
        $(CC) -I$(ZLIBINC) \

diff --git a/src/png/scripts/makefile.ne12bsd b/src/png/scripts/makefile.ne12bsd
index 48066969cda7fa41513b6b3f73bf2febe794c844..32d53720c5107b98cf52e8af391b5f8c9ceeb063 100644 (file)
--- a/src/png/scripts/makefile.ne12bsd
+++ b/src/png/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
 
 LIB=   png12
 SHLIB_MAJOR=   0
-SHLIB_MINOR=   1.2.6
+SHLIB_MINOR=   1.2.7
 SRCS=  pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
                pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
                pngwtran.c pngmem.c pngerror.c pngpread.c

diff --git a/src/png/scripts/makefile.netbsd b/src/png/scripts/makefile.netbsd
index a7015267279d862a333a83d02e9cfb90b15fe055..dc0b8b45901e68427c8f0442f3660fbb47dd0e2a 100644 (file)
--- a/src/png/scripts/makefile.netbsd
+++ b/src/png/scripts/makefile.netbsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng
 
 LIB=   png
 SHLIB_MAJOR=   3
-SHLIB_MINOR=   1.2.6
+SHLIB_MINOR=   1.2.7
 SRCS=  pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
                pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
                pngwtran.c pngmem.c pngerror.c pngpread.c

diff --git a/src/png/scripts/makefile.openbsd b/src/png/scripts/makefile.openbsd
index 80c6bd265bc1327cfa04c318db16360b5f6c13f1..4cac2fa0f35cb8949569d3efeaf56da5a1b9ceab 100644 (file)
--- a/src/png/scripts/makefile.openbsd
+++ b/src/png/scripts/makefile.openbsd
@@ -7,7 +7,7 @@ LIBDIR= ${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat
 
 SHLIB_MAJOR=   0
-SHLIB_MINOR=   1.2.6
+SHLIB_MINOR=   1.2.7
 
 LIB=   png
 SRCS=  png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \

diff --git a/src/png/scripts/makefile.sco b/src/png/scripts/makefile.sco
index 7a4dc4f77d5c05ffdf349e32a1fd95742ead93aa..b37e72dd5d51b491e1af50063a7707afc8e4693c 100644 (file)
--- a/src/png/scripts/makefile.sco
+++ b/src/png/scripts/makefile.sco
@@ -24,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
 RANLIB=echo
 
 PNGMAJ = 0
-PNGMIN = 1.2.6
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -162,7 +162,17 @@ install-config: libpng-config
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) -I$(DI) $(CFLAGS) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -L$(DL) -L$(ZLIBLIB) \
+          -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+       ./pngtestd pngtest.png
 
 test-installed:
        $(CC) $(CFLAGS) \

diff --git a/src/png/scripts/makefile.sggcc b/src/png/scripts/makefile.sggcc
index 9886476fdea817a0d04d40b9e2d21b4c8c4420d0..0902697848b107f689fa7eb73cc0819fda347716 100644 (file)
--- a/src/png/scripts/makefile.sggcc
+++ b/src/png/scripts/makefile.sggcc
@@ -18,7 +18,7 @@ ZLIBINC=../zlib
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.6
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 CC=gcc
 
@@ -169,14 +169,26 @@ install-config: libpng-config
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) -I$(DI) -I$(ZLIBINC) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -L$(DL) -L$(ZLIBLIB) \
+           -rpath $(ZLIBLIB):$(DL)\
+          -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+       ./pngtestd pngtest.png
 
 test-installed:
        echo
        echo Testing installed dynamic shared library.
        $(CC) -I$(ZLIBINC) \
           `$(BINPATH)/libpng12-config --cflags` pngtest.c \
-          -L$(ZLIBLIB) -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --libdir` \
+          -L$(ZLIBLIB) \
+           -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --libdir` \
           -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
        ./pngtesti pngtest.png
 

diff --git a/src/png/scripts/makefile.so9 b/src/png/scripts/makefile.so9
index dd08212bd69ad663badb11c31ff10a1c5d1ae9c6..c907deda91078a3316b474b57fdc5306dd62a991 100644 (file)
--- a/src/png/scripts/makefile.so9
+++ b/src/png/scripts/makefile.so9
@@ -34,7 +34,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
 RANLIB=echo
 
 PNGMAJ = 0
-PNGMIN = 1.2.6
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -182,7 +182,17 @@ install-config: libpng-config
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) -I$(DI) -I$(ZLIBINC) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -o pngtestd `$(BINPATH)/libpng12-config --ldflags` \
+          -L$(DL) -L$(ZLIBLIB)  -R$(ZLIBLIB) -R$(DL)
+       ./pngtestd pngtest.png
 
 test-installed:
        echo

diff --git a/src/png/scripts/makefile.solaris b/src/png/scripts/makefile.solaris
index db2fc1cda617a6d708b0b93a439f549e3048e86a..8455c33f6d90b3bc1fbd0abfc541ff5787838c78 100644 (file)
--- a/src/png/scripts/makefile.solaris
+++ b/src/png/scripts/makefile.solaris
@@ -30,7 +30,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
 RANLIB=echo
 
 PNGMAJ = 0
-PNGMIN = 1.2.6
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -179,7 +179,17 @@ install-config: libpng-config
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) -I$(DI) -I$(ZLIBINC) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -o pngtestd `$(BINPATH)/libpng12-config --ldflags` \
+          -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL)
+       ./pngtestd pngtest.png
 
 test-installed:
        echo

diff --git a/src/png/scripts/pngos2.def b/src/png/scripts/pngos2.def
index bb21d979cf9d92e54a74075bc83d47d00c8c7fe3..1b75bc6036e0be40342ee3c01e67b51190864408 100644 (file)
--- a/src/png/scripts/pngos2.def
+++ b/src/png/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------
 
-; Version 1.2.6
+; Version 1.2.7
 
 LIBRARY                PNG
 DESCRIPTION    "PNG image compression library for OS/2"
@@ -184,6 +184,34 @@ EXPORTS
   png_convert_to_rfc1123
   png_set_invalid
 
+; Added at version 1.2.0:
+  png_mmx_support
+  png_permit_empty_plte
+  png_permit_mng_features
+  png_get_mmx_flagmask
+  png_get_asm_flagmask
+  png_get_asm_flags
+  png_get_mmx_bitdepth_threshold
+  png_get_mmx_rowbytes_threshold
+  png_set_asm_flags
+  png_init_mmx_flags
+
+; Added at version 1.2.2:
+  png_handle_as_unknown
+
+; Added at version 1.2.2 and deleted from 1.2.3:
+; png_zalloc
+; png_zfree
+
+; Added at version 1.2.4
+  png_malloc_warn
+
+; Added at version 1.2.6
+  png_set_user_limits
+  png_get_user_height_max
+  png_get_user_width_max
+; Added at version 1.2.7
+  png_set_add_alpha
 
 ; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS
   png_libpng_ver

diff --git a/src/png/scripts/pngw32.def b/src/png/scripts/pngw32.def
index 0a174112b76bbd5fd22ee4ba3fa387bf37721b3d..5bff2d2ab86b4769da9826361ebe29219716cad6 100644 (file)
--- a/src/png/scripts/pngw32.def
+++ b/src/png/scripts/pngw32.def
@@ -6,7 +6,7 @@ LIBRARY
 DESCRIPTION "PNG image compression library for Windows"
 
 EXPORTS
-;Version 1.2.6
+;Version 1.2.7
   png_build_grayscale_palette  @1
   png_check_sig        @2
   png_chunk_error      @3
@@ -191,3 +191,37 @@ EXPORTS
   png_write_init_3    @176
   png_info_init_3 @177
   png_destroy_struct  @178
+; Added at version 1.2.0
+; For use with PNG_USER_MEM_SUPPORTED
+  png_destroy_struct_2  @179
+  png_create_read_struct_2 @180
+  png_create_write_struct_2 @181
+  png_malloc_default @182
+  png_free_default @183
+; MNG features
+  png_permit_mng_features  @184
+; MMX support
+  png_mmx_support  @185
+  png_get_mmx_flagmask  @186
+  png_get_asm_flagmask  @187
+  png_get_asm_flags  @188
+  png_get_mmx_bitdepth_threshold  @189
+  png_get_mmx_rowbytes_threshold  @190
+  png_set_asm_flags  @191
+  png_init_mmx_flags  @192
+; Strip error numbers
+  png_set_strip_error_numbers @193
+; Added at version 1.2.2
+  png_handle_as_unknown @194
+; Added at version 1.2.2 and deleted from 1.2.3
+; png_zalloc @195
+; png_zfree @196
+; Added at version 1.2.4
+  png_malloc_warn @195
+; Added at version 1.2.6
+  png_malloc_warn @195
+  png_get_user_height_max @196
+  png_get_user_width_max @197
+  png_set_user_limits @198
+; Added at version 1.2.7
+  png_set_add_alpha @199