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

(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

3 files changed, 53 insertions, 5 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/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
+