Imported from libpng-1.2.4rc1.tar

2025-07-10 18:04:09 +02:00 · 2002-07-01 22:23:46 -05:00
parent d020e9d826
commit 2ae022da7e
63 changed files with 332 additions and 158 deletions
--- a/scripts/libpng-config-body.in
+++ b/scripts/libpng-config-body.in
@@ -11,6 +11,7 @@ Known values for OPTION are:
  --cflags              print compiler flags
  --cppflags            print pre-processor flags
  --ldflags             print loader flags
+  --rpath               print path to shared library
  --help                display this help and exit
  --version             output version information
 EOF
@@ -50,6 +51,10 @@ while test $# -gt 0; do
        echo ${libs}
        ;;

+    --rpath)
+        echo ${rpath}
+        ;;
+
    --ldflags)
        echo ${ldflags}
        ;;
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,10 +8,11 @@

 # Modeled after libxml-config.

-version=1.2.4beta3
+version=1.2.4rc1
 prefix=""
 cppflags=""
 cflags=""
 ldflags=""
 libs=""
+rpath=""

--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -6,6 +6,6 @@ includedir=${exec_prefix}/include

 Name: libpng12
 Description: Loads and saves PNG files
-Version: 1.2.4beta3
+Version: 1.2.4rc1
 Libs: -L${libdir} -lpng12 -lz -lm
 Cflags: -I${includedir}/libpng12
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -1,4 +1,4 @@
-# makefile for libpng on Solaris 2.x with gcc
+# makefile for libpng on Solaris 2.x with cc
 # Contributed by William L. Sebok, based on makefile.linux
 # Copyright (C) 2002 Glenn Randers-Pehrson
 # Copyright (C) 1998 Greg Roelofs
@@ -33,7 +33,7 @@ RANLIB=echo

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
@@ -182,7 +182,7 @@ test-installed:
 	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \
 	   $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
-	pngtesti pngtest.png
+	./pngtesti pngtest.png

 clean:
 	/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -1,4 +1,4 @@
-# makefile for libpng on Solaris 2.x with gcc
+# makefile for libpng on Solaris 2.x with cc
 # Contributed by William L. Sebok, based on makefile.linux
 # Copyright (C) 2002 Glenn Randers-Pehrson
 # Copyright (C) 1998 Greg Roelofs
@@ -33,7 +33,7 @@ RANLIB=echo

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
@@ -182,7 +182,7 @@ test-installed:
 	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \
 	   $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
-	pngtesti pngtest.png
+	./pngtesti pngtest.png

 clean:
 	/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -17,7 +17,7 @@ RANLIB = ranlib
 RM = rm -f

 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 prefix=/usr/local
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -12,7 +12,7 @@ ZLIBLIB=/usr/local/lib
 ZLIBINC=/usr/local/include

 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 ALIGN=
@@ -168,7 +168,7 @@ test-installed:
 	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
 	   -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
-	pngtesti pngtest.png
+	./pngtesti pngtest.png

 clean:
 	/bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -79,7 +79,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 PNGDLL = 13
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 SHAREDLIB=cygpng$(PNGDLL).dll
@@ -150,7 +150,7 @@ libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in
 	echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
 	echo cflags=\"\"; \
 	echo ldflags=\"-L$(LIBPATH)\"; \
-	echo libs=\"-lpng$(PNGDLL) -lz\"; \
+	echo libs=\"-lpng$(PNGMAJ) -lz\"; \
 	cat $(S)/scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config

@@ -258,13 +258,22 @@ test-config-install: $(DB)/libpng-config
    gytiu=$$(( $$gytiu + 1 )); \
   done

-
 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.
+
+test-installed:
+	$(CC) $(CFLAGS) \
+	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+	   -L$(ZLIBLIB) \
+	   -o pngtesti$(EXE) `$(BINPATH)/libpng12-config --ldflags --libs`
+	./pngtesti$(EXE) pngtest.png
+
 clean:
 	/bin/rm -f *.pic.o *.o $(STATLIB) $(IMPLIB) $(SHAREDLIB) \
 	pngtest-stat$(EXE) pngtest$(EXE) pngout.png $(SHAREDDEF) \
-	libpng-config libpng.pc
+	libpng-config libpng.pc pngtesti$(EXE)

 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -23,7 +23,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
 RANLIB=ranlib

 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -164,7 +164,7 @@ test-installed:
 	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
 	   -L$(ZLIBLIB) \
 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
-	pngtesti pngtest.png
+	./pngtesti pngtest.png

 clean:
 	rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -32,7 +32,7 @@ ZLIBLIB=../zlib
 ZLIBINC=../zlib

 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -150,7 +150,7 @@ test-installed:
 	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
 	   -L$(ZLIBLIB) -R$(ZLIBLIB) \
 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
-	pngtesti pngtest.png
+	./pngtesti pngtest.png

 clean:
 	/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -15,7 +15,7 @@

 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 CC=gcc
@@ -211,7 +211,7 @@ test-installed:
 	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
 	   -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
-	pngtesti pngtest.png
+	./pngtesti pngtest.png

 clean:
 	/bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -33,7 +33,7 @@ RANLIB=ranlib
 #RANLIB=echo

 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -173,7 +173,7 @@ test-installed:
 	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
 	   -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
-	pngtesti pngtest.png
+	./pngtesti pngtest.png

 clean:
 	/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -17,7 +17,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 RANLIB=ranlib

 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -158,7 +158,7 @@ test-installed:
 	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
 	   -L$(ZLIBLIB) \
 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
-	pngtesti pngtest.png
+	./pngtesti pngtest.png

 clean:
 	/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -5,7 +5,7 @@

 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 CC=gcc
@@ -183,7 +183,7 @@ test-installed:
 	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
 	   -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
-	pngtesti pngtest.png
+	./pngtesti pngtest.png

 clean:
 	/bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
--- a/scripts/makefile.macosx
+++ b/scripts/makefile.macosx
@@ -17,7 +17,7 @@ ZLIBINC=../zlib
 CC=cc

 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
@@ -158,7 +158,7 @@ test-installed:
 	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
 	   -L$(ZLIBLIB) \
 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
-	pngtesti pngtest.png
+	./pngtesti pngtest.png

 clean:
 	rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12

 LIB=	png12
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.4beta3
+SHLIB_MINOR=	1.2.4rc1
 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
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng

 LIB=	png
 SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.2.4beta3
+SHLIB_MINOR=	1.2.4rc1
 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
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat

 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.4beta3
+SHLIB_MINOR=	1.2.4rc1

 LIB=	png
 SRCS=	png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -24,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
 RANLIB=echo

 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -94,7 +94,6 @@ pngtest: pngtest.o $(LIBNAME).so
 test: pngtest
 	./pngtest

-
 install-headers: png.h pngconf.h
 	-@if [ ! -d $(DI) ]; then mkdir $(DI); fi
 	-@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
@@ -155,6 +154,20 @@ 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.
+
+test-installed:
+	$(CC) $(CFLAGS) \
+	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+	   -L$(ZLIBLIB) \
+	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
+	./pngtesti pngtest.png
+
+clean:
+	/bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
+	$(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti
+

 clean:
 	/bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest pngout.png
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -18,7 +18,7 @@ ZLIBINC=../zlib

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)
 CC=gcc

@@ -78,7 +78,8 @@ libpng-config:
 	echo cppflags=\"-I$(INCPATH)/$(LIBNAME) -DPNG_USE_PNGGCCRD \
 		-DPNG_NO_ASSEMBLER_CODE\"; \
 	echo cflags=\"$(ABI)\"; \
-	echo ldflags=\"-L$(LIBPATH) -rpath $(LIBPATH) \"; \
+	echo ldflags=\"-L$(LIBPATH)\"; \
+	echo rpath=\"$(LIBPATH)\"; \
 	echo libs=\"-lpng12 -lz -lm\"; \
 	cat scripts/libpng-config-body.in ) > libpng-config
 	chmod +x libpng-config
@@ -165,11 +166,11 @@ install: install-static install-shared install-man install-config
 test-installed:
 	$(CC) -I$(ZLIBINC) \
 	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-	   -L$(ZLIBLIB) -rpath $(ZLIBLIB) \
+	   -L$(ZLIBLIB) -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --rpath` \
 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
 	echo
 	echo Testing installed dynamic shared library.
-	pngtesti pngtest.png
+	./pngtesti pngtest.png

 clean:
 	rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -5,7 +5,7 @@

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Where make install puts libpng.a, libpng12.so, and libpng12/png.h
@@ -172,7 +172,7 @@ test-installed:
 	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
 	   -L$(ZLIBLIB) -rpath $(ZLIBLIB) \
 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
-	pngtesti pngtest.png
+	./pngtesti pngtest.png

 clean:
 	rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -34,7 +34,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
 RANLIB=echo

 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -184,7 +184,7 @@ test-installed:
 	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \
 	   -L$(ZLIBLIB) -R$(ZLIBLIB)
-	pngtesti pngtest.png
+	./pngtesti pngtest.png

 clean:
 	/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -30,7 +30,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
 RANLIB=echo

 PNGMAJ = 0
-PNGMIN = 1.2.4beta3
+PNGMIN = 1.2.4rc1
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

@@ -181,7 +181,7 @@ test-installed:
 	   `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \
 	   -L$(ZLIBLIB) -R$(ZLIBLIB)
-	pngtesti pngtest.png
+	./pngtesti pngtest.png

 clean:
 	/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -7,7 +7,7 @@ unit pngdef;
 interface

 const
-  PNG_LIBPNG_VER_STRING = '1.2.4beta3';
+  PNG_LIBPNG_VER_STRING = '1.2.4rc1';
  PNG_LIBPNG_VER        =  10204;

 type
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------

-; Version 1.2.4beta3
+; Version 1.2.4rc1

 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"