Imported from libpng-1.0.10beta1.tar

2025-07-10 18:04:09 +02:00 · 2001-03-14 07:08:39 -06:00
parent d4e8109a48
commit 1909560348
52 changed files with 1171 additions and 694 deletions
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -18,7 +18,7 @@ RM = rm -f
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.9
+PNGMIN = 1.0.10beta1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 prefix=/usr/local
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -13,7 +13,7 @@ ZLIBINC=/usr/local/include
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.9
+PNGMIN = 1.0.10beta1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 ALIGN=
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -39,9 +39,9 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \
 # have to change it.
 PNGMAJ = 2
 #PNGDLL = $%DLLNUM% # msvc
-PNGDLL = 2 # cygwin 1.0.9
-PNGMIN = 1.0.9
-PNGMIN_BASE = 1.0.9
+PNGDLL = 2 # cygwin 1.0.10beta1
+PNGMIN = 1.0.10beta1
+PNGMIN_BASE = 1.0.10
 PNGVER = $(PNGMAJ).$(PNGMIN)

 SHAREDLIB=cygpng$(PNGDLL).dll
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -17,7 +17,7 @@ ZLIBINC=../zlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.9
+PNGMIN = 1.0.10beta1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 CC=cc
@@ -64,7 +64,7 @@ install: libpng.a libpng.so.$(PNGVER)
 	chmod 644 $(LIBPATH)/libpng.a
 	chmod 644 $(LIBPATH)/libpng.so.$(PNGVER)
 	-@/bin/rm -f $(LIBPATH)/libpng.so.$(PNGMAJ) $(LIBPATH)/libpng.so
-	(cd $(LIBPATH)); ln -f -s libpng.so.$(PNGVER) libpng.so.$(PNGMAJ); \
+	(cd $(LIBPATH); ln -f -s libpng.so.$(PNGVER) libpng.so.$(PNGMAJ); \
 	 ln -f -s libpng.so.$(PNGMAJ) libpng.so)

 clean:
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -51,7 +51,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.9
+PNGMIN = 1.0.10beta1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -0,0 +1,112 @@
+# makefile for libpng on HP-UX using GCC
+# Copyright (C) 2001, Laurent faillie
+# Copyright (C) 1998, 1999 Greg Roelofs
+# Copyright (C) 1996, 1997 Andreas Dilger
+# For conditions of distribution and use, see copyright notice in png.h
+
+CC=gcc
+
+# where "make install" puts libpng.a, libpng.so*, png.h and pngconf.h
+prefix=/usr/local
+
+# Where the zlib library and include files are located
+ZLIBLIB=/opt/zlib/lib
+ZLIBINC=/opt/zlib/include
+
+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) -lpng -lz -lm
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
+
+RANLIB=ranlib
+#RANLIB=echo
+
+# read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
+# have to change it.
+PNGMAJ = 2
+PNGMIN = 1.0.10beta1
+PNGVER = $(PNGMAJ).$(PNGMIN)
+
+INCPATH=$(prefix)/include
+LIBPATH=$(prefix)/lib
+
+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 libpng.sl pngtest
+
+libpng.a: $(OBJS)
+	ar rc $@ $(OBJS)
+	$(RANLIB) $@
+
+libpng.sl: libpng.sl.$(PNGMAJ)
+	ln -f -s libpng.sl.$(PNGMAJ) libpng.sl
+
+libpng.sl.$(PNGMAJ): libpng.sl.$(PNGVER)
+	ln -f -s libpng.sl.$(PNGVER) libpng.sl.$(PNGMAJ)
+
+libpng.sl.$(PNGVER): $(OBJSDLL)
+	$(LD) -b -L$(ZLIBLIB) +s +b $(ZLIBLIB) \
+	+h libpng.sl.$(PNGMAJ) -o libpng.sl.$(PNGVER) $(OBJSDLL) -lz
+
+pngtest: pngtest.o libpng.sl
+	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
+
+test: pngtest
+	./pngtest
+
+install: libpng.a libpng.sl.$(PNGVER)
+	-@if [ ! -d $(INCPATH)  ]; then mkdir $(INCPATH); fi
+	-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi
+	cp png.h pngconf.h $(INCPATH)
+	chmod 644 $(INCPATH)/png.h $(INCPATH)/pngconf.h
+	cp libpng.a libpng.sl.$(PNGVER) $(LIBPATH)
+	chmod 755 $(LIBPATH)/libpng.sl.$(PNGVER)
+	-@/bin/rm -f $(LIBPATH)/libpng.sl.$(PNGMAJ) $(LIBPATH)/libpng.sl
+	(cd $(LIBPATH); ln -sf libpng.sl.$(PNGVER) libpng.sl.$(PNGMAJ); \
+	 ln -sf libpng.sl.$(PNGMAJ) libpng.sl)
+
+clean:
+	/bin/rm -f *.o libpng.a libpng.sl* pngtest pngout.png
+
+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
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -10,6 +10,7 @@ ZLIBINC=/opt/zlib/include

 CC=cc
 CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0
+# Caution: be sure you have built zlib with the same CFLAGS.
 CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm

@@ -18,7 +19,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.9
+PNGMIN = 1.0.10beta1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # where make install puts libpng.a and png.h
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -34,7 +34,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.9
+PNGMIN = 1.0.10beta1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -25,7 +25,7 @@ RANLIB=echo
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.9
+PNGMIN = 1.0.10beta1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -19,8 +19,8 @@ CFLAGS=-I$(ZLIBINC) -O2 $(WARNMORE) -fPIC -mabi=n32
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 LDSHARED=gcc -shared

-VER=1.0.9
-LIBS=libpng.so.1.0.9
+VER=1.0.10beta1
+LIBS=libpng.so.1.0.10beta1
 SHAREDLIB=libpng.so
 libdir=$(prefix)/lib32

@@ -59,12 +59,12 @@ install: libpng.a
 	cp libpng.a $(prefix)/lib
 	chmod 644 $(prefix)/lib/libpng.a
 	cp $(SHAREDLIB).$(VER) $(libdir); chmod 755 $(SHAREDLIB).$(VER)
-	cd $(libdir); if test -f $(SHAREDLIB).$(VER); then \
+	(cd $(libdir); if test -f $(SHAREDLIB).$(VER); then \
 	rm -f $(SHAREDLIB) $(SHAREDLIB).1; \
 	ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB); \
 	ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB).1; \
 	(ldconfig || true)  >/dev/null 2>&1; \
-	fi
+	fi)

 clean:
 	rm -f *.o libpng.a pngtest pngout.png
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -20,11 +20,12 @@ CC=cc
 WARNMORE=-fullwarn
 # You can add the -n32 option; then zlib must also be compiled with -n32
 # Note: -KPIC is the default anyhow
-CFLAGS=-I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5
+#CFLAGS=-I$(ZLIBINC) -O $(WARNMORE) -KPIC -DPNG_USE_PNGGCCRD # -g -DPNG_DEBUG=5
+CFLAGS=-I$(ZLIBINC) -O $(WARNMORE) -DPNG_USE_PNGGCCRD -DPNG_NO_ASSEMBLER_CODE
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 LDSHARED=cc -shared

-VER=1.0.9
+VER=1.0.10beta1
 SONUM=2
 SHAREDLIB=libpng.so
 libdir=$(prefix)
@@ -33,7 +34,7 @@ libdir=$(prefix)
 RANLIB=echo
 #RANLIB=ranlib

-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
+OBJS = pnggccrd.o 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

@@ -68,15 +69,15 @@ install: libpng.a
 	chmod 644 $(prefix)/lib/libpng.a

 install-shared: $(SHAREDLIB).$(SONUM).$(VER)
-	cp $(SHAREDLIB).$(SONUM).$(VER) $(libdir); 
+	cp $(SHAREDLIB).$(SONUM).$(VER) $(libdir)
 	chmod 755 $(SHAREDLIB).$(SONUM).$(VER)
-	cd $(libdir);
-	rm -f $(SHAREDLIB) $(SHAREDLIB).$(SONUM);
-	ln -s $(SHAREDLIB).$(SONUM).$(VER) $(SHAREDLIB).$(SONUM);
-	ln -s $(SHAREDLIB).$(SONUM) $(SHAREDLIB);
+	(cd $(libdir)
+	rm -f $(SHAREDLIB) $(SHAREDLIB).$(SONUM)
+	ln -s $(SHAREDLIB).$(SONUM).$(VER) $(SHAREDLIB).$(SONUM)
+	ln -s $(SHAREDLIB).$(SONUM) $(SHAREDLIB))

 clean:
-	rm -f *.o libpng.a pngtest pngout.png $(SHAREDLIB).* 
+	rm -f *.o libpng.a pngtest pngout.png $(SHAREDLIB).*

 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
@@ -100,4 +101,5 @@ pngwrite.o: png.h pngconf.h
 pngwtran.o: png.h pngconf.h
 pngwutil.o: png.h pngconf.h
 pngpread.o: png.h pngconf.h
+pnggccrd.o: png.h pngconf.h

--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -31,7 +31,7 @@ RANLIB=echo
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.9
+PNGMIN = 1.0.10beta1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -5,8 +5,8 @@ unit pngdef;
 interface

 const
-  PNG_LIBPNG_VER_STRING = '1.0.9';
-  PNG_LIBPNG_VER        =  10009;
+  PNG_LIBPNG_VER_STRING = '1.0.10beta1';
+  PNG_LIBPNG_VER        =  10010;

 type
  png_uint_32 = Cardinal;