Update to libav-9 api and fix thumbnail support

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 1191738E)

4 files changed, 73 insertions, 2 deletions

diff --git a/net-misc/mediatomb/ChangeLog b/net-misc/mediatomb/ChangeLog
index 7220a163c0cd..d382426a0371 100644
--- a/net-misc/mediatomb/ChangeLog
+++ b/net-misc/mediatomb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/mediatomb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.39 2012/11/07 20:41:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.40 2012/11/25 15:16:05 lu_zero Exp $
+
+  25 Nov 2012; Luca Barbato <lu_zero@gentoo.org> mediatomb-0.12.1-r4.ebuild,
+  +files/mediatomb-0.12.1-libav9.patch,
+  +files/mediatomb-0.12.1-no-thumbnail.patch:
+  Update to libav-9 api and fix thumbnail support
 
 *mediatomb-0.12.1-r4 (07 Nov 2012)
 
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-libav9.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-libav9.patch
new file mode 100644
index 000000000000..7193b7c03cd4
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-libav9.patch
@@ -0,0 +1,42 @@
+diff -burN mediatomb-0.12.1.old//src/metadata/ffmpeg_handler.cc mediatomb-0.12.1/src/metadata/ffmpeg_handler.cc
+--- mediatomb-0.12.1.old//src/metadata/ffmpeg_handler.cc	2012-11-25 14:55:05.335753129 +0100
++++ mediatomb-0.12.1/src/metadata/ffmpeg_handler.cc	2012-11-25 15:29:42.840677486 +0100
+@@ -110,8 +110,8 @@
+ 		return;
+ 	for (const mapping_t *m = mapping; m->avname != NULL; m++)
+ 	{
+-		AVMetadataTag *tag = NULL;
+-		tag = av_metadata_get(pFormatCtx->metadata, m->avname, NULL, 0);
++		AVDictionaryEntry *tag = NULL;
++		tag = av_dict_get(pFormatCtx->metadata, m->avname, NULL, 0);
+ 		if (tag && tag->value && tag->value[0])
+ 		{
+ 			log_debug("Added metadata %s: %s\n", m->avname, tag->value);
+@@ -290,14 +290,14 @@
+     av_register_all();
+ 
+     // Open video file
+-    if (av_open_input_file(&pFormatCtx, 
+-                          item->getLocation().c_str(), NULL, 0, NULL) != 0)
++    if (avformat_open_input(&pFormatCtx,
++                          item->getLocation().c_str(), NULL, NULL) != 0)
+         return; // Couldn't open file
+ 
+     // Retrieve stream information
+-    if (av_find_stream_info(pFormatCtx) < 0)
++    if (avformat_find_stream_info(pFormatCtx, NULL) < 0)
+     {
+-        av_close_input_file(pFormatCtx);
++        avformat_close_input(&pFormatCtx);
+         return; // Couldn't find stream information
+     }   
+ 	// Add metadata using ffmpeg library calls
+@@ -306,7 +306,7 @@
+ 	addFfmpegResourceFields(item, pFormatCtx, &x, &y);
+ 	
+     // Close the video file
+-    av_close_input_file(pFormatCtx);
++    avformat_close_input(&pFormatCtx);
+ }
+ 
+ static bool _mkdir(const char *path)
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-no-thumbnail.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-no-thumbnail.patch
new file mode 100644
index 000000000000..a16731ee29e4
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-no-thumbnail.patch
@@ -0,0 +1,22 @@
+diff -burN mediatomb-0.12.1.old//src/metadata/ffmpeg_handler.cc mediatomb-0.12.1/src/metadata/ffmpeg_handler.cc
+--- mediatomb-0.12.1.old//src/metadata/ffmpeg_handler.cc	2012-11-25 15:47:25.001638849 +0100
++++ mediatomb-0.12.1/src/metadata/ffmpeg_handler.cc	2012-11-25 15:52:15.926628259 +0100
+@@ -374,7 +374,7 @@
+     free(path_temp);
+     return ret;
+ }
+-
++#ifdef HAVE_FFMPEGTHUMBNAILER
+ static String getThumbnailCacheFilePath(String& movie_filename, bool create)
+ {
+     Ref<ConfigManager> cfg = ConfigManager::getInstance();
+@@ -421,6 +421,8 @@
+     fclose(fp);
+ }
+ 
++#endif
++
+ Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t *data_size)
+ {
+     *data_size = -1;
+Binary files mediatomb-0.12.1.old//src/metadata/.ffmpeg_handler.cc.swp and mediatomb-0.12.1/src/metadata/.ffmpeg_handler.cc.swp differ
diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r4.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r4.ebuild
index c51fd556fdc1..8dac38434756 100644
--- a/net-misc/mediatomb/mediatomb-0.12.1-r4.ebuild
+++ b/net-misc/mediatomb/mediatomb-0.12.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r4.ebuild,v 1.1 2012/11/07 20:41:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r4.ebuild,v 1.2 2012/11/25 15:16:05 lu_zero Exp $
 
 EAPI="4"
 inherit autotools eutils linux-info user
@@ -65,6 +65,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-libextractor.patch #435394
 	epatch "${FILESDIR}"/${P}-inotify-hard-links.patch
 	epatch "${FILESDIR}"/${P}-thumb-cache.patch
+	epatch "${FILESDIR}"/${P}-libav9.patch
+	epatch "${FILESDIR}"/${P}-no-thumbnail.patch
 	eautoreconf
 }