Ignore:
Timestamp:
Oct 24, 2012, 7:56:20 PM (13 years ago)
Author:
Silvan Scherrer
Message:

SMplayer: update vendor to 0.8.1

Location:
smplayer/vendor/current/zlib
Files:
2 added
1 deleted
49 edited
1 moved

Legend:

Unmodified
Added
Removed

  • smplayer/vendor/current/zlib/CMakeLists.txt

    r121 r133  
    44project(zlib C)
    55
    6 if(NOT DEFINED BUILD_SHARED_LIBS)
    7     option(BUILD_SHARED_LIBS "Build a shared library form of zlib" ON)
    8 endif()
     6set(VERSION "1.2.7")
     7
     8set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
     9set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
     10set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
     11set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
     12set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
    913
    1014include(CheckTypeSize)
    … …  
    5761    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
    5862    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
     63    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
    5964endif()
    6065
    … …  
    6368    # in their source tree...
    6469    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
    65         message(FATAL_ERROR
    66             "You must remove ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h "
    67             "from the source tree.  This file is included with zlib "
    68             "but CMake generates this file for you automatically "
    69             "in the build directory.")
     70        message(STATUS "Renaming")
     71        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
     72        message(STATUS "to 'zconf.h.included' because this file is included with zlib")
     73        message(STATUS "but CMake generates it automatically in the build directory.")
     74        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
    7075  endif()
    7176endif()
    7277
    73 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
    74                ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
    75 include_directories(${CMAKE_CURRENT_BINARY_DIR})
     78set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
     79configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
     80                ${ZLIB_PC} @ONLY)
     81configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
     82                ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
     83include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
    7684
    7785
    … …  
    121129# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
    122130file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
    123 string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([0-9A-Za-z.]+)\".*"
     131string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
    124132    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
    125133
    … …  
    140148endif(MINGW)
    141149
    142 add_library(zlib ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
     150add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
     151add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
    143152set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
    144 
    145153set_target_properties(zlib PROPERTIES SOVERSION 1)
    146154
    … …  
    158166if(UNIX)
    159167    # On unix-like platforms the library is almost always called libz
    160    set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
     168   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
     169   set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/zlib.map")
    161170elseif(BUILD_SHARED_LIBS AND WIN32)
    162171    # Creates zlib1.dll when building shared library version
    … …  
    165174
    166175if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
    167     install(TARGETS zlib
    168         RUNTIME DESTINATION bin
    169         ARCHIVE DESTINATION lib
    170         LIBRARY DESTINATION lib )
     176    install(TARGETS zlib zlibstatic
     177        RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
     178        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
     179        LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
    171180endif()
    172181if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
    173     install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION include)
     182    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
    174183endif()
    175184if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
    176     install(FILES zlib.3 DESTINATION share/man/man3)
     185    install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")
     186endif()
     187if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
     188    install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
    177189endif()
    178190

  • smplayer/vendor/current/zlib/ChangeLog

    r121 r133  
    11
    22                ChangeLog file for zlib
     3
     4Changes in 1.2.7 (2 May 2012)
     5- Replace use of memmove() with a simple copy for portability
     6- Test for existence of strerror
     7- Restore gzgetc_ for backward compatibility with 1.2.6
     8- Fix build with non-GNU make on Solaris
     9- Require gcc 4.0 or later on Mac OS X to use the hidden attribute
     10- Include unistd.h for Watcom C
     11- Use __WATCOMC__ instead of __WATCOM__
     12- Do not use the visibility attribute if NO_VIZ defined
     13- Improve the detection of no hidden visibility attribute
     14- Avoid using __int64 for gcc or solo compilation
     15- Cast to char * in gzprintf to avoid warnings [Zinser]
     16- Fix make_vms.com for VAX [Zinser]
     17- Don't use library or built-in byte swaps
     18- Simplify test and use of gcc hidden attribute
     19- Fix bug in gzclose_w() when gzwrite() fails to allocate memory
     20- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen()
     21- Fix bug in test/minigzip.c for configure --solo
     22- Fix contrib/vstudio project link errors [Mohanathas]
     23- Add ability to choose the builder in make_vms.com [Schweda]
     24- Add DESTDIR support to mingw32 win32/Makefile.gcc
     25- Fix comments in win32/Makefile.gcc for proper usage
     26- Allow overriding the default install locations for cmake
     27- Generate and install the pkg-config file with cmake
     28- Build both a static and a shared version of zlib with cmake
     29- Include version symbols for cmake builds
     30- If using cmake with MSVC, add the source directory to the includes
     31- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta]
     32- Move obsolete emx makefile to old [Truta]
     33- Allow the use of -Wundef when compiling or using zlib
     34- Avoid the use of the -u option with mktemp
     35- Improve inflate() documentation on the use of Z_FINISH
     36- Recognize clang as gcc
     37- Add gzopen_w() in Windows for wide character path names
     38- Rename zconf.h in CMakeLists.txt to move it out of the way
     39- Add source directory in CMakeLists.txt for building examples
     40- Look in build directory for zlib.pc in CMakeLists.txt
     41- Remove gzflags from zlibvc.def in vc9 and vc10
     42- Fix contrib/minizip compilation in the MinGW environment
     43- Update ./configure for Solaris, support --64 [Mooney]
     44- Remove -R. from Solaris shared build (possible security issue)
     45- Avoid race condition for parallel make (-j) running example
     46- Fix type mismatch between get_crc_table() and crc_table
     47- Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler]
     48- Fix the path to zlib.map in CMakeLists.txt
     49- Force the native libtool in Mac OS X to avoid GNU libtool [Beebe]
     50- Add instructions to win32/Makefile.gcc for shared install [Torri]
     51
     52Changes in 1.2.6.1 (12 Feb 2012)
     53- Avoid the use of the Objective-C reserved name "id"
     54- Include io.h in gzguts.h for Microsoft compilers
     55- Fix problem with ./configure --prefix and gzgetc macro
     56- Include gz_header definition when compiling zlib solo
     57- Put gzflags() functionality back in zutil.c
     58- Avoid library header include in crc32.c for Z_SOLO
     59- Use name in GCC_CLASSIC as C compiler for coverage testing, if set
     60- Minor cleanup in contrib/minizip/zip.c [Vollant]
     61- Update make_vms.com [Zinser]
     62- Remove unnecessary gzgetc_ function
     63- Use optimized byte swap operations for Microsoft and GNU [Snyder]
     64- Fix minor typo in zlib.h comments [Rzesniowiecki]
    365
    466Changes in 1.2.6 (29 Jan 2012)

  • smplayer/vendor/current/zlib/INDEX

    r121 r133  
    1818zlib.map        Linux symbol information
    1919zlib.pc.in      Template for pkg-config descriptor
     20zlib.pc.cmakein zlib.pc template for cmake
    2021zlib2ansi       perl script to convert source files for C++ compilation
    2122

  • smplayer/vendor/current/zlib/Makefile.in

    r121 r133  
    3333STATICLIB=libz.a
    3434SHAREDLIB=libz.so
    35 SHAREDLIBV=libz.so.1.2.6
     35SHAREDLIBV=libz.so.1.2.7
    3636SHAREDLIBM=libz.so.1
    3737LIBS=$(STATICLIB) $(SHAREDLIBV)
    … …  
    5454man3dir = ${mandir}/man3
    5555pkgconfigdir = ${libdir}/pkgconfig
    56 tempfile := $(shell mktemp -u __XXXXXX)
    5756
    5857OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
    … …  
    8584
    8685teststatic: static
    87         @if echo hello world | ./minigzip | ./minigzip -d && ./example; then \
     86        @TMPST=`mktemp fooXXXXXX`; \
     87        if echo hello world | ./minigzip | ./minigzip -d && ./example $$TMPST ; then \
    8888          echo '                *** zlib test OK ***'; \
    8989        else \
    9090          echo '                *** zlib test FAILED ***'; false; \
    91         fi
    92         -@rm -f foo.gz
     91        fi; \
     92        rm -f $$TMPST
    9393
    9494testshared: shared
    … …  
    9797        DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
    9898        SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
    99         if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh; then \
     99        TMPSH=`mktemp fooXXXXXX`; \
     100        if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh $$TMPSH; then \
    100101          echo '                *** zlib shared test OK ***'; \
    101102        else \
    102103          echo '                *** zlib shared test FAILED ***'; false; \
    103         fi
    104         -@rm -f foo.gz
     104        fi; \
     105        rm -f $$TMPSH
    105106
    106107test64: all64
    107         @if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64; then \
     108        @TMP64=`mktemp fooXXXXXX`; \
     109        if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64 $$TMP64; then \
    108110          echo '                *** zlib 64-bit test OK ***'; \
    109111        else \
    110112          echo '                *** zlib 64-bit test FAILED ***'; false; \
    111         fi
    112         -@rm -f foo.gz
     113        fi; \
     114        rm -f $$TMP64
    113115
    114116infcover.o: test/infcover.c zlib.h zconf.h
    … …  
    229231
    230232zconf.h.cmakein: zconf.h.in
    231         -@echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" > $(tempfile)
    232         -@sed -f $(tempfile) zconf.h.in > zconf.h.cmakein
    233         -@touch -r zconf.h.in zconf.h.cmakein
    234         -@rm $(tempfile)
     233        -@ TEMPFILE=`mktemp __XXXXXX`; \
     234        echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\
     235        sed -f $$TEMPFILE zconf.h.in > zconf.h.cmakein &&\
     236        touch -r zconf.h.in zconf.h.cmakein &&\
     237        rm $$TEMPFILE
    235238
    236239zconf: zconf.h.in

  • smplayer/vendor/current/zlib/README

    r121 r133  
    11ZLIB DATA COMPRESSION LIBRARY
    22
    3 zlib 1.2.6 is a general purpose data compression library.  All the code is
     3zlib 1.2.7 is a general purpose data compression library.  All the code is
    44thread safe.  The data format used by the zlib library is described by RFCs
    55(Request for Comments) 1950 to 1952 in the files
    … …  
    3232http://marknelson.us/1997/01/01/zlib-engine/ .
    3333
    34 The changes made in version 1.2.6 are documented in the file ChangeLog.
     34The changes made in version 1.2.7 are documented in the file ChangeLog.
    3535
    3636Unsupported third party contributions are provided in directory contrib/ .

  • smplayer/vendor/current/zlib/as400/bndsrc

    r121 r133  
    196196
    197197  EXPORT SYMBOL("gzgetc_")
    198   EXPORT SYMBOL("gzflags")
    199198
    200199/********************************************************************/

  • smplayer/vendor/current/zlib/as400/compile.clp

    r121 r133  
    106106                                 &MODLIB/ZUTIL)                          +
    107107                          SRCFILE(&SRCLIB/&CTLFILE) SRCMBR(BNDSRC)       +
    108                           TEXT('ZLIB 1.2.6') TGTRLS(&TGTRLS)
     108                          TEXT('ZLIB 1.2.7') TGTRLS(&TGTRLS)
    109109
    110110             ENDPGM

  • smplayer/vendor/current/zlib/as400/readme.txt

    r121 r133  
    1         ZLIB version 1.2.6 for AS400 installation instructions
     1        ZLIB version 1.2.7 for AS400 installation instructions
    22
    33I) From an AS400 *SAVF file:

  • smplayer/vendor/current/zlib/as400/zlib.inc

    r121 r133  
    22      *
    33      *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.
    4       *  Version 1.2.6
     4      *  Version 1.2.7
    55      *
    66      *
    … …  
    2323      *  Versioning information.
    2424      *
    25      D ZLIB_VERSION    C                   '1.2.6'
    26      D ZLIB_VERNUM     C                   X'1260'
     25     D ZLIB_VERSION    C                   '1.2.7'
     26     D ZLIB_VERNUM     C                   X'1270'
    2727     D ZLIB_VER_MAJOR  C                   1
    2828     D ZLIB_VER_MINOR  C                   2
    2929     D ZLIB_VER_REVISION...
    30      D                 C                   6
     30     D                 C                   7
    3131     D ZLIB_VER_SUBREVISION...
    3232     D                 C                   0
    … …  
    443443     D  strm                               like(z_stream)                       Expansion stream
    444444      *
    445      D gzflags         PR            10U 0 extproc('gzflags')
    446       *
    447445      /endif

  • smplayer/vendor/current/zlib/configure

    r121 r133  
    1414# an error.
    1515
     16# start off configure.log
    1617echo -------------------- >> configure.log
    1718echo $0 $* >> configure.log
    1819date >> configure.log
    1920
     21# set command prefix for cross-compilation
    2022if [ -n "${CHOST}" ]; then
    2123    uname="`echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/'`"
    … …  
    2325fi
    2426
     27# destination name for static library
    2528STATICLIB=libz.a
     29
     30# extract zlib version numbers from zlib.h
    2631VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
    2732VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < zlib.h`
    2833VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
    2934VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
     35
     36# establish commands for library building
    3037if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then
    3138    AR=${AR-"${CROSS_PREFIX}ar"}
    … …  
    4855    NM=${NM-"nm"}
    4956fi
     57
     58# set defaults before processing command line options
    5059LDCONFIG=${LDCONFIG-"ldconfig"}
    5160LDSHAREDLIBC="${LDSHAREDLIBC--lc}"
    … …  
    6978PIC_OBJC='$(PIC_OBJZ) $(PIC_OBJG)'
    7079
     80# process command line options
    7181while test $# -ge 1
    7282do
    … …  
    101111done
    102112
     113# define functions for testing compiler and library characteristics and logging the results
    103114test=ztest$$
    104115
    … …  
    137148fi
    138149
    139 echo >> configure.log
    140 
     150tryboth()
     151{
     152  show $*
     153  got=`( $* ) 2>&1`
     154  ret=$?
     155  printf %s "$got" >> configure.log
     156  if test $ret -ne 0; then
     157    return $ret
     158  fi
     159  test "$got" = ""
     160}
     161
     162echo >> configure.log
     163
     164# check for gcc vs. cc and set compile and link flags based on the system identified by uname
    141165cat > $test.c <<EOF
    142166extern int getchar();
    … …  
    150174case "$cc" in
    151175  *gcc*) gcc=1 ;;
     176  *clang*) gcc=1 ;;
    152177esac
    153178case `$cc -v 2>&1` in
    … …  
    207232             SHAREDLIBM=libz.$VER1$shared_ext
    208233             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
    209              AR="libtool"
     234             AR="/usr/bin/libtool"
    210235             ARFLAGS="-o" ;;
    211236  *)             LDSHARED=${LDSHARED-"$cc -shared"} ;;
    … …  
    252277             LDSHARED=${LDSHARED-"cc -dy -KPIC -G"} ;;
    253278  SunOS\ 5* | solaris*)
    254          LDSHARED=${LDSHARED-"cc -G"}
    255          case `(uname -m || echo unknown) 2>/dev/null` in
    256          i86*)
    257              SFLAGS=${CFLAGS-"-xpentium -fast -KPIC -R."}
    258              CFLAGS=${CFLAGS-"-xpentium -fast"} ;;
    259          *)
    260              SFLAGS=${CFLAGS-"-fast -xcg92 -KPIC -R."}
    261              CFLAGS=${CFLAGS-"-fast -xcg92"} ;;
    262          esac ;;
     279         LDSHARED=${LDSHARED-"cc -G -h libz$shared_ext.$VER1"}
     280         SFLAGS=${CFLAGS-"-fast -KPIC"}
     281         CFLAGS=${CFLAGS-"-fast"}
     282         if test $build64 -eq 1; then
     283             # old versions of SunPRO/Workshop/Studio don't support -m64,
     284             # but newer ones do.  Check for it.
     285             flag64=`$CC -flags | egrep -- '^-m64'`
     286             if test x"$flag64" != x"" ; then
     287                 CFLAGS="${CFLAGS} -m64"
     288                 SFLAGS="${SFLAGS} -m64"
     289             else
     290                 case `(uname -m || echo unknown) 2>/dev/null` in
     291                   i86*)
     292                     SFLAGS="$SFLAGS -xarch=amd64"
     293                     CFLAGS="$CFLAGS -xarch=amd64" ;;
     294                   *)
     295                     SFLAGS="$SFLAGS -xarch=v9"
     296                     CFLAGS="$CFLAGS -xarch=v9" ;;
     297                 esac
     298             fi
     299         fi
     300         ;;
    263301  SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
    264302             CFLAGS=${CFLAGS-"-O2"}
    … …  
    290328fi
    291329
     330# destination names for shared library if not defined above
    292331SHAREDLIB=${SHAREDLIB-"libz$shared_ext"}
    293332SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"}
    … …  
    296335echo >> configure.log
    297336
     337# see if shared library build supported
    298338if test $shared -eq 1; then
    299339  echo Checking for shared library support... | tee -a configure.log
    … …  
    323363fi
    324364
     365echo >> configure.log
     366
     367# check for underscores in external names for use by assembler code
    325368CPP=${CPP-"$CC -E"}
    326369case $CFLAGS in
    … …  
    338381echo >> configure.log
    339382
     383# check for large file support, and if none, check for fseeko()
    340384cat > $test.c <<EOF
    341385#include <sys/types.h>
    … …  
    368412fi
    369413
     414echo >> configure.log
     415
     416# check for strerror() for use by gz* functions
     417cat > $test.c <<EOF
     418#include <string.h>
     419#include <errno.h>
     420int main() { return strlen(strerror(errno)); }
     421EOF
     422if try $CC $CFLAGS -o $test $test.c; then
     423  echo "Checking for strerror... Yes." | tee -a configure.log
     424else
     425  CFLAGS="${CFLAGS} -DNO_STRERROR"
     426  SFLAGS="${SFLAGS} -DNO_STRERROR"
     427  echo "Checking for strerror... No." | tee -a configure.log
     428fi
     429
     430# copy clean zconf.h for subsequent edits
    370431cp -p zconf.h.in zconf.h
    371432
    372433echo >> configure.log
    373434
     435# check for unistd.h and save result in zconf.h
    374436cat > $test.c <<EOF
    375437#include <unistd.h>
    … …  
    386448echo >> configure.log
    387449
     450# check for stdarg.h and save result in zconf.h
    388451cat > $test.c <<EOF
    389452#include <stdarg.h>
    … …  
    398461fi
    399462
     463# if the z_ prefix was requested, save that in zconf.h
    400464if test $zprefix -eq 1; then
    401465  sed < zconf.h "/#ifdef Z_PREFIX.* may be/s/def Z_PREFIX\(.*\) may be/ 1\1 was/" > zconf.temp.h
    … …  
    405469fi
    406470
     471# if --solo compilation was requested, save that in zconf.h and remove gz stuff from object lists
    407472if test $solo -eq 1; then
    408473  sed '/#define ZCONF_H/a\
    … …  
    415480fi
    416481
     482# if code coverage testing was requested, use older gcc if defined, e.g. "gcc-4.2" on Mac OS X
    417483if test $cover -eq 1; then
    418484  CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage"
    419 fi
    420 
    421 echo >> configure.log
    422 
     485  if test -n "$GCC_CLASSIC"; then
     486    CC=$GCC_CLASSIC
     487  fi
     488fi
     489
     490echo >> configure.log
     491
     492# conduct a series of tests to resolve eight possible cases of using "vs" or "s" printf functions
     493# (using stdarg or not), with or without "n" (proving size of buffer), and with or without a
     494# return value.  The most secure result is vsnprintf() with a return value.  snprintf() with a
     495# return value is secure as well, but then gzprintf() will be limited to 20 arguments.
    423496cat > $test.c <<EOF
    424497#include <stdio.h>
    … …  
    433506}
    434507EOF
    435 
    436508if try $CC -c $CFLAGS $test.c; then
    437509  echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()." | tee -a configure.log
    … …  
    607679fi
    608680
     681# see if we can hide zlib internal symbols that are linked between separate source files
    609682if test "$gcc" -eq 1; then
    610683  echo >> configure.log
    611684  cat > $test.c <<EOF
    612 #if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33)
    613 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
    614 #else
    615 #  define ZLIB_INTERNAL
    616 #endif
     685#define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
    617686int ZLIB_INTERNAL foo;
    618687int main()
    … …  
    621690}
    622691EOF
    623   if try $CC -c $CFLAGS $test.c; then
     692  if tryboth $CC -c $CFLAGS $test.c; then
     693    CFLAGS="$CFLAGS -DHAVE_HIDDEN"
     694    SFLAGS="$SFLAGS -DHAVE_HIDDEN"
    624695    echo "Checking for attribute(visibility) support... Yes." | tee -a configure.log
    625696  else
    626     CFLAGS="$CFLAGS -DNO_VIZ"
    627     SFLAGS="$SFLAGS -DNO_VIZ"
    628697    echo "Checking for attribute(visibility) support... No." | tee -a configure.log
    629698  fi
    630699fi
    631700
     701echo >> configure.log
     702
     703# find a four-byte unsiged integer type for crc calculations
     704cat > $test.c <<EOF
     705#include <stdio.h>
     706#define is32(n,t) for(n=1,k=0;n;n<<=1,k++);if(k==32){puts(t);return 0;}
     707int main() {
     708    int k;
     709    unsigned i;
     710    unsigned long l;
     711    unsigned short s;
     712    is32(i, "unsigned")
     713    is32(l, "unsigned long")
     714    is32(s, "unsigned short")
     715    return 1;
     716}
     717EOF
     718Z_U4=""
     719if try $CC $CFLAGS $test.c -o $test && Z_U4=`./$test` && test -n "$Z_U4"; then
     720  sed < zconf.h "/#define Z_U4/s/\/\* \.\/configure may/#define Z_U4 $Z_U4   \/* .\/configure put the/" > zconf.temp.h
     721  mv zconf.temp.h zconf.h
     722  echo "Looking for a four-byte integer type... Found." | tee -a configure.log
     723else
     724  echo "Looking for a four-byte integer type... Not found." | tee -a configure.log
     725fi
     726
     727# clean up files produced by running the compiler and linker
    632728rm -f $test.[co] $test $test$shared_ext $test.gcno
    633729
    … …  
    655751echo TEST = $TEST >> configure.log
    656752echo VER = $VER >> configure.log
     753echo Z_U4 = $Z_U4 >> configure.log
    657754echo exec_prefix = $exec_prefix >> configure.log
    658755echo includedir = $includedir >> configure.log
    … …  
    666763echo >> configure.log
    667764
    668 # udpate Makefile
     765# udpate Makefile with the configure results
    669766sed < Makefile.in "
    670767/^CC *=/s#=.*#=$CC#
    … …  
    696793" > Makefile
    697794
     795# create zlib.pc with the configure results
    698796sed < zlib.pc.in "
    699797/^CC *=/s#=.*#=$CC#

  • smplayer/vendor/current/zlib/contrib/delphi/ZLib.pas

    r121 r133  
    153153
    154154const
    155   zlib_version = '1.2.6';
     155  zlib_version = '1.2.7';
    156156
    157157type

  • smplayer/vendor/current/zlib/contrib/dotzlib/DotZLib/UnitTests.cs

    r121 r133  
    157157        {
    158158            Info info = new Info();
    159             Assert.AreEqual("1.2.6", Info.Version);
     159            Assert.AreEqual("1.2.7", Info.Version);
    160160            Assert.AreEqual(32, info.SizeOfUInt);
    161161            Assert.AreEqual(32, info.SizeOfULong);

  • smplayer/vendor/current/zlib/contrib/infback9/inftree9.c

    r121 r133  
    1010
    1111const char inflate9_copyright[] =
    12    " inflate9 1.2.6 Copyright 1995-2012 Mark Adler ";
     12   " inflate9 1.2.7 Copyright 1995-2012 Mark Adler ";
    1313/*
    1414  If you use the zlib library in a product, an acknowledgment is welcome
    … …  
    6565        128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
    6666        130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
    67         133, 133, 133, 133, 144, 203, 69};
     67        133, 133, 133, 133, 144, 78, 68};
    6868    static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
    6969        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,

  • smplayer/vendor/current/zlib/contrib/minizip/Makefile.am

    r121 r133  
    1111AM_LDFLAGS = -L$(zlib_top_builddir)
    1212
     13if WIN32
     14iowin32_src = iowin32.c
     15iowin32_h = iowin32.h
     16endif
     17
    1318libminizip_la_SOURCES = \
    1419        ioapi.c \
    1520        mztools.c \
    1621        unzip.c \
    17         zip.c
     22        zip.c \
     23        ${iowin32_src}
    1824
    1925libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz
    … …  
    2531        mztools.h \
    2632        unzip.h \
    27         zip.h
     33        zip.h \
     34        ${iowin32_h}
    2835
    2936pkgconfigdir = $(libdir)/pkgconfig

  • smplayer/vendor/current/zlib/contrib/minizip/configure.ac

    r121 r133  
    22# Process this file with autoconf to produce a configure script.
    33
    4 AC_INIT([minizip], [1.2.6], [bugzilla.redhat.com])
     4AC_INIT([minizip], [1.2.7], [bugzilla.redhat.com])
    55AC_CONFIG_SRCDIR([minizip.c])
    66AM_INIT_AUTOMAKE([foreign])
    … …  
    1717fi
    1818
     19case "${host}" in
     20        *-mingw* | mingw*)
     21                WIN32="yes"
     22                ;;
     23        *)
     24                ;;
     25esac
     26AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
     27
     28
    1929AC_SUBST([HAVE_UNISTD_H], [0])
    2030AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], [])

  • smplayer/vendor/current/zlib/contrib/minizip/zip.c

    r121 r133  
    11161116    if ((level==8) || (level==9))
    11171117      zi->ci.flag |= 2;
    1118     if ((level==2))
     1118    if (level==2)
    11191119      zi->ci.flag |= 4;
    1120     if ((level==1))
     1120    if (level==1)
    11211121      zi->ci.flag |= 6;
    11221122    if (password != NULL)

  • smplayer/vendor/current/zlib/contrib/pascal/zlibpas.pas

    r121 r133  
    1111
    1212const
    13   ZLIB_VERSION = '1.2.6';
    14   ZLIB_VERNUM  = $1260;
     13  ZLIB_VERSION = '1.2.7';
     14  ZLIB_VERNUM  = $1270;
    1515
    1616type

  • smplayer/vendor/current/zlib/contrib/vstudio/readme.txt

    r121 r133  
    1 Building instructions for the DLL versions of Zlib 1.2.4
     1Building instructions for the DLL versions of Zlib 1.2.7
    22========================================================
    33
    44This directory contains projects that build zlib and minizip using
    5 Microsoft Visual C++ 9.0/10.0, and Visual C++ .
     5Microsoft Visual C++ 9.0/10.0.
    66
    77You don't need to build these projects yourself. You can download the
    … …  
    1111More information can be found at this site.
    1212
    13 first compile assembly code by running
    14 bld_ml64.bat in contrib\masmx64
    15 bld_ml32.bat in contrib\masmx86
    1613
    1714
    … …  
    2118--------------------------------------------------------------
    2219- Uncompress current zlib, including all contrib/* files
    23 - Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008.0
     20- Compile assembly code (with Visual Studio Command Prompt) by running:
     21   bld_ml64.bat (in contrib\masmx64)
     22   bld_ml32.bat (in contrib\masmx86)
     23- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
    2424- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"
    2525
    … …  
    2727--------------------------------------------------------------
    2828- Uncompress current zlib, including all contrib/* files
    29 - Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010.0
     29- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010
    3030
    3131

  • smplayer/vendor/current/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj

    r121 r133  
    140140    <Link>
    141141      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    142       <OutputFile>$(OutDir)testzlib.exe</OutputFile>
     142      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
    143143      <GenerateDebugInformation>true</GenerateDebugInformation>
    144144      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
    … …  
    170170    <Link>
    171171      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    172       <OutputFile>$(OutDir)testzlib.exe</OutputFile>
     172      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
    173173      <GenerateDebugInformation>true</GenerateDebugInformation>
    174174      <SubSystem>Console</SubSystem>
    … …  
    201201    <Link>
    202202      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    203       <OutputFile>$(OutDir)testzlib.exe</OutputFile>
     203      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
    204204      <GenerateDebugInformation>true</GenerateDebugInformation>
    205205      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
    … …  
    228228    <Link>
    229229      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    230       <OutputFile>$(OutDir)testzlib.exe</OutputFile>
     230      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
    231231      <GenerateDebugInformation>true</GenerateDebugInformation>
    232232      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
    … …  
    258258    <Link>
    259259      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    260       <OutputFile>$(OutDir)testzlib.exe</OutputFile>
     260      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
    261261      <GenerateDebugInformation>true</GenerateDebugInformation>
    262262      <SubSystem>Console</SubSystem>
    … …  
    289289    <Link>
    290290      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    291       <OutputFile>$(OutDir)testzlib.exe</OutputFile>
     291      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
    292292      <GenerateDebugInformation>true</GenerateDebugInformation>
    293293      <SubSystem>Console</SubSystem>

  • smplayer/vendor/current/zlib/contrib/vstudio/vc10/zlib.rc

    r121 r133  
    33#define IDR_VERSION1  1
    44IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
    5   FILEVERSION    1.2.6,1
    6   PRODUCTVERSION 1.2.6,1
     5  FILEVERSION    1.2.7,0
     6  PRODUCTVERSION 1.2.7,0
    77  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
    88  FILEFLAGS     0
    … …  
    1818    BEGIN
    1919      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
    20       VALUE "FileVersion",      "1.2.6\0"
     20      VALUE "FileVersion",      "1.2.7\0"
    2121      VALUE "InternalName",     "zlib\0"
    2222      VALUE "OriginalFilename", "zlib.dll\0"

  • smplayer/vendor/current/zlib/contrib/vstudio/vc10/zlibvc.def

    r121 r133  
    22; zlib data compression and ZIP file I/O library
    33
    4 VERSION         1.24
     4VERSION         1.2.7
    55
    66EXPORTS
    … …  
    133133; zlib1 v1.2.6 added:
    134134        gzgetc_                                 @161
    135         gzflags                                 @162
    136135        inflateResetKeep                        @163
    137         deflateResetKeep                        @164
     136        deflateResetKeep                        @164
     137
     138; zlib1 v1.2.7 added:
     139        gzopen_w                                @165

  • smplayer/vendor/current/zlib/contrib/vstudio/vc10/zlibvc.vcxproj

    r121 r133  
    181181    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    182182    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     183    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
     184    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
     185    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
     186    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
     187    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
     188    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
    183189  </PropertyGroup>
    184190  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    228234      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
    229235    </Link>
     236    <PreBuildEvent>
     237      <Command>cd ..\..\masmx86
     238bld_ml32.bat</Command>
     239    </PreBuildEvent>
    230240  </ItemDefinitionGroup>
    231241  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
    … …  
    325335      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
    326336    </Link>
     337    <PreBuildEvent>
     338      <Command>cd ..\..\masmx86
     339bld_ml32.bat</Command>
     340    </PreBuildEvent>
    327341  </ItemDefinitionGroup>
    328342  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    … …  
    369383      <TargetMachine>MachineX64</TargetMachine>
    370384    </Link>
     385    <PreBuildEvent>
     386      <Command>cd ..\..\contrib\masmx64
     387bld_ml64.bat</Command>
     388    </PreBuildEvent>
    371389  </ItemDefinitionGroup>
    372390  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
    … …  
    548566      <TargetMachine>MachineX64</TargetMachine>
    549567    </Link>
     568    <PreBuildEvent>
     569      <Command>cd ..\..\masmx64
     570bld_ml64.bat</Command>
     571    </PreBuildEvent>
    550572  </ItemDefinitionGroup>
    551573  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

  • smplayer/vendor/current/zlib/contrib/vstudio/vc9/zlib.rc

    r121 r133  
    33#define IDR_VERSION1  1
    44IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
    5   FILEVERSION    1.2.6,1
    6   PRODUCTVERSION 1.2.6,1
     5  FILEVERSION    1.2.7,0
     6  PRODUCTVERSION 1.2.7,0
    77  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
    88  FILEFLAGS     0
    … …  
    1818    BEGIN
    1919      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
    20       VALUE "FileVersion",      "1.2.6\0"
     20      VALUE "FileVersion",      "1.2.7\0"
    2121      VALUE "InternalName",     "zlib\0"
    2222      VALUE "OriginalFilename", "zlib.dll\0"

  • smplayer/vendor/current/zlib/contrib/vstudio/vc9/zlibvc.def

    r121 r133  
    22; zlib data compression and ZIP file I/O library
    33
    4 VERSION         1.24
     4VERSION         1.2.7
    55
    66EXPORTS
    … …  
    133133; zlib1 v1.2.6 added:
    134134        gzgetc_                                 @161
    135         gzflags                                 @162
    136135        inflateResetKeep                        @163
    137         deflateResetKeep                        @164
     136        deflateResetKeep                        @164
     137
     138; zlib1 v1.2.7 added:
     139        gzopen_w                                @165

  • smplayer/vendor/current/zlib/crc32.c

    r121 r133  
    11/* crc32.c -- compute the CRC-32 of a data stream
    2  * Copyright (C) 1995-2006, 2010, 2011 Mark Adler
     2 * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
    33 * For conditions of distribution and use, see copyright notice in zlib.h
    44 *
    … …  
    3333#define local static
    3434
    35 /* Find a four-byte integer type for crc32_little() and crc32_big(). */
    36 #ifndef NOBYFOUR
    37 #  ifdef STDC           /* need ANSI C limits.h to determine sizes */
    38 #    include <limits.h>
    39 #    define BYFOUR
    40 #    if (UINT_MAX == 0xffffffffUL)
    41        typedef unsigned int u4;
    42 #    else
    43 #      if (ULONG_MAX == 0xffffffffUL)
    44          typedef unsigned long u4;
    45 #      else
    46 #        if (USHRT_MAX == 0xffffffffUL)
    47            typedef unsigned short u4;
    48 #        else
    49 #          undef BYFOUR     /* can't find a four-byte integer type! */
    50 #        endif
    51 #      endif
    52 #    endif
    53 #  endif /* STDC */
    54 #endif /* !NOBYFOUR */
    55 
    5635/* Definitions for doing the crc four data bytes at a time. */
     36#if !defined(NOBYFOUR) && defined(Z_U4)
     37#  define BYFOUR
     38#endif
    5739#ifdef BYFOUR
    58    typedef u4 crc_table_t;
    59 #  define REV(w) ((((w)>>24)&0xff)+(((w)>>8)&0xff00)+ \
    60                 (((w)&0xff00)<<8)+(((w)&0xff)<<24))
    6140   local unsigned long crc32_little OF((unsigned long,
    6241                        const unsigned char FAR *, unsigned));
    … …  
    6544#  define TBLS 8
    6645#else
    67    typedef unsigned long crc_table_t;
    6846#  define TBLS 1
    6947#endif /* BYFOUR */
    … …  
    7957
    8058local volatile int crc_table_empty = 1;
    81 local crc_table_t FAR crc_table[TBLS][256];
     59local z_crc_t FAR crc_table[TBLS][256];
    8260local void make_crc_table OF((void));
    8361#ifdef MAKECRCH
    84    local void write_table OF((FILE *, const crc_table_t FAR *));
     62   local void write_table OF((FILE *, const z_crc_t FAR *));
    8563#endif /* MAKECRCH */
    8664/*
    … …  
    11290local void make_crc_table()
    11391{
    114     crc_table_t c;
     92    z_crc_t c;
    11593    int n, k;
    116     crc_table_t poly;                   /* polynomial exclusive-or pattern */
     94    z_crc_t poly;                       /* polynomial exclusive-or pattern */
    11795    /* terms of polynomial defining this crc (except x^32): */
    11896    static volatile int first = 1;      /* flag to limit concurrent making */
    … …  
    128106        poly = 0;
    129107        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
    130             poly |= (crc_table_t)1 << (31 - p[n]);
     108            poly |= (z_crc_t)1 << (31 - p[n]);
    131109
    132110        /* generate a crc for every 8-bit value */
    133111        for (n = 0; n < 256; n++) {
    134             c = (crc_table_t)n;
     112            c = (z_crc_t)n;
    135113            for (k = 0; k < 8; k++)
    136114                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
    … …  
    143121        for (n = 0; n < 256; n++) {
    144122            c = crc_table[0][n];
    145             crc_table[4][n] = REV(c);
     123            crc_table[4][n] = ZSWAP32(c);
    146124            for (k = 1; k < 4; k++) {
    147125                c = crc_table[0][c & 0xff] ^ (c >> 8);
    148126                crc_table[k][n] = c;
    149                 crc_table[k + 4][n] = REV(c);
     127                crc_table[k + 4][n] = ZSWAP32(c);
    150128            }
    151129        }
    … …  
    169147        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
    170148        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
    171         fprintf(out, "local const crc_table_t FAR ");
     149        fprintf(out, "local const z_crc_t FAR ");
    172150        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
    173151        write_table(out, crc_table[0]);
    … …  
    189167local void write_table(out, table)
    190168    FILE *out;
    191     const crc_table_t FAR *table;
     169    const z_crc_t FAR *table;
    192170{
    193171    int n;
    … …  
    210188 * This function can be used by asm versions of crc32()
    211189 */
    212 const unsigned long FAR * ZEXPORT get_crc_table()
     190const z_crc_t FAR * ZEXPORT get_crc_table()
    213191{
    214192#ifdef DYNAMIC_CRC_TABLE
    … …  
    216194        make_crc_table();
    217195#endif /* DYNAMIC_CRC_TABLE */
    218     return (const unsigned long FAR *)crc_table;
     196    return (const z_crc_t FAR *)crc_table;
    219197}
    220198
    … …  
    238216#ifdef BYFOUR
    239217    if (sizeof(void *) == sizeof(ptrdiff_t)) {
    240         u4 endian;
     218        z_crc_t endian;
    241219
    242220        endian = 1;
    … …  
    272250    unsigned len;
    273251{
    274     register u4 c;
    275     register const u4 FAR *buf4;
    276 
    277     c = (u4)crc;
     252    register z_crc_t c;
     253    register const z_crc_t FAR *buf4;
     254
     255    c = (z_crc_t)crc;
    278256    c = ~c;
    279257    while (len && ((ptrdiff_t)buf & 3)) {
    … …  
    282260    }
    283261
    284     buf4 = (const u4 FAR *)(const void FAR *)buf;
     262    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
    285263    while (len >= 32) {
    286264        DOLIT32;
    … …  
    312290    unsigned len;
    313291{
    314     register u4 c;
    315     register const u4 FAR *buf4;
    316 
    317     c = REV((u4)crc);
     292    register z_crc_t c;
     293    register const z_crc_t FAR *buf4;
     294
     295    c = ZSWAP32((z_crc_t)crc);
    318296    c = ~c;
    319297    while (len && ((ptrdiff_t)buf & 3)) {
    … …  
    322300    }
    323301
    324     buf4 = (const u4 FAR *)(const void FAR *)buf;
     302    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
    325303    buf4--;
    326304    while (len >= 32) {
    … …  
    339317    } while (--len);
    340318    c = ~c;
    341     return (unsigned long)(REV(c));
     319    return (unsigned long)(ZSWAP32(c));
    342320}
    343321

  • smplayer/vendor/current/zlib/crc32.h

    r121 r133  
    33 */
    44
    5 local const crc_table_t FAR crc_table[TBLS][256] =
     5local const z_crc_t FAR crc_table[TBLS][256] =
    66{
    77  {

  • smplayer/vendor/current/zlib/deflate.c

    r121 r133  
    5353
    5454const char deflate_copyright[] =
    55    " deflate 1.2.6 Copyright 1995-2012 Jean-loup Gailly and Mark Adler ";
     55   " deflate 1.2.7 Copyright 1995-2012 Jean-loup Gailly and Mark Adler ";
    5656/*
    5757  If you use the zlib library in a product, an acknowledgment is welcome

  • smplayer/vendor/current/zlib/gzguts.h

    r121 r133  
    1313#endif
    1414
    15 #if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
     15#ifdef HAVE_HIDDEN
    1616#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
    1717#else
    … …  
    2828#include <fcntl.h>
    2929
    30 #ifdef __TURBOC__
     30#ifdef _WIN32
     31#  include <stddef.h>
     32#endif
     33
     34#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
    3135#  include <io.h>
    3236#endif
    … …  
    6771#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
    6872#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
    69 #         include <io.h>
    7073#         define vsnprintf _vsnprintf
    7174#      endif
    … …  
    102105#  define zstrerror() gz_strwinerror((DWORD)GetLastError())
    103106#else
    104 #  ifdef STDC
     107#  ifndef NO_STRERROR
    105108#    include <errno.h>
    106109#    define zstrerror() strerror(errno)

  • smplayer/vendor/current/zlib/gzlib.c

    r121 r133  
    11/* gzlib.c -- zlib functions common to reading and writing gzip files
    2  * Copyright (C) 2004, 2010, 2011 Mark Adler
     2 * Copyright (C) 2004, 2010, 2011, 2012 Mark Adler
    33 * For conditions of distribution and use, see copyright notice in zlib.h
    44 */
    … …  
    1818/* Local functions */
    1919local void gz_reset OF((gz_statep));
    20 local gzFile gz_open OF((const char *, int, const char *));
     20local gzFile gz_open OF((const void *, int, const char *));
    2121
    2222#if defined UNDER_CE
    … …  
    9090/* Open a gzip file either by name or file descriptor. */
    9191local gzFile gz_open(path, fd, mode)
    92     const char *path;
     92    const void *path;
    9393    int fd;
    9494    const char *mode;
    9595{
    9696    gz_statep state;
     97    size_t len;
     98    int oflag;
     99#ifdef O_CLOEXEC
     100    int cloexec = 0;
     101#endif
     102#ifdef O_EXCL
     103    int exclusive = 0;
     104#endif
    97105
    98106    /* check input */
    … …  
    134142            case 'b':       /* ignore -- will request binary anyway */
    135143                break;
     144#ifdef O_CLOEXEC
     145            case 'e':
     146                cloexec = 1;
     147                break;
     148#endif
     149#ifdef O_EXCL
     150            case 'x':
     151                exclusive = 1;
     152                break;
     153#endif
    136154            case 'f':
    137155                state->strategy = Z_FILTERED;
    … …  
    169187
    170188    /* save the path name for error messages */
    171     state->path = malloc(strlen(path) + 1);
     189#ifdef _WIN32
     190    if (fd == -2) {
     191        len = wcstombs(NULL, path, 0);
     192        if (len == (size_t)-1)
     193            len = 0;
     194    }
     195    else
     196#endif
     197        len = strlen(path);
     198    state->path = malloc(len + 1);
    172199    if (state->path == NULL) {
    173200        free(state);
    174201        return NULL;
    175202    }
    176     strcpy(state->path, path);
    177 
    178     /* open the file with the appropriate mode (or just use fd) */
    179     state->fd = fd != -1 ? fd :
    180         open(path,
     203#ifdef _WIN32
     204    if (fd == -2)
     205        if (len)
     206            wcstombs(state->path, path, len + 1);
     207        else
     208            *(state->path) = 0;
     209    else
     210#endif
     211        strcpy(state->path, path);
     212
     213    /* compute the flags for open() */
     214    oflag =
    181215#ifdef O_LARGEFILE
    182             O_LARGEFILE |
     216        O_LARGEFILE |
    183217#endif
    184218#ifdef O_BINARY
    185             O_BINARY |
    186 #endif
    187             (state->mode == GZ_READ ?
    188                 O_RDONLY :
    189                 (O_WRONLY | O_CREAT | (
    190                     state->mode == GZ_WRITE ?
    191                         O_TRUNC :
    192                         O_APPEND))),
    193             0666);
     219        O_BINARY |
     220#endif
     221#ifdef O_CLOEXEC
     222        (cloexec ? O_CLOEXEC : 0) |
     223#endif
     224        (state->mode == GZ_READ ?
     225         O_RDONLY :
     226         (O_WRONLY | O_CREAT |
     227#ifdef O_EXCL
     228          (exclusive ? O_EXCL : 0) |
     229#endif
     230          (state->mode == GZ_WRITE ?
     231           O_TRUNC :
     232           O_APPEND)));
     233
     234    /* open the file with the appropriate flags (or just use fd) */
     235    state->fd = fd > -1 ? fd : (
     236#ifdef _WIN32
     237        fd == -2 ? _wopen(path, oflag, 0666) :
     238#endif
     239        open(path, oflag, 0666));
    194240    if (state->fd == -1) {
    195241        free(state->path);
    … …  
    244290    return gz;
    245291}
     292
     293/* -- see zlib.h -- */
     294#ifdef _WIN32
     295gzFile ZEXPORT gzopen_w(path, mode)
     296    const wchar_t *path;
     297    const char *mode;
     298{
     299    return gz_open(path, -2, mode);
     300}
     301#endif
    246302
    247303/* -- see zlib.h -- */

  • smplayer/vendor/current/zlib/gzread.c

    r121 r133  
    11/* gzread.c -- zlib functions for reading gzip files
    2  * Copyright (C) 2004, 2005, 2010, 2011 Mark Adler
     2 * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
    33 * For conditions of distribution and use, see copyright notice in zlib.h
    44 */
    … …  
    5858        return -1;
    5959    if (state->eof == 0) {
    60         if (strm->avail_in)
    61             memmove(state->in, strm->next_in, strm->avail_in);
     60        if (strm->avail_in) {       /* copy what's there to the start */
     61            unsigned char *p = state->in, *q = strm->next_in;
     62            unsigned n = strm->avail_in;
     63            do {
     64                *p++ = *q++;
     65            } while (--n);
     66        }
    6267        if (gz_load(state, state->in + strm->avail_in,
    6368                    state->size - strm->avail_in, &got) == -1)
    … …  
    341346            if (gz_fetch(state) == -1)
    342347                return -1;
    343             continue;       /* no progress yet -- go back to memcpy() above */
     348            continue;       /* no progress yet -- go back to copy above */
    344349            /* the copy above assures that we will leave with space in the
    345350               output buffer, allowing at least one gzungetc() to succeed */
    … …  
    374379
    375380/* -- see zlib.h -- */
    376 int ZEXPORT gzgetc_(file)
     381#undef gzgetc
     382int ZEXPORT gzgetc(file)
    377383    gzFile file;
    378384{
    … …  
    403409}
    404410
    405 #undef gzgetc
    406 int ZEXPORT gzgetc(file)
     411int ZEXPORT gzgetc_(file)
    407412gzFile file;
    408413{
    409     return gzgetc_(file);
    410 }   
     414    return gzgetc(file);
     415}
    411416
    412417/* -- see zlib.h -- */

  • smplayer/vendor/current/zlib/gzwrite.c

    r121 r133  
    339339#ifdef NO_vsnprintf
    340340#  ifdef HAS_vsprintf_void
    341     (void)vsprintf(state->in, format, va);
     341    (void)vsprintf((char *)(state->in), format, va);
    342342    va_end(va);
    343343    for (len = 0; len < size; len++)
    344344        if (state->in[len] == 0) break;
    345345#  else
    346     len = vsprintf(state->in, format, va);
     346    len = vsprintf((char *)(state->in), format, va);
    347347    va_end(va);
    348348#  endif
    349349#else
    350350#  ifdef HAS_vsnprintf_void
    351     (void)vsnprintf(state->in, size, format, va);
     351    (void)vsnprintf((char *)(state->in), size, format, va);
    352352    va_end(va);
    353     len = strlen(state->in);
     353    len = strlen((char *)(state->in));
    354354#  else
    355355    len = vsnprintf((char *)(state->in), size, format, va);
    … …  
    417417#ifdef NO_snprintf
    418418#  ifdef HAS_sprintf_void
    419     sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8,
     419    sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
    420420            a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
    421421    for (len = 0; len < size; len++)
    422422        if (state->in[len] == 0) break;
    423423#  else
    424     len = sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8,
    425                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
     424    len = sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
     425                  a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
    426426#  endif
    427427#else
    428428#  ifdef HAS_snprintf_void
    429     snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,
     429    snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8,
    430430             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
    431     len = strlen(state->in);
     431    len = strlen((char *)(state->in));
    432432#  else
    433     len = snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,
    434                  a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
     433    len = snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6,
     434                   a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18,
     435                   a19, a20);
    435436#  endif
    436437#endif
    … …  
    547548
    548549    /* flush, free memory, and close file */
    549     if (gz_comp(state, Z_FINISH) == -1)
    550         ret = state->err;
    551     if (!state->direct) {
    552         (void)deflateEnd(&(state->strm));
    553         free(state->out);
    554     }
    555     free(state->in);
     550    if (state->size) {
     551        if (gz_comp(state, Z_FINISH) == -1)
     552            ret = state->err;
     553        if (!state->direct) {
     554            (void)deflateEnd(&(state->strm));
     555            free(state->out);
     556        }
     557        free(state->in);
     558    }
    556559    gz_error(state, Z_OK, NULL);
    557560    free(state->path);
    … …  
    561564    return ret;
    562565}
    563 
    564 /* used by zlibVersion() to get the vsnprintf story from the horse's mouth */
    565 unsigned long ZEXPORT gzflags()
    566 {
    567     unsigned long flags = 0;
    568 #if defined(STDC) || defined(Z_HAVE_STDARG_H)
    569 #  ifdef NO_vsnprintf
    570     flags += 1L << 25;
    571 #    ifdef HAS_vsprintf_void
    572     flags += 1L << 26;
    573 #    endif
    574 #  else
    575 #    ifdef HAS_vsnprintf_void
    576     flags += 1L << 26;
    577 #    endif
    578 #  endif
    579 #else
    580     flags += 1L << 24;
    581 #  ifdef NO_snprintf
    582     flags += 1L << 25;
    583 #    ifdef HAS_sprintf_void
    584     flags += 1L << 26;
    585 #    endif
    586 #  else
    587 #    ifdef HAS_snprintf_void
    588     flags += 1L << 26;
    589 #    endif
    590 #  endif
    591 #endif
    592     return flags;
    593 }

  • smplayer/vendor/current/zlib/inflate.c

    r121 r133  
    11/* inflate.c -- zlib decompression
    2  * Copyright (C) 1995-2011 Mark Adler
     2 * Copyright (C) 1995-2012 Mark Adler
    33 * For conditions of distribution and use, see copyright notice in zlib.h
    44 */
    … …  
    520520    } while (0)
    521521
    522 /* Reverse the bytes in a 32-bit value */
    523 #define REVERSE(q) \
    524     ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
    525      (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
    526 
    527522/*
    528523   inflate() uses a state machine to process as much input data and generate as
    … …  
    818813        case DICTID:
    819814            NEEDBITS(32);
    820             strm->adler = state->check = REVERSE(hold);
     815            strm->adler = state->check = ZSWAP32(hold);
    821816            INITBITS();
    822817            state->mode = DICT;
    … …  
    11901185                     state->flags ? hold :
    11911186#endif
    1192                      REVERSE(hold)) != state->check) {
     1187                     ZSWAP32(hold)) != state->check) {
    11931188                    strm->msg = (char *)"incorrect data check";
    11941189                    state->mode = BAD;
    … …  
    12761271{
    12771272    struct inflate_state FAR *state;
    1278     unsigned long id;
     1273    unsigned long dictid;
    12791274    unsigned char *next;
    12801275    unsigned avail;
    … …  
    12871282        return Z_STREAM_ERROR;
    12881283
    1289     /* check for correct dictionary id */
     1284    /* check for correct dictionary identifier */
    12901285    if (state->mode == DICT) {
    1291         id = adler32(0L, Z_NULL, 0);
    1292         id = adler32(id, dictionary, dictLength);
    1293         if (id != state->check)
     1286        dictid = adler32(0L, Z_NULL, 0);
     1287        dictid = adler32(dictid, dictionary, dictLength);
     1288        if (dictid != state->check)
    12941289            return Z_DATA_ERROR;
    12951290    }

  • smplayer/vendor/current/zlib/inftrees.c

    r121 r133  
    1010
    1111const char inflate_copyright[] =
    12    " inflate 1.2.6 Copyright 1995-2012 Mark Adler ";
     12   " inflate 1.2.7 Copyright 1995-2012 Mark Adler ";
    1313/*
    1414  If you use the zlib library in a product, an acknowledgment is welcome
    … …  
    6363    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
    6464        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
    65         19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 203, 69};
     65        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 78, 68};
    6666    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
    6767        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,

  • smplayer/vendor/current/zlib/make_vms.com

    r121 r133  
    44$! In case of problems with the install you might contact me at
    55$! zinser@zinser.no-ip.info(preferred) or
    6 $! zinser@sysdev.deutsche-boerse.com (work)
     6$! martin.zinser@eurexchange.com (work)
    77$!
    88$! Make procedure history for Zlib
    … …  
    1515$! 0.04 20100110 Add new gzclose, gzlib, gzread, gzwrite
    1616$! 0.05 20100221 Exchange zlibdefs.h by zconf.h.in
     17$! 0.06 20120111 Fix missing amiss_err, update zconf_h.in, fix new exmples
     18$!               subdir path, update module search in makefile.in
     19$! 0.07 20120115 Triggered by work done by Alexey Chupahin completly redesigned
     20$!               shared image creation
     21$! 0.08 20120219 Make it work on VAX again, pre-load missing symbols to shared
     22$!               image
     23$! 0.09 20120305 SMS.  P1 sets builder ("MMK", "MMS", " " (built-in)).
     24$!               "" -> automatic, preference: MMK, MMS, built-in.
    1725$!
    1826$ on error then goto err_exit
    19 $ set proc/parse=ext
    2027$!
    2128$ true  = 1
    … …  
    3340$! Setup variables holding "config" information
    3441$!
    35 $ Make    = ""
     42$ Make    = "''p1'"
    3643$ name     = "Zlib"
    3744$ version  = "?.?.?"
    3845$ v_string = "ZLIB_VERSION"
    3946$ v_file   = "zlib.h"
    40 $ ccopt   = ""
     47$ ccopt   = "/include = []"
    4148$ lopts   = ""
    4249$ dnsrl   = ""
    43 $ aconf_in_file = "zconf.h.in#zconf.h_in"
     50$ aconf_in_file = "zconf.h.in#zconf.h_in#zconf_h.in"
    4451$ conf_check_string = ""
    4552$ linkonly = false
    4653$ optfile  = name + ".opt"
     54$ mapfile  = name + ".map"
    4755$ libdefs  = ""
     56$ vax      = f$getsyi("HW_MODEL").lt.1024
    4857$ axp      = f$getsyi("HW_MODEL").ge.1024 .and. f$getsyi("HW_MODEL").lt.4096
    49 $!
    50 $ whoami = f$parse(f$enviornment("Procedure"),,,,"NO_CONCEAL")
     58$ ia64     = f$getsyi("HW_MODEL").ge.4096
     59$!
     60$! 2012-03-05 SMS.
     61$! Why is this needed?  And if it is needed, why not simply ".not. vax"?
     62$!
     63$!!! if axp .or. ia64 then  set proc/parse=extended
     64$!
     65$ whoami = f$parse(f$environment("Procedure"),,,,"NO_CONCEAL")
    5166$ mydef  = F$parse(whoami,,,"DEVICE")
    5267$ mydir  = f$parse(whoami,,,"DIRECTORY") - "]["
    … …  
    5570$! Check for MMK/MMS
    5671$!
    57 $ If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS"
    58 $ If F$Type (MMK) .eqs. "STRING" Then Make = "MMK"
    59 $!
     72$ if (Make .eqs. "")
     73$ then
     74$   If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS"
     75$   If F$Type (MMK) .eqs. "STRING" Then Make = "MMK"
     76$ else
     77$   Make = f$edit( Make, "trim")
     78$ endif
    6079$!
    6180$ gosub find_version
    … …  
    7089$ gosub check_compiler
    7190$ close topt
     91$ close optf
    7292$!
    7393$ if its_decc
    … …  
    83103$       define sys decc$library_include:
    84104$     endif
     105$   endif
     106$!
     107$! 2012-03-05 SMS.
     108$! Why /NAMES = AS_IS?  Why not simply ".not. vax"?  And why not on VAX?
     109$!
     110$   if axp .or. ia64
     111$   then
     112$       ccopt = ccopt + "/name=as_is/opt=(inline=speed)"
     113$       s_case = true
    85114$   endif
    86115$ endif
    … …  
    123152$ goto aconf_loop
    124153$ACONF_EXIT:
     154$ write aconf ""
     155$ write aconf "/* VMS specifics added by make_vms.com: */"
    125156$ write aconf "#define VMS 1"
    126157$ write aconf "#include <unistd.h>"
    127158$ write aconf "#include <unixio.h>"
    128159$ write aconf "#ifdef _LARGEFILE"
    129 $ write aconf "#define off64_t __off64_t"
    130 $ write aconf "#define fopen64 fopen"
    131 $ write aconf "#define fseeko64 fseeko"
    132 $ write aconf "#define lseek64 lseek"
    133 $ write aconf "#define ftello64 ftell"
     160$ write aconf "# define off64_t __off64_t"
     161$ write aconf "# define fopen64 fopen"
     162$ write aconf "# define fseeko64 fseeko"
     163$ write aconf "# define lseek64 lseek"
     164$ write aconf "# define ftello64 ftell"
     165$ write aconf "#endif"
     166$ write aconf "#if !defined( __VAX) && (__CRTL_VER >= 70312000)"
     167$ write aconf "# define HAVE_VSNPRINTF"
    134168$ write aconf "#endif"
    135169$ close aconf_in
    … …  
    140174$ write sys$output "Compiling Zlib sources ..."
    141175$ if make.eqs.""
    142 $  then
    143 $   dele example.obj;*,minigzip.obj;*
     176$ then
     177$   if (f$search( "example.obj;*") .nes. "") then delete example.obj;*
     178$   if (f$search( "minigzip.obj;*") .nes. "") then delete minigzip.obj;*
    144179$   CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
    145180                adler32.c zlib.h zconf.h
    … …  
    175210$   CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
    176211$   write sys$output "Building example..."
    177 $   CALL MAKE example.OBJ "CC ''CCOPT' example" -
    178                 test/example.c zlib.h zconf.h
     212$   CALL MAKE example.OBJ "CC ''CCOPT' [.test]example" -
     213                [.test]example.c zlib.h zconf.h
    179214$   call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
    180 $   if f$search("x11vms:xvmsutils.olb") .nes. ""
    181 $   then
    182 $     write sys$output "Building minigzip..."
    183 $     CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" -
    184                 test/minigzip.c zlib.h zconf.h
    185 $     call make minigzip.exe -
    186                 "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" -
    187                 minigzip.obj libz.olb
    188 $   endif
    189 $  else
     215$   write sys$output "Building minigzip..."
     216$   CALL MAKE minigzip.OBJ "CC ''CCOPT' [.test]minigzip" -
     217              [.test]minigzip.c zlib.h zconf.h
     218$   call make minigzip.exe -
     219              "LINK minigzip,libz.olb/lib" -
     220              minigzip.obj libz.olb
     221$ else
    190222$   gosub crea_mms
    191223$   write sys$output "Make ''name' ''version' with ''Make' "
    192224$   'make'
    193 $  endif
    194 $!
    195 $! Alpha gets a shareable image
    196 $!
    197 $ If axp
    198 $ Then
    199 $   gosub crea_olist
    200 $   write sys$output "Creating libzshr.exe"
    201 $   call anal_obj_axp modules.opt _link.opt
    202 $   if s_case
    203 $   then
    204 $      open/append optf modules.opt
    205 $      write optf "case_sensitive=YES"
    206 $      close optf
    207 $   endif
    208 $   LINK_'lopts'/SHARE=libzshr.exe modules.opt/opt,_link.opt/opt
    209 $ endif
     225$ endif
     226$!
     227$! Create shareable image
     228$!
     229$ gosub crea_olist
     230$ write sys$output "Creating libzshr.exe"
     231$ call map_2_shopt 'mapfile' 'optfile'
     232$ LINK_'lopts'/SHARE=libzshr.exe modules.opt/opt,'optfile'/opt
    210233$ write sys$output "Zlib build completed"
     234$ delete/nolog tmp.opt;*
    211235$ exit
     236$AMISS_ERR:
     237$ write sys$output "No source for config.hin found."
     238$ write sys$output "Tried any of ''aconf_in_file'"
     239$ goto err_exit
    212240$CC_ERR:
    213241$ write sys$output "C compiler required to build ''name'"
    … …  
    217245$ close/nolog optf
    218246$ close/nolog topt
    219 $ close/nolog conf_hin
    220247$ close/nolog aconf_in
    221248$ close/nolog aconf
    … …  
    398425# descrip.mms: MMS description file for building zlib on VMS
    399426# written by Martin P.J. Zinser
    400 # <zinser@zinser.no-ip.info or zinser@sysdev.deutsche-boerse.com>
     427# <zinser@zinser.no-ip.info or martin.zinser@eurexchange.com>
    401428
    402429OBJS = adler32.obj, compress.obj, crc32.obj, gzclose.obj, gzlib.obj\
    … …  
    408435$ write out "CFLAGS=", ccopt
    409436$ write out "LOPTS=", lopts
     437$ write out "all : example.exe minigzip.exe libz.olb"
    410438$ copy sys$input: out
    411439$ deck
    412 
    413 all : example.exe minigzip.exe libz.olb
    414440        @ write sys$output " Example applications available"
    415441
    … …  
    421447
    422448minigzip.exe : minigzip.obj libz.olb
    423               link $(LOPTS) minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib
     449              link $(LOPTS) minigzip,libz.olb/lib
    424450
    425451clean :
    … …  
    432458crc32.obj    : crc32.c zutil.h zlib.h zconf.h
    433459deflate.obj  : deflate.c deflate.h zutil.h zlib.h zconf.h
    434 example.obj  : test/example.c zlib.h zconf.h
     460example.obj  : [.test]example.c zlib.h zconf.h
    435461gzclose.obj  : gzclose.c zutil.h zlib.h zconf.h
    436462gzlib.obj    : gzlib.c zutil.h zlib.h zconf.h
    … …  
    440466inflate.obj  : inflate.c zutil.h zlib.h zconf.h
    441467inftrees.obj : inftrees.c zutil.h zlib.h zconf.h inftrees.h
    442 minigzip.obj : test/minigzip.c zlib.h zconf.h
     468minigzip.obj : [.test]minigzip.c zlib.h zconf.h
    443469trees.obj    : trees.c deflate.h zutil.h zlib.h zconf.h
    444470uncompr.obj  : uncompr.c zlib.h zconf.h
    … …  
    456482$ open/read min makefile.in
    457483$ open/write mod modules.opt
    458 $ src_check = "OBJC ="
     484$ src_check_list = "OBJZ =#OBJG ="
    459485$MRLOOP:
    460486$ read/end=mrdone min rec
    461 $ if (f$extract(0,6,rec) .nes. src_check) then goto mrloop
     487$ i = 0
     488$SRC_CHECK_LOOP:
     489$ src_check = f$element(i, "#", src_check_list)
     490$ i = i+1
     491$ if src_check .eqs. "#" then goto mrloop
     492$ if (f$extract(0,6,rec) .nes. src_check) then goto src_check_loop
    462493$ rec = rec - src_check
    463494$ gosub extra_filnam
    464 $ if (f$element(1,"\",rec) .eqs. "\") then goto mrdone
     495$ if (f$element(1,"\",rec) .eqs. "\") then goto mrloop
    465496$MRSLOOP:
    466497$ read/end=mrdone min rec
    … …  
    673704$!------------------------------------------------------------------------------
    674705$!
    675 $! Analyze Object files for OpenVMS AXP to extract Procedure and Data
    676 $! information to build a symbol vector for a shareable image
    677 $! All the "brains" of this logic was suggested by Hartmut Becker
    678 $! (Hartmut.Becker@compaq.com). All the bugs were introduced by me
    679 $! (zinser@zinser.no-ip.info), so if you do have problem reports please do not
    680 $! bother Hartmut/HP, but get in touch with me
    681 $!
    682 $! Version history
    683 $! 0.01 20040406 Skip over shareable images in option file
    684 $! 0.02 20041109 Fix option file for shareable images with case_sensitive=YES
    685 $! 0.03 20050107 Skip over Identification labels in option file
    686 $! 0.04 20060117 Add uppercase alias to code compiled with /name=as_is
    687 $!
    688 $ ANAL_OBJ_AXP: Subroutine
    689 $ V = 'F$Verify(0)
    690 $ SAY := "WRITE_ SYS$OUTPUT"
    691 $
    692 $ IF F$SEARCH("''P1'") .EQS. ""
    693 $ THEN
    694 $    SAY "ANAL_OBJ_AXP-E-NOSUCHFILE:  Error, inputfile ''p1' not available"
    695 $    goto exit_aa
    696 $ ENDIF
    697 $ IF "''P2'" .EQS. ""
    698 $ THEN
    699 $    SAY "ANAL_OBJ_AXP:  Error, no output file provided"
    700 $    goto exit_aa
    701 $ ENDIF
    702 $
    703 $ open/read in 'p1
    704 $ create a.tmp
    705 $ open/append atmp a.tmp
    706 $ loop:
    707 $ read/end=end_loop in line
    708 $ if f$locate("/SHARE",f$edit(line,"upcase")) .lt. f$length(line)
    709 $ then
    710 $   write sys$output "ANAL_SKP_SHR-i-skipshare, ''line'"
    711 $   goto loop
    712 $ endif
    713 $ if f$locate("IDENTIFICATION=",f$edit(line,"upcase")) .lt. f$length(line)
    714 $ then
    715 $   write sys$output "ANAL_OBJ_AXP-i-ident: Identification ", -
    716                      f$element(1,"=",line)
    717 $   goto loop
    718 $ endif
    719 $ f= f$search(line)
    720 $ if f .eqs. ""
    721 $ then
    722 $       write sys$output "ANAL_OBJ_AXP-w-nosuchfile, ''line'"
    723 $       goto loop
    724 $ endif
    725 $ define/user sys$output nl:
    726 $ define/user sys$error nl:
    727 $ anal/obj/gsd 'f /out=x.tmp
    728 $ open/read xtmp x.tmp
    729 $ XLOOP:
    730 $ read/end=end_xloop xtmp xline
    731 $ xline = f$edit(xline,"compress")
    732 $ write atmp xline
    733 $ goto xloop
    734 $ END_XLOOP:
    735 $ close xtmp
    736 $ goto loop
    737 $ end_loop:
    738 $ close in
    739 $ close atmp
    740 $ if f$search("a.tmp") .eqs. "" -
    741         then $ exit
    742 $ ! all global definitions
    743 $ search a.tmp "symbol:","EGSY$V_DEF 1","EGSY$V_NORM 1"/out=b.tmp
    744 $ ! all procedures
    745 $ search b.tmp "EGSY$V_NORM 1"/wind=(0,1) /out=c.tmp
    746 $ search c.tmp "symbol:"/out=d.tmp
    747 $ define/user sys$output nl:
    748 $ edito/edt/command=sys$input d.tmp
    749 sub/symbol: "/symbol_vector=(/whole
    750 sub/"/=PROCEDURE)/whole
    751 exit
    752 $ ! all data
    753 $ search b.tmp "EGSY$V_DEF 1"/wind=(0,1) /out=e.tmp
    754 $ search e.tmp "symbol:"/out=f.tmp
    755 $ define/user sys$output nl:
    756 $ edito/edt/command=sys$input f.tmp
    757 sub/symbol: "/symbol_vector=(/whole
    758 sub/"/=DATA)/whole
    759 exit
    760 $ sort/nodupl d.tmp,f.tmp g.tmp
    761 $ open/read raw_vector g.tmp
    762 $ open/write case_vector 'p2'
    763 $ RAWLOOP:
    764 $ read/end=end_rawloop raw_vector raw_element
    765 $ write case_vector raw_element
    766 $ if f$locate("=PROCEDURE)",raw_element) .lt. f$length(raw_element)
    767 $ then
    768 $     name = f$element(1,"=",raw_element) - "("
    769 $     if f$edit(name,"UPCASE") .nes. name then -
    770           write case_vector f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)", -
    771                                   f$edit(name,"UPCASE"), name)
    772 $ endif
    773 $ if f$locate("=DATA)",raw_element) .lt. f$length(raw_element)
    774 $ then
    775 $     name = f$element(1,"=",raw_element) - "("
    776 $     if f$edit(name,"UPCASE") .nes. name then -
    777           write case_vector f$fao(" symbol_vector=(!AS/!AS=DATA)", -
    778                                   f$edit(name,"UPCASE"), name)
    779 $ endif
    780 $ goto rawloop
    781 $ END_RAWLOOP:
    782 $ close raw_vector
    783 $ close case_vector
    784 $ delete a.tmp;*,b.tmp;*,c.tmp;*,d.tmp;*,e.tmp;*,f.tmp;*,g.tmp;*
    785 $ if f$search("x.tmp") .nes. "" -
    786         then $ delete x.tmp;*
    787 $!
    788 $ EXIT_AA:
    789 $ if V then set verify
    790 $ endsubroutine
    791 $!------------------------------------------------------------------------------
    792 $!
    793706$! Write configuration to both permanent and temporary config file
    794707$!
    … …  
    803716$ENDSUBROUTINE
    804717$!------------------------------------------------------------------------------
     718$!
     719$! Analyze the project map file and create the symbol vector for a shareable
     720$! image from it
     721$!
     722$! Version history
     723$! 0.01 20120128 First version
     724$! 0.02 20120226 Add pre-load logic
     725$!
     726$ MAP_2_SHOPT: Subroutine
     727$!
     728$ SAY := "WRITE_ SYS$OUTPUT"
     729$!
     730$ IF F$SEARCH("''P1'") .EQS. ""
     731$ THEN
     732$    SAY "MAP_2_SHOPT-E-NOSUCHFILE:  Error, inputfile ''p1' not available"
     733$    goto exit_m2s
     734$ ENDIF
     735$ IF "''P2'" .EQS. ""
     736$ THEN
     737$    SAY "MAP_2_SHOPT:  Error, no output file provided"
     738$    goto exit_m2s
     739$ ENDIF
     740$!
     741$ module1 = "deflate#deflateEnd#deflateInit_#deflateParams#deflateSetDictionary"
     742$ module2 = "gzclose#gzerror#gzgetc#gzgets#gzopen#gzprintf#gzputc#gzputs#gzread"
     743$ module3 = "gzseek#gztell#inflate#inflateEnd#inflateInit_#inflateSetDictionary"
     744$ module4 = "inflateSync#uncompress#zlibVersion#compress"
     745$ open/read map 'p1
     746$ if axp .or. ia64
     747$ then
     748$     open/write aopt a.opt
     749$     open/write bopt b.opt
     750$     write aopt " CASE_SENSITIVE=YES"
     751$     write bopt "SYMBOL_VECTOR= (-"
     752$     mod_sym_num = 1
     753$ MOD_SYM_LOOP:
     754$     if f$type(module'mod_sym_num') .nes. ""
     755$     then
     756$         mod_in = 0
     757$ MOD_SYM_IN:
     758$         shared_proc = f$element(mod_in, "#", module'mod_sym_num')
     759$         if shared_proc .nes. "#"
     760$         then
     761$             write aopt f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)",-
     762                               f$edit(shared_proc,"upcase"),shared_proc)
     763$             write bopt f$fao("!AS=PROCEDURE,-",shared_proc)
     764$             mod_in = mod_in + 1
     765$             goto mod_sym_in
     766$         endif
     767$         mod_sym_num = mod_sym_num + 1
     768$         goto mod_sym_loop
     769$     endif
     770$MAP_LOOP:
     771$     read/end=map_end map line
     772$     if (f$locate("{",line).lt. f$length(line)) .or. -
     773         (f$locate("global:", line) .lt. f$length(line))
     774$     then
     775$         proc = true
     776$         goto map_loop
     777$     endif
     778$     if f$locate("}",line).lt. f$length(line) then proc = false
     779$     if f$locate("local:", line) .lt. f$length(line) then proc = false
     780$     if proc
     781$     then
     782$         shared_proc = f$edit(line,"collapse")
     783$         chop_semi = f$locate(";", shared_proc)
     784$         if chop_semi .lt. f$length(shared_proc) then -
     785              shared_proc = f$extract(0, chop_semi, shared_proc)
     786$         write aopt f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)",-
     787                                 f$edit(shared_proc,"upcase"),shared_proc)
     788$         write bopt f$fao("!AS=PROCEDURE,-",shared_proc)
     789$     endif
     790$     goto map_loop
     791$MAP_END:
     792$     close/nolog aopt
     793$     close/nolog bopt
     794$     open/append libopt 'p2'
     795$     open/read aopt a.opt
     796$     open/read bopt b.opt
     797$ALOOP:
     798$     read/end=aloop_end aopt line
     799$     write libopt line
     800$     goto aloop
     801$ALOOP_END:
     802$     close/nolog aopt
     803$     sv = ""
     804$BLOOP:
     805$     read/end=bloop_end bopt svn
     806$     if (svn.nes."")
     807$     then
     808$        if (sv.nes."") then write libopt sv
     809$        sv = svn
     810$     endif
     811$     goto bloop
     812$BLOOP_END:
     813$     write libopt f$extract(0,f$length(sv)-2,sv), "-"
     814$     write libopt ")"
     815$     close/nolog bopt
     816$     delete/nolog/noconf a.opt;*,b.opt;*
     817$ else
     818$     if vax
     819$     then
     820$     open/append libopt 'p2'
     821$     mod_sym_num = 1
     822$ VMOD_SYM_LOOP:
     823$     if f$type(module'mod_sym_num') .nes. ""
     824$     then
     825$         mod_in = 0
     826$ VMOD_SYM_IN:
     827$         shared_proc = f$element(mod_in, "#", module'mod_sym_num')
     828$         if shared_proc .nes. "#"
     829$         then
     830$             write libopt f$fao("UNIVERSAL=!AS",-
     831                                     f$edit(shared_proc,"upcase"))
     832$             mod_in = mod_in + 1
     833$             goto vmod_sym_in
     834$         endif
     835$         mod_sym_num = mod_sym_num + 1
     836$         goto vmod_sym_loop
     837$     endif
     838$VMAP_LOOP:
     839$         read/end=vmap_end map line
     840$         if (f$locate("{",line).lt. f$length(line)) .or. -
     841              (f$locate("global:", line) .lt. f$length(line))
     842$         then
     843$             proc = true
     844$             goto vmap_loop
     845$         endif
     846$         if f$locate("}",line).lt. f$length(line) then proc = false
     847$         if f$locate("local:", line) .lt. f$length(line) then proc = false
     848$         if proc
     849$         then
     850$             shared_proc = f$edit(line,"collapse")
     851$             chop_semi = f$locate(";", shared_proc)
     852$             if chop_semi .lt. f$length(shared_proc) then -
     853                  shared_proc = f$extract(0, chop_semi, shared_proc)
     854$             write libopt f$fao("UNIVERSAL=!AS",-
     855                                     f$edit(shared_proc,"upcase"))
     856$         endif
     857$         goto vmap_loop
     858$VMAP_END:
     859$     else
     860$         write sys$output "Unknown Architecture (Not VAX, AXP, or IA64)"
     861$         write sys$output "No options file created"
     862$     endif
     863$ endif
     864$ EXIT_M2S:
     865$ close/nolog map
     866$ close/nolog libopt
     867$ endsubroutine

  • smplayer/vendor/current/zlib/qnx/package.qpg

    r121 r133  
    2626         <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
    2727         <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
    28          <QPG:Add file="../libz.so.1.2.6" install="/opt/lib/" user="root:bin" permission="644"/>
    29          <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.6"/>
    30          <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.6"/>
    31          <QPG:Add file="../libz.so.1.2.6" install="/opt/lib/" component="slib"/>
     28         <QPG:Add file="../libz.so.1.2.7" install="/opt/lib/" user="root:bin" permission="644"/>
     29         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.7"/>
     30         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.7"/>
     31         <QPG:Add file="../libz.so.1.2.7" install="/opt/lib/" component="slib"/>
    3232      </QPG:Files>
    3333
    … …  
    6464
    6565            <QPM:ReleaseDescription>
    66                <QPM:ReleaseVersion>1.2.6</QPM:ReleaseVersion>
     66               <QPM:ReleaseVersion>1.2.7</QPM:ReleaseVersion>
    6767               <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
    6868               <QPM:ReleaseStability>Stable</QPM:ReleaseStability>

  • smplayer/vendor/current/zlib/test/minigzip.c

    r121 r133  
    198198    int ret;
    199199
    200     gz = malloc(sizeof(gzFile));
     200    gz = malloc(sizeof(struct gzFile_s));
    201201    if (gz == NULL)
    202202        return NULL;

  • smplayer/vendor/current/zlib/treebuild.xml

    r121 r133  
    11<?xml version="1.0" ?>
    2 <package name="zlib" version="1.2.6">
    3     <library name="zlib" dlversion="1.2.6" dlname="z">
     2<package name="zlib" version="1.2.7">
     3    <library name="zlib" dlversion="1.2.7" dlname="z">
    44        <property name="description"> zip compression library </property>
    55        <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />

  • smplayer/vendor/current/zlib/win32/Makefile.gcc

    r121 r133  
    22# Modified for mingw32 by C. Spieler, 6/16/98.
    33# Updated for zlib 1.2.x by Christian Spieler and Cosmin Truta, Mar-2003.
    4 # Last updated: 1-Aug-2003.
     4# Last updated: Mar 2012.
    55# Tested under Cygwin and MinGW.
    66
    … …  
    88# For conditions of distribution and use, see copyright notice in zlib.h
    99
    10 # To compile, or to compile and test, type:
     10# To compile, or to compile and test, type from the top level zlib directory:
    1111#
    12 #   make -fmakefile.gcc;  make test testdll -fmakefile.gcc
     12#   make -fwin32/Makefile.gcc;  make test testdll -fwin32/Makefile.gcc
    1313#
    1414# To use the asm code, type:
    1515#   cp contrib/asm?86/match.S ./match.S
    16 #   make LOC=-DASMV OBJA=match.o -fmakefile.gcc
     16#   make LOC=-DASMV OBJA=match.o -fwin32/Makefile.gcc
    1717#
    1818# To install libz.a, zconf.h and zlib.h in the system directories, type:
    1919#
    20 #   make install -fmakefile.gcc
     20#   make install -fwin32/Makefile.gcc
     21#
     22# BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set.
     23#
     24# To install the shared lib, append SHARED_MODE=1 to the make command :
     25#
     26#   make install -fwin32/Makefile.gcc SHARED_MODE=1
    2127
    2228# Note:
    … …  
    3945CC = $(PREFIX)gcc
    4046CFLAGS = $(LOC) -O3 -Wall
    41 EXTRA_CFLAGS = -DNO_VIZ
    4247
    4348AS = $(CC)
    … …  
    5863# If GNU install is available, replace $(CP) with install.
    5964INSTALL = $(CP)
    60 #RM = rm -f
     65# RM = rm -f
    6166RM = del
    6267
    … …  
    7984
    8085.c.o:
    81         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
     86        $(CC) $(CFLAGS) -c -o $@ $<
    8287
    8388.S.o:
    … …  
    111116
    112117example.o: test/example.c zlib.h zconf.h
    113         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -I. -c -o $@ test/example.c
     118        $(CC) $(CFLAGS) -I. -c -o $@ test/example.c
    114119
    115120minigzip.o: test/minigzip.c zlib.h zconf.h
    116         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -I. -c -o $@ test/minigzip.c
     121        $(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c
    117122
    118123zlibrc.o: win32/zlib1.rc
    119124        $(RC) $(RCFLAGS) -o $@ win32/zlib1.rc
    120125
    121 
    122 # BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set.
    123 
    124126.PHONY: install uninstall clean
    125127
    126128install: zlib.h zconf.h $(STATICLIB) $(IMPLIB)
    127         @if test -z "$(INCLUDE_PATH)" -o -z "$(LIBRARY_PATH)" -o -z "$(BINARY_PATH)"; then \
     129        @if test -z "$(DESTDIR)$(INCLUDE_PATH)" -o -z "$(DESTDIR)$(LIBRARY_PATH)" -o -z "$(DESTDIR)$(BINARY_PATH)"; then \
    128130                echo INCLUDE_PATH, LIBRARY_PATH, and BINARY_PATH must be specified; \
    129131                exit 1; \
    130132        fi
    131         -@mkdir -p $(INCLUDE_PATH)
    132         -@mkdir -p $(LIBRARY_PATH) $(LIBRARY_PATH)/pkgconfig
     133        -@mkdir -p '$(DESTDIR)$(INCLUDE_PATH)'
     134        -@mkdir -p '$(DESTDIR)$(LIBRARY_PATH)' '$(DESTDIR)$(LIBRARY_PATH)'/pkgconfig
    133135        -if [ "$(SHARED_MODE)" = "1" ]; then \
    134                 mkdir -p $(BINARY_PATH); \
    135                 $(INSTALL) $(SHAREDLIB) $(BINARY_PATH); \
    136                 $(INSTALL) $(IMPLIB) $(LIBRARY_PATH); \
     136                mkdir -p '$(DESTDIR)$(BINARY_PATH)'; \
     137                $(INSTALL) $(SHAREDLIB) '$(DESTDIR)$(BINARY_PATH)'; \
     138                $(INSTALL) $(IMPLIB) '$(DESTDIR)$(LIBRARY_PATH)'; \
    137139        fi
    138         -$(INSTALL) zlib.h $(INCLUDE_PATH)
    139         -$(INSTALL) zconf.h $(INCLUDE_PATH)
    140         -$(INSTALL) $(STATICLIB) $(LIBRARY_PATH)
     140        -$(INSTALL) zlib.h '$(DESTDIR)$(INCLUDE_PATH)'
     141        -$(INSTALL) zconf.h '$(DESTDIR)$(INCLUDE_PATH)'
     142        -$(INSTALL) $(STATICLIB) '$(DESTDIR)$(LIBRARY_PATH)'
    141143        sed \
    142144                -e 's|@prefix@|${prefix}|g' \
    … …  
    146148                -e 's|@includedir@|$(INCLUDE_PATH)|g' \
    147149                -e 's|@VERSION@|'`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' zlib.h`'|g' \
    148                 zlib.pc.in > $(LIBRARY_PATH)/pkgconfig/zlib.pc
     150                zlib.pc.in > '$(DESTDIR)$(LIBRARY_PATH)'/pkgconfig/zlib.pc
    149151
    150152uninstall:
    151153        -if [ "$(SHARED_MODE)" = "1" ]; then \
    152                 $(RM) $(BINARY_PATH)/$(SHAREDLIB); \
    153                 $(RM) $(LIBRARY_PATH)/$(IMPLIB); \
     154                $(RM) '$(DESTDIR)$(BINARY_PATH)'/$(SHAREDLIB); \
     155                $(RM) '$(DESTDIR)$(LIBRARY_PATH)'/$(IMPLIB); \
    154156        fi
    155         -$(RM) $(INCLUDE_PATH)/zlib.h
    156         -$(RM) $(INCLUDE_PATH)/zconf.h
    157         -$(RM) $(LIBRARY_PATH)/$(STATICLIB)
     157        -$(RM) '$(DESTDIR)$(INCLUDE_PATH)'/zlib.h
     158        -$(RM) '$(DESTDIR)$(INCLUDE_PATH)'/zconf.h
     159        -$(RM) '$(DESTDIR)$(LIBRARY_PATH)'/$(STATICLIB)
    158160
    159161clean:

  • smplayer/vendor/current/zlib/win32/README-WIN32.txt

    r121 r133  
    11ZLIB DATA COMPRESSION LIBRARY
    22
    3 zlib 1.2.4 is a general purpose data compression library.  All the code is
     3zlib 1.2.7 is a general purpose data compression library.  All the code is
    44thread safe.  The data format used by the zlib library is described by RFCs
    55(Request for Comments) 1950 to 1952 in the files
    … …  
    2323Manifest:
    2424
    25 The package zlib-1.2.4-win32-x86.zip contains the following files:
     25The package zlib-1.2.7-win32-x86.zip will contain the following files:
    2626
    2727  README-WIN32.txt This document
    … …  
    5959All .pdb files above are entirely optional, but are very useful to a developer
    6060attempting to diagnose program misbehavior or a crash.  Many additional
    61 important files for developers can be found in the zlib124.zip source package
     61important files for developers can be found in the zlib127.zip source package
    6262available from http://zlib.net/ - review that package's README file for details.
    6363
    … …  
    7373Copyright notice:
    7474
    75   (C) 1995-2010 Jean-loup Gailly and Mark Adler
     75  (C) 1995-2012 Jean-loup Gailly and Mark Adler
    7676
    7777  This software is provided 'as-is', without any express or implied

  • smplayer/vendor/current/zlib/win32/zlib.def

    r121 r133  
    7575    inflateInit2_
    7676    inflateBackInit_
     77    gzgetc_
    7778    zError
    7879    inflateSyncPoint
    … …  
    8182    inflateResetKeep
    8283    deflateResetKeep
    83     gzgetc_
    84     gzflags
     84    gzopen_w

  • smplayer/vendor/current/zlib/zconf.h

    r121 r133  
    11/* zconf.h -- configuration of the zlib compression library
    2  * Copyright (C) 1995-2011 Jean-loup Gailly.
     2 * Copyright (C) 1995-2012 Jean-loup Gailly.
    33 * For conditions of distribution and use, see copyright notice in zlib.h
    44 */
    … …  
    6666#    define gzeof                 z_gzeof
    6767#    define gzerror               z_gzerror
    68 #    define gzflags               z_gzflags
    6968#    define gzflush               z_gzflush
    7069#    define gzgetc                z_gzgetc
    … …  
    7574#    define gzopen                z_gzopen
    7675#    define gzopen64              z_gzopen64
     76#    ifdef _WIN32
     77#      define gzopen_w              z_gzopen_w
     78#    endif
    7779#    define gzprintf              z_gzprintf
    7880#    define gzputc                z_gzputc
    … …  
    128130#  ifndef Z_SOLO
    129131#    define gzFile                z_gzFile
    130 #    define gz_header             z_gz_header
    131 #    define gz_headerp            z_gz_headerp
    132 #  endif
     132#  endif
     133#  define gz_header             z_gz_header
     134#  define gz_headerp            z_gz_headerp
    133135#  define in_func               z_in_func
    134136#  define intf                  z_intf
    … …  
    143145
    144146/* all zlib structs in zlib.h and zconf.h */
    145 #  ifndef Z_SOLO
    146 #    define gz_header_s           z_gz_header_s
    147 #  endif
     147#  define gz_header_s           z_gz_header_s
    148148#  define internal_state        z_internal_state
    149149
    … …  
    389389#endif
    390390
     391/* ./configure may #define Z_U4 here */
     392
     393#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
     394#  include <limits.h>
     395#  if (UINT_MAX == 0xffffffffUL)
     396#    define Z_U4 unsigned
     397#  else
     398#    if (ULONG_MAX == 0xffffffffUL)
     399#      define Z_U4 unsigned long
     400#    else
     401#      if (USHRT_MAX == 0xffffffffUL)
     402#        define Z_U4 unsigned short
     403#      endif
     404#    endif
     405#  endif
     406#endif
     407
     408#ifdef Z_U4
     409   typedef Z_U4 z_crc_t;
     410#else
     411   typedef unsigned long z_crc_t;
     412#endif
     413
    391414#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
    392415#  define Z_HAVE_UNISTD_H
    … …  
    401424#    include <sys/types.h>      /* for off_t */
    402425#  endif
     426#endif
     427
     428#ifdef _WIN32
     429#  include <stddef.h>           /* for wchar_t */
    403430#endif
    404431
    … …  
    409436 * equivalently requesting no 64-bit operations
    410437 */
    411 #if -_LARGEFILE64_SOURCE - -1 == 1
     438#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
    412439#  undef _LARGEFILE64_SOURCE
    413440#endif
    414441
    415 #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
    416 #  define Z_LARGE
    417 #endif
    418 
    419 #if (defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)) && !defined(Z_SOLO)
    420 #  include <unistd.h>       /* for SEEK_* and off_t */
    421 #  ifdef VMS
    422 #    include <unixio.h>     /* for off_t */
    423 #  endif
    424 #  ifndef z_off_t
    425 #    define z_off_t off_t
    426 #  endif
     442#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
     443#  define Z_HAVE_UNISTD_H
     444#endif
     445#ifndef Z_SOLO
     446#  if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
     447#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
     448#    ifdef VMS
     449#      include <unixio.h>       /* for off_t */
     450#    endif
     451#    ifndef z_off_t
     452#      define z_off_t off_t
     453#    endif
     454#  endif
     455#endif
     456
     457#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
     458#  define Z_LFS64
     459#endif
     460
     461#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
     462#  define Z_LARGE64
     463#endif
     464
     465#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
     466#  define Z_WANT64
    427467#endif
    428468
    … …  
    437477#endif
    438478
    439 #if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0)
     479#if !defined(_WIN32) && defined(Z_LARGE64)
    440480#  define z_off64_t off64_t
    441481#else
    442 #  if defined(_WIN32)
     482#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
    443483#    define z_off64_t __int64
    444484#  else
    445 #  define z_off64_t z_off_t
    446 #endif
     485#    define z_off64_t z_off_t
     486#  endif
    447487#endif
    448488

  • smplayer/vendor/current/zlib/zconf.h.cmakein

    r121 r133  
    11/* zconf.h -- configuration of the zlib compression library
    2  * Copyright (C) 1995-2011 Jean-loup Gailly.
     2 * Copyright (C) 1995-2012 Jean-loup Gailly.
    33 * For conditions of distribution and use, see copyright notice in zlib.h
    44 */
    … …  
    6868#    define gzeof                 z_gzeof
    6969#    define gzerror               z_gzerror
    70 #    define gzflags               z_gzflags
    7170#    define gzflush               z_gzflush
    7271#    define gzgetc                z_gzgetc
    … …  
    7776#    define gzopen                z_gzopen
    7877#    define gzopen64              z_gzopen64
     78#    ifdef _WIN32
     79#      define gzopen_w              z_gzopen_w
     80#    endif
    7981#    define gzprintf              z_gzprintf
    8082#    define gzputc                z_gzputc
    … …  
    130132#  ifndef Z_SOLO
    131133#    define gzFile                z_gzFile
    132 #    define gz_header             z_gz_header
    133 #    define gz_headerp            z_gz_headerp
    134 #  endif
     134#  endif
     135#  define gz_header             z_gz_header
     136#  define gz_headerp            z_gz_headerp
    135137#  define in_func               z_in_func
    136138#  define intf                  z_intf
    … …  
    145147
    146148/* all zlib structs in zlib.h and zconf.h */
    147 #  ifndef Z_SOLO
    148 #    define gz_header_s           z_gz_header_s
    149 #  endif
     149#  define gz_header_s           z_gz_header_s
    150150#  define internal_state        z_internal_state
    151151
    … …  
    391391#endif
    392392
     393/* ./configure may #define Z_U4 here */
     394
     395#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
     396#  include <limits.h>
     397#  if (UINT_MAX == 0xffffffffUL)
     398#    define Z_U4 unsigned
     399#  else
     400#    if (ULONG_MAX == 0xffffffffUL)
     401#      define Z_U4 unsigned long
     402#    else
     403#      if (USHRT_MAX == 0xffffffffUL)
     404#        define Z_U4 unsigned short
     405#      endif
     406#    endif
     407#  endif
     408#endif
     409
     410#ifdef Z_U4
     411   typedef Z_U4 z_crc_t;
     412#else
     413   typedef unsigned long z_crc_t;
     414#endif
     415
    393416#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
    394417#  define Z_HAVE_UNISTD_H
    … …  
    403426#    include <sys/types.h>      /* for off_t */
    404427#  endif
     428#endif
     429
     430#ifdef _WIN32
     431#  include <stddef.h>           /* for wchar_t */
    405432#endif
    406433
    … …  
    411438 * equivalently requesting no 64-bit operations
    412439 */
    413 #if -_LARGEFILE64_SOURCE - -1 == 1
     440#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
    414441#  undef _LARGEFILE64_SOURCE
    415442#endif
    416443
    417 #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
    418 #  define Z_LARGE
    419 #endif
    420 
    421 #if (defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)) && !defined(Z_SOLO)
    422 #  include <unistd.h>       /* for SEEK_* and off_t */
    423 #  ifdef VMS
    424 #    include <unixio.h>     /* for off_t */
    425 #  endif
    426 #  ifndef z_off_t
    427 #    define z_off_t off_t
    428 #  endif
     444#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
     445#  define Z_HAVE_UNISTD_H
     446#endif
     447#ifndef Z_SOLO
     448#  if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
     449#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
     450#    ifdef VMS
     451#      include <unixio.h>       /* for off_t */
     452#    endif
     453#    ifndef z_off_t
     454#      define z_off_t off_t
     455#    endif
     456#  endif
     457#endif
     458
     459#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
     460#  define Z_LFS64
     461#endif
     462
     463#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
     464#  define Z_LARGE64
     465#endif
     466
     467#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
     468#  define Z_WANT64
    429469#endif
    430470
    … …  
    439479#endif
    440480
    441 #if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0)
     481#if !defined(_WIN32) && defined(Z_LARGE64)
    442482#  define z_off64_t off64_t
    443483#else
    444 #  if defined(_WIN32)
     484#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
    445485#    define z_off64_t __int64
    446486#  else
    447 #  define z_off64_t z_off_t
    448 #endif
     487#    define z_off64_t z_off_t
     488#  endif
    449489#endif
    450490

  • smplayer/vendor/current/zlib/zconf.h.in

    r121 r133  
    11/* zconf.h -- configuration of the zlib compression library
    2  * Copyright (C) 1995-2011 Jean-loup Gailly.
     2 * Copyright (C) 1995-2012 Jean-loup Gailly.
    33 * For conditions of distribution and use, see copyright notice in zlib.h
    44 */
    … …  
    6666#    define gzeof                 z_gzeof
    6767#    define gzerror               z_gzerror
    68 #    define gzflags               z_gzflags
    6968#    define gzflush               z_gzflush
    7069#    define gzgetc                z_gzgetc
    … …  
    7574#    define gzopen                z_gzopen
    7675#    define gzopen64              z_gzopen64
     76#    ifdef _WIN32
     77#      define gzopen_w              z_gzopen_w
     78#    endif
    7779#    define gzprintf              z_gzprintf
    7880#    define gzputc                z_gzputc
    … …  
    128130#  ifndef Z_SOLO
    129131#    define gzFile                z_gzFile
    130 #    define gz_header             z_gz_header
    131 #    define gz_headerp            z_gz_headerp
    132 #  endif
     132#  endif
     133#  define gz_header             z_gz_header
     134#  define gz_headerp            z_gz_headerp
    133135#  define in_func               z_in_func
    134136#  define intf                  z_intf
    … …  
    143145
    144146/* all zlib structs in zlib.h and zconf.h */
    145 #  ifndef Z_SOLO
    146 #    define gz_header_s           z_gz_header_s
    147 #  endif
     147#  define gz_header_s           z_gz_header_s
    148148#  define internal_state        z_internal_state
    149149
    … …  
    389389#endif
    390390
     391/* ./configure may #define Z_U4 here */
     392
     393#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
     394#  include <limits.h>
     395#  if (UINT_MAX == 0xffffffffUL)
     396#    define Z_U4 unsigned
     397#  else
     398#    if (ULONG_MAX == 0xffffffffUL)
     399#      define Z_U4 unsigned long
     400#    else
     401#      if (USHRT_MAX == 0xffffffffUL)
     402#        define Z_U4 unsigned short
     403#      endif
     404#    endif
     405#  endif
     406#endif
     407
     408#ifdef Z_U4
     409   typedef Z_U4 z_crc_t;
     410#else
     411   typedef unsigned long z_crc_t;
     412#endif
     413
    391414#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
    392415#  define Z_HAVE_UNISTD_H
    … …  
    401424#    include <sys/types.h>      /* for off_t */
    402425#  endif
     426#endif
     427
     428#ifdef _WIN32
     429#  include <stddef.h>           /* for wchar_t */
    403430#endif
    404431
    … …  
    409436 * equivalently requesting no 64-bit operations
    410437 */
    411 #if -_LARGEFILE64_SOURCE - -1 == 1
     438#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
    412439#  undef _LARGEFILE64_SOURCE
    413440#endif
    414441
    415 #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
    416 #  define Z_LARGE
    417 #endif
    418 
    419 #if (defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)) && !defined(Z_SOLO)
    420 #  include <unistd.h>       /* for SEEK_* and off_t */
    421 #  ifdef VMS
    422 #    include <unixio.h>     /* for off_t */
    423 #  endif
    424 #  ifndef z_off_t
    425 #    define z_off_t off_t
    426 #  endif
     442#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
     443#  define Z_HAVE_UNISTD_H
     444#endif
     445#ifndef Z_SOLO
     446#  if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
     447#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
     448#    ifdef VMS
     449#      include <unixio.h>       /* for off_t */
     450#    endif
     451#    ifndef z_off_t
     452#      define z_off_t off_t
     453#    endif
     454#  endif
     455#endif
     456
     457#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
     458#  define Z_LFS64
     459#endif
     460
     461#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
     462#  define Z_LARGE64
     463#endif
     464
     465#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
     466#  define Z_WANT64
    427467#endif
    428468
    … …  
    437477#endif
    438478
    439 #if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0)
     479#if !defined(_WIN32) && defined(Z_LARGE64)
    440480#  define z_off64_t off64_t
    441481#else
    442 #  if defined(_WIN32)
     482#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
    443483#    define z_off64_t __int64
    444484#  else
    445 #  define z_off64_t z_off_t
    446 #endif
     485#    define z_off64_t z_off_t
     486#  endif
    447487#endif
    448488

  • smplayer/vendor/current/zlib/zlib.3

    r121 r133  
    1 .TH ZLIB 3 "29 Jan 2012"
     1.TH ZLIB 3 "2 May 2012"
    22.SH NAME
    33zlib \- compression/decompression library
    … …  
    126126or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
    127127.SH AUTHORS
    128 Version 1.2.6
     128Version 1.2.7
    129129Copyright (C) 1995-2012 Jean-loup Gailly (jloup@gzip.org)
    130130and Mark Adler (madler@alumni.caltech.edu).

  • smplayer/vendor/current/zlib/zlib.h

    r121 r133  
    11/* zlib.h -- interface of the 'zlib' general purpose compression library
    2   version 1.2.6, January 29th, 2012
     2  version 1.2.7, May 2nd, 2012
    33
    44  Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
    … …  
    3838#endif
    3939
    40 #define ZLIB_VERSION "1.2.6"
    41 #define ZLIB_VERNUM 0x1260
     40#define ZLIB_VERSION "1.2.7"
     41#define ZLIB_VERNUM 0x1270
    4242#define ZLIB_VER_MAJOR 1
    4343#define ZLIB_VER_MINOR 2
    44 #define ZLIB_VER_REVISION 6
     44#define ZLIB_VER_REVISION 7
    4545#define ZLIB_VER_SUBREVISION 0
    4646
    … …  
    453453  single call of inflate), the parameter flush should be set to Z_FINISH.  In
    454454  this case all pending input is processed and all pending output is flushed;
    455   avail_out must be large enough to hold all the uncompressed data.  (The size
    456   of the uncompressed data may have been saved by the compressor for this
    457   purpose.) The next operation on this stream must be inflateEnd to deallocate
    458   the decompression state.  The use of Z_FINISH is not required to perform an
    459   inflation in one step.  However it may be used to inform inflate that a
    460   faster approach can be used for the single inflate() call.  Z_FINISH also
    461   informs inflate to not maintain a sliding window if the stream completes,
    462   which reduces inflate's memory footprint.
     455  avail_out must be large enough to hold all of the uncompressed data for the
     456  operation to complete.  (The size of the uncompressed data may have been
     457  saved by the compressor for this purpose.) The use of Z_FINISH is not
     458  required to perform an inflation in one step.  However it may be used to
     459  inform inflate that a faster approach can be used for the single inflate()
     460  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
     461  stream completes, which reduces inflate's memory footprint.  If the stream
     462  does not complete, either because not all of the stream is provided or not
     463  enough output space is provided, then a sliding window will be allocated and
     464  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
     465  been used.
    463466
    464467     In this implementation, inflate() always flushes as much output as
    … …  
    12181221     "a" can be used instead of "w" to request that the gzip stream that will
    12191222   be written be appended to the file.  "+" will result in an error, since
    1220    reading and writing to the same gzip file is not supported.
     1223   reading and writing to the same gzip file is not supported.  The addition of
     1224   "x" when writing will create the file exclusively, which fails if the file
     1225   already exists.  On systems that support it, the addition of "e" when
     1226   reading or writing will set the flag to close the file on an execve() call.
    12211227
    12221228     These functions, as well as gzip, will read and decode a sequence of gzip
    … …  
    15791585     Update a running CRC-32 with the bytes buf[0..len-1] and return the
    15801586   updated CRC-32.  If buf is Z_NULL, this function returns the required
    1581    initial value for the for the crc.  Pre- and post-conditioning (one's
    1582    complement) is performed within this function so it shouldn't be done by the
    1583    application.
     1587   initial value for the crc.  Pre- and post-conditioning (one's complement) is
     1588   performed within this function so it shouldn't be done by the application.
    15841589
    15851590   Usage example:
    … …  
    16511656    z_off64_t pos;
    16521657};
    1653 ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));
    1654 #define gzgetc(g) \
    1655     ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc_(g))
     1658ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
     1659#ifdef Z_PREFIX_SET
     1660#  undef z_gzgetc
     1661#  define z_gzgetc(g) \
     1662          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
     1663#else
     1664#  define gzgetc(g) \
     1665          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
     1666#endif
    16561667
    16571668/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
    … …  
    16611672 * without large file support, _LFS64_LARGEFILE must also be true
    16621673 */
    1663 #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
     1674#ifdef Z_LARGE64
    16641675   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
    16651676   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
    … …  
    16701681#endif
    16711682
    1672 #if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
     1683#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
    16731684#  ifdef Z_PREFIX_SET
    16741685#    define z_gzopen z_gzopen64
    … …  
    16861697#    define crc32_combine crc32_combine64
    16871698#  endif
    1688 #  ifndef _LARGEFILE64_SOURCE
     1699#  ifndef Z_LARGE64
    16891700     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
    16901701     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
    … …  
    17181729ZEXTERN const char   * ZEXPORT zError           OF((int));
    17191730ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
    1720 ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
     1731ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
    17211732ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
    17221733ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
    17231734ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
    1724 #ifndef Z_SOLO
    1725   ZEXTERN unsigned long  ZEXPORT gzflags          OF((void));
     1735#if defined(_WIN32) && !defined(Z_SOLO)
     1736ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
     1737                                            const char *mode));
    17261738#endif
    17271739

  • smplayer/vendor/current/zlib/zlib.map

    r127 r133  
    7474ZLIB_1.2.5.2 {
    7575    deflateResetKeep;
    76     gzflags;
    7776    gzgetc_;
    7877    inflateResetKeep;

  • smplayer/vendor/current/zlib/zutil.c

    r121 r133  
    11/* zutil.c -- target dependent utility functions for the compression library
    2  * Copyright (C) 1995-2005, 2010, 2011 Jean-loup Gailly.
     2 * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
    33 * For conditions of distribution and use, see copyright notice in zlib.h
    44 */
    … …  
    77
    88#include "zutil.h"
     9#ifndef Z_SOLO
     10#  include "gzguts.h"
     11#endif
    912
    1013#ifndef NO_DUMMY_DECL
    … …  
    8689    flags += 1L << 21;
    8790#endif
    88 #ifdef Z_SOLO
     91#if defined(STDC) || defined(Z_HAVE_STDARG_H)
     92#  ifdef NO_vsnprintf
     93    flags += 1L << 25;
     94#    ifdef HAS_vsprintf_void
     95    flags += 1L << 26;
     96#    endif
     97#  else
     98#    ifdef HAS_vsnprintf_void
     99    flags += 1L << 26;
     100#    endif
     101#  endif
     102#else
     103    flags += 1L << 24;
     104#  ifdef NO_snprintf
     105    flags += 1L << 25;
     106#    ifdef HAS_sprintf_void
     107    flags += 1L << 26;
     108#    endif
     109#  else
     110#    ifdef HAS_snprintf_void
     111    flags += 1L << 26;
     112#    endif
     113#  endif
     114#endif
    89115    return flags;
    90 #else
    91     return flags + gzflags();
    92 #endif
    93116}
    94117

  • smplayer/vendor/current/zlib/zutil.h

    r121 r133  
    11/* zutil.h -- internal interface and configuration of the compression library
    2  * Copyright (C) 1995-2011 Jean-loup Gailly.
     2 * Copyright (C) 1995-2012 Jean-loup Gailly.
    33 * For conditions of distribution and use, see copyright notice in zlib.h
    44 */
    … …  
    1414#define ZUTIL_H
    1515
    16 #if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
     16#ifdef HAVE_HIDDEN
    1717#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
    1818#else
    … …  
    246246#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
    247247
     248/* Reverse the bytes in a 32-bit value */
     249#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
     250                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
     251
    248252#endif /* ZUTIL_H */
Note: See TracChangeset for help on using the changeset viewer.