Add test and new libav support requested by Nikoli, bug 393331; add pkgconfig dependency, bug 393205

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

4 files changed, 180 insertions, 15 deletions

diff --git a/media-video/bombono-dvd/ChangeLog b/media-video/bombono-dvd/ChangeLog
index 8a50a46a2a8b..8bcb87c7023d 100644
--- a/media-video/bombono-dvd/ChangeLog
+++ b/media-video/bombono-dvd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/bombono-dvd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.20 2011/12/06 20:40:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.21 2011/12/06 22:34:58 dilfridge Exp $
+
+*bombono-dvd-1.2.0-r2 (06 Dec 2011)
+
+  06 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +bombono-dvd-1.2.0-r2.ebuild, +files/bombono-dvd-1.2.0-libav.patch:
+  Add test and new libav support requested by Nikoli, bug 393331; add pkgconfig
+  dependency, bug 393205
 
 *bombono-dvd-1.2.0-r1 (06 Dec 2011)
 
diff --git a/media-video/bombono-dvd/Manifest b/media-video/bombono-dvd/Manifest
index f1832a374d1a..d7b3d49c6843 100644
--- a/media-video/bombono-dvd/Manifest
+++ b/media-video/bombono-dvd/Manifest
@@ -3,28 +3,30 @@ Hash: SHA512
 
 AUX bombono-dvd-1.0.1-cflags.patch 404 RMD160 b4b5e7fa62cb38e259c308e74f2d987012415436 SHA1 221de9705bc55ba8f7c302e5aff7445c98b2eb37 SHA256 444670fc33219364ff6fa360f35d34ac4db9e5df89fca62b616f369fdf1b7a85
 AUX bombono-dvd-1.2.0-cdrtools.patch 864 RMD160 d91b366245161a3f632f02e4ffceb74251185dfb SHA1 37e75f082e0d48b4fe5f1f883819e8bf12df7f65 SHA256 48bc239848cfff2adff21a11f11d7690bc11a1fb6a4b1bdbef6fa2c2948c135b
+AUX bombono-dvd-1.2.0-libav.patch 2581 RMD160 84c7ed5626c8e543e181598291d20a8e9fbef3a4 SHA1 f1323ccd48ab2f432e2e46e075d5b994fd7ea9d9 SHA256 0448a67d6071a3e643dafdefc9fa259292ced25b0f1d67f9e2bc6a3f2cd5ec41
 DIST bombono-dvd-1.0.0.tar.bz2 2513011 RMD160 74e36c8f6648de2a3576ab08d4d8802ca615d206 SHA1 6023ac09d92468578b83877c2e2290f51a4c3e79 SHA256 20d09039e6ded6be573a6def0ff27de51d0f31febd0451e41f8ae88d8da324d0
 DIST bombono-dvd-1.0.2.tar.bz2 2515568 RMD160 51b315ffeb106c844c916aaf9b6d4eab2436e8eb SHA1 b3a88775a0ca20c581a4e250f8d83efbc167cd49 SHA256 352fb23686e04c335392037d849cd6e7fe15690efdd96f12a06003175dd23c14
 DIST bombono-dvd-1.2.0.tar.bz2 4104588 RMD160 124616d5e2840b15569bce6f44ec5e4cd0519f09 SHA1 bb0c1d09124a3208c6f87c6db2d1e863385de08a SHA256 0bc6fbab5c1786754d6346eacb34bc11e430e1d6e42008cb1a4bb883601b2cc1
 EBUILD bombono-dvd-1.0.0.ebuild 1380 RMD160 c9a493be60349cea15c8e26526b85ff3109f7257 SHA1 91ed80ca0920e33ccf6fd1191528f770ea825c28 SHA256 0f91aa9c852b1b019ee3cc4d1e019935def55daaf651d48735fec2118fd23298
 EBUILD bombono-dvd-1.0.2.ebuild 1253 RMD160 e37d157b806840584d802965d815414edd03e003 SHA1 0949588189d3c954219eb1b84c19d26a955b7a3d SHA256 7b3c23a4e3bcb91ac0d11cef112c043207a2c548901e5d16964cde7e9580facd
 EBUILD bombono-dvd-1.2.0-r1.ebuild 1394 RMD160 4b7ca9d4e927b743fc24a338c72b854a6109dd13 SHA1 f4a2c10de962cdb2dad718ae2456d636425bff06 SHA256 ddd412c86a7efde84a23e4b90bce905df415d0b9e4949cb61f3103f1e53895a3
-MISC ChangeLog 4176 RMD160 c65b77e8443e1703d7119b1be645043381016118 SHA1 23035d67296d3c8462c937cb497a654230ba2afc SHA256 222ad84c618038d56a139f624690edcb8b46d0e869ae009c072a4c0f5f197ef8
+EBUILD bombono-dvd-1.2.0-r2.ebuild 1590 RMD160 9019bdecfb021d0adfc19c806354555f0570e566 SHA1 866e857d75e8e340f934b4269dc39c1f97627a9b SHA256 dd2ef95ebbfc6eaf1716088cb8e6b7f968d69ab59cc58dee2a3b324c811363d6
+MISC ChangeLog 4446 RMD160 94e96bedfc040d79133942e98e0f09935126f4af SHA1 5393669e0c088ebcb5b5fa652b32a70212f80178 SHA256 107820ea8ae63dade02a576a42c1c648b11634c513d958f5aa30127a17940fe5
 MISC metadata.xml 316 RMD160 8b9ec18f9c8b7482ced9ffc80691954a51b207fd SHA1 04076bb20e7d6961cf2b9cdba049670f4feb62d0 SHA256 75918b600bc480f95cefc2a22804bf65e9ed2e114ee3c20df99ec18e689fa5ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO3n3HAAoJENwGBM22xffemMYQAJaKfURknu5kwn+r2mWkE20u
-qu8uROc83qD9HBjLHlLwsTVI/OPmd1kqQqip543aoVn3JkzGCqlyYXiaHxsLmHLZ
-b3Yc+y10p6Hha28DpS/I4oZqH9FUOFISX6NKYEOTQVEXYRqSMh4Vqvg+YRIbdMdY
-+hO0Fol4aedW1S1XafrkfuIK6C4CgC3ACp3/SvVsXGbZHZzLqYcOzeZ12Qp1+k+q
-CrvRCgNmKMtPfZaI6k40XNeF71liCedvfRXbDSjayKDOjodkQ66FUGKlea4qN4Rx
-0EheDIBi7qYrT3iyxYATkmuWmAQLfpCvHDzc1Q+A6wNpPSaUDtt7bGf+HIAXMLRM
-834SNKTCTKs1tseVtPqIVrFuKbkjGFuuCEIZGlYbn7JSkc3k06Q/yZtwvi3tPXeg
-Q0euTdEswPy5qt+60jVO4fa8iIAGwypcftu9eELWoj0QyBnlLaUZuufT1CrYq1aD
-N7tuUjoVSN6j00Fh4LTKzcmPgz8IZdnDmuacYzKKC/mig4pcISUcP/FPIkNuehXA
-Gp0AAD0x+TRB4j3cqUd6WaODvvhPP/fDNEtfQW5MPWvQLzzCWB3undhmDbVQXiVV
-3JH0fSIHP5UfGQyHiihkt49nPslYf3DTgXUpiwyG5kxx9w3mM1USs0d5La6Ag0yI
-X4hY4zQ6DRelfIQhoIDr
-=sHvg
+iQIcBAEBCgAGBQJO3pieAAoJENwGBM22xffeCPIP/3ohxS/Q4OndjFjkO/bTlgSe
+IPVrwWc35mGJlOHVjZWnPQufWIl+XQcWrW4ZubIndQhKm3mgWsYQV6oHEimchPnX
+IRJiL7AyrFKz7uqpeMleY2TP/cM8Fw3G9r3W6xdCQMkWywvdmDGRIOIMiu7PgEyW
+KEV6nAYLNyT8N7cIFB35xIVVfjPN6TMxx/OPlb/MxinRLXUf/M565GbJAlFklMh3
+B8SBmWO7hQJsbrk83ksyTjg1DXHLu0tk3hdByQuebVWCIwM4hHpWckOt1HEJ9vnN
+KTj/IW/3DG4pFEEwxs19AZPEHV59CmsEkUAc165tieLEBkU5BzeZS36Ow+npzw1z
+JOyNVMjM3EAUxIMz+MESCF3tPUHYScC73IcPWaa7pwurCqvJoF2q3MeGCb4BnbUq
+NAe6ep2tjmhjeRHi5IX4FgMwRtsj1r1UKXIVo/paBbV7z92Fk8ozshlyuhTgrYDp
+NoglSb96BQErPBQbAOuJzlGa+V5o9BC9uogCmTp7wMt1KuF7pPItVOlhqtW2ddz7
+K0krUmHzNIBQDAdYCBZlT091LVWiRZmuRmLphkYv2GMZkjTquY/pJidSVUasJaxz
+lMeZ6waZ0EqVdzqEwMHqbZB0206LfV7gl/YJK2Nz8ebjSA/JCRP8nmGzcm1jmbWq
+XxacGBVSoVbHXlrijeyX
+=OG76
 -----END PGP SIGNATURE-----
diff --git a/media-video/bombono-dvd/bombono-dvd-1.2.0-r2.ebuild b/media-video/bombono-dvd/bombono-dvd-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..0596f20b27b6
--- /dev/null
+++ b/media-video/bombono-dvd/bombono-dvd-1.2.0-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 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.0-r2.ebuild,v 1.1 2011/12/06 22:34:58 dilfridge Exp $
+
+EAPI=4
+SCONS_MIN_VERSION="0.96.1"
+
+inherit base scons-utils toolchain-funcs flag-o-matic virtualx
+
+DESCRIPTION="GUI DVD authoring program"
+HOMEPAGE="http://www.bombono.org/"
+SRC_URI="mirror://sourceforge/bombono/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gnome"
+
+COMMONDEPEND="
+	app-i18n/enca
+	app-cdr/dvd+rw-tools
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libxmlpp:2.6
+	>=dev-libs/boost-1.47
+	media-libs/libdvdread
+	media-sound/twolame
+	media-video/dvdauthor
+	virtual/cdrtools
+	virtual/ffmpeg
+	>=media-video/mjpegtools-1.8.0
+	x11-libs/gtk+:2
+"
+RDEPEND="${COMMONDEPEND}
+	gnome?	( gnome-base/gvfs )
+"
+DEPEND="${COMMONDEPEND}
+	dev-util/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.1-cflags.patch"
+	"${FILESDIR}/${PN}-1.2.0-cdrtools.patch"
+	"${FILESDIR}/${PN}-1.2.0-libav.patch"
+)
+
+src_configure() {
+	append-flags -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_VERSION=2 
+	myesconsargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		CFLAGS="${CFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		DESTDIR="${D}"
+		LDFLAGS="${LDFLAGS}"
+		USE_EXT_BOOST=1
+		PREFIX="${EPREFIX}/usr"
+	)
+}
+
+src_compile() {
+	nonfatal escons \
+		|| die 'Please add "${S}/config.opts" when filing bugs reports!'
+}
+
+src_test() {
+	VIRTUALX_COMMAND="escons TEST=1" virtualmake
+}
+
+src_install() {
+	nonfatal escons install || die 'Please add "${S}/config.opts" when filing bugs reports!'
+}
diff --git a/media-video/bombono-dvd/files/bombono-dvd-1.2.0-libav.patch b/media-video/bombono-dvd/files/bombono-dvd-1.2.0-libav.patch
new file mode 100644
index 000000000000..a86808da8432
--- /dev/null
+++ b/media-video/bombono-dvd/files/bombono-dvd-1.2.0-libav.patch
@@ -0,0 +1,83 @@
+From b3e5482083d71e9913e12b038b329e36c2bbb130 Mon Sep 17 00:00:00 2001
+From: Ilya Murav'jov <muravev@yandex.ru>
+Date: Fri, 18 Nov 2011 22:31:18 +0300
+Subject: [PATCH] fix for ArchLinux: new ffmpeg hides ff_codec_bmp_tags etc
+
+---
+ src/mgui/ffviewer.cpp |   32 +++++++++++++++++++++++++-------
+ 1 files changed, 25 insertions(+), 7 deletions(-)
+
+diff --git a/src/mgui/ffviewer.cpp b/src/mgui/ffviewer.cpp
+index 3d8e9d9..9e6d31c 100644
+--- a/src/mgui/ffviewer.cpp
++++ b/src/mgui/ffviewer.cpp
+@@ -32,7 +32,15 @@
+ #include <mlib/read_stream.h> // ReadAllStream()
+ #include <mlib/string.h>
+ 
+-/////////////////////////////////////////
++// Прямой доступ к ff_codec_bmp_tags, в частности, закрыл, некий
++// Anton Khirnov, см. libavformat/libavformat.v (из него генерится скрипт
++// для опции --version-script=<script_file> линковщика ld)
++// Вообще, можно воспользоваться av_codec_get_tag(), а доступ к ff_codec_bmp_tags
++// получить через ff_avi_muxer->codec_tag (самого же найти по имени "avi") или подобный объект,
++// но это сейчас неактуально (никто не попадается на ошибку отсутствия кодека) => игра не стоит свеч
++//#define CALC_FF_TAG
++
++#ifdef CALC_FF_TAG
+ // :KLUDGE: потому что riff.h не копируют
+ C_LINKAGE_BEGIN
+ 
+@@ -62,7 +70,7 @@ static uint FFCodecID2Tag(CodecID codec_id)
+ #endif
+ 
+ C_LINKAGE_END
+-/////////////////////////////////////////
++#endif // CALC_FF_TAG
+ 
+ static AVStream* VideoStream(FFData& ffv)
+ {
+@@ -287,11 +295,6 @@ static bool IsFFError(int av_res)
+     return av_res < 0;
+ }
+ 
+-static unsigned char GetChar(uint tag, int bit_begin)
+-{
+-    return (tag>>bit_begin) & 0xFF;
+-}
+-
+ static bool SetIndex(int& idx, int i, bool b)
+ {
+     bool res = (idx == -1) && b;
+@@ -300,6 +303,12 @@ static bool SetIndex(int& idx, int i, bool b)
+     return res;
+ }
+ 
++#ifdef CALC_FF_TAG
++static unsigned char GetChar(uint tag, int bit_begin)
++{
++    return (tag>>bit_begin) & 0xFF;
++}
++
+ static std::string CodecID2Str(CodecID codec_id)
+ {
+ #ifdef _MSC_VER
+@@ -316,6 +325,15 @@ static std::string CodecID2Str(CodecID codec_id)
+     return tag_str;
+ }
+ 
++#else // CALC_FF_TAG
++
++static std::string CodecID2Str(CodecID codec_id)
++{
++    return Int2Str(codec_id);
++}
++
++#endif // CALC_FF_TAG
++
+ bool OpenInfo(FFData& ffi, const char* fname, FFDiagnosis& diag)
+ {
+     std::string& err_str = diag.errStr;
+-- 
+1.7.3.4
+