fix build after the big libav* version bump, backported by Luca Barbato, bug #364177

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

4 files changed, 18 insertions, 12 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index e42213736320..7aff0a68dbae 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.708 2011/04/16 16:47:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.709 2011/04/20 15:12:13 aballier Exp $
+
+  20 Apr 2011; Alexis Ballier <aballier@gentoo.org> vlc-1.1.9.ebuild,
+  vlc-1.1.9999.ebuild:
+  fix build after the big libav* version bump, backported by Luca Barbato, bug
+  #364177
 
   16 Apr 2011; Raúl Porcel <armin76@gentoo.org> vlc-1.1.9.ebuild:
   alpha/sparc stable wrt #363359
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 859bff448bd1..a8c005fbb950 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -5,16 +5,17 @@ DIST vlc-1.1.8.tar.bz2 25212756 RMD160 728085c222f0a3c831d28f149898cc77f6cbe3a2
 DIST vlc-1.1.9.tar.bz2 25333292 RMD160 00b09bfd90467ec731fe2772dd15c952e8589a25 SHA1 cff81791d83fcd55f99cb12a4d9ad617cdff00c4 SHA256 f0bd71decbcdaaee7d8421039eddef503425059fd5460c7ef7e0b403bbcb2d0b
 DIST vlc-patches-88.tar.bz2 3341 RMD160 b29676117f2a4033e66f4c956b5de1cc1be872b0 SHA1 93bbfd854270596fa6e5084e68c93a66dc73c616 SHA256 64544578d02a9c2cfa5aa9ba3181106d9e631c5cd2989874d632caed38acd3d1
 DIST vlc-patches-93.tar.bz2 3384 RMD160 5676a0e7ecb9ec643b5bbcdb3e31bc4262e77f76 SHA1 70620a6f10a6b813a6fd201421954470c62829c1 SHA256 e22286e170c5a734637c6f0c868d8a9a575f67690aa50920fb9227ad26026f83
+DIST vlc-patches-94.tar.bz2 7721 RMD160 351241f5e354a4de634c7f167e051ed7b10a9fdd SHA1 25ae313d541f0ef2561a500e9c472d4664340a0f SHA256 3709ebe4165424e682da759dadf2b1d81e7b29e3a50ab0ef1a601612f385b1f4
 EBUILD vlc-1.1.8.ebuild 12231 RMD160 3d917faefa987b34a6d1efb1f97612fec86aa2bd SHA1 813974ef8cea55e0b2611fd6adf8b449eecfac2a SHA256 bc0e74fba5494b29cb9e8700ff77618b43fb656d63b6345628d43476d8699eb8
-EBUILD vlc-1.1.9.ebuild 12233 RMD160 7d34144d812025dbeee7fbb7ee13f7fe9c83bfbc SHA1 b03d2498533b4d707e5facb5bfce50b90bf1349f SHA256 9755838e738ce06691da746a0ec77f3d067dbdcd29128a174b52afff6b849449
-EBUILD vlc-1.1.9999.ebuild 12243 RMD160 9469eb695e37e554c7834abe226d0654f40b7fe8 SHA1 0f5680c11f8376cdae69311c563c773f731d4dec SHA256 9e449a667b71b9fb480784a0d3ba184ea990d6a6ff8ec14a0fdd9f588e232871
+EBUILD vlc-1.1.9.ebuild 12234 RMD160 4e1ef36afcc46568611e20c2ec2b984534339fa7 SHA1 2fb9358639481f208c7a2ed522a282df35900c89 SHA256 4a4d47a486520e0453d38a593ac578161d3d52908005628b249c77f6531c7e7f
+EBUILD vlc-1.1.9999.ebuild 12242 RMD160 fcfacf634d4e50d918680636d2ea2a1beb29a1e4 SHA1 9f210e1da1de708ee1faf4cfa6cffa212628d019 SHA256 fca18361d5e4f1be98dc0d8c2f1750a9e8824f2c0f8cd4910d57c4d2c77f4674
 EBUILD vlc-9999.ebuild 10997 RMD160 dce4406f25d4501b7226c304888d5bf75f1c2d08 SHA1 14dbac5284cd04d865d9289c31a93473406b63dd SHA256 40ef98a7de1bb687643d18748c1ee2ba80b82ea54e245cab4ab487c3e7fbd943
-MISC ChangeLog 106313 RMD160 0898ce30073ee900bfe25cabd324651dfc2c6446 SHA1 8028f41dbbadb22f61653c3f3a2bca9761ac8a26 SHA256 c16cedbe8d6e9887f3abc82dc993799ccb6b1d8ded5e48477b0758edd339bda4
+MISC ChangeLog 106497 RMD160 d4e5102e7f9fa1395c2ce7fa7cb9df76b133aa71 SHA1 85ec917f60276e3112fb5eb9f8cdd78863b6847a SHA256 a56178c40ef0e6dd504017df655f90381d67c615e5b46ce0a9ea616d2b2d3428
 MISC metadata.xml 6478 RMD160 7ddf32170a0d306d753eb1c567bab738871f93ee SHA1 fc20ca23fbef32370d86fdaa1154d5eb744ca6a2 SHA256 c72d228750d1d28196388c2bedc79de711a14e0c1c664eaedbb1ad63467955f8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2pyFwACgkQuQc30/atMkDg3wCgtHSrraEgeTmJXX6zmSGiMRnd
-HAgAnA5YSdKUBM7y6gLjngFYZ2QTneab
-=s5FQ
+iEYEARECAAYFAk2u99MACgkQvFcC4BYPU0pndwCfUpSf8Cftu6ATRNuwR4hYkHB2
+e4IAoMsHJ0IxFirzQeByDeFbBsL6GmBj
+=jbMF
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.1.9.ebuild b/media-video/vlc/vlc-1.1.9.ebuild
index 749c1501f7c3..5b8feb259aba 100644
--- a/media-video/vlc/vlc-1.1.9.ebuild
+++ b/media-video/vlc/vlc-1.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9.ebuild,v 1.4 2011/04/16 16:47:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9.ebuild,v 1.5 2011/04/20 15:12:13 aballier Exp $
 
 EAPI="3"
 
@@ -24,7 +24,7 @@ MY_PV="${MY_PV/-beta/-test}"
 MY_P="${PN}-${MY_PV}"
 VLC_SNAPSHOT_TIME="0013"
 
-PATCHLEVEL="88"
+PATCHLEVEL="94"
 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 4d3f600fd6bf..e7017a2c3820 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
 # 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.26 2011/04/03 11:17:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.27 2011/04/20 15:12:13 aballier Exp $
 
 EAPI="3"
 
@@ -24,7 +24,7 @@ MY_PV="${MY_PV/-beta/-test}"
 MY_P="${PN}-${MY_PV}"
 VLC_SNAPSHOT_TIME="0013"
 
-PATCHLEVEL="88"
+PATCHLEVEL="94"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild