From 00eac92cb6a615ac76170c1f6b7db0682e607813 Mon Sep 17 00:00:00 2001
From: Yixun Lan <dlan@gentoo.org>
Date: Mon, 16 Feb 2015 08:49:01 +0000
Subject: [PATCH] foward libavcodec patch to 2.1.9999, disable bogus version
 check

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55
---
 media-video/vlc/ChangeLog           |  5 ++++-
 media-video/vlc/Manifest            | 30 ++++++++++++++---------------
 media-video/vlc/vlc-2.1.9999.ebuild |  5 ++++-
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 1698f2ee2c9d..4959af7b6cc9 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.930 2015/02/16 08:27:10 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.931 2015/02/16 08:48:37 dlan Exp $
+
+  16 Feb 2015; Yixun Lan <dlan@gentoo.org> vlc-2.1.9999.ebuild:
+  foward libavcodec patch to 2.1.9999, disable bogus version check
 
   16 Feb 2015; Yixun Lan <dlan@gentoo.org> vlc-2.1.5-r1.ebuild,
   vlc-2.1.9999.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 09d6e510370e..f22859a632b4 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -13,26 +13,26 @@ EBUILD vlc-2.1.2.ebuild 14571 SHA256 f99605ce757ba7367b943ad4bdd935e5b40541c5b70
 EBUILD vlc-2.1.4.ebuild 14937 SHA256 08a7fc04b78b6f7340ed79b9ca3ee3d97fb9ba5f2f171342c73c4a47506b430c SHA512 256680f7d2138f835c280b84c2fbbeb5c1e58c49361a2b7af015e88f18c0065cf987d39d6af876f77d5ae8c886877a3025e5ce0754ca36da2c7ad3b596b1cc94 WHIRLPOOL a94356111330b63ccec18281377f23bd65bee602b74b65d21e843c444b761d52470f22c2b36d9915d17a5105fa624680846ad8e4de18b470c91d7160bdc88459
 EBUILD vlc-2.1.5-r1.ebuild 15303 SHA256 b943e8d3274ae1445d6e75b07f9931aa0088f264c9947042da83c0049beac7d7 SHA512 409d5d8fc768c8327a22e284f56bcf33eb015bbdfef9d5d80f430481321566075a70562db65359308a5d727d5eca80db76e7c5b7d0e71df4ba585233e358b0ad WHIRLPOOL 44e6ff6daea537010bcf762c2187cdefb3f00ebcf746bffa43735c18978d2dff800c55effcbf0cc7f4dc8ba1e6e51c563c9ae2b5cbd10a0f6167e423f3e58587
 EBUILD vlc-2.1.5.ebuild 15029 SHA256 03faaae62354534ef7dc653063633888a5b1b0aaa9c470898dd1312eb5330976 SHA512 b469c9b6ea81c5df53322f888cecf20d780722aaee4ce46d22a689085c43ebe062da8109b4a8506736293f22b8cafa475100a9d9157455b4a51fdf6667c50acf WHIRLPOOL 955996c8befa5cc12cf9a38e8372d58ab09d3bcac31d800acaba84360409b2fe361cb112abf8a85ee98234cda1d50d800a542f510c2e98faaefbde2e5622f4a6
-EBUILD vlc-2.1.9999.ebuild 15212 SHA256 241b70ff920c401027a9b95e70931fde18533af6d2f457ce438080b38618579d SHA512 1a038d360b07bb42616f81c99bde15abe83bb6d863b3196def9aca032272e2b650f278bd74486a2d7938169fe0327f251125e784efe5c95688deb72554064ba8 WHIRLPOOL 13eecaf485e8b49cc81b8dc9b2ca93e0d97965e9ac5aff261f756f569096ec3d0b4687b7b6b0a88ef917125a87260f12b1f96bdf47484e65449a153688e90291
+EBUILD vlc-2.1.9999.ebuild 15304 SHA256 5ca101d0da03f4045cd5f292feb318194992b66870ba8f4903727af06ca0bdc7 SHA512 11a0ee5508b7db06b545d961e01a7e747eeec19af3b23aa2279bee4a7054e7ac8f2119a77971aeda12f822556ce09db108a4041f25b09e6d66b21d9258ad90f3 WHIRLPOOL 07e99f49e2a06c74836ac7448a39a3e3c1920cf22d7b56b6eff33a09e4ec38e3a2b44f669804a5f0c81c49f0c339568f8f943def234d8c234d6c69cf62f7d9b4
 EBUILD vlc-2.2.9999.ebuild 15498 SHA256 17e3df0e83c60f3d580c3f9a9f7204dea66c61d71310c68d4490f0494a050367 SHA512 053a6e75ca9f9124f942bf97d5327593595be1a63a4fd6c8c9c1ca6d4b85d7845fdc66c53c728c3413672d2053b6c7774aea8156fe0dab0f62297fe03992df0f WHIRLPOOL 67a496ea097939919ff7a32aa324adf9c34bb96051dca9d27131d36a27e89fd2ac4f8e3f6d7d52865e3f8568e0a02562957aa6530b7d771347392f03d85da234
 EBUILD vlc-9999.ebuild 15489 SHA256 50c08cceecd4d9514f6e7a14b9f503e494379675da003b44cd4614c06d15f883 SHA512 23f326c9e39963b585acad84fe5c473be5c696a398f9916b17f5d26a36e8a0c9e2d1f4c73d06ecd61319b3dca2ebf11505a469fccdc0c417e2db1990e85a599d WHIRLPOOL 6d1262d28ea9d529d4e04b6c9bf4fb236642d92c72bcc0629f02ce97c7eb1edd71282ca946374120143aa7295b35798fd9ddde34db27de41a7bceb597db53be9
-MISC ChangeLog 34123 SHA256 8e8062c993d157b7b6353ef2261b7a338d6565d2c4b162cfe11443b3ee686003 SHA512 dbc43e9d377e344177f46ce46eb365d43cbb3257cb5b0970d9a5570539838f9c4e5327411aefc30d1959cc096f46147b303eaec79eb535b1e34caeaeb9d3fac1 WHIRLPOOL 1b8161398524f09ea07ce263c2476737dfe83ddaebd014c488ceeec920d4b809b6baa82877f2e825e5ccd084e9b0cf10393d67a2ea97ea5695a051424663def3
+MISC ChangeLog 34255 SHA256 c2db6ae4ebdd5366624d2db8c221c70efb376e085e7b56fb390be97ff0939105 SHA512 0cf37824bfb56d209535f8c4feb00b47ebc0ea53926f87855b3a5799dc7e9efce132108fd2b86f817058257448f298dca2aa8d9059049da0631954f5fec1b699 WHIRLPOOL 883c1e13cfa63499012f31190a6ec12e786d6b7dd5c1ccec39d3f817c9da347ea850eaa8b14d53b39670ce6f126430feeadecc3708b3d9d21e16afd5d6f76d10
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 6542 SHA256 e0e3e42a1d4154a172ab9b484a53e51765a47334f4380b3dd9319140e48e29f5 SHA512 986b6088cf654051271249ac3779473410be06e97aee45a69842e33af3b63dbbdb4c475b7c35e6cbbdf8f7589bd0bf4f0bc520f295274332ceb0d8a3ec3dd6fe WHIRLPOOL f58561b53d63f5ead7142a7297ae17176b0889c3f8d30d4b300b3747a5891c8ed6b6b5b3df056add768eb7cac81196cc8ca5b9fdf737ff2dab48b3487b31bf26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIbBAEBCAAGBQJU4TkPAAoJEJIMDbyqvv1VsigP936AXoshAtI1DYpPjlAAr2+K
-No1tAm8uoju7cW2874GE9yqGCiZOb+NvHw2dr1wfRJcyLrtYKp6xiybDSZCFtF6a
-JKsihXmRIY1kTOgLR7IRetgDC5SlloH7bRb9pLZ+W1BLCMMekAkYVt+jpnHDlbZA
-X6MXPr/QvN/SSYgp7Sy7XSIsZk4nRwSujqILhliDrDUD4wBbUAjjODRnQaxdBvtX
-y4+os9TuyVN8PZHLOpKoOmRNQJ4x9q9Wsz24U0WuQ+6T55Q0QccyIgYwoGBYygh8
-HHZe++90+NXq71IPfglDLSsafkpgCbdkC4TUXLfU3aN9ktvT0W4jtjAGsUrmlvjM
-iZtbKt/rlc0umTgmA5VNbN5Ulp3/EAOWXfn9Lt7zRFP6DUmkhM3CVeRScsh8B0ja
-5Nwk4mo111zBjdTngY5/cnFl89lii26nYPXhpbDKent5Fk4j8MRffQqJdMrRO3PF
-E2VeTPdUZ4Glhrk0xy5LxyCR0fPWLIeUpeDzWNzljyzKCG0TK43RKgoa+kcNF7Wo
-fUdqrIln53ePlMyHJmmhouvEkOpoNsAVxouxTqaiP5QCdWX03/ATVPm+MhgAZJSk
-tHIeQc/Q1Z8qI+Bw8aiC8Fh5l/zY2IBFL8HzbrdtXiRjypzr0DYDccYVe9WrZLHk
-i7p8l6BFZoAPSlHyTmw=
-=z0um
+iQIcBAEBCAAGBQJU4T4gAAoJEJIMDbyqvv1VaZ4QAKNrMAww/Lb3RcB+YBowPuyh
+/3RruIB+Dwoq3nb2wyNAX0pNg8R+q43yHdHQV5eXMKP10tPwnV2hPmvx7fvyXdhX
+qyvgZmiItHJtib/AnBVDJO0TH7t9Ypj0t7BmPVd/2v/dLRuCjQpe3253Fw9VaDu/
+anM4bceO5p+t5IC9dBJ9kodgh/HXJef2PzZtXy9ahWXE2OxR6las/MlI02Uqcr5x
+ixDACi+cx8OWjtQGi2pw5aMENF/xRNfO5xwi8aGBAdS5OrW02b0ILwFXG80xQL8I
+L38R8l08z2+zhxpE5U/nSjt0MpY49QjkINs45SjYKay2SGXBz74/41bXgL2k/YVf
+wev8dlaiS5WyYjVbwQDXIGBVBHRpqNu7Z5CMQsR1gKBaghFT9Xfic76OXXj8jnYJ
+IF+PRdAIJE9NVrHyAhIQghpDxKXN0OJcgXz+PYOsk8CGIyXbJw0CbhF0Ge5xTHMu
+FoCm4/d9cUFNXCnJ54Re3i5shBMwEwo1jl+2ZgT5hzsxMexfQPQCmByKu7ca8Kgy
+argnX7Qk1rHRvrdmE/fYY2VXetG+O9JocTjuvX60+DyaX+YJPDAPfvDpVkLyCCc3
+81wBOxwNs1mCzQhaAGpuwvHj355PnCrTtpgwkB1MMZcepvQd3N2IgifsFrQ3XCrG
+ObP2p77g4pCiw+YTxLRc
+=gudz
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-2.1.9999.ebuild b/media-video/vlc/vlc-2.1.9999.ebuild
index a33ca1716890..0eca839e7ca2 100644
--- a/media-video/vlc/vlc-2.1.9999.ebuild
+++ b/media-video/vlc/vlc-2.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.34 2015/02/16 08:27:10 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.35 2015/02/16 08:48:37 dlan Exp $
 
 EAPI="5"
 
@@ -256,6 +256,9 @@ src_prepare() {
 		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
 	fi
 
+	# Disable a bogus check
+	sed -i "s:libavcodec < 56:libavcodec < 57:g" configure.ac || die
+
 	epatch_user
 
 	eautoreconf
-- 
2.26.2