fix broken #if directive causing build failure with latest ffmpeg, bug #456170

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 36 insertions, 6 deletions

diff --git a/media-video/2mandvd/2mandvd-1.8.4.ebuild b/media-video/2mandvd/2mandvd-1.8.4.ebuild
index a501df6a0786..f6f2187b6f0d 100644
--- a/media-video/2mandvd/2mandvd-1.8.4.ebuild
+++ b/media-video/2mandvd/2mandvd-1.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.8.4.ebuild,v 1.3 2012/11/20 20:48:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.8.4.ebuild,v 1.4 2013/02/08 13:08:43 aballier Exp $
 
 EAPI=4
 LANGS="cs de en it ru"
@@ -43,6 +43,7 @@ S=${WORKDIR}/${MY_PN}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.7.3-libav.patch"
+	"${FILESDIR}/${PN}-1.8.4-libavformat54.patch"
 )
 
 src_prepare() {
diff --git a/media-video/2mandvd/ChangeLog b/media-video/2mandvd/ChangeLog
index 193077abd260..df7ec8263821 100644
--- a/media-video/2mandvd/ChangeLog
+++ b/media-video/2mandvd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/2mandvd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.28 2012/11/20 20:48:41 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.29 2013/02/08 13:08:43 aballier Exp $
+
+  08 Feb 2013; Alexis Ballier <aballier@gentoo.org> 2mandvd-1.8.4.ebuild,
+  +files/2mandvd-1.8.4-libavformat54.patch:
+  fix broken #if directive causing build failure with latest ffmpeg, bug
+  #456170
 
   20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> 2mandvd-1.8.4.ebuild:
   Stable for x86, wrt bug #442166
diff --git a/media-video/2mandvd/Manifest b/media-video/2mandvd/Manifest
index 8c99465620d6..8799b0c7f358 100644
--- a/media-video/2mandvd/Manifest
+++ b/media-video/2mandvd/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2mandvd-1.7.3-libav.patch 269 SHA256 5c60fc260aca4a7c32e9a54646b8fae88eabbdc9a9fb8f867f2f81de62abefe5 SHA512 fc6d557ee3bf81f388f3f76b57a76364d1c68105d89391eaad74f2a429e1847d97a937c627ca28085dd3e9c12d9b882e0ffa68ffe9ba7b917faa9e952a8de0c5 WHIRLPOOL 8d95a4b78043d9026a06b8c292dcdc17f55569780b270de3ea0ec0d9b6181b8480b9d89bc0968d6d7bc6627e3581a96383848e784de52fb896e5cc911bc43d55
+AUX 2mandvd-1.8.4-libavformat54.patch 514 SHA256 96b15adc6b7941e4509b9bd01e3c52d7a516c5b084590bf1ce5ada1d0d04f62b SHA512 5cbf80f7db82143c8f9d676c245ef16a03ac9a3f962aacaed51130b3bb2bd228a894a9522cc1b223fadf75ee16358c373e17db8d6ffec4504a68f4e0a8c459f8 WHIRLPOOL aa1160ed28404335214911c3ca0789706219024cea766daa0192ed2f354e1c459cd1e12692080ca945d0e54793a90b65c0bba443874c7948333237cea7f76f6e
 AUX 2mandvd-fix-const-char-concatenation.patch 671 SHA256 4799eb928497642b5440224667af2eb52fd31505d48e075dd7deb234d7ee69f0 SHA512 e93c2eb39589c1b428a9da049440507e31b9fdfecb79e2ee7c5b87c7bd40cb3f8fe53d875e5cf6efc3a4091eabc972919b2b251d2f41043bd56e0554fc2c35f1 WHIRLPOOL 376708c77e5b5f2e1fb58a874a9d40850a8d1f455a1ffc761a06ea8790c5d75b9b4da8315f7787a97a311e5a7164f21c67f45722cd1ddd15ecff705d55cc92d3
 DIST 2ManDVD-1.8.4.tar.gz 29523342 SHA256 b74e8a62b4e396c4cbb1db2864d77c87ea45f74bb599f4f270608d9e7f91888c SHA512 2bef9b5cdda2949507855193607cf953d4127bd1fb913c7710e1d3e7753bc6ba64bf04f5b1158a500c84d798c513dd4106a1ec7b54ae5054801a1215ade7ed09 WHIRLPOOL 4af1bd075a0d21d64afb955963da90d32ba5682209a125d55b5de32690c545081be6c46cd81e33da79724790511f83c62e9a2d85a8d83de45b17cd642800554d
 DIST 2mandvd-1.8.1.tar.gz 29615342 SHA256 cd1252afe1733d1aa2517947a6199369d6b946e50c75e1f9fd3445c1ff717d7a
 EBUILD 2mandvd-1.8.1.ebuild 2393 SHA256 3f0d32cbe0f65d133286b8d5cd0821d6f0e1f7e035d03a5f326750dcb4c93455 SHA512 815e3ea6b1ce154a40b8f84d32d1175a35647bd6c6ef7af63de2a22d8a45eb8dbfe1cee867003935f4a98038ca6fdea4e16f58ba1879dce6b90f98e7d39f1d50 WHIRLPOOL 501b1d1f25c4dacc0360eb43dc912724036012c994239dd0f61185974082f611eee2d75da9d8fdfec011b52b41f965d6daa6341ed7e045d071caad1ed9d2d3d3
-EBUILD 2mandvd-1.8.4.ebuild 1427 SHA256 efc5744319cdfcc3d96c8fc3ca5492c0d369a23f9f78922a8bf6dd656db443ff SHA512 688e2523acd83369696c7c4eb7252635009cfb67d8ffd4ee640e12a6253cbeebeebedbc097434f17cb4a7ab1285ff6db6b24865cbb29fc435f2348472298e34f WHIRLPOOL 6e1bb01f5a13e0ab0b4feb89ff7d7a292f0b6758464afa28cb67201a5ab022afc55276b1c50358d99933e2bead10f292951ea6fae1eea60dc40cb657de955f58
-MISC ChangeLog 4484 SHA256 41619b022931fb2e5c5b4f46681af1a1fc6892eacfaa85f3ebc71dca46726a02 SHA512 7ee732e7fdf4ece98047d3a0df8c1d6c72a6ab1a5380fdac380d82c9d8fd308e2d99016b012ffe7725af66b20b92f0c5be13acc2831c28c4667ce4dc9c084c3e WHIRLPOOL 004a62ab6ec99e676ed627c6a24c316fea85462fe202612732d50ad6932cd7be7523f89cd79b95cd37ac90410c633fe9ebde5653426a1039a75fe1fcf64ac51b
+EBUILD 2mandvd-1.8.4.ebuild 1479 SHA256 a969d52fc9c69c93e0f879b04d43409c9dc7efff37940e172e8d64c6c72e6028 SHA512 e2f75f8a10e8d7a2c19ae79bca791d4e22d3884a16c605494e8cff461f57a566105ac76b60c2f60174405f67efd378b1150ee4567bbcbfe8c598af586b78aedb WHIRLPOOL 5ca3bc2bfdba60ffde49cb3872ae21c9bd89bd2be117ba7e3976019f3d840f7faa965a5fda54164086069a6edec831905e2fbb4d28dc5b9131a414a54dba76cc
+MISC ChangeLog 4691 SHA256 b184129eecbc72fffb6a3e623a7d2667196824415f22503ae1c662704b4f214c SHA512 235870bf0b81ba14a37300b29a72cf3bff95c68a845f7387e533f9269f2a7954698251e49422e554121334a7265fcb4f523dc28def38d43adc7d8967ec1946f6 WHIRLPOOL 839d58559e6c948ee05c9f98a663e54ba9639967a081d83a19157bbf4356ce78c875be34cb582fbd7cd2ae08505ebd102507e50c857aa264997c91ce210c0881
 MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEU+NwACgkQvFcC4BYPU0o75ACfdimiBR7JNr6s3MQ2tYuIX5Ls
+n00AnjvZBml/fhzmUxwwP1UBfeUd3b1Y
+=+wN1
+-----END PGP SIGNATURE-----
diff --git a/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch b/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch
new file mode 100644
index 000000000000..73b8a5335fb4
--- /dev/null
+++ b/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch
@@ -0,0 +1,13 @@
+Index: 2ManDVD/videowrapper.cpp
+===================================================================
+--- 2ManDVD.orig/videowrapper.cpp
++++ 2ManDVD/videowrapper.cpp
+@@ -38,7 +38,7 @@ void videowrapper::delete_videowrapper()
+ int videowrapper::load_video(QString filename)
+ {
+     // *** OUVERTURE DU FICHIER VIDEO ***
+-    #ifdef avformat_open_input
++    #if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,5,0)
+         if (avformat_open_input(&pFormatCtx,filename.toAscii().data(),NULL,NULL)!=0)
+         {
+     #else