multimedia/mediatomb: Patched for new ffmpeg and moved from Network

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

9 files changed, 70 insertions, 3 deletions

diff --git a/network/mediatomb/README b/multimedia/mediatomb/README
index ff48d720029c5..8faecd79d0fba 100644
--- a/network/mediatomb/README
+++ b/multimedia/mediatomb/README
@@ -3,5 +3,5 @@ web user interface, it allows you to stream your digital media
 through your home network and listen to/watch it on a variety
 of UPnP compatible devices.
 
-mediatomb optionally depends on ffmpeg, libmp4v2, lastfmlib and
-ffmpegthumbnailer.
+mediatomb optionally depends on ffmpeg, libmp4v2, lastfmlib, 
+and ffmpegthumbnailer.
diff --git a/network/mediatomb/config.xml b/multimedia/mediatomb/config.xml
index 497ae5d2d945d..497ae5d2d945d 100644
--- a/network/mediatomb/config.xml
+++ b/multimedia/mediatomb/config.xml
diff --git a/network/mediatomb/doinst.sh b/multimedia/mediatomb/doinst.sh
index adc456f74f254..adc456f74f254 100644
--- a/network/mediatomb/doinst.sh
+++ b/multimedia/mediatomb/doinst.sh
diff --git a/multimedia/mediatomb/libav_0.7_support.patch b/multimedia/mediatomb/libav_0.7_support.patch
new file mode 100644
index 0000000000000..e25697c5021b2
--- /dev/null
+++ b/multimedia/mediatomb/libav_0.7_support.patch
@@ -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++;
+
diff --git a/network/mediatomb/mediatomb.SlackBuild b/multimedia/mediatomb/mediatomb.SlackBuild
index de89416ec070e..62fa78c034d46 100644
--- a/network/mediatomb/mediatomb.SlackBuild
+++ b/multimedia/mediatomb/mediatomb.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=mediatomb
 VERSION=0.12.1
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -77,6 +77,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Fix building with newer ffmpeg releases
+patch -p1 -i $CWD/libav_0.7_support.patch
+
 # We need LDFLAGS="-ldl" for proper sqlite detection
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/network/mediatomb/mediatomb.info b/multimedia/mediatomb/mediatomb.info
index 2ffe0063418c4..2ffe0063418c4 100644
--- a/network/mediatomb/mediatomb.info
+++ b/multimedia/mediatomb/mediatomb.info
diff --git a/network/mediatomb/rc.mediatomb b/multimedia/mediatomb/rc.mediatomb
index 92804835b987c..92804835b987c 100644
--- a/network/mediatomb/rc.mediatomb
+++ b/multimedia/mediatomb/rc.mediatomb
diff --git a/network/mediatomb/rc.mediatomb.conf b/multimedia/mediatomb/rc.mediatomb.conf
index af5ea4feef9ca..af5ea4feef9ca 100644
--- a/network/mediatomb/rc.mediatomb.conf
+++ b/multimedia/mediatomb/rc.mediatomb.conf
diff --git a/network/mediatomb/slack-desc b/multimedia/mediatomb/slack-desc
index ddfff1fd22c3d..ddfff1fd22c3d 100644
--- a/network/mediatomb/slack-desc
+++ b/multimedia/mediatomb/slack-desc