Imported from libpng-1.2.8beta4.tar

2025-07-10 18:04:09 +02:00 · 2004-11-12 22:04:56 -06:00
parent 7806777139
commit 878b31e0b4
58 changed files with 170 additions and 112 deletions
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@

 # Modeled after libxml-config.

-version=1.2.8beta3
+version=1.2.8beta4
 prefix=""
 libdir=""
 libs=""
--- 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.8beta3
+Version: 1.2.8beta4
 Libs: -L${libdir} -lpng12 -lz -lm
 Cflags: -I${includedir}/libpng12
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -33,7 +33,7 @@ RANLIB=echo

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.8beta3
+PNGMIN = 1.2.8beta4
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -33,7 +33,7 @@ RANLIB=echo

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.8beta3
+PNGMIN = 1.2.8beta4
 PNGVER = $(PNGMAJ).$(PNGMIN)

 INCPATH=$(prefix)/include
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -18,7 +18,7 @@ RM = rm -f

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.8beta3
+PNGMIN = 1.2.8beta4
 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.8beta3
+PNGMIN = 1.2.8beta4
 PNGVER = $(PNGMAJ).$(PNGMIN)

 ALIGN=
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -79,7 +79,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 CYGDLL = 12
-PNGMIN = 1.2.8beta3
+PNGMIN = 1.2.8beta4
 PNGVER = $(PNGMAJ).$(PNGMIN)

 SHAREDLIB=cygpng$(CYGDLL).dll
--- 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.8beta3
+PNGMIN = 1.2.8beta4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -32,7 +32,7 @@ ZLIBLIB=../zlib
 ZLIBINC=../zlib

 PNGMAJ = 0
-PNGMIN = 1.2.8beta3
+PNGMIN = 1.2.8beta4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -15,7 +15,7 @@

 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.8beta3
+PNGMIN = 1.2.8beta4
 PNGVER = $(PNGMAJ).$(PNGMIN)

 CC=gcc
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -27,7 +27,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 RANLIB=ranlib

 PNGMAJ = 0
-PNGMIN = 1.2.8beta3
+PNGMIN = 1.2.8beta4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -41,7 +41,7 @@ RANLIB=ranlib
 #RANLIB=echo

 PNGMAJ = 0
-PNGMIN = 1.2.8beta3
+PNGMIN = 1.2.8beta4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -24,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 RANLIB=ranlib

 PNGMAJ = 0
-PNGMIN = 1.2.8beta3
+PNGMIN = 1.2.8beta4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -5,7 +5,7 @@

 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.8beta3
+PNGMIN = 1.2.8beta4
 PNGVER = $(PNGMAJ).$(PNGMIN)

 CC=gcc
--- 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.8beta3
+SHLIB_MINOR=	1.2.8beta4
 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.8beta3
+SHLIB_MINOR=	1.2.8beta4
 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.8beta3
+SHLIB_MINOR=	1.2.8beta4

 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.8beta3
+PNGMIN = 1.2.8beta4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -18,7 +18,7 @@ ZLIBINC=../zlib

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

--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -5,7 +5,7 @@

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.8beta3
+PNGMIN = 1.2.8beta4
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Where make install puts libpng.a, libpng12.so, and libpng12/png.h
--- 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.8beta3
+PNGMIN = 1.2.8beta4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

--- 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.8beta3
+PNGMIN = 1.2.8beta4
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

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

-; Version 1.2.8beta3
+; Version 1.2.8beta4

 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -6,7 +6,7 @@ LIBRARY
 DESCRIPTION "PNG image compression library for Windows"

 EXPORTS
-;Version 1.2.8beta3
+;Version 1.2.8beta4
  png_build_grayscale_palette  @1
  png_check_sig        @2
  png_chunk_error      @3
--- a/scripts/pngw32.rc
+++ b/scripts/pngw32.rc
@@ -8,14 +8,21 @@

 #define PNG_LIBPNG_DLLFNAME "LIBPNG"

-#if defined(DLLFNAME_POSTFIX) && !defined(PRIVATEBUILD) && !defined(SPECIALBUILD)
-#  error PRIVATEBUILD or SPECIALBUILD must be defined as a string describing the type of change brought to the standard library
+#if defined(DLLFNAME_POSTFIX) && !defined(PNG_LIBPNG_BUILD_PRIVATE_STRING) && \
+    !defined(PNG_LIBPNG_BUILD_SPECIAL_STRING)
+#  error PNG_LIBPNG_BUILD_PRIVATE_STRING or PNG_LIBPNG_BUILD_SPECIAL_STRING \
+must be defined as a string describing the type of change brought to the \
+standard library
 #endif /* defined(DLLFNAME_POSTFIX)... */

 #if defined(PNG_USE_PNGVCRD)
-#  if !defined(SPECIALBUILD)
-#    define SPECIALBUILD "Use MMX instructions"
-#  endif /* SPECIALBUILD */
+#  if !(PNG_LIBPNG_BUILD_TYPE & PNG_LIBPNG_BUILD_SPECIAL)
+#    define PNG_LIBPNG_BUILD_TYPE_SAVE PNG_LIBPNG_BUILD_TYPE
+#    undef PNG_LIBPNG_BUILD_TYPE
+#    define PNG_LIBPNG_BUILD_TYPE \
+        PNG_LIBPNG_BUILD_TYPE_SAVE|PNG_LIBPNG_BUILD_SPECIAL
+#    define PNG_LIBPNG_BUILD_SPECIAL_STRING "Use MMX instructions"
+#  endif /* PNG_LIBPNG_BUILD_SPECIAL */
 #endif

 #if defined(PNG_DEBUG) && (PNG_DEBUG > 0)
@@ -33,17 +40,17 @@
 #  endif /* DLLFNAME_POSTFIX */
 #endif /* defined(DEBUG)... */

-#ifdef PRIVATEBUILD
+#if (PNG_LIBPNG_BUILD_PRIVATE & PNG_LIBPNG_BUILD_TYPE)
 #  define VS_PRIVATEBUILD VS_FF_PRIVATEBUILD
 #else
 #  define VS_PRIVATEBUILD 0
-#endif /* PRIVATEBUILD */
+#endif /* PNG_LIBPNG_BUILD_PRIVATE */

-#ifdef SPECIALBUILD
+#if (PNG_LIBPNG_BUILD_SPECIAL & PNG_LIBPNG_BUILD_TYPE)
 #  define VS_SPECIALBUILD VS_FF_SPECIALBUILD
 #else
 #  define VS_SPECIALBUILD 0
-#endif /* SPECIALBUILD */
+#endif /* PNG_LIBPNG_BUILD_SPECIAL */

 #if ((PNG_LIBPNG_BUILD_TYPE & PNG_LIBPNG_BUILD_TYPEMASK) != \
      PNG_LIBPNG_BUILD_STABLE)