Merge lp:~vanvugt/ubuntu/oneiric/mediatomb/fix-770964-784431 into lp:ubuntu/oneiric/mediatomb

[Daniel van Vugt]

Fix all problems causing mediatomb builds to fail on oneiric:
* Fix gcc-4.6 build failures (missing header) (LP: #770964)
* Fix libav-0.7 build failures (mediatomb using deprecated API) (LP: #784431).

[Luke Yelavich (themuso)]

Thanks for your work. The change from this branch, along with your other branch all build fine here, so I am going to go ahead and upload your work.

Thanks again.

review: Approve

=== added file 'debian/patches/libav_0.7_support.patch'
--- debian/patches/libav_0.7_support.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/libav_0.7_support.patch	2011-05-25 09:27:27 +0000
@@ -0,0 +1,64 @@
+=== modified file 'src/metadata/ffmpeg_handler.cc'
+--- old/src/metadata/ffmpeg_handler.cc	2010-08-25 17:07:03 +0000
++++ new/src/metadata/ffmpeg_handler.cc	2011-05-19 04:33:32 +0000
+@@ -89,6 +89,33 @@
+ 
+ 	Ref<StringConverter> sc = StringConverter::m2i();
+     
++	/* Tabs are 4 characters here */
++	typedef struct {const char *avname; metadata_fields_t field;} mapping_t;
++	static const mapping_t mapping[] =
++	{
++		{"title",   M_TITLE},
++		{"artist",  M_ARTIST},
++		{"album",   M_ALBUM},
++		{"date",    M_DATE},
++		{"genre",   M_GENRE},
++		{"comment", M_DESCRIPTION},
++		{"track",   M_TRACKNUMBER},
++		{NULL,      M_MAX},
++	};
++
++	if (!pFormatCtx->metadata)
++		return;
++	for (const mapping_t *m = mapping; m->avname != NULL; m++)
++	{
++		AVMetadataTag *tag = NULL;
++		tag = av_metadata_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);
++			item->setMetadata(MT_KEYS[m->field].upnp, sc->convert(tag->value));
++		}
++	}
++	/* Old algorithm (doesn't work with libav >= 0.7)
+ 	if (strlen(pFormatCtx->title) > 0) 
+     {
+ 	    log_debug("Added metadata title: %s\n", pFormatCtx->title);
+@@ -131,6 +158,7 @@
+         item->setMetadata(MT_KEYS[M_TRACKNUMBER].upnp, 
+                           sc->convert(String::from(pFormatCtx->track)));
+ 	}
++	*/
+ }
+ 
+ // ffmpeg library calls
+@@ -178,7 +206,7 @@
+ 	for(i=0; i<pFormatCtx->nb_streams; i++) 
+     {
+ 		AVStream *st = pFormatCtx->streams[i];
+-		if((st != NULL) && (videoset == false) && (st->codec->codec_type == CODEC_TYPE_VIDEO))
++		if((st != NULL) && (videoset == false) && (st->codec->codec_type == AVMEDIA_TYPE_VIDEO))
+         {
+             if (st->codec->codec_tag > 0)
+             {
+@@ -209,7 +237,7 @@
+                 *y = st->codec->height;
+ 			}
+ 		} 
+-		if(st->codec->codec_type == CODEC_TYPE_AUDIO) 
++		if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO) 
+         {
+ 			// Increase number of audiochannels
+ 			audioch++;
+

=== added file 'debian/patches/mediatomb-0.12.1-gcc46.patch'
--- debian/patches/mediatomb-0.12.1-gcc46.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/mediatomb-0.12.1-gcc46.patch	2011-05-25 09:27:27 +0000
@@ -0,0 +1,10 @@
+--- a/src/zmm/object.h
++++ b/src/zmm/object.h
+@@ -33,6 +33,7 @@
+ #define __ZMM_OBJECT_H__
+ 
+ #include <new> // for size_t
++#include <cstddef>
+ #include "atomic.h"
+ 
+ namespace zmm

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-08-25 17:07:03 +0000
+++ debian/patches/series	2011-05-25 09:27:27 +0000
@@ -1,3 +1,5 @@
 debug-mode-fix.patch
 config_xml_comment.patch
 const_char_conversion.patch
+mediatomb-0.12.1-gcc46.patch
+libav_0.7_support.patch