[vlc-commits] Zlib: update to 1.2.6

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Apr 30 23:33:53 2012 +0200| [1801dbcc4f181d71d41bca581019ce3103133e9e] | committer: Jean-Baptiste Kempf

Zlib: update to 1.2.6

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1801dbcc4f181d71d41bca581019ce3103133e9e
---

 contrib/src/zlib/SHA512SUMS        |    2 +-
 contrib/src/zlib/rules.mak         |    3 +--
 contrib/src/zlib/zlib-static.patch |   11 -----------
 contrib/src/zlib/zlib-wince.patch  |    8 ++++----
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/contrib/src/zlib/SHA512SUMS b/contrib/src/zlib/SHA512SUMS
index c119f1a..95088bc 100644
--- a/contrib/src/zlib/SHA512SUMS
+++ b/contrib/src/zlib/SHA512SUMS
@@ -1 +1 @@
-83ce467787903b7e90ece203aaea0be42174b9cf4a9aa16fe3f72925a4993b549d50154dec4cc76b4cb1aa0b7b966118772aca3d73efa0601167256ff7ce7a12  zlib-1.2.5.tar.gz
+f812ab3049fc2920a8da4649f6e60340ac365d58a0e76ace5219426aeb0759c0a474cfb2b9902cd0471158fa32a4d2c35692309d266e66013444bdced8ed00d9  zlib-1.2.6.tar.gz
diff --git a/contrib/src/zlib/rules.mak b/contrib/src/zlib/rules.mak
index cd5b156..d96edaf 100644
--- a/contrib/src/zlib/rules.mak
+++ b/contrib/src/zlib/rules.mak
@@ -1,5 +1,5 @@
 # ZLIB
-ZLIB_VERSION := 1.2.5
+ZLIB_VERSION := 1.2.6
 ZLIB_URL := $(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
 
 PKGS += zlib
@@ -15,7 +15,6 @@ $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz:
 zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
 	$(UNPACK)
 	$(APPLY) $(SRC)/zlib/zlib-wince.patch
-	$(APPLY) $(SRC)/zlib/zlib-static.patch
 	$(MOVE)
 
 .zlib: zlib
diff --git a/contrib/src/zlib/zlib-static.patch b/contrib/src/zlib/zlib-static.patch
deleted file mode 100644
index c85f4a7..0000000
--- a/contrib/src/zlib/zlib-static.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zlib/Makefile.in	2010-04-20 06:12:21.000000000 +0200
-+++ zlib.new/Makefile.in	2010-06-08 14:02:43.000000000 +0200
-@@ -168,7 +168,7 @@
- 	- at if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
- 	- at if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
- 	cp $(STATICLIB) $(DESTDIR)$(libdir)
--	cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
-+	cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) || true >/dev/null 2>&1
- 	cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
- 	-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
- 	- at cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
diff --git a/contrib/src/zlib/zlib-wince.patch b/contrib/src/zlib/zlib-wince.patch
index e9bffb9..0daf76c 100644
--- a/contrib/src/zlib/zlib-wince.patch
+++ b/contrib/src/zlib/zlib-wince.patch
@@ -1,6 +1,6 @@
---- zlib/zutil.h	2010-04-18 21:29:24.000000000 +0200
-+++ zlib.new/zutil.h	2010-06-08 13:53:03.000000000 +0200
-@@ -153,6 +153,10 @@
+--- zlib-1.2.6/zutil.h.orig	2011-12-18 19:39:45.000000000 +0100
++++ zlib-1.2.6/zutil.h	2012-04-30 23:29:05.787740053 +0200
+@@ -161,6 +161,10 @@
  #  endif
  #endif
  
@@ -8,6 +8,6 @@
 +#    define fdopen(fd,mode) NULL /* No fdopen() */
 +#endif
 +
- #if defined(__BORLANDC__)
+ #if defined(__BORLANDC__) && !defined(MSDOS)
    #pragma warn -8004
    #pragma warn -8008