Backport FLAC 1.3.x support patch to 2.0.5 and 2.0.7, pointed out by monkeh; fixes bug #471936, reported by Alphat-PC, tested by Zero_Chaos.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

5 files changed, 62 insertions, 14 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 234826ef89df..375a77667da8 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.901 2014/04/23 13:52:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.902 2014/04/25 00:35:39 tomwij Exp $
+
+  25 Apr 2014; Tom Wijsman <TomWij@gentoo.org>
+  +files/vlc-2.0.7-include-flac-1.3.x-support.patch, vlc-2.0.5.ebuild,
+  vlc-2.0.7.ebuild:
+  Backport FLAC 1.3.x support patch to 2.0.5 and 2.0.7, pointed out by monkeh;
+  fixes bug #471936, reported by Alphat-PC, tested by Zero_Chaos.
 
   23 Apr 2014; Tom Wijsman <TomWij@gentoo.org> vlc-9999.ebuild:
   Reviewed dependencies of 9999 ebuild according to configure.ac; fixes bug
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 40768dcb0aa6..8a31047c99fe 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX vlc-2.0.7-include-flac-1.3.x-support.patch 1100 SHA256 1f64d1e9afb3ccf8e13efcc892a9245772c6d8b3695a47224e5011f90d034324 SHA512 de0ed49280365446c1505523f0d36fc1566a174ada4d1990d79252dfeb1873b8c29a48cfd8bd70c3200de1ba60f2f7208b91b1c0dcde20b3f78812c3a3554299 WHIRLPOOL e5f15080af6705e29597c92f1dbf488bce9d408c4f6f9cb2f8f1cf5ba685548a69dd3ebdf037826567276450406f9aa3d397f91815174fbefff436c392770823
 AUX vlc-2.0.8-freetype-proper-default-font.patch 448 SHA256 ee7e9b545ef6fbed5e2047e9b941a7aa38789cc0e1731367e2222641ca7e4188 SHA512 7f0c8f8e525d68bad9fca663741a1c5cdc77a81bea7cb7c365c4c5c87e027abb70c67ebfe1d92b96b5523f48d79f564dd1880b37488cc44e91198b40f43067eb WHIRLPOOL 46d20200fadcbe1e6715b6734b905d027808b5b1f7a6fd9aa6b011a60e52c899e6d69a750704844052940a8df905d4a1c0a3140222844bff9622147aab67407c
 AUX vlc-2.0.8-support-uclibc.patch 634 SHA256 51a046e290da05cc564e81523e04efeee8fbb8b5657e35ff64d35b46ad149db1 SHA512 05c373e67a100808fb36090e4719fd3d358153f8d646eff0e7451980c4629766b5842ca1c496d51246fe2c2430592e7c05c830bafbd909095c2f7003cf5cbadd WHIRLPOOL fac6f159d6a2d7d6472a4386bd2ed48429959fc9847fe46921df12fd180140fdd8089235a93730d1141ddf93d335a997a8dd8472cf95dad0e49607d5f9ab9c36
 AUX vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch 700 SHA256 91752f1ed1fbe8a2fcc78336a0725e1450946bab8085a4efce85a076dff40b87 SHA512 c3aa82ba9252f87d8f87c0bbfed7e0cdbd93c4f454e0ca6a9d73346e2efa294864af7eea1ea76b504354fb1baf5378cf626b35dcbfba3d888dbf0168ddfbed13 WHIRLPOOL 87c5017c8cdc1ad8cb313b6342f89af7ca7e90b20f151dd226ad8863407dae4cefb5934040154020778d3eb5dc78c5be43ae1e8e33fd0e823628c69c8cac7e61
@@ -21,8 +22,8 @@ DIST vlc-2.1.1.tar.xz 19605108 SHA256 339c92cfb939ef6517b42fce7db59e59f259476d79
 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-patches-101.tar.bz2 3011 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae SHA512 f059f3c47b571dd5a28d979abdcb3a8c2ebef13845cd4102d877b1786ef4b3ba15cc22873de0fd84fcc7a4413f582064f12edf40627e9f030fd8e6fa03d67c66 WHIRLPOOL eb2f184c99db6d174d22e4231003d93171f5081f917f10ecf6bc927ff96983aa21756d15063909cb6f8ad77f0db0b978fdf2eb2fba3320f19c6bc26e17b04ba7
-EBUILD vlc-2.0.5.ebuild 10998 SHA256 2a8cd9d13c8ed74b2e43412bd4c95101e0ff276ccb603538c4974ebe8df62745 SHA512 d8d4bc9092ec55f2ba723141990e4d698a755e3b26eac767582172fb872340eed20273b81cf3fb3c2268525c0c862e383638b1b3c9059ff9bb8ce345c87d4e78 WHIRLPOOL cec063dabe72654656f13b88a302026697f32516b2e63f10262db1a0f9900ecbb69d370330e1e660d7ec1e3d10097e38a8584a860f58b1ae0ea63a04db4e725e
-EBUILD vlc-2.0.7.ebuild 11056 SHA256 c61209c44357101e9bdf57b9c75c5d465c1efda24d7a51ca1095bf7dfb5ae3da SHA512 2c192451f737259d96a60b7506952431cee5d8f8eec102dfb3d78ba0cfb0eac879214665b9a192a76c4f7a87dcbc3537e7ae4007d8998c33b1ddaa7c882e0388 WHIRLPOOL 62ad0747640723d879796639eebb27b6fb4bf68c58f3b099d0d0afdba122e0097455bdeebde37b897b31f967999895e26d379b82e4edd455909da188208f6b58
+EBUILD vlc-2.0.5.ebuild 11066 SHA256 9e906091c5bc3198f65567d1e3e5deaebb55090ff0e1993aec59ab4374534888 SHA512 7552ca24730999f94a377af52ce604cf03e9a8daa2dc73403e9c22816680398f0d847b0b3d8adc7158ff144d96753eeaf9a08ca18edd4447a6c3d9a5e221e661 WHIRLPOOL 7eb86e63c4961edd45af9d50f9a3fa6ae100e061c3dadda1566cc760b9589964d0f8f90da766afb03ece22114b87d97d541ee68a4bd1662989e9b860ac45ae54
+EBUILD vlc-2.0.7.ebuild 11116 SHA256 6eef5ac5d6537bed5ed62f32bdd5e197ea3be3df77f364503abb022d6c093664 SHA512 5d0c8eba0f0309a6912d908f170c799a1b4d66f7f30d57a66ad24b7bb6b05aa0de45065a71a8d24c7f92b10082a3567547f358b6c1ccf56254f08415a727e215 WHIRLPOOL 73a481da20fd14f59ab18e7a47e43dd839074e2775df42913d1adfaf6cf617c04063f7bcffa0e074b5cf03bf5c6f360b6d9832ec37f1dc4f91d23375ae9c090c
 EBUILD vlc-2.0.8.ebuild 13217 SHA256 81f1acbce1742e508f9d442a8ce7003eb15aefa5baf2e8119bd81ce9decaf0aa SHA512 0281ac12804aa548f8eb76dbdda91ad53aedf6f74e28fc4f46179f5a277b10f6f99ac27dcd3fe4f866704d3dadaf03a316bd85494bac1e7488339f42a9b21da8 WHIRLPOOL f57e2694a397666fd11d04f34cccccf8198df700629b54bcd1d814968b06dc605ac289a1e8cc367e8a301aa72012ed9091af6fe9659be648af174b4c4218f759
 EBUILD vlc-2.0.8a.ebuild 13218 SHA256 b2ac2b8c28912287f656e728ae0a02a3f24d2588c43f205220b46642d5f19c63 SHA512 10239d1c16485eb6f38cfe6a42a6bbbf35ccf5a9eac2f60982f539659e1ae19dfc43d1bebeebc09e408e53bc387babe067bc146ed085b9c473d4dd9b986420eb WHIRLPOOL f04c391d8fbbb627b4a82f544442cceaa6e750ce41a3421cf7f2cc8e5cf57375a396b5859df9b264ccb1710641f35aa18ed2485f3da0f2d2f48aba8f2666b556
 EBUILD vlc-2.0.9.ebuild 13243 SHA256 9879a4e5661c3af0a2482774b82f50f27bd96fab27405c97562c0bb11458800d SHA512 77f5515aa3f6d488ba6e82a469ad08a5f0d2db14b4f92848aa4aaecf381ef93ac198cd14d57c1dd9115ebf7e8a3aac96546a310a2f6f7ff220fdf5957d573366 WHIRLPOOL 3cdb9d892d3cf79a8a2fbdd83cf2602a10467e02a253cdc69acd89d5b62bbed8af05bbedf1259f6867f9fbf66afecb74bb7ee82b246136814178e1876071cf62
@@ -33,17 +34,17 @@ EBUILD vlc-2.1.2.ebuild 14111 SHA256 bacaf3cd5b1182023386370d5fcc8c00484c8f25809
 EBUILD vlc-2.1.4.ebuild 14486 SHA256 c721e2a128eae51845d8c1d0da6445c1e2b0bb9af759fb1bbfa33c1dfc11d81d SHA512 246751eff0f68b45eb98e837c7820f2fdd30c916520abd8a7bf192a9ad88c9e1d9ab3c76d296909ca90a777c64e4a6380d61ff771ce0a07d596455bc7627d775 WHIRLPOOL e13d9462e210b465d106794901c6eb1575ef17efc5174f1e836c99e556673159e65cd0c906d43cfcfb72a0661fcc1150e5b623270a80c3f6632d5011c2c267bc
 EBUILD vlc-2.1.9999.ebuild 14502 SHA256 d8e0953c9d87a504ab568deb78c9b45c389ee8ece76254462cfe505dfb53fc33 SHA512 0d4e03ad3f20dde3a23d5ce5d0ac74aa22dec39ea01ea167d43f734bd22f1aea6d755446954154683818f06a4934189f1a6bea842ef6a26ab3b1cb25c0041dc8 WHIRLPOOL 9bd9cf0f3cc0937343ea2be90803cb77f7fbd058cc3e9f882b8d0c6f7d9b6169206cfd343fe9d727c330c8f1c6b4f5e0ce7a04004c50f6bc4c3e0d4a91480721
 EBUILD vlc-9999.ebuild 14866 SHA256 2ff7851453e92c6b814f1c0ea0983a81d3de029695231cbce504fb44b15de967 SHA512 1f344f50550039b51e0cd1dfe1e8173424106c33bbc4d2a442e12a7585c5d3e39e78587a1a415de8014d2f98d675db3ddb88a24c909defa78f14e15c9cc597d6 WHIRLPOOL a58a7cdd97be07f0829fdfba3e5f9687483ecf4dc6f5e87406554fc058d6319c34234c490050114a6c806bff724718d5cfe89668b1c27ba6baed9076ae1635f7
-MISC ChangeLog 26847 SHA256 6cc97b32b679b26196cb9407b618dd9391d8b70808d7a3226193edfec6e1ee4a SHA512 4e684f1ba6c06fc7618c15243f121e5578a800ff14b934384cc3f50360e40b3587d60ce5d0087c4ee8a3899e81c9d31f7023044c2c9e2ed6f1bec0100796fa60 WHIRLPOOL d99d95231f085016d60f666fc8566cede3b592ff352fcb1f52f849f9ad218377a12982b12cfe1f9e16d2f50636b6297714064e89fb78cc1b4d65ad8e0c36fda1
+MISC ChangeLog 27131 SHA256 aabe77fbb081160094c235c39bef8a4b48c460ad0f9c0d88fd5d2a953c640b2e SHA512 5ff0abf28d3d65ae5b80b17e3a7fe45f25c3f7447b94ea51d56fea670b0db2addb9c27fc032479a06b6830f6d11cf4591905d6b46e59a87d9872c0cd6dec88c5 WHIRLPOOL a787129bd19babc35b070508986de1890e5aaeb5ec94a0c79799bd956f690bc2d13bfd41787761b619db78ad3fd0347653c15580391adfcc250e01c0e549f803
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 7078 SHA256 06f15f0f664689d21c79529dcd73781bc7be5c087df60cb7512c634445ab62bd SHA512 0186ee55a67cc50a935a7fb39bcbc3119165f27c342bef97695262c6cebf05a792babd899a7933dc79e2255b01d26b9f737c1f55b2b329078edeac3ab4a57319 WHIRLPOOL 674a810ff112b97d341e2453d97d15f4e82bddbf83c61baa970e19ebdf45d3193bd7509f889fea72c309a64146c2879e1bedcb0f9d0b18a3c71fef3990b080c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTV8WBAAoJEJWyH81tNOV93goH/iWBSA/hv0ylGzybbB3uhJcA
-flRiCAGX/XrneULVv9VDapyLmwKoOnDBNHj4Ld+xDFgvxoq2FQEtajlwVE/gl4H0
-0vTp2TuwTqdaJCZ7/7jBkyfrYwhiCavVIxAfq6dvLsk5rajh0xfNeIK29lA0kpUG
-E0xIzysyyCtvz7fD104lU49Az1ay+0GtUUeIz2y3JkwxWCkL0mhparev5DF1mJwL
-LXMKDtpJ91obDuIqybuofDb/9/+Cu72QFkWfE4kPXBiA02nYOQTLDArQV3kVzGO8
-ZgEoLaHASGRasFjXXP+CMcbASUAQ7SrKKAe/Q8ZShXw1RzFdqQTGQS1wmT+WZ1c=
-=oxLr
+iQEcBAEBCAAGBQJTWa2jAAoJEJWyH81tNOV9wVEH/15h0dp4mFQIeKSSkOohQriI
+/netr4KtCTFhHoNF1p0Ln1U3IRY8zJvWXAHsY5Dinxcqlr1UWhIwOwsn76Ee1nKk
+wAp1nqEJ/bdRY+dA3olOT04ptIYi9qHKHkhpSz/OBaONUJVvkoVNTRRPj/FzorvZ
+skCZN7OYBsaZCAqS+5FnDjjHkfqQfeJ7t6qYybmUeKGBUAnK1N30qG8Wn6rgm8HC
+exRUZKZ6MsQJyRtuf0PAwDKc8cod/vU3kpca9dJ+kDNzOnq1ulIuGbeYF/7294Mg
+rzzeEFeDN/Cc+BdDEWqX+AKZ4J7vkNrkk4oinyn1fKh+ClU/MCaQhoD0+hxSozc=
+=KbYv
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/vlc-2.0.7-include-flac-1.3.x-support.patch b/media-video/vlc/files/vlc-2.0.7-include-flac-1.3.x-support.patch
new file mode 100644
index 000000000000..bbcd6df863fc
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.0.7-include-flac-1.3.x-support.patch
@@ -0,0 +1,38 @@
+From 607065b410b4768372c204ccdbbca200230fff25 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart@gmail.com>
+Date: Wed, 2 Jan 2013 22:44:33 +0100
+Subject: [PATCH] Fix build with unreleased FLAC 1.3.x
+
+The issue was initialy reported here:
+http://bugzilla.redhat.com/891123
+
+FLAC upstream has always expected to include <FLAC/ suffix
+for included headers as shown in examples/c/decode/file/main.c
+
+The FLAC suffix will not be be made available in the flac.pc
+for the next release:
+http://lists.xiph.org/pipermail/flac-dev/2012-April/003355.html
+
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+---
+ modules/codec/flac.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/codec/flac.c b/modules/codec/flac.c
+index 4cfbfa9..543e8bb 100644
+--- a/modules/codec/flac.c
++++ b/modules/codec/flac.c
+@@ -37,8 +37,8 @@
+ #include <vlc_plugin.h>
+ #include <vlc_codec.h>
+ 
+-#include <stream_decoder.h>
+-#include <stream_encoder.h>
++#include <FLAC/stream_decoder.h>
++#include <FLAC/stream_encoder.h>
+ 
+ #include <vlc_block_helper.h>
+ #include <vlc_bits.h>
+-- 
+1.7.6.6.GIT
+
diff --git a/media-video/vlc/vlc-2.0.5.ebuild b/media-video/vlc/vlc-2.0.5.ebuild
index a29a9de72f54..ada6d69646aa 100644
--- a/media-video/vlc/vlc-2.0.5.ebuild
+++ b/media-video/vlc/vlc-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.5.ebuild,v 1.13 2014/03/26 15:50:36 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.5.ebuild,v 1.14 2014/04/25 00:35:39 tomwij Exp $
 
 EAPI="5"
 
@@ -194,6 +194,8 @@ src_prepare() {
 	# Make it build with libtool 1.5
 	rm -f m4/lt* m4/libtool.m4
 
+	epatch "${FILESDIR}"/${PN}-2.0.7-include-flac-1.3.x-support.patch
+
 	eautoreconf
 }
 
diff --git a/media-video/vlc/vlc-2.0.7.ebuild b/media-video/vlc/vlc-2.0.7.ebuild
index dd9bedac3125..31e5cf08117d 100644
--- a/media-video/vlc/vlc-2.0.7.ebuild
+++ b/media-video/vlc/vlc-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.7.ebuild,v 1.12 2014/03/26 15:50:35 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.7.ebuild,v 1.13 2014/04/25 00:35:39 tomwij Exp $
 
 EAPI="5"
 
@@ -194,7 +194,8 @@ src_prepare() {
 	# Make it build with libtool 1.5
 	rm -f m4/lt* m4/libtool.m4
 
-	epatch "${WORKDIR}/patches/010_all_freetype-font.patch"
+	epatch "${WORKDIR}"/patches/010_all_freetype-font.patch
+	epatch "${FILESDIR}"/${P}-include-flac-1.3.x-support.patch
 
 	eautoreconf
 }