Imported from libpng-1.2.15beta5.tar

2025-07-10 18:04:09 +02:00 · 2006-12-07 19:21:29 -06:00
parent 05db10fda3
commit a0113ee049
47 changed files with 198 additions and 162 deletions
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,5 +1,3 @@
-# CMakeLists.txt, for use with cmake.  See www.cmake.org
-
 project(libpng)

 SET(PNG_VER_MAJOR 1)
@@ -11,8 +9,8 @@ find_package(ZLIB REQUIRED)


 # command line options
-OPTION(PNG_SHARED "Build shared lib" YES)
-OPTION(PNG_TESTS  "Build pngtest" YES)
+option(PNG_SHARED "Build shared lib" YES)
+option(PNG_TESTS  "Build pngtest" YES)
 #TODO:
 # PNG_NO_CONSOLE_IO
 # PNG_NO_STDIO
@@ -20,6 +18,21 @@ OPTION(PNG_TESTS  "Build pngtest" YES)
 # PNGARG
 # some others :)

+set(png_asm_tmp "OFF")
+if(NOT WIN32)
+  find_program(uname_executable NAMES uname PATHS /bin /usr/bin /usr/local/bin)
+  if(uname_executable)
+    EXEC_PROGRAM(${uname_executable} ARGS --machine OUTPUT_VARIABLE uname_output)
+    if("uname_output" MATCHES "^.*i[1-9]86.*$")
+       set(png_asm_tmp "ON")
+    else("uname_output" MATCHES "^.*i[1-9]86.*$")
+       set(png_asm_tmp "OFF")
+    endif("uname_output" MATCHES "^.*i[1-9]86.*$")
+  endif(uname_executable)
+endif(NOT WIN32)
+
+option(PNG_MMX "Use MMX assembler code (x86 only)" ${png_asm_tmp})
+

 # msvc does not append 'lib' - do it here to have consistent name
 if(MSVC)
@@ -77,6 +90,16 @@ else(MSVC)
  )
 endif(MSVC)

+if(NOT PNG_MMX)
+  add_definitions(-DPNG_NO_MMX_CODE)
+endif(NOT PNG_MMX)
+
+if(NOT WIN32)
+  find_library(M_LIBRARY
+      NAMES m
+      PATHS /usr/lib /usr/local/lib
+  )
+endif(NOT WIN32)

 # now build our target
 include_directories(${CMAKE_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})
@@ -87,10 +110,10 @@ else(PNG_SHARED)
  add_library(STATIC ${libpng_sources})
 endif(PNG_SHARED)

-target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY})
-if(PNG_SHARED)
+target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY})
+if(PNG_SHARED AND WIN32)
  set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL)
-endif(PNG_SHARED)
+endif(PNG_SHARED AND WIN32)

 if(PNG_TESTS)
 # does not work with msvc due to png_lib_ver issue
@@ -102,7 +125,7 @@ endif(PNG_TESTS)

 # install
 install_targets(/bin ${PNG_LIB_NAME})
-install(FILES png.h pngconf.h DESTINATION include)
+install(FILES libpng.so libpng.a DESTINATION lib)
 install(FILES png.h pngconf.h DESTINATION include)
 install(FILES libpng.3 libpngpf.3 DESTINATION man/man3)
 # what's with libpng.txt and all the extra files?
@@ -120,3 +143,5 @@ install(FILES libpng.3 libpngpf.3 DESTINATION man/man3)
 # lib /def:libpng.def /machine:x86

 	  	 
+
+ 	  	 
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@

 # Modeled after libxml-config.

-version=1.2.15beta4
+version=1.2.15beta5
 prefix=""
 libdir=""
 libs=""
--- a/scripts/libpng.pc-configure.in
+++ b/scripts/libpng.pc-configure.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng12

 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.2.15beta4
+Version: 1.2.15beta5
 Libs: -L${libdir} -lpng12
 Cflags: -I${includedir} @LIBPNG_NO_MMX@
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng12

 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.2.15beta4
+Version: 1.2.15beta5
 Libs: -L${libdir} -lpng12
 Cflags: -I${includedir}
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@ LN_SF = ln -f -s

 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 prefix=/usr/local
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 CYGDLL = 12
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 SHAREDLIB=cygpng$(CYGDLL).dll
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@ ZLIBINC=../zlib
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@

 # Library name:
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -16,7 +16,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -76,7 +76,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 MINGDLL = 12
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 SHAREDLIB=libpng$(MINGDLL).dll
--- 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.15beta4
+SHLIB_MINOR=	1.2.15beta5
 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.15beta4
+SHLIB_MINOR=	1.2.15beta5
 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.15beta4
+SHLIB_MINOR=	1.2.15beta5

 LIB=	png
 SRCS=	png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

 # Shared library names:
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@

 # Library name:
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12

--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.15beta4
+PNGMIN = 1.2.15beta5
 PNGVER = $(PNGMAJ).$(PNGMIN)

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

-; Version 1.2.15beta4
+; Version 1.2.15beta5

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

 EXPORTS
-;Version 1.2.15beta4
+;Version 1.2.15beta5
  png_build_grayscale_palette  @1
  png_check_sig        @2
  png_chunk_error      @3