Fix build with libmatroska-1.1.0, by Ambroz Bizjak, bug #353491

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

3 files changed, 19 insertions, 5 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 27f6e13e8649..3194eb593515 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
 # 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.656 2011/02/01 20:19:32 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.657 2011/02/03 14:10:21 aballier Exp $
+
+  03 Feb 2011; Alexis Ballier <aballier@gentoo.org> vlc-1.1.7.ebuild:
+  Fix build with libmatroska-1.1.0, by Ambroz Bizjak, bug #353491
 
   01 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> vlc-1.1.7.ebuild:
   ppc/ppc64 stable wrt #353326
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 75a29205c5c6..2b6c439e7f21 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST vlc-1.1.4.1.tar.bz2 23669651 RMD160 539f8e87c81b090524b1ada56301ffde302cd016 SHA1 91a88c02a7ed04de150ce998ce0534ccfabe57bc SHA256 61c9ea30a17ea40c6ccbfd507026e5c83ad9e0691f221d3667c8e49696d7c2aa
 DIST vlc-1.1.4.tar.bz2 23923550 RMD160 9ea0fa94f46bc9624e1314423f4bc6d3d20c8c4f SHA1 2c4f85fbccbd11946cb4b2cf94464e5db38db78a SHA256 0951493d27af3f950ed57ff123d9cb17ed1d17c8ae51741d3a90f4973af397d7
 DIST vlc-1.1.5.tar.bz2 24111723 RMD160 b3ac38109e11e86df6049c7d7af4d484e582c586 SHA1 19f4b3d82afd9cfd2131447d0cc65032e7cb9e5f SHA256 f8e3af9c317fb2e695ba2b9b7f5ac904e6eda3b078f632b98746ffc277e5ca26
@@ -6,12 +9,20 @@ DIST vlc-1.1.7.tar.bz2 24635812 RMD160 1662f458c5e1cec41e27fa1320af817551577def
 DIST vlc-patches-88.tar.bz2 3341 RMD160 b29676117f2a4033e66f4c956b5de1cc1be872b0 SHA1 93bbfd854270596fa6e5084e68c93a66dc73c616 SHA256 64544578d02a9c2cfa5aa9ba3181106d9e631c5cd2989874d632caed38acd3d1
 DIST vlc-patches-89.tar.bz2 3370 RMD160 da3c173817f6666abfaaef5762af58f3810e5180 SHA1 0535f90fc6efd71aad2f6522bb7cee1325549ae6 SHA256 9e994200a9da9ec5e5eb3db7f5abfde822f2b36e99ada4be3db0cbf621be950b
 DIST vlc-patches-90.tar.bz2 3836 RMD160 b77017afe5e707bea472dd318aed265aefc4364b SHA1 a29aa594a7638cd873519ef406d8148e347b5812 SHA256 a36bebfdd17c6d2a2301ae7e55b00fe85b5a9c9b938b9bf60d4ed0a1573c590d
+DIST vlc-patches-91.tar.bz2 3955 RMD160 37024ac3d68f0c36f711bb680c573976e4e729e8 SHA1 987ac5f47926d76073e84643023df346f9a0027a SHA256 9863e9fd62bf07641e3e99cbd11194cd462ad99ca1719034badfff74419ec451
 EBUILD vlc-1.1.4.1.ebuild 11981 RMD160 e2c6701494dac52d8a784b234722d6367630242e SHA1 bc8df5385a9d19269a611c06287a2a8ef10f8d34 SHA256 2f104f95fc1405b549fee1da8e57cd5d1762e3040d940584b2869ac0ca50253b
 EBUILD vlc-1.1.4.ebuild 11973 RMD160 0c2b9fcddbcbfa56f9f8f9ae6a32d29a276eef43 SHA1 2dbf8285b9c6c1d44c23f2d8c5ac91c27e640654 SHA256 159648e61b2582d293c23f06d5110a0419203ffae3175243d5796ef2335647a5
 EBUILD vlc-1.1.5.ebuild 12080 RMD160 08f59cd6ba634267a3134681c5049ebed5250cf8 SHA1 c4809e386833fcc86c0608bb613b3c0652d2cd02 SHA256 761d2089ed74f9095479e5c902642a967863a06889b09e8337bea40e7c4e99d2
 EBUILD vlc-1.1.6.ebuild 12267 RMD160 75262235cc39f8cfd44a81f0c8578ccb2d144da2 SHA1 f5619f4f6cc83fedc20fde8a800f8c92da47a4c3 SHA256 b25bb07aa31ae1abdbd09da750f055156908b09f2f692c956da13302e36eb435
-EBUILD vlc-1.1.7.ebuild 12268 RMD160 947e7b64e9a3e2440b25a801e7be74bac5d2ff7f SHA1 14115366f7596c9605a2530cfeb5d3308138805f SHA256 1b369dfa57e3fa789236e535b8410b8ccfb8af3670e3069492699a1c45b82ff9
+EBUILD vlc-1.1.7.ebuild 12266 RMD160 5c7d5e70fc96f586158e9bc4aa21af50f19576f1 SHA1 62aed0b6ec5c57ab10185d4ee136b18d316aa15a SHA256 9f52566f2f645ce9b3d397912476b6781fa7fa75052ceb2b35cd2f533e1b40f2
 EBUILD vlc-1.1.9999.ebuild 12280 RMD160 e7e42fd81239d7151280219c89c88350505e5d5f SHA1 b13979bc3cff3478efe29e8181de1e1b13a84107 SHA256 8a31788ba75dcb01a467c315b11110a2e0d2ed3f823233d87e6572d296da6843
 EBUILD vlc-9999.ebuild 11085 RMD160 fb4b580ae26070acfd1b4190a9f3d53dfbce7416 SHA1 4f622fe5c1cc800ed100da70d112a0c3cc6838dd SHA256 3859a72c576904a90d347c6964972aef5a37e8d63c78071086fcf1ebccab872a
-MISC ChangeLog 99726 RMD160 e7696952ef91cb5c5c27d60dd10c7670758d0366 SHA1 43a02f88a674c847653f959db4221a15173d4f96 SHA256 e8b2428e60b94fef31a912fdaf3f27c860daa43e7f0f17ea1b2b62f7ddef6d6f
+MISC ChangeLog 99861 RMD160 b8249d3cd421854e7735f213ff265744bb60d32a SHA1 a529c8ade028dc4e0b9876f37cf8fd711ea5ce9d SHA256 86d2e31bde6b8c3c94d7fa3c0a5c2dbe0a0b53a0fcd080e3251ae5db4e64d5f6
 MISC metadata.xml 4211 RMD160 2a8b9684d21db73920b1967ea27af9828250c228 SHA1 5c4e0725c9e48f64c7b26237327c34ffe00cc976 SHA256 baa70c6763379c4f483ff330bb5f141882b6ea448c07be55c445bed332c5342e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1Kt1MACgkQvFcC4BYPU0qikQCfY+CV0/4OF8ow3dG+96agfrAg
+0ZoAnirD1svvMunOu38KPwgGC37NFoBJ
+=T6ho
+-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.1.7.ebuild b/media-video/vlc/vlc-1.1.7.ebuild
index d5d68ea97de8..734a4a3073bf 100644
--- a/media-video/vlc/vlc-1.1.7.ebuild
+++ b/media-video/vlc/vlc-1.1.7.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.7.ebuild,v 1.3 2011/02/01 20:19:32 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.7.ebuild,v 1.4 2011/02/03 14:10:21 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="91"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild