Merge lp:~ubuntu-branches/ubuntu/oneiric/mediatomb/oneiric-201106030110 into lp:ubuntu/oneiric/mediatomb

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/oneiric/mediatomb now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/mediatomb/oneiric-201106030110. A merge should be performed if necessary.

Unmerged revisions

20. By Luke Yelavich on 2011-06-03

releasing version 0.12.1-0ubuntu2

19. By Luke Yelavich on 2011-06-03

Add changelog entry to cover libav patch

18. By Luke Yelavich on 2011-06-03

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

17. By Luke Yelavich on 2011-06-03

Merge lp:~broder/ubuntu/oneiric/mediatomb/fix-212441-and-770964 which is based
on lp:vanvugt/ubuntu/oneiric/mediatomb/fix-212441

=== added file 'debian/mediatomb-daemon.mediatomb.upstart'
--- debian/mediatomb-daemon.mediatomb.upstart	1970-01-01 00:00:00 +0000
+++ debian/mediatomb-daemon.mediatomb.upstart	2011-06-03 01:15:53 +0000
@@ -0,0 +1,34 @@
+description "MediaTomb UPnP media server"
+author      "Daniel van Vugt <vanvugt in launchpad>"
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on runlevel [!2345]
+respawn
+
+env CONFIGXML=/etc/mediatomb/config.xml
+env LOGFILE=/var/log/mediatomb.log
+env DEFAULT=/etc/default/mediatomb
+
+script
+	[ -r $DEFAULT ] && . $DEFAULT
+	[ ! $USER ] && USER=root
+	[ ! $GROUP ] && GROUP=$USER
+	if [ -n "$INTERFACE" ]; then
+		INTERFACE_ARG="-e $INTERFACE"
+		$ROUTE_ADD $INTERFACE
+	fi
+	exec mediatomb \
+		-c $CONFIGXML \
+		-u $USER \
+		-g $GROUP \
+		-l $LOGFILE \
+		$INTERFACE_ARG \
+		$OPTIONS
+end script
+
+post-stop script
+	[ -r $DEFAULT ] && . $DEFAULT
+	if [ -n "$INTERFACE" ]; then
+		$ROUTE_DEL $INTERFACE
+	fi
+end script

=== renamed file 'debian/mediatomb-daemon.mediatomb.upstart' => 'debian/mediatomb-daemon.mediatomb.upstart.moved'
=== 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-06-03 01:15:53 +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++;
+

=== renamed file 'debian/patches/libav_0.7_support.patch' => 'debian/patches/libav_0.7_support.patch.moved'
=== 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-06-03 01:15:53 +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

=== renamed file 'debian/patches/mediatomb-0.12.1-gcc46.patch' => 'debian/patches/mediatomb-0.12.1-gcc46.patch.moved'