Imported from libpng-1.2.9beta1.tar
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index b2c6a33..ff3d9b9 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.2.8
+version=1.2.9beta1
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index f164c41..54cc7e2 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -6,6 +6,6 @@
Name: libpng12
Description: Loads and saves PNG files
-Version: 1.2.8
+Version: 1.2.9beta1
Libs: -L${libdir} -lpng12 -lz -lm
Cflags: -I${includedir}/libpng12
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index a70c1a1..7b0506e 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -33,7 +33,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
@@ -111,9 +111,9 @@
$(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBNAME).so.$(PNGMAJ) \
-o $(LIBNAME).so.$(PNGVER) $(OBJSDLL)
-libpng.so.3.$(PNGMIN): $(OBJS)
- $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h libpng.so.3 \
- -o libpng.so.3.$(PNGMIN) $(OBJSDLL)
+libpng.so.0.$(PNGMIN): $(OBJS)
+ $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h libpng.so.0 \
+ -o libpng.so.0.$(PNGMIN) $(OBJSDLL)
pngtest: pngtest.o $(LIBNAME).so
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -138,20 +138,20 @@
(cd $(DL); ln -f -s $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
- libpng.so.3.$(PNGMIN)
+ libpng.so.0.$(PNGMIN)
-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
-@/bin/rm -f $(DL)/libpng.so
- -@/bin/rm -f $(DL)/libpng.so.3
- -@/bin/rm -f $(DL)/libpng.so.3.$(PNGVER)*
+ -@/bin/rm -f $(DL)/libpng.so.0
+ -@/bin/rm -f $(DL)/libpng.so.0.$(PNGVER)*
cp $(LIBNAME).so.$(PNGVER) $(DL)
- cp libpng.so.3.$(PNGMIN) $(DL)
+ cp libpng.so.0.$(PNGMIN) $(DL)
chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
- chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
+ chmod 755 $(DL)/libpng.so.0.$(PNGMIN)
(cd $(DL); \
- ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \
- ln -f -s libpng.so.3 libpng.so; \
+ ln -f -s libpng.so.0.$(PNGMIN) libpng.so.0; \
+ ln -f -s libpng.so.0 libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -207,7 +207,7 @@
clean:
/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
- libpng.so.3.$(PNGMIN) \
+ libpng.so.0.$(PNGMIN) \
libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 4b3360a..91de916 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -33,7 +33,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
@@ -111,9 +111,9 @@
$(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBNAME).so.$(PNGMAJ) \
-o $(LIBNAME).so.$(PNGVER) $(OBJSDLL)
-libpng.so.3.$(PNGMIN): $(OBJSDLL)
- $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h libpng.so.3 \
- -o libpng.so.3.$(PNGMIN) $(OBJSDLL)
+libpng.so.0.$(PNGMIN): $(OBJSDLL)
+ $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h libpng.so.0 \
+ -o libpng.so.0.$(PNGMIN) $(OBJSDLL)
pngtest: pngtest.o $(LIBNAME).so
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -138,21 +138,21 @@
(cd $(DL); ln -f -s $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
- libpng.so.3.$(PNGMIN)
+ libpng.so.0.$(PNGMIN)
-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ).$(PNGVER)*
-@/bin/rm -f $(DL)/$(LIBNAME).so
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
-@/bin/rm -f $(DL)/libpng.so
- -@/bin/rm -f $(DL)/libpng.so.3
- -@/bin/rm -f $(DL)/libpng.so.3.$(PNGVER)*
+ -@/bin/rm -f $(DL)/libpng.so.0
+ -@/bin/rm -f $(DL)/libpng.so.0.$(PNGVER)*
cp $(LIBNAME).so.$(PNGVER) $(DL)
- cp libpng.so.3.$(PNGMIN) $(DL)
+ cp libpng.so.0.$(PNGMIN) $(DL)
chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
- chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
+ chmod 755 $(DL)/libpng.so.0.$(PNGMIN)
(cd $(DL); \
- ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \
- ln -f -s libpng.so.3 libpng.so; \
+ ln -f -s libpng.so.0.$(PNGMIN) libpng.so.0; \
+ ln -f -s libpng.so.0 libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -208,7 +208,7 @@
clean:
/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
- libpng.so.3.$(PNGMIN) \
+ libpng.so.0.$(PNGMIN) \
libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 93aec12..161dbac 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -18,7 +18,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32
index 90b178b..04407dd 100644
--- a/scripts/makefile.bc32
+++ b/scripts/makefile.bc32
@@ -17,14 +17,14 @@
LD=bcc32
LIB=tlib
-#TARGET_CPU=6
-# 3 = 386, 4 = 486, 5 = Pentium etc.
+# -3 = 386, -4 = 486, -5 = Pentium etc.
!ifndef TARGET_CPU
-TARGET_CPU=5
+#TARGET_CPU=-6
!endif
# Use this if you don't want Borland's fancy exception handling
-NOEHLIB=noeh32.lib
+# (Caution: doesn't work with CBuilderX)
+#NOEHLIB=noeh32.lib
!ifdef DEBUG
CDEBUG=-v
@@ -40,14 +40,14 @@
LDEBUG=$(LDEBUG) -N
!endif
-# -X- turn on dependency generation in the object file
-# -w set all warnings on
# -O2 optimize for speed
-# -Z global optimization
-CFLAGS=-O2 -Z -X- -w -I$(ZLIB_DIR) -$(TARGET_CPU) $(CDEBUG)
+# -d merge duplicate strings
+# -k- turn off standard stack frame
+# -w display all warnings
+CFLAGS=-I$(ZLIB_DIR) -O2 -d -k- -w $(TARGET_CPU) $(CDEBUG)
# -M generate map file
-LDFLAGS=-M -L$(ZLIB_DIR) $(LDEBUG)
+LDFLAGS=-L$(ZLIB_DIR) -M $(LDEBUG)
## Variables
@@ -138,14 +138,15 @@
|
-# Clean up anything else you want
+# Cleanup
clean:
-del *.obj
- -del *.exe
- -del *.lib
+ -del $(LIBNAME)
+ -del pngtest.exe
-del *.lst
-del *.map
-del *.tds
+ -del pngout.png
# End of makefile for libpng
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 98ace87..50bc54b 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -12,7 +12,7 @@
ZLIBINC=/usr/local/include
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
ALIGN=
@@ -93,9 +93,9 @@
$(CC) -nostart -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -o \
$(LIBNAME).so.$(PNGVER) $(OBJSDLL)
-libpng.so.3.$(PNGMIN): $(OBJSDLL)
- $(CC) -nostart -Wl,-soname,libpng.so.3 -o \
- libpng.so.3.$(PNGMIN) $(OBJSDLL)
+libpng.so.0.$(PNGMIN): $(OBJSDLL)
+ $(CC) -nostart -Wl,-soname,libpng.so.0 -o \
+ libpng.so.0.$(PNGMIN) $(OBJSDLL)
pngtest: pngtest.o $(LIBNAME).so
$(CC) -L$(ZLIBLIB) -lz -lpng12 -o pngtest pngtest.o
@@ -120,20 +120,20 @@
(cd $(DL); ln -sf $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
- libpng.so.3.$(PNGMIN)
+ libpng.so.0.$(PNGMIN)
-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
-@/bin/rm -f $(DL)/libpng.so
- -@/bin/rm -f $(DL)/libpng.so.3
- -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
+ -@/bin/rm -f $(DL)/libpng.so.0
+ -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)*
cp $(LIBNAME).so.$(PNGVER) $(DL)
- cp libpng.so.3.$(PNGMIN) $(DL)
+ cp libpng.so.0.$(PNGMIN) $(DL)
chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
- chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
+ chmod 755 $(DL)/libpng.so.0.$(PNGMIN)
(cd $(DL); \
- ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
- ln -sf libpng.so.3 libpng.so; \
+ ln -sf libpng.so.0.$(PNGMIN) libpng.so.0; \
+ ln -sf libpng.so.0 libpng.so; \
ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -187,7 +187,7 @@
clean:
/bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \
$(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtesti \
- libpng.so.3.$(PNGMIN) \
+ libpng.so.0.$(PNGMIN) \
libpng.pc
# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 09f92d3..226204a 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -79,7 +79,7 @@
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
@@ -176,7 +176,7 @@
ar rc $@ $(OBJS)
$(RANLIB) $@
-$(SHAREDDEF): scripts/png32ms.def
+$(SHAREDDEF): scripts/pngw32.def
cat $< | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \
sed -e 's/\([^;]*\);/;/' > $@
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 1a1f988..5d54389 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -23,7 +23,7 @@
RANLIB=ranlib
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index f8482f9..1a757fe 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -32,7 +32,7 @@
ZLIBINC=../zlib
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -76,9 +76,9 @@
$(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \
-soname $(LIBNAME).so.$(PNGMAJ)
-libpng.so.3.$(PNGMIN): $(OBJS)
+libpng.so.0.$(PNGMIN): $(OBJS)
$(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \
- -soname libpng.so.3
+ -soname libpng.so.0
pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -103,20 +103,20 @@
(cd $(DL); ln -sf $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
- libpng.so.3.$(PNGMIN)
+ libpng.so.0.$(PNGMIN)
-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
-@/bin/rm -f $(DL)/libpng.so
- -@/bin/rm -f $(DL)/libpng.so.3
- -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
+ -@/bin/rm -f $(DL)/libpng.so.0
+ -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)*
cp $(LIBNAME).so.$(PNGVER) $(DL)
- cp libpng.so.3.$(PNGMIN) $(DL)
+ cp libpng.so.0.$(PNGMIN) $(DL)
chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
- chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
+ chmod 755 $(DL)/libpng.so.0.$(PNGMIN)
(cd $(DL); \
- ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \
- ln -f -s libpng.so.3 libpng.so; \
+ ln -f -s libpng.so.0.$(PNGMIN) libpng.so.0; \
+ ln -f -s libpng.so.0 libpng.so; \
ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -172,7 +172,7 @@
clean:
/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
- libpng.so.3.$(PNGMIN) \
+ libpng.so.0.$(PNGMIN) \
libpng.pc
# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
deleted file mode 100644
index a04b497..0000000
--- a/scripts/makefile.elf
+++ /dev/null
@@ -1,249 +0,0 @@
-# makefile for libpng.a and libpng12.so on Linux ELF with gcc
-# Copyright (C) 1998, 1999, 2002 Greg Roelofs and Glenn Randers-Pehrson
-# Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
-
-LIBNAME = libpng12
-PNGMAJ = 0
-PNGMIN = 1.2.8
-PNGVER = $(PNGMAJ).$(PNGMIN)
-
-CC=gcc
-
-# where "make install" puts libpng12.a, libpng12.so*,
-# libpng12/png.h and libpng12/pngconf.h
-# Prefix must be a full pathname.
-prefix=/usr/local
-
-# Where the zlib library and include files are located.
-#ZLIBLIB=/usr/local/lib
-#ZLIBINC=/usr/local/include
-ZLIBLIB=../zlib
-ZLIBINC=../zlib
-
-ALIGN=
-# for i386:
-#ALIGN=-malign-loops=2 -malign-functions=2
-
-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
- -Wmissing-declarations -Wtraditional -Wcast-align \
- -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
-
-# for pgcc version 2.95.1, -O3 is buggy; don't use it.
-
-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
- $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
-
-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
-LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-
-RANLIB=ranlib
-#RANLIB=echo
-
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
-
-OBJSDLL = $(OBJS:.o=.pic.o)
-
-.SUFFIXES: .c .o .pic.o
-
-.c.pic.o:
- $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
-
-all: libpng.a $(LIBNAME).so pngtest pngtest-static libpng.pc libpng-config
-
-libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
- $(RANLIB) $@
-
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
-
-libpng.syms: png.h pngconf.h
- $(CC) $(CFLAGS) -E -DPNG_BUILDSYMS png.h |\
- awk -F '[\t [\]();]' 'BEGIN{print "{global:"}\
- { for (i=1;i+2<=NF;++i)\
- if ($$(i)=="PNG_FUNCTION_EXPORT" && $$(i+2)=="END")\
- print $$(i+1) ";";\
- for (i=1;i+1<=NF;++i)\
- if ($$(i)=="PNG_DATA_EXPORT")\
- print $$(i+1) ";";}\
- END{print "local: *; };"}' >$@.new
- rm -f $@
- mv $@.new $@
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
- echo libs=\"-lpng12 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
-$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
- ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
-
-$(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER)
- ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)
-
-$(LIBNAME).so.$(PNGVER): $(OBJSDLL) libpng.syms
- $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
- -Wl,-version-script,libpng.syms \
- -o $(LIBNAME).so.$(PNGVER) \
- $(OBJSDLL)
-
-libpng.so.3.$(PNGMIN): $(OBJSDLL) libpng.syms
- $(CC) -shared -Wl,-soname,libpng.so.3 \
- -Wl,-version-script,libpng.syms \
- -o libpng.so.3.$(PNGMIN) \
- $(OBJSDLL)
-
-pngtest: pngtest.o $(LIBNAME).so
- $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-
-pngtest-static: pngtest.o libpng.a
- $(CC) -o pngtest-static $(CFLAGS) pngtest.o $(LDFLAGS_A)
-
-test: pngtest pngtest-static
- @echo ""
- @echo " Running pngtest dynamically linked with $(LIBNAME).so:"
- @echo ""
- ./pngtest
- @echo ""
- @echo " Running pngtest statically linked with libpng.a:"
- @echo ""
- ./pngtest-static
-
-install-headers: png.h pngconf.h
- -@if [ ! -d $(DI) ]; then mkdir $(DI); fi
- -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
- -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h
- -@/bin/rm -f $(DI)/libpng
- (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
-
-install-static: install-headers libpng.a
- -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@/bin/rm -f $(DL)/libpng.a
- (cd $(DL); ln -sf $(LIBNAME).a libpng.a)
-
-install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
- libpng.so.3.$(PNGMIN)
- -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
- -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
- -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
- -@/bin/rm -f $(DL)/libpng.so
- -@/bin/rm -f $(DL)/libpng.so.3
- -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
- cp $(LIBNAME).so.$(PNGVER) $(DL)
- cp libpng.so.3.$(PNGMIN) $(DL)
- chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
- chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
- (cd $(DL); \
- ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
- ln -sf libpng.so.3 libpng.so; \
- ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
- ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
- -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
- -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc
- -@/bin/rm -f $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)
-
-install-man: libpng.3 libpngpf.3 png.5
- -@if [ ! -d $(DM) ]; then mkdir $(DM); fi
- -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi
- -@/bin/rm -f $(DM)/man3/libpng.3
- -@/bin/rm -f $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi
- -@/bin/rm -f $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- -@if [ ! -d $(DB) ]; then mkdir $(DB); fi
- -@/bin/rm -f $(DB)/libpng-config
- -@/bin/rm -f $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); ln -sf $(LIBNAME)-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. 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) \
- `$(BINPATH)/libpng12-config --cflags` pngtest.c \
- -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
- -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
- ./pngtesti pngtest.png
-
-clean:
- /bin/rm -f *.o libpng.a libpng.syms pngtest pngout.png libpng-config \
- $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \
- libpng.so.3.$(PNGMIN) \
- libpng.pc
-
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-png.o png.pic.o: png.h pngconf.h
-pngerror.o pngerror.pic.o: png.h pngconf.h
-pngrio.o pngrio.pic.o: png.h pngconf.h
-pngwio.o pngwio.pic.o: png.h pngconf.h
-pngmem.o pngmem.pic.o: png.h pngconf.h
-pngset.o pngset.pic.o: png.h pngconf.h
-pngget.o pngget.pic.o: png.h pngconf.h
-pngread.o pngread.pic.o: png.h pngconf.h
-pngrtran.o pngrtran.pic.o: png.h pngconf.h
-pngrutil.o pngrutil.pic.o: png.h pngconf.h
-pngtrans.o pngtrans.pic.o: png.h pngconf.h
-pngwrite.o pngwrite.pic.o: png.h pngconf.h
-pngwtran.o pngwtran.pic.o: png.h pngconf.h
-pngwutil.o pngwutil.pic.o: png.h pngconf.h
-pngpread.o pngpread.pic.o: png.h pngconf.h
-
-pngtest.o: png.h pngconf.h
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index c46c221..5c4ae57 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -15,7 +15,7 @@
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=gcc
@@ -129,9 +129,9 @@
-o $(LIBNAME).so.$(PNGVER) \
$(OBJSDLL)
-libpng.so.3.$(PNGMIN): $(OBJSDLL)
- $(CC) -shared -Wl,-soname,libpng.so.3 \
- -o libpng.so.3.$(PNGMIN) \
+libpng.so.0.$(PNGMIN): $(OBJSDLL)
+ $(CC) -shared -Wl,-soname,libpng.so.0 \
+ -o libpng.so.0.$(PNGMIN) \
$(OBJSDLL)
pngtest: pngtest.o $(LIBNAME).so
@@ -167,20 +167,20 @@
(cd $(DL); ln -sf $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
- libpng.so.3.$(PNGMIN)
+ libpng.so.0.$(PNGMIN)
-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
-@/bin/rm -f $(DL)/libpng.so
- -@/bin/rm -f $(DL)/libpng.so.3
- -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
+ -@/bin/rm -f $(DL)/libpng.so.0
+ -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)*
cp $(LIBNAME).so.$(PNGVER) $(DL)
- cp libpng.so.3.$(PNGMIN) $(DL)
+ cp libpng.so.0.$(PNGMIN) $(DL)
chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
- chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
+ chmod 755 $(DL)/libpng.so.0.$(PNGMIN)
(cd $(DL); \
- ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
- ln -sf libpng.so.3 libpng.so; \
+ ln -sf libpng.so.0.$(PNGMIN) libpng.so.0; \
+ ln -sf libpng.so.0 libpng.so; \
ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -234,7 +234,7 @@
clean:
/bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \
$(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \
- libpng.so.3.$(PNGMIN) \
+ libpng.so.0.$(PNGMIN) \
libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index e860e37..f6e4557 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -27,7 +27,7 @@
RANLIB=ranlib
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index d12d6cd..0c0f732 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -41,7 +41,7 @@
#RANLIB=echo
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 47b5c26..33692ae 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -24,7 +24,7 @@
RANLIB=ranlib
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 9ba553b..d133832 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -5,7 +5,7 @@
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=gcc
@@ -101,9 +101,9 @@
-o $(LIBNAME).so.$(PNGVER) \
$(OBJSDLL)
-libpng.so.3.$(PNGMIN): $(OBJSDLL)
- $(CC) -shared -Wl,-soname,libpng.so.3 \
- -o libpng.so.3.$(PNGMIN) \
+libpng.so.0.$(PNGMIN): $(OBJSDLL)
+ $(CC) -shared -Wl,-soname,libpng.so.0 \
+ -o libpng.so.0.$(PNGMIN) \
$(OBJSDLL)
pngtest: pngtest.o $(LIBNAME).so
@@ -139,20 +139,20 @@
(cd $(DL); ln -sf $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
- libpng.so.3.$(PNGMIN)
+ libpng.so.0.$(PNGMIN)
-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
-@/bin/rm -f $(DL)/libpng.so
- -@/bin/rm -f $(DL)/libpng.so.3
- -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
+ -@/bin/rm -f $(DL)/libpng.so.0
+ -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)*
cp $(LIBNAME).so.$(PNGVER) $(DL)
- cp libpng.so.3.$(PNGMIN) $(DL)
+ cp libpng.so.0.$(PNGMIN) $(DL)
chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
- chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
+ chmod 755 $(DL)/libpng.so.0.$(PNGMIN)
(cd $(DL); \
- ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
- ln -sf libpng.so.3 libpng.so; \
+ ln -sf libpng.so.0.$(PNGMIN) libpng.so.0; \
+ ln -sf libpng.so.0 libpng.so; \
ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -206,7 +206,7 @@
clean:
/bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \
$(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \
- libpng.so.3.$(PNGMIN) \
+ libpng.so.0.$(PNGMIN) \
libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 17d317b..3e043d7 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.8
+SHLIB_MINOR= 1.2.9beta1
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/scripts/makefile.netbsd b/scripts/makefile.netbsd
index 52fa339..a596b71 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.2.8
+SHLIB_MINOR= 1.2.9beta1
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/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 5d401a3..9ecf962 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.8
+SHLIB_MINOR= 1.2.9beta1
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index f364231..eec1296 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -24,7 +24,7 @@
RANLIB=echo
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -88,8 +88,8 @@
$(CC) -G -Wl,-h,$(LIBNAME).so.$(PNGMAJ) -o $(LIBNAME).so.$(PNGVER) \
$(OBJSDLL)
-libpng.so.3.$(PNGMIN): $(OBJSDLL)
- $(CC) -G -Wl,-h,libpng.so.3 -o libpng.so.3.$(PNGMIN) \
+libpng.so.0.$(PNGMIN): $(OBJSDLL)
+ $(CC) -G -Wl,-h,libpng.so.0 -o libpng.so.0.$(PNGMIN) \
$(OBJSDLL)
pngtest: pngtest.o $(LIBNAME).so
@@ -117,20 +117,20 @@
(cd $(DL); ln -f -s $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
- libpng.so.3.$(PNGMIN)
+ libpng.so.0.$(PNGMIN)
-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
-@/bin/rm -f $(DL)/libpng.so
- -@/bin/rm -f $(DL)/libpng.so.3
- -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
+ -@/bin/rm -f $(DL)/libpng.so.0
+ -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)*
cp $(LIBNAME).so.$(PNGVER) $(DL)
- cp libpng.so.3.$(PNGMIN) $(DL)
+ cp libpng.so.0.$(PNGMIN) $(DL)
chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
- chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
+ chmod 755 $(DL)/libpng.so.0.$(PNGMIN)
(cd $(DL); \
- ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \
- ln -f -s libpng.so.3 libpng.so; \
+ ln -f -s libpng.so.0.$(PNGMIN) libpng.so.0; \
+ ln -f -s libpng.so.0 libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -184,7 +184,7 @@
clean:
/bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \
$(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \
- libpng.so.3.$(PNGMIN) \
+ libpng.so.0.$(PNGMIN) \
libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 5010daa..64ef06e 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -18,7 +18,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=gcc
@@ -31,7 +31,7 @@
LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
LDSHARED=cc $(ABI) -shared -soname $(LIBNAME).so.$(PNGMAJ) \
-set_version sgi$(PNGMAJ).0
-LDLEGACY=cc $(ABI) -shared -soname libpng.so.3 \
+LDLEGACY=cc $(ABI) -shared -soname libpng.so.0 \
-set_version sgi$3.0
# See "man dso" for info about shared objects
@@ -96,7 +96,7 @@
$(LDSHARED) -o $@ $(OBJS)
rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)
-libpng.so.3.$(PNGMIN): $(OBJS)
+libpng.so.0.$(PNGMIN): $(OBJS)
$(LDLEGACY) -o $@ $(OBJS)
pngtest: pngtest.o libpng.a
@@ -124,20 +124,20 @@
(cd $(DL); ln -sf $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
- libpng.so.3.$(PNGMIN)
+ libpng.so.0.$(PNGMIN)
-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
-@/bin/rm -f $(DL)/libpng.so
- -@/bin/rm -f $(DL)/libpng.so.3
- -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
+ -@/bin/rm -f $(DL)/libpng.so.0
+ -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)*
cp $(LIBNAME).so.$(PNGVER) $(DL)
- cp libpng.so.3.$(PNGMIN) $(DL)
+ cp libpng.so.0.$(PNGMIN) $(DL)
chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
- chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
+ chmod 755 $(DL)/libpng.so.0.$(PNGMIN)
(cd $(DL); \
- ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
- ln -sf libpng.so.3 libpng.so; \
+ ln -sf libpng.so.0.$(PNGMIN) libpng.so.0; \
+ ln -sf libpng.so.0 libpng.so; \
ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -195,7 +195,7 @@
clean:
rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \
$(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
- libpng.so.3.$(PNGMIN) \
+ libpng.so.0.$(PNGMIN) \
so_locations
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 584da7c..418621b 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -5,7 +5,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Where make install puts libpng.a, libpng12.so, and libpng12/png.h
@@ -36,7 +36,7 @@
LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
LDSHARED=cc $(ABI) -shared -soname $(LIBNAME).so.$(PNGMAJ) \
-set_version sgi$(PNGMAJ).0
-LDLEGACY=cc $(ABI) -shared -soname libpng.so.3 \
+LDLEGACY=cc $(ABI) -shared -soname libpng.so.0 \
-set_version sgi$3.0
# See "man dso" for info about shared objects
@@ -102,7 +102,7 @@
$(LDSHARED) -o $@ $(OBJS)
rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)
-libpng.so.3.$(PNGMIN): $(OBJS)
+libpng.so.0.$(PNGMIN): $(OBJS)
$(LDLEGACY) -o $@ $(OBJS)
pngtest: pngtest.o libpng.a
@@ -130,20 +130,20 @@
(cd $(DL); ln -sf $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
- libpng.so.3.$(PNGMIN)
+ libpng.so.0.$(PNGMIN)
-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
-@/bin/rm -f $(DL)/libpng.so
- -@/bin/rm -f $(DL)/libpng.so.3
- -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
+ -@/bin/rm -f $(DL)/libpng.so.0
+ -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)*
cp $(LIBNAME).so.$(PNGVER) $(DL)
- cp libpng.so.3.$(PNGMIN) $(DL)
+ cp libpng.so.0.$(PNGMIN) $(DL)
chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
- chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
+ chmod 755 $(DL)/libpng.so.0.$(PNGMIN)
(cd $(DL); \
- ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
- ln -sf libpng.so.3 libpng.so; \
+ ln -sf libpng.so.0.$(PNGMIN) libpng.so.0; \
+ ln -sf libpng.so.0 libpng.so; \
ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -201,7 +201,7 @@
clean:
rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \
$(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
- libpng.so.3.$(PNGMIN) \
+ libpng.so.0.$(PNGMIN) \
so_locations
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index a53a80d..75fa4d8 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -34,7 +34,7 @@
RANLIB=echo
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -110,9 +110,9 @@
$(LD) -G -h $(LIBNAME).so.$(PNGMAJ) \
-o $(LIBNAME).so.$(PNGVER) $(OBJSDLL)
-libpng.so.3.$(PNGMIN): $(OBJS)
- $(LD) -G -h libpng.so.3 \
- -o libpng.so.3.$(PNGMIN) $(OBJSDLL)
+libpng.so.0.$(PNGMIN): $(OBJS)
+ $(LD) -G -h libpng.so.0 \
+ -o libpng.so.0.$(PNGMIN) $(OBJSDLL)
pngtest: pngtest.o $(LIBNAME).so
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -137,20 +137,20 @@
(cd $(DL); ln -f -s $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
- libpng.so.3.$(PNGMIN)
+ libpng.so.0.$(PNGMIN)
-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
-@/bin/rm -f $(DL)/libpng.so
- -@/bin/rm -f $(DL)/libpng.so.3
- -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
+ -@/bin/rm -f $(DL)/libpng.so.0
+ -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)*
cp $(LIBNAME).so.$(PNGVER) $(DL)
- cp libpng.so.3.$(PNGMIN) $(DL)
+ cp libpng.so.0.$(PNGMIN) $(DL)
chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
- chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
+ chmod 755 $(DL)/libpng.so.0.$(PNGMIN)
(cd $(DL); \
- ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \
- ln -f -s libpng.so.3 libpng.so; \
+ ln -f -s libpng.so.0.$(PNGMIN) libpng.so.0; \
+ ln -f -s libpng.so.0 libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -206,7 +206,7 @@
clean:
/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
- libpng.so.3.$(PNGMIN) \
+ libpng.so.0.$(PNGMIN) \
libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 8e053f8..51e0181 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -30,7 +30,7 @@
RANLIB=echo
PNGMAJ = 0
-PNGMIN = 1.2.8
+PNGMIN = 1.2.9beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -107,9 +107,9 @@
$(LD) -G -h $(LIBNAME).so.$(PNGMAJ) \
-o $(LIBNAME).so.$(PNGVER) $(OBJSDLL)
-libpng.so.3.$(PNGMIN): $(OBJS)
- $(LD) -G -h libpng.so.3 \
- -o libpng.so.3.$(PNGMIN) $(OBJSDLL)
+libpng.so.0.$(PNGMIN): $(OBJS)
+ $(LD) -G -h libpng.so.0 \
+ -o libpng.so.0.$(PNGMIN) $(OBJSDLL)
pngtest: pngtest.o $(LIBNAME).so
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -134,20 +134,20 @@
(cd $(DL); ln -f -s $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
- libpng.so.3.$(PNGMIN)
+ libpng.so.0.$(PNGMIN)
-@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
-@/bin/rm -f $(DL)/libpng.so
- -@/bin/rm -f $(DL)/libpng.so.3
- -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
+ -@/bin/rm -f $(DL)/libpng.so.0
+ -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)*
cp $(LIBNAME).so.$(PNGVER) $(DL)
- cp libpng.so.3.$(PNGMIN) $(DL)
+ cp libpng.so.0.$(PNGMIN) $(DL)
chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
- chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
+ chmod 755 $(DL)/libpng.so.0.$(PNGMIN)
(cd $(DL); \
- ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \
- ln -f -s libpng.so.3 libpng.so; \
+ ln -f -s libpng.so.0.$(PNGMIN) libpng.so.0; \
+ ln -f -s libpng.so.0 libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so; \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ))
-@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -203,7 +203,7 @@
clean:
/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
- libpng.so.3.$(PNGMIN) \
+ libpng.so.0.$(PNGMIN) \
libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 9aa6135..b325ada 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.8
+; Version 1.2.9beta1
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
@@ -213,6 +213,15 @@
; Added at version 1.2.7
png_set_add_alpha
+; Added at version 1.2.9
+ png_get_uint_32
+ png_save_uint_32
+ png_get_uint_16
+ png_save_uint_16
+ png_get_int_32
+ png_save_int_32
+ png_get_uint_31
+
; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS
png_libpng_ver
png_pass_start
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index 8303bfe..438cc16 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.2.8
+;Version 1.2.9beta1
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
@@ -184,7 +184,7 @@
png_convert_to_rfc1123 @172
png_set_invalid @173
; Added at version 1.0.12
-; For compatiblity with 1.0.7-1.0.11
+; For compatibility with 1.0.7-1.0.11
png_info_init @174
png_read_init_3 @175
png_write_init_3 @176