Add patch to fix build failure without flac as per bug #270054.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 28 insertions, 7 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index dc92687a652c..f0c422611f4a 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.105 2009/05/15 07:32:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.106 2009/05/17 00:37:07 flameeyes Exp $
+
+  17 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  mkvtoolnix-2.8.0.ebuild, +files/mkvtoolnix-2.8.0-noflac.patch:
+  Add patch to fix build failure without flac as per bug #270054.
 
 *mkvtoolnix-2.8.0 (15 May 2009)
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 5b78d2d29b0e..1b549dad6c22 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX mkvtoolnix-2.8.0-noflac.patch 332 RMD160 0a8f82b6cb5f86e656d15a0fc4b24a59c3af4bb5 SHA1 5e3f20112dc0e7b7f4f7204434c97f76acd47768 SHA256 a442ce04487df511139a5ed2da40424d219c2b25b04515b980c1298c366a08be
 DIST mkvtoolnix-2.4.0.tar.bz2 801465 RMD160 3101e05f763a00807da593ac6ea6441f010ad97c SHA1 1220475a7e9753aee8f17fb0dcc121fed6b98284 SHA256 80434538df5d46d71c873974707172c7d19e06ef4ceff9ff1cb70117ccd19185
 DIST mkvtoolnix-2.7.0.tar.bz2 958241 RMD160 b068108ef81fd6d0ea9143a9c460dff281dd2ef1 SHA1 d444986d68f1bc243cc6443b3e37f8c0d6d3a670 SHA256 cdd30b628734a6a1ec658451091788765a19748f1a8686465e2e9b787549b967
 DIST mkvtoolnix-2.8.0.tar.bz2 978005 RMD160 c67b0569fbb19d48572c790adf6cc724590a15b1 SHA1 434ba486f5de2103ad7bb8bed8f71f7c146eb16f SHA256 23291168cca4fa8f7b70948d76c336f993c029a8692c0a02fd39460ac4517809
 EBUILD mkvtoolnix-2.4.0.ebuild 1664 RMD160 f0639e1bb1ca5ec57fffa7eafaef05265dc26a7a SHA1 48d8a2a3bb498590f802eff933aee63eddef28a8 SHA256 c71fb2436a566485e72685f7b80e6d40d5ce1c4859a46143a6b8eae0d2c66a8f
 EBUILD mkvtoolnix-2.7.0.ebuild 1720 RMD160 64f39a8776ef71d069d23aa758c470728a51781e SHA1 726a405f0705e60ea3238ec5ffe9b7a13b6b730b SHA256 2bec02ebc0edab313ca0fead4f547d5218986a7be19b87c9a2b7159de9072c37
-EBUILD mkvtoolnix-2.8.0.ebuild 1721 RMD160 0d006c332451ec895bcf912eb8c10f3a706e371a SHA1 b4c6d19bbc5094bcef4d0dbb8cdd60ddad7598b1 SHA256 049cbb85459126e428f273addb84159345b1cb31325535986c7b21022de8c9b9
-MISC ChangeLog 15728 RMD160 014c5dc7dd7491ad4a1b8e008b0a9bdd3b97768f SHA1 b02b4ac7a374cee9908e32f5b804edf4a1f2a26e SHA256 51256b8c9bca245b99b08709a8e93b2acbc4b360aa44c9e45ef4a767f4243fc0
+EBUILD mkvtoolnix-2.8.0.ebuild 1764 RMD160 b6c813f80585cfbb59c1b9f8d0cf6f2b25ba239e SHA1 8c041b33762bff45a429a2609edbaa34b338958d SHA256 5f304b3f9ab3795c4484a0921b12a9ef8a76017e581fe65da94140560f19f374
+MISC ChangeLog 15917 RMD160 1adceee479c9d38189ffda13d62749adf6ba4535 SHA1 ee6455e4d51a2501f54c5fa0f5e22015b02e3694 SHA256 baf2ee0b4719bc7fd8811100c8fb660e63b7c364bc164dffbfc4b89cc44a93a4
 MISC metadata.xml 253 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 SHA1 f8d7127515244fba82de7daad73ef24ed65f36ef SHA256 9f4dc1b64d959e6192e5f464ee00ea68518f541193c39fe683f93f2eae4268cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoNGpcACgkQvFcC4BYPU0oDYgCdE6A6k9SzmIUSiircqIlTNJJq
-PFEAoJw0QgeSCNPHVU9Anbz68W1KYS/j
-=DqSZ
+iEYEARECAAYFAkoPXDkACgkQAiZjviIA2Xge3wCgvrALfMVlHq8bu1TIHzX0sE2s
+FsIAoLaqljrhT9V4LXqkwuOnp5a5/+OE
+=XXga
 -----END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-2.8.0-noflac.patch b/media-video/mkvtoolnix/files/mkvtoolnix-2.8.0-noflac.patch
new file mode 100644
index 000000000000..61a6ecab015f
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-2.8.0-noflac.patch
@@ -0,0 +1,13 @@
+Index: mkvtoolnix-2.8.0/src/input/r_flac.h
+===================================================================
+--- mkvtoolnix-2.8.0.orig/src/input/r_flac.h
++++ mkvtoolnix-2.8.0/src/input/r_flac.h
+@@ -18,6 +18,8 @@
+ 
+ #include "common/mm_io.h"
+ 
++#include "merge/pr_generic.h"
++
+ #if defined(HAVE_FLAC_FORMAT_H)
+ #include <vector>
+ 
diff --git a/media-video/mkvtoolnix/mkvtoolnix-2.8.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-2.8.0.ebuild
index 5793d4cf8345..30f4c577bf31 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-2.8.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-2.8.0.ebuild,v 1.1 2009/05/15 07:32:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-2.8.0.ebuild,v 1.2 2009/05/17 00:37:07 flameeyes Exp $
 
 EAPI="1"
 inherit eutils wxwidgets flag-o-matic qt4 autotools
@@ -38,6 +38,9 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-noflac.patch"
+
 	eautoreconf
 }