Build with latest libav/ffmpeg. Resolves bug#457852.

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 76 insertions, 7 deletions

diff --git a/media-video/bombono-dvd/ChangeLog b/media-video/bombono-dvd/ChangeLog
index 774413690741..95e2f06583b7 100644
--- a/media-video/bombono-dvd/ChangeLog
+++ b/media-video/bombono-dvd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/bombono-dvd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.34 2012/12/09 19:13:23 pinkbyte Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.35 2013/06/17 07:43:33 scarabeus Exp $
+
+  17 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/bombono-dvd-1.2.1-libav9.patch, bombono-dvd-1.2.1-r1.ebuild:
+  Build with latest libav/ffmpeg. Resolves bug#457852.
 
 *bombono-dvd-1.2.1-r1 (09 Dec 2012)
 
@@ -180,4 +184,3 @@
   +bombono-dvd-0.5.2.ebuild, +files/bombono-dvd-0.5.2-twolame.patch,
   +metadata.xml:
   New application, see bug 291478. Thanks to Ilya Muravjov.
-
diff --git a/media-video/bombono-dvd/Manifest b/media-video/bombono-dvd/Manifest
index d6104c7eac0a..8bffb4bd749c 100644
--- a/media-video/bombono-dvd/Manifest
+++ b/media-video/bombono-dvd/Manifest
@@ -1,9 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX bombono-dvd-1.0.1-cflags.patch 404 SHA256 444670fc33219364ff6fa360f35d34ac4db9e5df89fca62b616f369fdf1b7a85 SHA512 a70787c4495279e847c2d277e5b90bf53478cd85b7a31c5065038262c2fb853366dbf13aa38b6b756f01e87bd5466962186ddde202f2df1abd251b17eec3ae1e WHIRLPOOL c938f43624ac09c87f40662e18830f8108cdddabeea8c598361d92fbc520a4d5480e039ef8b9e5343c2887a7af16fb6d89150e4706e452b4bd0a4d280f04d4d1
 AUX bombono-dvd-1.2.0-cdrtools.patch 864 SHA256 48bc239848cfff2adff21a11f11d7690bc11a1fb6a4b1bdbef6fa2c2948c135b SHA512 30bbc8860860c5d0d9d25edab1b70917ba615851cea54eff405598d8ebad9aade1ecc9701883b70fac738b8d4ce7465e39c08768efc203bc192234fadc624e28 WHIRLPOOL 89b276ac1d2b0998d7ab2da9836d1253bbe04f4be7ea1c579a2b3c99ca9f7d37fd5a129293729ddc5c75c2fa7f49c19758e2e570d00ddb0a8974bf5e3b729747
 AUX bombono-dvd-1.2.1-glib.patch 375 SHA256 bff2c5f84dc4aae2fc4bcbda393d752de794a8a956848c560e4d2f471113e359 SHA512 ac6a71cd699979e665c209885c8586f260cd2ae973188a7a541235c264996a93f0636a74ed230d6dffd0de60dfbb87757738521552bc6aa5d7ffe859685179f9 WHIRLPOOL c9799826d6483200af120279f536dde8a1ede1677029166e8d3e3ad500fc6f74935873ef626a2c19b4a6bbc35f02a615355bb93aa9fbbbd374ede41a3006abde
+AUX bombono-dvd-1.2.1-libav9.patch 1338 SHA256 3c702126af49a3ac58131d7aef39738890afb833b0e6d156d19cee411db56935 SHA512 f4bded7a4ea89591dadf10529a1cd6f6a63a87b1511e06018bb7210243660deb1ebf66b6754fb6a66384e607310704ea545b082fd40b9b296bbe29f15d4f9255 WHIRLPOOL 4430d5eb062dc97d82d30a5eb647559a62ed2b5ed6387366f0ff69b272312e4592960ea2a4a636b698b240fbfb5952ed8e7e255f9e24afd07d2ae775ae64e07a
 AUX bombono-dvd-boost-1.51.0-fix.patch 23903 SHA256 f96827cbf9ef0aa50c522dee4db863bdfe44994a5d3811f5a52a195ddafa2622 SHA512 dd3b2054fe2c40bf33f3835d4b1a9eec9722e10bbcac4951a77365b83fccf1ada051a10aee1692ccce9076dcf7bac247d0f6d159ec3e24c5fe2875233ac8c2d7 WHIRLPOOL efb0c80880fa3d5b755a6b6744e7b0454855c32a48a09ee032d64009a809f3323e28b9959a448d1e6bf8937365a647b2867a9e85191e4e67c598eedb1de1ec18
 DIST bombono-dvd-1.2.1.tar.bz2 4111237 SHA256 89817ce134b5ee2879285dfb30e9f8b0603b2282989ecb91793e7b928d64152f SHA512 09dcb91b16074f21606af052e3e22a842050d06a93ba41dbe9474ccacb1dad4e5903dffb1f7818fcf864df9b234fb50087d39f19dbdc2eb14268847059c30765 WHIRLPOOL 36376b1375a7cb8f8cb96c8f5adf3589b4ada0ed3f8707394da6ffdbc98b3853eb620a43636322b3e64ecbeab1c11fceebc076df83df93ee59b41f117ba2f0fc
-EBUILD bombono-dvd-1.2.1-r1.ebuild 1657 SHA256 f3672b9f5b022a8636fa9f4029ac8b7fdab7e5c8c4d918c690c6fe81da3ec01f SHA512 a5b0e3cb88a8d20a0fdb296621bf4462d39f073606dea861bcabcc8d9d1b4538c062ec02c4a1ac480fcbd35aeb7739658cb1606416e3a38284b9cb11e196a529 WHIRLPOOL c4c788d8eaf1fd0f9925624b06bab3ef2e09054d0ec71880186ce1e8753f2c385076a3c1e1b031d237d974572f33ba1543026c2a94e6049e1c2f4abf002b81b9
+EBUILD bombono-dvd-1.2.1-r1.ebuild 1698 SHA256 5d602c023a7423b96f2b03b075ce8bc3113722e1e316c887939cce9ce384f2a5 SHA512 4398047a2876d1d2719cd381a82eb14c8d354338094309090a15bba739cfc646ae97e11aa9b92ceb34e4b84e46a2c8c04a467d9fc8664df25f43abc5f9c024a9 WHIRLPOOL 505859ba01bc165cdcd61e2b6c3fb1a7c7b516389aca8d4a2c6aab3531d6eb061aa4d259b4eb9f36e805eed7a40c077132dc47f37c6d4abb2a89f79d32d6337c
 EBUILD bombono-dvd-1.2.1.ebuild 1606 SHA256 0271cc2f122bea4a80f5963c3323b9629cb9837b47cb26511878d7f381d96ed0 SHA512 14d1c4e6d88fe0a17dc75e7add227440428f7e1f115d9f7a423eca20ef1734f31c9f09bea7492724406bee2c2d0884b78a7a3aa59ab866fdc06c04d9fa6a8b5f WHIRLPOOL beb2a9671f12512647394bd3a31701b8d643c1c58ffe59f915c2f9b433e1d9152856e00cbc3bfeb1c814672d01c317e0e8a36ed0ef6cd8bfec33d0fbddf444e6
-MISC ChangeLog 6364 SHA256 b7228b42a21dd354ae05a71cd67cb2c5c238bb699f0ccdaee983c1e0b6e70e05 SHA512 8ca72cc19c92ae7a0fd875d84ed2d3f1c425685e1dbac086833a5d0fd9bb9693fa372fd15ff86971eb9811a51b1e5d2320eadc606e1cb3aa681acbd11bcd68a2 WHIRLPOOL 0ae68dd8c7332aba0bafa0e3496951707f34862985431b176b6819ab5007ff5afd0efbd3ed5fe3c739870383c182789269652031e7074ecba9e1cf04b6f52252
+MISC ChangeLog 6545 SHA256 84543ec8a2560125a959cb302592992b5adf1ab85692dddb0247510433fd35cc SHA512 dc77e8cc2e30b61d8da99715a897b885b9a13359292d932b46f8bf76ce16d0228dc67190b6e2085749592e246a9fa0581172dbfbe21167b6cf97220a9aac442a WHIRLPOOL aee47e772a1f243014f71a615943fdcf7bd9b9aa40a27b6cc42f63aaa21082f0f1ad2f1230b1161a0355311612b3650fcb125bc0f113a6ea43a673bce34a27ee
 MISC metadata.xml 290 SHA256 3bb63ae5b1fbcfa2f62fb73656f85027b0703d398b3fe2e0a19c1b0c58e4452f SHA512 b9281587b7b73585274a406a01b3e2b185e5293ef50eb7968683c64ad85abd8357a420d1bad3f250975ee59e5dd3fa68c7978f9b4c63987a4c40c92506a90816 WHIRLPOOL 0e8df82744267b36619e322c546c35f3b1b234b20d3c14444198e411880aee2b929d45b02c0b1063408717cce1454a48738c8c2ec1c89b118f05f610e1357e56
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRvr4pAAoJEOSiRoyO7jvoOwYP/2K8zJ51139NhkR3z4/c43Nf
+3ac6Q8OPgZMQwwXuK950QeJINSFpDIj7OILpx23G+Kto1eP2AbwHUe1G9SeBNJC0
+sWbg3vkELqaS2apl442N4jxLAyqRFC9HfsKEqQEHT6OVJXBcDeeBwsKSyaomzQAZ
+u+HzXnh0NmBAYop3dNXu3T9JkT/KKDhvjvcUwqokBoY/UolLwkNE1EHOL9dEtVdm
+TftH7cGC66NH+y4j50jFo0n6Joz9Zt5B7faNIazsgLUJ0Q327OzLQ0w+8e1bcCnu
+akNtNKBra1eQLPEPJA/fpSlHDeQlszrFhDiQ6QxZxjzqHKypNX1Fy0431x1A5OFs
+byLohwYVQTpVTUXnSCsYD4NdBqpNG0zz0cQwoqDs3MkO/zjIsBeAO4NzREktjKob
+h4P465sPc3lNGdR+eTl3Bjvge8aU8k8f2PC1PV4se3Yq9BSlllgxxEr8Pu6rfLXZ
+JL94j8fE4P7tLJaTYetRWMejsRazyzXMX0hkBpmfNopA2x+8qbJrimTWX41bLv2f
+ZT6EkLwlh2A3W3tZUyS4ndynnWrO9kbME9ITkOkwSCfFp/vCRgjYoAtfpL4dKa3w
+Qzk/gVizgpI+YLEnARKr2pDMWNjQFucSwzbHpdrlsVU8MKsWQyccNAiA15ycrfkZ
+DArhZ6yaxy7XE8bMdREU
+=xvTl
+-----END PGP SIGNATURE-----
diff --git a/media-video/bombono-dvd/bombono-dvd-1.2.1-r1.ebuild b/media-video/bombono-dvd/bombono-dvd-1.2.1-r1.ebuild
index 3b66359fe2ea..ad42f7b4c859 100644
--- a/media-video/bombono-dvd/bombono-dvd-1.2.1-r1.ebuild
+++ b/media-video/bombono-dvd/bombono-dvd-1.2.1-r1.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/bombono-dvd/bombono-dvd-1.2.1-r1.ebuild,v 1.1 2012/12/09 19:13:23 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/bombono-dvd-1.2.1-r1.ebuild,v 1.2 2013/06/17 07:43:33 scarabeus Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="0.96.1"
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.2.0-cdrtools.patch"
 	"${FILESDIR}/${PN}-1.2.1-glib.patch"
 	"${FILESDIR}/${PN}-boost-1.51.0-fix.patch"
+	"${FILESDIR}/${PN}-1.2.1-libav9.patch"
 )
 
 src_configure() {
diff --git a/media-video/bombono-dvd/files/bombono-dvd-1.2.1-libav9.patch b/media-video/bombono-dvd/files/bombono-dvd-1.2.1-libav9.patch
new file mode 100644
index 000000000000..2c8f4a3c48ed
--- /dev/null
+++ b/media-video/bombono-dvd/files/bombono-dvd-1.2.1-libav9.patch
@@ -0,0 +1,44 @@
+--- src/mgui/ffviewer.cpp.ORIG	2012-02-08 13:19:21.000000000 +0100
++++ src/mgui/ffviewer.cpp	2013-02-24 18:11:07.565711375 +0100
+@@ -36,7 +36,13 @@
+ #define AVFORMAT_54
+ #endif
+ 
+-#ifdef AVFORMAT_54
++// разрабы libav считают себя самыми умными и потому решили
++// закрыть простым смертным доступ к ffurl_register_protocol() 
++// (бывшая av_register_protocol2()),- https://bugzilla.libav.org/show_bug.cgi?id=224
++// 
++// Поэтому: пользователи Linux остаются без предпросмотра содержимого DVD,
++// пользователи же Windows не страдают из-за подобного политгемора
++#if defined(AVFORMAT_54) && defined(_WIN32)
+ C_LINKAGE_BEGIN
+ #include <libavformat/url.h> // ffurl_register_protocol()
+ C_LINKAGE_END
+@@ -1125,6 +1131,8 @@
+ 
+ namespace DVD {
+ 
++#if !defined(AVFORMAT_54) || defined(_WIN32)
++
+ struct VobCtx
+ {
+    int64_t  curPos;
+@@ -1266,6 +1274,17 @@
+     BmdDVD = 0;
+     return res;
+ }
++    
++#else    
++    
++bool OpenVob(FFViewer&, VobPtr, dvd_reader_t*, std::string& err_str)
++{
++    err_str = "Libav: no soup for Linux users^W^W^W^W^W see https://bugzilla.libav.org/show_bug.cgi?id=224";
++    return false;
++}
++    
++#endif
++    
+ 
+ } // namespace DVD
+