[prev in list] [next in list] [prev in thread] [next in thread]
List: graphicsmagick-commit
Subject: [GM-commit] GraphicsMagick: 2 new changesets
From: GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date: 2012-06-16 20:11:15
Message-ID: hg.a3ca89a17e1a.1339877475.-1602079902 () blade ! simplesystems ! org
[Download RAW message or body]
changeset a3ca89a17e1a in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=a3ca89a17e1a
summary: Upgrade zlib to release 1.2.7
changeset ac6a834de752 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=ac6a834de752
summary: Update ChangeLog regarding upgrading zlib to release 1.2.7
diffstat:
ChangeLog | 2 +
www/Changelog.html | 1 +
zlib/CMakeLists.txt | 54 ++-
zlib/ChangeLog | 62 +++
zlib/INDEX | 1 +
zlib/Makefile.in | 33 +-
zlib/README | 4 +-
zlib/as400/bndsrc | 1 -
zlib/as400/compile.clp | 2 +-
zlib/as400/readme.txt | 2 +-
zlib/as400/zlib.inc | 10 +-
zlib/configure | 138 +++++++-
zlib/contrib/delphi/ZLib.pas | 2 +-
zlib/contrib/dotzlib/DotZLib/UnitTests.cs | 2 +-
zlib/contrib/infback9/inftree9.c | 4 +-
zlib/contrib/minizip/Makefile.am | 11 +-
zlib/contrib/minizip/configure.ac | 12 +-
zlib/contrib/minizip/zip.c | 4 +-
zlib/contrib/pascal/zlibpas.pas | 4 +-
zlib/contrib/vstudio/readme.txt | 14 +-
zlib/contrib/vstudio/vc10/testzlibdll.vcxproj | 12 +-
zlib/contrib/vstudio/vc10/zlib.rc | 6 +-
zlib/contrib/vstudio/vc10/zlibvc.def | 8 +-
zlib/contrib/vstudio/vc10/zlibvc.vcxproj | 22 +
zlib/contrib/vstudio/vc9/zlib.rc | 6 +-
zlib/contrib/vstudio/vc9/zlibvc.def | 8 +-
zlib/crc32.c | 74 +---
zlib/crc32.h | 2 +-
zlib/deflate.c | 2 +-
zlib/gzguts.h | 11 +-
zlib/gzlib.c | 90 ++++-
zlib/gzread.c | 23 +-
zlib/gzwrite.c | 68 +---
zlib/inflate.c | 21 +-
zlib/inftrees.c | 4 +-
zlib/make_vms.com | 405 +++++++++++++++----------
zlib/old/Makefile.emx | 69 ++++
zlib/qnx/package.qpg | 10 +-
zlib/test/minigzip.c | 2 +-
zlib/treebuild.xml | 4 +-
zlib/win32/Makefile.emx | 69 ----
zlib/win32/Makefile.gcc | 56 +-
zlib/win32/README-WIN32.txt | 8 +-
zlib/win32/zlib.def | 4 +-
zlib/zconf.h | 84 +++-
zlib/zconf.h.cmakein | 84 +++-
zlib/zconf.h.in | 84 +++-
zlib/zlib.3 | 4 +-
zlib/zlib.3.pdf | 0
zlib/zlib.h | 62 ++-
zlib/zlib.map | 1 -
zlib/zlib.pc.cmakein | 13 +
zlib/zutil.c | 33 +-
zlib/zutil.h | 8 +-
54 files changed, 1092 insertions(+), 628 deletions(-)
diffs (truncated from 3460 to 300 lines):
diff -r 160b18034b49 -r ac6a834de752 ChangeLog
--- a/ChangeLog Sat Jun 16 14:41:14 2012 -0500
+++ b/ChangeLog Sat Jun 16 15:11:10 2012 -0500
@@ -1,5 +1,7 @@
2012-06-16 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+ * zlib: Updated zlib to 1.2.7 release.
+
* magick/blob.c (MagickFileHandle): Refer to stdio, bzip2, and
gzip file handles using their own type. Eliminates warnings
observed when compiling with zlib 1.2.7.
diff -r 160b18034b49 -r ac6a834de752 www/Changelog.html
--- a/www/Changelog.html Sat Jun 16 14:41:14 2012 -0500
+++ b/www/Changelog.html Sat Jun 16 15:11:10 2012 -0500
@@ -39,6 +39,7 @@
<p>2012-06-16 Bob Friesenhahn <<a class="reference external" \
href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span> \
4;</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p>
<blockquote>
<ul class="simple">
+<li>zlib: Updated zlib to 1.2.7 release.</li>
<li>magick/blob.c (MagickFileHandle): Refer to stdio, bzip2, and
gzip file handles using their own type. Eliminates warnings
observed when compiling with zlib 1.2.7.</li>
diff -r 160b18034b49 -r ac6a834de752 zlib/CMakeLists.txt
--- a/zlib/CMakeLists.txt Sat Jun 16 14:41:14 2012 -0500
+++ b/zlib/CMakeLists.txt Sat Jun 16 15:11:10 2012 -0500
@@ -3,9 +3,13 @@
project(zlib C)
-if(NOT DEFINED BUILD_SHARED_LIBS)
- option(BUILD_SHARED_LIBS "Build a shared library form of zlib" ON)
-endif()
+set(VERSION "1.2.7")
+
+set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory \
for executables") +set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH \
"Installation directory for libraries") +set(INSTALL_INC_DIR \
"${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") \
+set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation \
directory for manual pages") +set(INSTALL_PKGCONFIG_DIR \
"${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for \
pkgconfig (.pc) files")
include(CheckTypeSize)
include(CheckFunctionExists)
@@ -56,23 +60,27 @@
set(CMAKE_DEBUG_POSTFIX "d")
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
endif()
if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
# If we're doing an out of source build and the user has a zconf.h
# in their source tree...
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
- message(FATAL_ERROR
- "You must remove ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h "
- "from the source tree. This file is included with zlib "
- "but CMake generates this file for you automatically "
- "in the build directory.")
+ message(STATUS "Renaming")
+ message(STATUS " ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
+ message(STATUS "to 'zconf.h.included' because this file is included with \
zlib") + message(STATUS "but CMake generates it automatically in the build \
directory.") + file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h \
${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included) endif()
endif()
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
- ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
+ ${ZLIB_PC} @ONLY)
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
+ ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
#============================================================================
@@ -120,7 +128,7 @@
# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
-string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([0-9A-Za-z.]+)\".*"
+string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
"\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
if(MINGW)
@@ -139,9 +147,9 @@
set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
endif(MINGW)
-add_library(zlib ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
-
set_target_properties(zlib PROPERTIES SOVERSION 1)
if(NOT CYGWIN)
@@ -157,23 +165,27 @@
if(UNIX)
# On unix-like platforms the library is almost always called libz
- set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
+ set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
+ set_target_properties(zlib PROPERTIES LINK_FLAGS \
"-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/zlib.map") \
elseif(BUILD_SHARED_LIBS AND WIN32) # Creates zlib1.dll when building shared library \
version set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
endif()
if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
- install(TARGETS zlib
- RUNTIME DESTINATION bin
- ARCHIVE DESTINATION lib
- LIBRARY DESTINATION lib )
+ install(TARGETS zlib zlibstatic
+ RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+ ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+ LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
endif()
if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
- install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION include)
+ install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
endif()
if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
- install(FILES zlib.3 DESTINATION share/man/man3)
+ install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")
+endif()
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+ install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
endif()
#============================================================================
diff -r 160b18034b49 -r ac6a834de752 zlib/ChangeLog
--- a/zlib/ChangeLog Sat Jun 16 14:41:14 2012 -0500
+++ b/zlib/ChangeLog Sat Jun 16 15:11:10 2012 -0500
@@ -1,6 +1,68 @@
ChangeLog file for zlib
+Changes in 1.2.7 (2 May 2012)
+- Replace use of memmove() with a simple copy for portability
+- Test for existence of strerror
+- Restore gzgetc_ for backward compatibility with 1.2.6
+- Fix build with non-GNU make on Solaris
+- Require gcc 4.0 or later on Mac OS X to use the hidden attribute
+- Include unistd.h for Watcom C
+- Use __WATCOMC__ instead of __WATCOM__
+- Do not use the visibility attribute if NO_VIZ defined
+- Improve the detection of no hidden visibility attribute
+- Avoid using __int64 for gcc or solo compilation
+- Cast to char * in gzprintf to avoid warnings [Zinser]
+- Fix make_vms.com for VAX [Zinser]
+- Don't use library or built-in byte swaps
+- Simplify test and use of gcc hidden attribute
+- Fix bug in gzclose_w() when gzwrite() fails to allocate memory
+- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen()
+- Fix bug in test/minigzip.c for configure --solo
+- Fix contrib/vstudio project link errors [Mohanathas]
+- Add ability to choose the builder in make_vms.com [Schweda]
+- Add DESTDIR support to mingw32 win32/Makefile.gcc
+- Fix comments in win32/Makefile.gcc for proper usage
+- Allow overriding the default install locations for cmake
+- Generate and install the pkg-config file with cmake
+- Build both a static and a shared version of zlib with cmake
+- Include version symbols for cmake builds
+- If using cmake with MSVC, add the source directory to the includes
+- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta]
+- Move obsolete emx makefile to old [Truta]
+- Allow the use of -Wundef when compiling or using zlib
+- Avoid the use of the -u option with mktemp
+- Improve inflate() documentation on the use of Z_FINISH
+- Recognize clang as gcc
+- Add gzopen_w() in Windows for wide character path names
+- Rename zconf.h in CMakeLists.txt to move it out of the way
+- Add source directory in CMakeLists.txt for building examples
+- Look in build directory for zlib.pc in CMakeLists.txt
+- Remove gzflags from zlibvc.def in vc9 and vc10
+- Fix contrib/minizip compilation in the MinGW environment
+- Update ./configure for Solaris, support --64 [Mooney]
+- Remove -R. from Solaris shared build (possible security issue)
+- Avoid race condition for parallel make (-j) running example
+- Fix type mismatch between get_crc_table() and crc_table
+- Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler]
+- Fix the path to zlib.map in CMakeLists.txt
+- Force the native libtool in Mac OS X to avoid GNU libtool [Beebe]
+- Add instructions to win32/Makefile.gcc for shared install [Torri]
+
+Changes in 1.2.6.1 (12 Feb 2012)
+- Avoid the use of the Objective-C reserved name "id"
+- Include io.h in gzguts.h for Microsoft compilers
+- Fix problem with ./configure --prefix and gzgetc macro
+- Include gz_header definition when compiling zlib solo
+- Put gzflags() functionality back in zutil.c
+- Avoid library header include in crc32.c for Z_SOLO
+- Use name in GCC_CLASSIC as C compiler for coverage testing, if set
+- Minor cleanup in contrib/minizip/zip.c [Vollant]
+- Update make_vms.com [Zinser]
+- Remove unnecessary gzgetc_ function
+- Use optimized byte swap operations for Microsoft and GNU [Snyder]
+- Fix minor typo in zlib.h comments [Rzesniowiecki]
+
Changes in 1.2.6 (29 Jan 2012)
- Update the Pascal interface in contrib/pascal
- Fix function numbers for gzgetc_ in zlibvc.def files
diff -r 160b18034b49 -r ac6a834de752 zlib/INDEX
--- a/zlib/INDEX Sat Jun 16 14:41:14 2012 -0500
+++ b/zlib/INDEX Sat Jun 16 15:11:10 2012 -0500
@@ -17,6 +17,7 @@
zlib.3.pdf Man page in PDF format
zlib.map Linux symbol information
zlib.pc.in Template for pkg-config descriptor
+zlib.pc.cmakein zlib.pc template for cmake
zlib2ansi perl script to convert source files for C++ compilation
amiga/ makefiles for Amiga SAS C
diff -r 160b18034b49 -r ac6a834de752 zlib/Makefile.in
--- a/zlib/Makefile.in Sat Jun 16 14:41:14 2012 -0500
+++ b/zlib/Makefile.in Sat Jun 16 15:11:10 2012 -0500
@@ -32,7 +32,7 @@
STATICLIB=libz.a
SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.6
+SHAREDLIBV=libz.so.1.2.7
SHAREDLIBM=libz.so.1
LIBS=$(STATICLIB) $(SHAREDLIBV)
@@ -53,7 +53,6 @@
mandir = ${prefix}/share/man
man3dir = ${mandir}/man3
pkgconfigdir = ${libdir}/pkgconfig
-tempfile := $(shell mktemp -u __XXXXXX)
OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o \
zutil.o OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
@@ -84,32 +83,35 @@
test: all teststatic testshared
teststatic: static
- @if echo hello world | ./minigzip | ./minigzip -d && ./example; then \
+ @TMPST=`mktemp fooXXXXXX`; \
+ if echo hello world | ./minigzip | ./minigzip -d && ./example $$TMPST ; then \
echo ' *** zlib test OK ***'; \
else \
echo ' *** zlib test FAILED ***'; false; \
- fi
- -@rm -f foo.gz
+ fi; \
+ rm -f $$TMPST
testshared: shared
@LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \
DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
- if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh; then \
+ TMPSH=`mktemp fooXXXXXX`; \
+ if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh $$TMPSH; then \
echo ' *** zlib shared test OK ***'; \
else \
echo ' *** zlib shared test FAILED ***'; false; \
- fi
- -@rm -f foo.gz
+ fi; \
+ rm -f $$TMPSH
test64: all64
- @if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64; then \
+ @TMP64=`mktemp fooXXXXXX`; \
+ if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64 $$TMP64; then \
echo ' *** zlib 64-bit test OK ***'; \
else \
echo ' *** zlib 64-bit test FAILED ***'; false; \
- fi
- -@rm -f foo.gz
+ fi; \
+ rm -f $$TMP64
infcover.o: test/infcover.c zlib.h zconf.h
$(CC) $(CFLAGS) -I. -c -o $@ test/infcover.c
@@ -228,10 +230,11 @@
groff -mandoc -f H -T ps zlib.3 | ps2pdf - zlib.3.pdf
zconf.h.cmakein: zconf.h.in
- -@echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine \
Z_HAVE_UNISTD_H\n" > $(tempfile)
- -@sed -f $(tempfile) zconf.h.in > zconf.h.cmakein
- -@touch -r zconf.h.in zconf.h.cmakein
- -@rm $(tempfile)
+ -@ TEMPFILE=`mktemp __XXXXXX`; \
+ echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine \
Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\ + sed -f $$TEMPFILE zconf.h.in > zconf.h.cmakein \
&&\ + touch -r zconf.h.in zconf.h.cmakein &&\
+ rm $$TEMPFILE
zconf: zconf.h.in
cp -p zconf.h.in zconf.h
diff -r 160b18034b49 -r ac6a834de752 zlib/README
--- a/zlib/README Sat Jun 16 14:41:14 2012 -0500
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Graphicsmagick-commit mailing list
Graphicsmagick-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic