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:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • 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
Note: See TracChangeset for help on using the changeset viewer.