Fix bug #541654

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x7194459F

5 files changed, 45 insertions, 19 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 4959af7b6cc9..4fdf7926ece3 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.931 2015/02/16 08:48:37 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.932 2015/02/28 15:52:03 ago Exp $
+
+  28 Feb 2015; Agostino Sarubbo <ago@gentoo.org>
+  +files/vlc-2.1-mem_undefined_functions.patch, vlc-2.1.2.ebuild,
+  vlc-2.1.5-r1.ebuild:
+  Fix bug #541654
 
   16 Feb 2015; Yixun Lan <dlan@gentoo.org> vlc-2.1.9999.ebuild:
   foward libavcodec patch to 2.1.9999, disable bogus version check
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index f22859a632b4..9219dca14001 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX vlc-2.1-mem_undefined_functions.patch 561 SHA256 d10c70d249bc795374b52e94bba53fcf2ca524c7d2f918b3ebb5467b1c2cbf33 SHA512 4a9cd18e8f552f9f469d5ff56c09e826e4b16c13f4702bd2d096ac3ff1ff17b4ad92aecd0fb553e8c1c0d7db99f8f2ec1920a1f34f497864338b215cc88f24e7 WHIRLPOOL caf9ce29af9b0e4234918f7e0a59f71e0d713fc27e3e45db59a0b3f913b29c2aaab1eaeb8a564170d71e4a4f3424902bb1278511d2add88c0a63c871ca901429
 AUX vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch 700 SHA256 91752f1ed1fbe8a2fcc78336a0725e1450946bab8085a4efce85a076dff40b87 SHA512 c3aa82ba9252f87d8f87c0bbfed7e0cdbd93c4f454e0ca6a9d73346e2efa294864af7eea1ea76b504354fb1baf5378cf626b35dcbfba3d888dbf0168ddfbed13 WHIRLPOOL 87c5017c8cdc1ad8cb313b6342f89af7ca7e90b20f151dd226ad8863407dae4cefb5934040154020778d3eb5dc78c5be43ae1e8e33fd0e823628c69c8cac7e61
 AUX vlc-2.1.0-fix-libtremor-libs.patch 453 SHA256 5b2d4272b0258b30d1e34717ad83ebe2bcea78a5247798a74c0b86ace6d39463 SHA512 6c25995a518aeb1d501fa217d897962e1e81f66a4f28b6bb164dde3afe7f91772bb608f946d802857fa9a272cab1f88d3990d582be89ab8e37b1a8b6681798ae WHIRLPOOL 39d9d1670e244169087ecc81654b1d6407c9e5f0f0da1bb1b15d7c89a7dab232b9a174c2a5e9ed2586a57a370f3cd9d2c9434381387a1fbc70b7f7bd8de2ef85
 AUX vlc-2.1.0-libva-1.2.1-compat.patch 272 SHA256 fe9a4fdfe5447c869ec881f9e30236486a885b9f64b4c80004db7964b2b931c1 SHA512 74cba8136b2abb7a78b5ee8c8b5a9b3509a4a16ff9d4f136a3a7e2d6ff634ce20e34b8d140810ac63dd6cd3115d71cbb87a6e213fb172485494e55ade1b5230a WHIRLPOOL 1d2e747f4097c7903b798d7dfd17e11de41c01e903afda0b2c766ef5d7977da32362c52e5bc41c93a1f801a93c857c08d2cee3840f76a55afe0b2a768250073e
@@ -9,30 +10,30 @@ AUX vlc-9999-libva-1.2.1-compat.patch 291 SHA256 54eb34b32afe6876fa40abac2cb9709
 DIST vlc-2.1.2.tar.xz 19609868 SHA256 219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4 SHA512 24ea51befb30ec2e4f796866bf086d36e809cb97bf04203a4637518c91a3035fa38a8e778aaf6fb3481db49d19236ae88bcbf31e1e4f7ae79b9d7bcc3cf037af WHIRLPOOL 7e4576370ea4a0d74d29b936f7c554c4fa22ca6b5d9260ce76d0e2bddf50826a2472c77746de61c81bd4601bead49f85c5c76a2f7ca309601c7a684c7091d09a
 DIST vlc-2.1.4.tar.xz 19560884 SHA256 3e566c7525478167e18cc53dc75d621e4af91eb40aabb6231e47db25d682d5d3 SHA512 da09744d0da1742a89747a34f749b83a30b18ddfc84ed9ee1a59a1c16cfa4ce0e7d4ddd66e9dfd13d5309b7ff66f72a7d3b2c3837ec740a193656ce6f8b04845 WHIRLPOOL 4929a66f4f1afc44726bb2d88e2e5e9b770811f57d21ee2258ccf84d7f5997c29b5b07bbb41cfc165b78339e4b070eadd5be958059f68d8f6e57b565eb977396
 DIST vlc-2.1.5.tar.xz 19574208 SHA256 6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72 SHA512 37c6b82b4e89f4a14ed391cc677d9325a032e04bcc51a3e0d7d2ccf9e17a7a0deb90d9129e9dc3baf05a1ea9dae9c05e3177ab17a31098aafa6a2cb23388fa32 WHIRLPOOL c13098f922c7b24f3c718e88807a7dcb656af21bcf2be63d2ec7401583680658bd371e3935ba22537857861e0b1b0c4f0e693c87ed20999c679b4a04cddf7008
-EBUILD vlc-2.1.2.ebuild 14571 SHA256 f99605ce757ba7367b943ad4bdd935e5b40541c5b700e3713cf2fc5cb4a3fc1b SHA512 963511f9c4c54ce1a0ac368a567ded534b6ff4966805077d207526e09a005c99d88a4ab2e9b8c6495d07f8a7a8fdef4e0b13c97bf4f4e6da103e9c4347ce9f20 WHIRLPOOL cb357d100b75a2b01209e592d3480b1674c122234910e3b1c51e7b792816012dbac8d9c6c47acdcf9d4aae83f175a07af3a543b9091acaee0d9c194b5750a18a
+EBUILD vlc-2.1.2.ebuild 14652 SHA256 f349764f2fe11b16f89fa6d48048722b21936dc59d350ed59c9c19ea4861118f SHA512 05b0f1f9f1309208359b535ec1b47a49b9a03ba0a46e889bc4bda69d9abbcc602b139df660f9ea0fe9a513823e262ab0c97a9e320d24c6ca2afca91e72297d2e WHIRLPOOL 6b096a3ae3d7eb8a3f89031ceb61fbb5e87a3e04faedb1c43a939f26eeb254c8add24473725c84f2b36f732920888b2cd183019b8bcdfaf5bf61ef3f5101ef57
 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-r1.ebuild 15384 SHA256 619e6560523fb88a380133fa51480a9ae4e0ddd4db6df2f1f8e21ce01107c0db SHA512 af461d96f5dd04e5820ab91e8c150ec3bdbf25c8eb021a1a5059c1ab362ab9db04313ddc00f57ee16ef42b1e438cd719ea571b5f6281e09c3c27b06113a681dc WHIRLPOOL a53a00d639043b6e5f6d86583eabca22ba1caf779c8abc4a3cd5cb78d46c15db11f89bbbcef2dabcf9bb9cecbd04fb3e65c7e644965421eaa95ce788b23c13b0
 EBUILD vlc-2.1.5.ebuild 15029 SHA256 03faaae62354534ef7dc653063633888a5b1b0aaa9c470898dd1312eb5330976 SHA512 b469c9b6ea81c5df53322f888cecf20d780722aaee4ce46d22a689085c43ebe062da8109b4a8506736293f22b8cafa475100a9d9157455b4a51fdf6667c50acf WHIRLPOOL 955996c8befa5cc12cf9a38e8372d58ab09d3bcac31d800acaba84360409b2fe361cb112abf8a85ee98234cda1d50d800a542f510c2e98faaefbde2e5622f4a6
 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 34255 SHA256 c2db6ae4ebdd5366624d2db8c221c70efb376e085e7b56fb390be97ff0939105 SHA512 0cf37824bfb56d209535f8c4feb00b47ebc0ea53926f87855b3a5799dc7e9efce132108fd2b86f817058257448f298dca2aa8d9059049da0631954f5fec1b699 WHIRLPOOL 883c1e13cfa63499012f31190a6ec12e786d6b7dd5c1ccec39d3f817c9da347ea850eaa8b14d53b39670ce6f126430feeadecc3708b3d9d21e16afd5d6f76d10
+MISC ChangeLog 34411 SHA256 c3975171642f2523f13bc0940ac06148a9648a65cc5558a2170bfa69f6b682cb SHA512 de2e7381a5b5a3bf340892a8e4a33100cd279436f2aaeae204caecb2bc49838f0fee54ab59decf7624f9991e129adbd067343d9edb989d36ae8bbdecefc72516 WHIRLPOOL da71ca9589f8175cfefae93852d7257723781b8ce688319e09681e1979fb99e05a8939729c0985ab8049e16a450eaaf018a3a2d0bdebea27cf2eefedf2f0b117
 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
 
-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
+iQIcBAEBCAAGBQJU8eQkAAoJELp701BxlEWfrSsP/RAP++Yd5W/koFD2fpJf+RcX
+0XHdzB0uW9XQE6RIONpRtk10EqYL50jePzrCTeszXZUDIY8sRN/f170Z80mBeOAy
+Ge91kLnu+VWcqKuktMB8r6lYIsFUxPr631rTPnQJab+yCqAG/CmUP6f9ErSR2BnK
+hLfljkPXDoyOvAT/lw67q7aN79/xXXiLJoFkUyV62znbiG1jyze9wdvyBbAU6XLX
+atk8VG0/Viuy+Jo0kdK+bb0q523Gk3a9stHTqybx9Ib3jgXV9LIjU4AUbYvSYTcE
+Wu+9Ds2rE2DDZD3u9SlBuLBMeGnu4jBmC8NdlduB5LQivjyFwDcVnWTJgsrH7mhp
+zerydV/Q5B+QUva2i/5wFicBr5h6N/Jsio9HBuTDjC/hN9hi5zT/prMrwXWBLe4I
+qKdEy4d3mNWfHSeolC0SJ4Gf7LlQpoY6X23bJ7Rb0mwhEP8yK6MhRw3KG+ngSTL2
+d06xlWAGS8KAMagagzaULxgPvkwKzNYKxfZhbCC9/jwRP2CWHw0UX76iFRKVQiA0
+yMjzR5fRLnnDCjTpyG0YeG3//uN+Xg8rE7dVyT4IHrlGzMp/jbRq752TuGSWXoxH
+2lJDEvRRAdacUbPtMNPOwuqazrWjUwFks/xr0MAOtabKep5F7q3EZQng4QYhnMBN
+MRzZ+iwUXPqQXcRHJ+qK
+=l/zG
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/vlc-2.1-mem_undefined_functions.patch b/media-video/vlc/files/vlc-2.1-mem_undefined_functions.patch
new file mode 100644
index 000000000000..7289c073641b
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.1-mem_undefined_functions.patch
@@ -0,0 +1,14 @@
+# Fixes gentoo bug 541654
+# https://bugs.gentoo.org/show_bug.cgi?id=541654
+# Committed on behalf of Luca Barbato <lu_zero@gentoo.org>
+
+--- modules/codec/avcodec/avcommon.h.orig	2015-02-28 15:19:33.449761287 +0000
++++ modules/codec/avcodec/avcommon.h	2015-02-28 15:20:10.469537179 +0000
+@@ -81,6 +81,7 @@
+ #ifdef HAVE_LIBAVUTIL_AVUTIL_H
+ # include <libavutil/avutil.h>
+ # include <libavutil/dict.h>
++# include <libavutil/mem.h>
+ 
+ #define AV_OPTIONS_TEXT     "Advanced options."
+ #define AV_OPTIONS_LONGTEXT "Advanced options, in the form {opt=val,opt2=val2} ."
diff --git a/media-video/vlc/vlc-2.1.2.ebuild b/media-video/vlc/vlc-2.1.2.ebuild
index 98fa81a12cc7..17d682176d0d 100644
--- a/media-video/vlc/vlc-2.1.2.ebuild
+++ b/media-video/vlc/vlc-2.1.2.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.2.ebuild,v 1.22 2015/02/16 02:16:22 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.23 2015/02/28 15:52:03 ago Exp $
 
 EAPI="5"
 
@@ -229,6 +229,9 @@ src_prepare() {
 	# Fix up broken audio; first is a fixed reversed bisected commit, latter two are backported.
 	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
 
+	# Fix bug #541654
+	epatch "${FILESDIR}"/${PN}-2.1-mem_undefined_functions.patch
+
 	# Disable avcodec checks when avcodec is not used.
 	if ! use avcodec; then
 		sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
diff --git a/media-video/vlc/vlc-2.1.5-r1.ebuild b/media-video/vlc/vlc-2.1.5-r1.ebuild
index bd73ae52a7f9..2bf527f52e76 100644
--- a/media-video/vlc/vlc-2.1.5-r1.ebuild
+++ b/media-video/vlc/vlc-2.1.5-r1.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.5-r1.ebuild,v 1.4 2015/02/16 08:27:10 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5-r1.ebuild,v 1.5 2015/02/28 15:52:03 ago Exp $
 
 EAPI="5"
 
@@ -246,6 +246,9 @@ src_prepare() {
 	# Fix up broken audio when skipping using a fixed reversed bisected commit.
 	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
 
+	# Fix bug #541654
+	epatch "${FILESDIR}"/${PN}-2.1-mem_undefined_functions.patch
+
 	# Disable avcodec checks when avcodec is not used.
 	if ! use avcodec; then
 		sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die