[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [emerge/kde-4.11] portage/win32libs/zlib: add zlib version 1.2.8 and set as default
From: Nico Kruber <nico.kruber () gmail ! com>
Date: 2013-09-01 1:07:45
Message-ID: E1VFw8n-0002M4-Ht () scm ! kde ! org
[Download RAW message or body]
Git commit fc825c49dd17a589aa286eb6c2691f5954687e97 by Nico Kruber.
Committed on 31/08/2013 at 23:07.
Pushed by nkruber into branch 'kde-4.11'.
add zlib version 1.2.8 and set as default
M +4 -2 portage/win32libs/zlib/zlib-1.2.5-1.py
A +673 -0 portage/win32libs/zlib/zlib-1.2.8-20130901.diff
http://commits.kde.org/emerge/fc825c49dd17a589aa286eb6c2691f5954687e97
diff --git a/portage/win32libs/zlib/zlib-1.2.5-1.py b/portage/win32libs/zlib/zlib-1.2.5-1.py
index 6733d2c..6765d31 100644
--- a/portage/win32libs/zlib/zlib-1.2.5-1.py
+++ b/portage/win32libs/zlib/zlib-1.2.5-1.py
@@ -7,17 +7,19 @@ from Package.CMakePackageBase import *
class subinfo(info.infoclass):
def setTargets( self ):
- for ver in [ '1.2.5', '1.2.6', '1.2.7' ]:
+ for ver in [ '1.2.5', '1.2.6', '1.2.7', '1.2.8' ]:
self.targets[ ver ] = 'http://downloads.sourceforge.net/sourceforge/libpng/zlib-%s.tar.gz' % \
ver self.targetInstSrc[ ver ] = "zlib-" + ver
self.patchToApply['1.2.5'] = [("zlib-1.2.5-20110629.diff", 1)]
self.patchToApply['1.2.6'] = [("zlib-1.2.6-20120421.diff", 1)]
self.patchToApply['1.2.7'] = [("zlib-1.2.7-20130123.diff", 1)]
+ self.patchToApply['1.2.8'] = [("zlib-1.2.8-20130901.diff", 1)]
self.targetDigests['1.2.5'] = '8e8b93fa5eb80df1afe5422309dca42964562d7e'
self.targetDigests['1.2.7'] = '4aa358a95d1e5774603e6fa149c926a80df43559'
+ self.targetDigests['1.2.8'] = 'a4d316c404ff54ca545ea71a27af7dbc29817088'
self.shortDescription = 'The zlib compression and decompression library'
- self.defaultTarget = '1.2.7'
+ self.defaultTarget = '1.2.8'
def setDependencies( self ):
self.buildDependencies['virtual/base'] = 'default'
diff --git a/portage/win32libs/zlib/zlib-1.2.8-20130901.diff \
b/portage/win32libs/zlib/zlib-1.2.8-20130901.diff new file mode 100644
index 0000000..7f75b33
--- /dev/null
+++ b/portage/win32libs/zlib/zlib-1.2.8-20130901.diff
@@ -0,0 +1,673 @@
+diff -Nru -x '*~' zlib-1.2.8.orig/cmake/modules/FindWcecompat.cmake \
zlib-1.2.8/cmake/modules/FindWcecompat.cmake +--- \
zlib-1.2.8.orig/cmake/modules/FindWcecompat.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ \
zlib-1.2.8/cmake/modules/FindWcecompat.cmake 2013-09-01 00:55:16.876062400 +0200 +@@ -0,0 +1,33 @@
++# Try to find Wcecompat functionality
++# Once done this will define
++#
++# WCECOMPAT_FOUND - system has Wcecompat
++# WCECOMPAT_INCLUDE_DIR - Wcecompat include directory
++# WCECOMPAT_LIBRARIES - Libraries needed to use Wcecompat
++#
++# Copyright (c) 2010, Andreas Holzammer, <andy@kdab.com>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++
++if(WCECOMPAT_INCLUDE_DIR AND WCECOMPAT_LIB_FOUND)
++ set(Wcecompat_FIND_QUIETLY TRUE)
++endif(WCECOMPAT_INCLUDE_DIR AND WCECOMPAT_LIB_FOUND)
++
++find_path(WCECOMPAT_INCLUDE_DIR errno.h PATH_SUFFIXES wcecompat)
++
++set(WCECOMPAT_LIB_FOUND FALSE)
++
++if(WCECOMPAT_INCLUDE_DIR)
++ find_library(WCECOMPAT_LIBRARIES NAMES wcecompat wcecompatex )
++ if(WCECOMPAT_LIBRARIES)
++ set(WCECOMPAT_LIB_FOUND TRUE)
++ endif(WCECOMPAT_LIBRARIES)
++endif(WCECOMPAT_INCLUDE_DIR)
++
++# I have no idea what this is about, but it seems to be used quite often, so I add this here
++set(WCECOMPAT_CONST const)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(Wcecompat DEFAULT_MSG WCECOMPAT_LIBRARIES WCECOMPAT_LIB_FOUND)
++
++mark_as_advanced(WCECOMPAT_INCLUDE_DIR WCECOMPAT_LIBRARIES WCECOMPAT_CONST WCECOMPAT_LIB_FOUND)
+diff -Nru -x '*~' zlib-1.2.8.orig/CMakeLists.txt zlib-1.2.8/CMakeLists.txt
+--- zlib-1.2.8.orig/CMakeLists.txt 2013-04-29 00:57:10.000000000 +0200
++++ zlib-1.2.8/CMakeLists.txt 2013-09-01 00:58:02.253521400 +0200
+@@ -1,8 +1,15 @@
+-cmake_minimum_required(VERSION 2.4.4)
++cmake_minimum_required(VERSION 2.6)
+ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
+
++set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
++
+ project(zlib C)
+
++if(WINCE)
++ find_package(Wcecompat REQUIRED)
++ include_directories(${WCECOMPAT_INCLUDE_DIR})
++endif(WINCE)
++
+ set(VERSION "1.2.8")
+
+ option(ASM686 "Enable building i686 assembly implementation")
+@@ -14,6 +21,8 @@
+ 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_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
++
+ include(CheckTypeSize)
+ include(CheckFunctionExists)
+ include(CheckIncludeFile)
+@@ -24,6 +33,7 @@
+ check_include_file(stdint.h HAVE_STDINT_H)
+ check_include_file(stddef.h HAVE_STDDEF_H)
+
++set(CMAKE_DEBUG_POSTFIX)
+ #
+ # Check to see if we have large file support
+ #
+@@ -60,7 +70,7 @@
+ check_include_file(unistd.h Z_HAVE_UNISTD_H)
+
+ if(MSVC)
+- set(CMAKE_DEBUG_POSTFIX "d")
++# 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})
+@@ -188,6 +198,10 @@
+ set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+ set_target_properties(zlib PROPERTIES SOVERSION 1)
+
++if(WINCE)
++ target_link_libraries(zlib ${WCECOMPAT_LIBRARIES})
++endif(WINCE)
++
+ if(NOT CYGWIN)
+ # This property causes shared libraries on Linux to have the full version
+ # encoded into their final filename. We disable this on Cygwin because
+@@ -199,7 +213,7 @@
+ set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
+ endif()
+
+-if(UNIX)
++if(UNIX OR MINGW)
+ # On unix-like platforms the library is almost always called libz
+ set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
+ if(NOT APPLE)
+@@ -230,12 +244,14 @@
+ # Example binaries
+ #============================================================================
+
++if(NOT WINCE)
+ add_executable(example test/example.c)
+ target_link_libraries(example zlib)
+ add_test(example example)
+
+ add_executable(minigzip test/minigzip.c)
+ target_link_libraries(minigzip zlib)
++endif(NOT WINCE)
+
+ if(HAVE_OFF64_T)
+ add_executable(example64 test/example.c)
+@@ -247,3 +263,7 @@
+ target_link_libraries(minigzip64 zlib)
+ set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+ endif()
++
++
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc @ONLY)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc DESTINATION lib/pkgconfig)
+diff -Nru -x '*~' zlib-1.2.8.orig/win32/zlib1.rc zlib-1.2.8/win32/zlib1.rc
+--- zlib-1.2.8.orig/win32/zlib1.rc 2013-04-29 00:57:11.000000000 +0200
++++ zlib-1.2.8/win32/zlib1.rc 2013-09-01 00:59:54.116919600 +0200
+@@ -10,9 +10,9 @@
+ PRODUCTVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ #ifdef _DEBUG
+- FILEFLAGS 1
++ FILEFLAGS 0x1L
+ #else
+- FILEFLAGS 0
++ FILEFLAGS 0x0L
+ #endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
+diff -Nru -x '*~' zlib-1.2.8.orig/zconf.h zlib-1.2.8/zconf.h
+--- zlib-1.2.8.orig/zconf.h 2013-04-29 00:57:11.000000000 +0200
++++ zlib-1.2.8/zconf.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,511 +0,0 @@
+-/* zconf.h -- configuration of the zlib compression library
+- * Copyright (C) 1995-2013 Jean-loup Gailly.
+- * For conditions of distribution and use, see copyright notice in zlib.h
+- */
+-
+-/* @(#) $Id$ */
+-
+-#ifndef ZCONF_H
+-#define ZCONF_H
+-
+-/*
+- * If you *really* need a unique prefix for all types and library functions,
+- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+- * Even better than compiling with -DZ_PREFIX would be to use configure to set
+- * this permanently in zconf.h using "./configure --zprefix".
+- */
+-#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
+-# define Z_PREFIX_SET
+-
+-/* all linked symbols */
+-# define _dist_code z__dist_code
+-# define _length_code z__length_code
+-# define _tr_align z__tr_align
+-# define _tr_flush_bits z__tr_flush_bits
+-# define _tr_flush_block z__tr_flush_block
+-# define _tr_init z__tr_init
+-# define _tr_stored_block z__tr_stored_block
+-# define _tr_tally z__tr_tally
+-# define adler32 z_adler32
+-# define adler32_combine z_adler32_combine
+-# define adler32_combine64 z_adler32_combine64
+-# ifndef Z_SOLO
+-# define compress z_compress
+-# define compress2 z_compress2
+-# define compressBound z_compressBound
+-# endif
+-# define crc32 z_crc32
+-# define crc32_combine z_crc32_combine
+-# define crc32_combine64 z_crc32_combine64
+-# define deflate z_deflate
+-# define deflateBound z_deflateBound
+-# define deflateCopy z_deflateCopy
+-# define deflateEnd z_deflateEnd
+-# define deflateInit2_ z_deflateInit2_
+-# define deflateInit_ z_deflateInit_
+-# define deflateParams z_deflateParams
+-# define deflatePending z_deflatePending
+-# define deflatePrime z_deflatePrime
+-# define deflateReset z_deflateReset
+-# define deflateResetKeep z_deflateResetKeep
+-# define deflateSetDictionary z_deflateSetDictionary
+-# define deflateSetHeader z_deflateSetHeader
+-# define deflateTune z_deflateTune
+-# define deflate_copyright z_deflate_copyright
+-# define get_crc_table z_get_crc_table
+-# ifndef Z_SOLO
+-# define gz_error z_gz_error
+-# define gz_intmax z_gz_intmax
+-# define gz_strwinerror z_gz_strwinerror
+-# define gzbuffer z_gzbuffer
+-# define gzclearerr z_gzclearerr
+-# define gzclose z_gzclose
+-# define gzclose_r z_gzclose_r
+-# define gzclose_w z_gzclose_w
+-# define gzdirect z_gzdirect
+-# define gzdopen z_gzdopen
+-# define gzeof z_gzeof
+-# define gzerror z_gzerror
+-# define gzflush z_gzflush
+-# define gzgetc z_gzgetc
+-# define gzgetc_ z_gzgetc_
+-# define gzgets z_gzgets
+-# define gzoffset z_gzoffset
+-# define gzoffset64 z_gzoffset64
+-# define gzopen z_gzopen
+-# define gzopen64 z_gzopen64
+-# ifdef _WIN32
+-# define gzopen_w z_gzopen_w
+-# endif
+-# define gzprintf z_gzprintf
+-# define gzvprintf z_gzvprintf
+-# define gzputc z_gzputc
+-# define gzputs z_gzputs
+-# define gzread z_gzread
+-# define gzrewind z_gzrewind
+-# define gzseek z_gzseek
+-# define gzseek64 z_gzseek64
+-# define gzsetparams z_gzsetparams
+-# define gztell z_gztell
+-# define gztell64 z_gztell64
+-# define gzungetc z_gzungetc
+-# define gzwrite z_gzwrite
+-# endif
+-# define inflate z_inflate
+-# define inflateBack z_inflateBack
+-# define inflateBackEnd z_inflateBackEnd
+-# define inflateBackInit_ z_inflateBackInit_
+-# define inflateCopy z_inflateCopy
+-# define inflateEnd z_inflateEnd
+-# define inflateGetHeader z_inflateGetHeader
+-# define inflateInit2_ z_inflateInit2_
+-# define inflateInit_ z_inflateInit_
+-# define inflateMark z_inflateMark
+-# define inflatePrime z_inflatePrime
+-# define inflateReset z_inflateReset
+-# define inflateReset2 z_inflateReset2
+-# define inflateSetDictionary z_inflateSetDictionary
+-# define inflateGetDictionary z_inflateGetDictionary
+-# define inflateSync z_inflateSync
+-# define inflateSyncPoint z_inflateSyncPoint
+-# define inflateUndermine z_inflateUndermine
+-# define inflateResetKeep z_inflateResetKeep
+-# define inflate_copyright z_inflate_copyright
+-# define inflate_fast z_inflate_fast
+-# define inflate_table z_inflate_table
+-# ifndef Z_SOLO
+-# define uncompress z_uncompress
+-# endif
+-# define zError z_zError
+-# ifndef Z_SOLO
+-# define zcalloc z_zcalloc
+-# define zcfree z_zcfree
+-# endif
+-# define zlibCompileFlags z_zlibCompileFlags
+-# define zlibVersion z_zlibVersion
+-
+-/* all zlib typedefs in zlib.h and zconf.h */
+-# define Byte z_Byte
+-# define Bytef z_Bytef
+-# define alloc_func z_alloc_func
+-# define charf z_charf
+-# define free_func z_free_func
+-# ifndef Z_SOLO
+-# define gzFile z_gzFile
+-# endif
+-# define gz_header z_gz_header
+-# define gz_headerp z_gz_headerp
+-# define in_func z_in_func
+-# define intf z_intf
+-# define out_func z_out_func
+-# define uInt z_uInt
+-# define uIntf z_uIntf
+-# define uLong z_uLong
+-# define uLongf z_uLongf
+-# define voidp z_voidp
+-# define voidpc z_voidpc
+-# define voidpf z_voidpf
+-
+-/* all zlib structs in zlib.h and zconf.h */
+-# define gz_header_s z_gz_header_s
+-# define internal_state z_internal_state
+-
+-#endif
+-
+-#if defined(__MSDOS__) && !defined(MSDOS)
+-# define MSDOS
+-#endif
+-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+-# define OS2
+-#endif
+-#if defined(_WINDOWS) && !defined(WINDOWS)
+-# define WINDOWS
+-#endif
+-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+-# ifndef WIN32
+-# define WIN32
+-# endif
+-#endif
+-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+-# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+-# ifndef SYS16BIT
+-# define SYS16BIT
+-# endif
+-# endif
+-#endif
+-
+-/*
+- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+- * than 64k bytes at a time (needed on systems with 16-bit int).
+- */
+-#ifdef SYS16BIT
+-# define MAXSEG_64K
+-#endif
+-#ifdef MSDOS
+-# define UNALIGNED_OK
+-#endif
+-
+-#ifdef __STDC_VERSION__
+-# ifndef STDC
+-# define STDC
+-# endif
+-# if __STDC_VERSION__ >= 199901L
+-# ifndef STDC99
+-# define STDC99
+-# endif
+-# endif
+-#endif
+-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+-# define STDC
+-#endif
+-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+-# define STDC
+-#endif
+-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+-# define STDC
+-#endif
+-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+-# define STDC
+-#endif
+-
+-#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
+-# define STDC
+-#endif
+-
+-#ifndef STDC
+-# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+-# define const /* note: need a more gentle solution here */
+-# endif
+-#endif
+-
+-#if defined(ZLIB_CONST) && !defined(z_const)
+-# define z_const const
+-#else
+-# define z_const
+-#endif
+-
+-/* Some Mac compilers merge all .h files incorrectly: */
+-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
+-# define NO_DUMMY_DECL
+-#endif
+-
+-/* Maximum value for memLevel in deflateInit2 */
+-#ifndef MAX_MEM_LEVEL
+-# ifdef MAXSEG_64K
+-# define MAX_MEM_LEVEL 8
+-# else
+-# define MAX_MEM_LEVEL 9
+-# endif
+-#endif
+-
+-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+- * created by gzip. (Files created by minigzip can still be extracted by
+- * gzip.)
+- */
+-#ifndef MAX_WBITS
+-# define MAX_WBITS 15 /* 32K LZ77 window */
+-#endif
+-
+-/* The memory requirements for deflate are (in bytes):
+- (1 << (windowBits+2)) + (1 << (memLevel+9))
+- that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
+- plus a few kilobytes for small objects. For example, if you want to reduce
+- the default memory requirements from 256K to 128K, compile with
+- make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+- Of course this will generally degrade compression (there's no free lunch).
+-
+- The memory requirements for inflate are (in bytes) 1 << windowBits
+- that is, 32K for windowBits=15 (default value) plus a few kilobytes
+- for small objects.
+-*/
+-
+- /* Type declarations */
+-
+-#ifndef OF /* function prototypes */
+-# ifdef STDC
+-# define OF(args) args
+-# else
+-# define OF(args) ()
+-# endif
+-#endif
+-
+-#ifndef Z_ARG /* function prototypes for stdarg */
+-# if defined(STDC) || defined(Z_HAVE_STDARG_H)
+-# define Z_ARG(args) args
+-# else
+-# define Z_ARG(args) ()
+-# endif
+-#endif
+-
+-/* The following definitions for FAR are needed only for MSDOS mixed
+- * model programming (small or medium model with some far allocations).
+- * This was tested only with MSC; for other MSDOS compilers you may have
+- * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
+- * just define FAR to be empty.
+- */
+-#ifdef SYS16BIT
+-# if defined(M_I86SM) || defined(M_I86MM)
+- /* MSC small or medium model */
+-# define SMALL_MEDIUM
+-# ifdef _MSC_VER
+-# define FAR _far
+-# else
+-# define FAR far
+-# endif
+-# endif
+-# if (defined(__SMALL__) || defined(__MEDIUM__))
+- /* Turbo C small or medium model */
+-# define SMALL_MEDIUM
+-# ifdef __BORLANDC__
+-# define FAR _far
+-# else
+-# define FAR far
+-# endif
+-# endif
+-#endif
+-
+-#if defined(WINDOWS) || defined(WIN32)
+- /* If building or using zlib as a DLL, define ZLIB_DLL.
+- * This is not mandatory, but it offers a little performance increase.
+- */
+-# ifdef ZLIB_DLL
+-# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+-# ifdef ZLIB_INTERNAL
+-# define ZEXTERN extern __declspec(dllexport)
+-# else
+-# define ZEXTERN extern __declspec(dllimport)
+-# endif
+-# endif
+-# endif /* ZLIB_DLL */
+- /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+- * define ZLIB_WINAPI.
+- * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+- */
+-# ifdef ZLIB_WINAPI
+-# ifdef FAR
+-# undef FAR
+-# endif
+-# include <windows.h>
+- /* No need for _export, use ZLIB.DEF instead. */
+- /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+-# define ZEXPORT WINAPI
+-# ifdef WIN32
+-# define ZEXPORTVA WINAPIV
+-# else
+-# define ZEXPORTVA FAR CDECL
+-# endif
+-# endif
+-#endif
+-
+-#if defined (__BEOS__)
+-# ifdef ZLIB_DLL
+-# ifdef ZLIB_INTERNAL
+-# define ZEXPORT __declspec(dllexport)
+-# define ZEXPORTVA __declspec(dllexport)
+-# else
+-# define ZEXPORT __declspec(dllimport)
+-# define ZEXPORTVA __declspec(dllimport)
+-# endif
+-# endif
+-#endif
+-
+-#ifndef ZEXTERN
+-# define ZEXTERN extern
+-#endif
+-#ifndef ZEXPORT
+-# define ZEXPORT
+-#endif
+-#ifndef ZEXPORTVA
+-# define ZEXPORTVA
+-#endif
+-
+-#ifndef FAR
+-# define FAR
+-#endif
+-
+-#if !defined(__MACTYPES__)
+-typedef unsigned char Byte; /* 8 bits */
+-#endif
+-typedef unsigned int uInt; /* 16 bits or more */
+-typedef unsigned long uLong; /* 32 bits or more */
+-
+-#ifdef SMALL_MEDIUM
+- /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+-# define Bytef Byte FAR
+-#else
+- typedef Byte FAR Bytef;
+-#endif
+-typedef char FAR charf;
+-typedef int FAR intf;
+-typedef uInt FAR uIntf;
+-typedef uLong FAR uLongf;
+-
+-#ifdef STDC
+- typedef void const *voidpc;
+- typedef void FAR *voidpf;
+- typedef void *voidp;
+-#else
+- typedef Byte const *voidpc;
+- typedef Byte FAR *voidpf;
+- typedef Byte *voidp;
+-#endif
+-
+-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+-# include <limits.h>
+-# if (UINT_MAX == 0xffffffffUL)
+-# define Z_U4 unsigned
+-# elif (ULONG_MAX == 0xffffffffUL)
+-# define Z_U4 unsigned long
+-# elif (USHRT_MAX == 0xffffffffUL)
+-# define Z_U4 unsigned short
+-# endif
+-#endif
+-
+-#ifdef Z_U4
+- typedef Z_U4 z_crc_t;
+-#else
+- typedef unsigned long z_crc_t;
+-#endif
+-
+-#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
+-# define Z_HAVE_UNISTD_H
+-#endif
+-
+-#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
+-# define Z_HAVE_STDARG_H
+-#endif
+-
+-#ifdef STDC
+-# ifndef Z_SOLO
+-# include <sys/types.h> /* for off_t */
+-# endif
+-#endif
+-
+-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+-# ifndef Z_SOLO
+-# include <stdarg.h> /* for va_list */
+-# endif
+-#endif
+-
+-#ifdef _WIN32
+-# ifndef Z_SOLO
+-# include <stddef.h> /* for wchar_t */
+-# endif
+-#endif
+-
+-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+- * though the former does not conform to the LFS document), but considering
+- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+- * equivalently requesting no 64-bit operations
+- */
+-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+-# undef _LARGEFILE64_SOURCE
+-#endif
+-
+-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
+-# define Z_HAVE_UNISTD_H
+-#endif
+-#ifndef Z_SOLO
+-# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+-# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+-# ifdef VMS
+-# include <unixio.h> /* for off_t */
+-# endif
+-# ifndef z_off_t
+-# define z_off_t off_t
+-# endif
+-# endif
+-#endif
+-
+-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+-# define Z_LFS64
+-#endif
+-
+-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+-# define Z_LARGE64
+-#endif
+-
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+-# define Z_WANT64
+-#endif
+-
+-#if !defined(SEEK_SET) && !defined(Z_SOLO)
+-# define SEEK_SET 0 /* Seek from beginning of file. */
+-# define SEEK_CUR 1 /* Seek from current position. */
+-# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
+-#endif
+-
+-#ifndef z_off_t
+-# define z_off_t long
+-#endif
+-
+-#if !defined(_WIN32) && defined(Z_LARGE64)
+-# define z_off64_t off64_t
+-#else
+-# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+-# define z_off64_t __int64
+-# else
+-# define z_off64_t z_off_t
+-# endif
+-#endif
+-
+-/* MVS linker does not support external names larger than 8 bytes */
+-#if defined(__MVS__)
+- #pragma map(deflateInit_,"DEIN")
+- #pragma map(deflateInit2_,"DEIN2")
+- #pragma map(deflateEnd,"DEEND")
+- #pragma map(deflateBound,"DEBND")
+- #pragma map(inflateInit_,"ININ")
+- #pragma map(inflateInit2_,"ININ2")
+- #pragma map(inflateEnd,"INEND")
+- #pragma map(inflateSync,"INSY")
+- #pragma map(inflateSetDictionary,"INSEDI")
+- #pragma map(compressBound,"CMBND")
+- #pragma map(inflate_table,"INTABL")
+- #pragma map(inflate_fast,"INFA")
+- #pragma map(inflate_copyright,"INCOPY")
+-#endif
+-
+-#endif /* ZCONF_H */
+diff -Nru -x '*~' zlib-1.2.8.orig/zlib.pc.cmake zlib-1.2.8/zlib.pc.cmake
+--- zlib-1.2.8.orig/zlib.pc.cmake 1970-01-01 01:00:00.000000000 +0100
++++ zlib-1.2.8/zlib.pc.cmake 2013-09-01 00:55:16.932065600 +0200
+@@ -0,0 +1,13 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=@CMAKE_INSTALL_PREFIX@
++libdir=@CMAKE_INSTALL_PREFIX@/lib
++sharedlibdir=@CMAKE_INSTALL_PREFIX@/lib
++includedir=@CMAKE_INSTALL_PREFIX@/include
++
++Name: zlib
++Description: zlib compression library
++Version: @ZLIB_FULL_VERSION@
++
++Requires:
++Libs: -L${libdir} -L${sharedlibdir} -lz
++Cflags: -I${includedir}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic