[vlc-commits] Contribs: update zlib to 1.2.7

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Aug  8 00:43:07 2012 +0200| [9eb524de4ec18b9977abbd5a8fa0632349e6e0db] | committer: Jean-Baptiste Kempf

Contribs: update zlib to 1.2.7

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

 contrib/src/zlib/SHA512SUMS     |    2 +-
 contrib/src/zlib/rules.mak      |    3 +--
 contrib/src/zlib/zlib-osx.patch |   12 ------------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/contrib/src/zlib/SHA512SUMS b/contrib/src/zlib/SHA512SUMS
index 95088bc..e84e0ec 100644
--- a/contrib/src/zlib/SHA512SUMS
+++ b/contrib/src/zlib/SHA512SUMS
@@ -1 +1 @@
-f812ab3049fc2920a8da4649f6e60340ac365d58a0e76ace5219426aeb0759c0a474cfb2b9902cd0471158fa32a4d2c35692309d266e66013444bdced8ed00d9  zlib-1.2.6.tar.gz
+b1c073ad26684e354f7c522c14655840592e03872bc0a94690f89cae2ff88f146fce1dad252ff27a889dac4a32ff9f8ab63ba940671f9da89e9ba3e19f1bf58d  zlib-1.2.7.tar.gz
diff --git a/contrib/src/zlib/rules.mak b/contrib/src/zlib/rules.mak
index 210da1e..4e07918 100644
--- a/contrib/src/zlib/rules.mak
+++ b/contrib/src/zlib/rules.mak
@@ -1,5 +1,5 @@
 # ZLIB
-ZLIB_VERSION := 1.2.6
+ZLIB_VERSION := 1.2.7
 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-osx.patch
 	$(MOVE)
 
 .zlib: zlib
diff --git a/contrib/src/zlib/zlib-osx.patch b/contrib/src/zlib/zlib-osx.patch
deleted file mode 100644
index 9097f22..0000000
--- a/contrib/src/zlib/zlib-osx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru zlib.orig/configure zlib/configure
---- zlib.orig/configure	2012-04-30 23:41:03.155668067 -0400
-+++ zlib/configure	2012-04-30 23:41:13.787667975 -0400
-@@ -206,7 +206,7 @@
-              SHAREDLIBV=libz.$VER$shared_ext
-              SHAREDLIBM=libz.$VER1$shared_ext
-              LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
--             AR="libtool"
-+             AR="/usr/bin/libtool"
-              ARFLAGS="-o" ;;
-   *)             LDSHARED=${LDSHARED-"$cc -shared"} ;;
-   esac