backport upstream patch to fix build with latest zlib, bug #401629

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 17 insertions, 13 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 0b4e10402067..d463f7eee16f 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.775 2012/01/28 15:30:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.776 2012/02/01 13:50:25 aballier Exp $
+
+  01 Feb 2012; Alexis Ballier <aballier@gentoo.org> vlc-1.1.13.ebuild,
+  vlc-1.1.9999.ebuild:
+  backport upstream patch to fix build with latest zlib, bug #401629
 
   28 Jan 2012; Alexis Ballier <aballier@gentoo.org> -vlc-1.2.0_pre3.ebuild,
   -vlc-1.2.0_pre4.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 4ebb0f4f4ade..7fc5948ead30 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -4,19 +4,19 @@ Hash: SHA1
 DIST vlc-1.1.13.tar.bz2 26226587 RMD160 c5aa438a9085ddbf28e849df442b75475693290d SHA1 05bbc7ff427f3b919b29a45ce014caff9ba92648 SHA256 03edec44d463b9f5e7db56fd844c6d4ac79966638e1ac32dedcfb5847a9323c1
 DIST vlc-2.0.0-rc1.tar.xz 16936652 RMD160 994ca78637109324cc0987b3930f753829449c14 SHA1 c4a7416b949a6f5c6839fd8805bae170b2d1bd12 SHA256 a237aee9edde249d03ae15e918ddd90cd20c8faff30883a300bf0a24659442f4
 DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a736 SHA1 e9be6b192bb3d69e4bd2387a9854543e0f8b3132 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae
-DIST vlc-patches-104.tar.bz2 3839 RMD160 bde7bd345b8082a82382f8c874d7ec2a9151382e SHA1 85729ea0889de759d8476c9571c2680fd31b588c SHA256 cb019bdea9ea95b7bbe2d2ef1194d276e93e1cf0e4e62403e80698c785f1a1ec
-EBUILD vlc-1.1.13.ebuild 12193 RMD160 ecb63cb768039dcc38b0ca81af81aee994af0d26 SHA1 dbb51c13ac469e3c1a386df099107842a528deaf SHA256 f4155557ab7a9b349e898448ae93bfabf469fcfe29d85c993cdbc61633970d5d
-EBUILD vlc-1.1.9999.ebuild 12203 RMD160 c01bd4a095afb95e134d0381c0a607d95c02a5c6 SHA1 260af6ab266b05e9cd9ee4f7650dea7b997b056d SHA256 613280dc3e31ede0759666fa39169e3bae7c9bc8d58941bfa59599e368e85212
+DIST vlc-patches-105.tar.bz2 4325 RMD160 1fc8f5edc1f136c7074a5a00aabec583aec1cc58 SHA1 9f70e4a7ac7749da58b0134f4de79227a6b66c69 SHA256 e28047c097de2b1daa26b32227f11bb06d09a060b93c6ae2fe564094373f0778
+EBUILD vlc-1.1.13.ebuild 12194 RMD160 92bdf50ddae671aff53e870c49263d2c7df031c3 SHA1 dc47c9b331ecd773434477eff18c26a436cc0f93 SHA256 84a530506a3d232db5001547a0f2d5fb84b3071e130944972e0d98512759c819
+EBUILD vlc-1.1.9999.ebuild 12203 RMD160 cc8693367d7991d5056f1683b79f432b3eb4441d SHA1 fc15e004900a1f2094218bc2d66994f427d64d7b SHA256 9bfce7ebe400262e21e17b2a6638576c1723da36de0813943f53596e370f37b8
 EBUILD vlc-2.0.0_rc1.ebuild 10913 RMD160 9faeeb77985a4aea268109e67c3d849ed9e5a8bf SHA1 0e0d8ec521091844a2410c45a553dff329e2f950 SHA256 ea4269b932940172100ec813ebf5760d283563855bbc5f239c0343460f34c982
 EBUILD vlc-2.0.9999.ebuild 10912 RMD160 ef27a538a9b0016307b7d1855d75edfb234bee34 SHA1 abd9540017081009b855d495a2319931111c9535 SHA256 c3a34ee19c2bbca82b0c3b607c0c804e155b3122153f86d55f13c40b7b1e983a
 EBUILD vlc-9999.ebuild 10910 RMD160 48906616d9e68f18bbb8abe863d8c1504bae2d6a SHA1 2c1a31f3c9793855b87a50864ff804e3fc4d35fa SHA256 16da5cf3ca1ca0361fbb2636cf5cc247cc8b02f59290c8d9b1020bddf8b997d4
-MISC ChangeLog 1370 RMD160 508cac76c0eaa45c2415801d619fca87cd55f5d5 SHA1 d51286fc3ff951b0889c8c6f50b1d4eea3faea41 SHA256 0c42ce37500743bc1065306c6b889ff418697ad7d366deb621b46ca3bca4a712
+MISC ChangeLog 1534 RMD160 855e796d1fc47d8c361189caac2d891a4fc72f04 SHA1 247e6020d7492f7578600046094050e43a469bed SHA256 76e45214363d6c9dc4c08bd421966fa2852ed95020fe7dd9e98b948933a77c4b
 MISC ChangeLog-2011 113818 RMD160 fbb86916aed66ae0a18a2b1f13d3c1dc9fdcaf7a SHA1 5e3dab004808f103ffae80563d33568e98f0d119 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2
 MISC metadata.xml 6434 RMD160 25dd84337768e1300e1f749aae2bfc5f1049cae6 SHA1 13b5b26151422b36aaecffadbd85fe50d797f978 SHA256 1f61197b2f127f1a6dfd60f76de3568ee1ccb8cbaff1fac52757b6f32d5f4d6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8kFKoACgkQvFcC4BYPU0q1TwCfRjrZLyWuW2mlcxtg6X1K98gP
-8n0AoKMFvMN0jXbdQTNeXLYxqibOYHQE
-=akek
+iEYEARECAAYFAk8pQycACgkQvFcC4BYPU0ouIgCfd9uaJSnBkevL4bPr/iKksOTJ
+u6kAni1YweYDZFeF3e3ql/7soJ+2mcIK
+=rIFk
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.1.13.ebuild b/media-video/vlc/vlc-1.1.13.ebuild
index 837718fa1072..bd19203dd1b9 100644
--- a/media-video/vlc/vlc-1.1.13.ebuild
+++ b/media-video/vlc/vlc-1.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.13.ebuild,v 1.5 2012/01/01 15:21:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.13.ebuild,v 1.6 2012/02/01 13:50:25 aballier Exp $
 
 EAPI="3"
 
@@ -22,7 +22,7 @@ MY_PV="${MY_PV/-beta/-test}"
 MY_P="${PN}-${MY_PV}"
 VLC_SNAPSHOT_TIME="0013"
 
-PATCHLEVEL="104"
+PATCHLEVEL="105"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
index bbfd93c9fef0..31adf7fc858a 100644
--- a/media-video/vlc/vlc-1.1.9999.ebuild
+++ b/media-video/vlc/vlc-1.1.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.38 2011/12/21 12:18:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.39 2012/02/01 13:50:25 aballier Exp $
 
 EAPI="3"
 
@@ -22,7 +22,7 @@ MY_PV="${MY_PV/-beta/-test}"
 MY_P="${PN}-${MY_PV}"
 VLC_SNAPSHOT_TIME="0013"
 
-PATCHLEVEL="104"
+PATCHLEVEL="105"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild