Update mediatomb to version 0.12.1, from patch from Jan Danielsson in

private mail.

	MediaTomb 0.12.1 is a minor bugfix release which fixes:
	- YouTube support
	- a problem in the soap response http header
	- automatic id3lib detection when taglib is not available

	The following patches are no longer needed as they have been integrated
	upstream:
	patches/patch-aa
	patches/patch-ab
	patches/patch-ac
	patches/patch-ad
	patches/patch-ae
	patches/patch-ah
	patches/patch-ai
	patches/patch-aj

14 files changed, 26 insertions, 185 deletions

diff --git a/multimedia/mediatomb/Makefile b/multimedia/mediatomb/Makefile
index a705cdb0d97..559d756e3ac 100644
--- a/multimedia/mediatomb/Makefile
+++ b/multimedia/mediatomb/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2010/10/03 02:14:26 obache Exp $
+# $NetBSD: Makefile,v 1.17 2010/11/27 06:30:24 agc Exp $
 
-DISTNAME=	mediatomb-0.11.0
-PKGREVISION=	8
+DISTNAME=	mediatomb-0.12.1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mediatomb/}
 
diff --git a/multimedia/mediatomb/distinfo b/multimedia/mediatomb/distinfo
index fb39980c96f..e68af8e107c 100644
--- a/multimedia/mediatomb/distinfo
+++ b/multimedia/mediatomb/distinfo
@@ -1,18 +1,10 @@
-$NetBSD: distinfo,v 1.6 2009/03/30 17:07:46 drochner Exp $
+$NetBSD: distinfo,v 1.7 2010/11/27 06:30:24 agc Exp $
 
-SHA1 (mediatomb-0.11.0.tar.gz) = 1d7c86924686f9999a359ba96092aa36d30832a6
-RMD160 (mediatomb-0.11.0.tar.gz) = 11c53d5757da3a689c025107331526c0486befc4
-Size (mediatomb-0.11.0.tar.gz) = 1059429 bytes
-SHA1 (patch-aa) = 00bd9c244c4a4853e65a1430921ce7b170ce9373
-SHA1 (patch-ab) = c7ec78ca4fdae632b580487bf1451ed5f1370e82
-SHA1 (patch-ac) = 801ef3895fc848103f81433b066d6ae9fddccaf9
-SHA1 (patch-ad) = 6ab358d4ad7530a8337db154017024da8bf89fbf
-SHA1 (patch-ae) = dd75f7fd3d2794dd53062d5710285ed96d030c5b
+SHA1 (mediatomb-0.12.1.tar.gz) = 86e880584cc9c8aaf3926d56048510d1d06e76b4
+RMD160 (mediatomb-0.12.1.tar.gz) = ecb61ca2483f76421beef1036ac442b8f805fa96
+Size (mediatomb-0.12.1.tar.gz) = 1240612 bytes
 SHA1 (patch-af) = ec9261d2ec645a07144f8b927fd57a50175903ca
-SHA1 (patch-ag) = 932f8f4d2764c6cb098e0e78e7476527561b198e
-SHA1 (patch-ah) = 9b12a346a61bdeb7d5cc7a7289c0b4046a7a6255
-SHA1 (patch-ai) = e9cad8e72f7e4e9d6eb7448d1380da3bcc8c28df
-SHA1 (patch-aj) = b3893ec5c8fc518673a144cb74a12eaa7e34f008
-SHA1 (patch-ba) = ee8b711de0a10bb58adb2ef25720f764e19b3ab2
-SHA1 (patch-bb) = 94f180b618dce3d0f12a009fd29a0e640667cdcc
-SHA1 (patch-bc) = 348bd87b5f586a0f16326aaafcf7f1b5e039a8b2
+SHA1 (patch-ag) = 4ceebfca5a1f0556b71bee4713cb35726208f27e
+SHA1 (patch-ba) = ff31a77e71b772be945441d3c9219cd199f5ff83
+SHA1 (patch-bb) = 27661c4d0e841b6da8b280a3cbac3c38f581b2df
+SHA1 (patch-bc) = 40ef84ec5802431c5f2a811a5bf53a76d15c3904
diff --git a/multimedia/mediatomb/patches/patch-aa b/multimedia/mediatomb/patches/patch-aa
deleted file mode 100644
index 5c6753806c2..00000000000
--- a/multimedia/mediatomb/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/04/09 20:36:38 agc Exp $
-
---- tombupnp/threadutil/inc/ithread.h	2008-03-01 22:48:51.000000000 +0000
-+++ tombupnp/threadutil/inc/ithread.h	2008-03-21 20:18:37.000000000 +0000
-@@ -47,7 +47,7 @@
-  #include <unistd.h>
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
- #endif    
- 
diff --git a/multimedia/mediatomb/patches/patch-ab b/multimedia/mediatomb/patches/patch-ab
deleted file mode 100644
index de0b9aa2993..00000000000
--- a/multimedia/mediatomb/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/04/09 20:36:38 agc Exp $
-
---- tombupnp/threadutil/src/ThreadPool.c	2008-03-01 22:48:51.000000000 +0000
-+++ tombupnp/threadutil/src/ThreadPool.c	2008-03-21 20:18:54.000000000 +0000
-@@ -370,7 +370,7 @@
-     gettimeofday( &t, NULL );
- #if defined(WIN32)
-     srand( ( unsigned int )(t.tv_usec/1000) + (unsigned int)ithread_get_current_thread_id(  ).p );
--#elif defined(__FreeBSD__) || defined (__APPLE__)
-+#elif defined(__FreeBSD__) || defined (__APPLE__) || defined(__NetBSD__)
-     srand( ( unsigned int )(t.tv_usec/1000) + (unsigned int)ithread_get_current_thread_id(  ) );
- #else
-     srand( ( unsigned int )(t.tv_usec/1000) + ithread_get_current_thread_id(  ) );
diff --git a/multimedia/mediatomb/patches/patch-ac b/multimedia/mediatomb/patches/patch-ac
deleted file mode 100644
index 8733240ce80..00000000000
--- a/multimedia/mediatomb/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/04/09 20:36:38 agc Exp $
-
---- tombupnp/upnp/inc/upnp.h	2008-03-01 22:48:51.000000000 +0000
-+++ tombupnp/upnp/inc/upnp.h	2008-03-21 20:17:16.000000000 +0000
-@@ -58,7 +58,7 @@
- //@{
- 
- #include <stdio.h>
--#if defined(__FreeBSD__) || defined(__APPLE__)
-+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
- #include <time.h>
- #include <sys/types.h>
- #endif
diff --git a/multimedia/mediatomb/patches/patch-ad b/multimedia/mediatomb/patches/patch-ad
deleted file mode 100644
index d7d2655d83a..00000000000
--- a/multimedia/mediatomb/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/04/09 20:36:38 agc Exp $
-
---- tombupnp/upnp/src/genlib/net/uri/uri.c	2008-03-01 22:48:50.000000000 +0000
-+++ tombupnp/upnp/src/genlib/net/uri/uri.c	2008-03-21 20:18:05.000000000 +0000
-@@ -61,7 +61,7 @@
- #include "config.h"
- #include "uri.h"
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-     #ifdef HAVE_LWRES_NETDB_H
-         #include <lwres/netdb.h>
-     #endif
diff --git a/multimedia/mediatomb/patches/patch-ae b/multimedia/mediatomb/patches/patch-ae
deleted file mode 100644
index 5b4faf1a646..00000000000
--- a/multimedia/mediatomb/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2008/04/10 09:09:37 agc Exp $
-
---- tombupnp/upnp/src/ssdp/ssdp_server.c	2008-03-01 22:48:51.000000000 +0000
-+++ tombupnp/upnp/src/ssdp/ssdp_server.c	2008-03-21 20:17:43.000000000 +0000
-@@ -962,7 +962,7 @@
-         return UPNP_E_SOCKET_ERROR;
-     }
-     
--    #ifdef __FreeBSD__
-+    #if defined(__FreeBSD__) || defined(__NetBSD__)
-     if( setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEPORT,
-                     ( char * )&onOff, sizeof( onOff ) ) != 0 ) {
- 
diff --git a/multimedia/mediatomb/patches/patch-ag b/multimedia/mediatomb/patches/patch-ag
index b6360c3e235..b2c830786d3 100644
--- a/multimedia/mediatomb/patches/patch-ag
+++ b/multimedia/mediatomb/patches/patch-ag
@@ -1,12 +1,12 @@
-$NetBSD: patch-ag,v 1.1 2008/04/11 10:11:59 agc Exp $
+$NetBSD: patch-ag,v 1.2 2010/11/27 06:30:24 agc Exp $
 
---- src/config_manager.cc	2008/04/11 09:51:48	1.1
-+++ src/config_manager.cc	2008/04/11 09:52:52
-@@ -486,6 +486,7 @@
+--- src/config_manager.cc.orig	2010-10-02 22:05:12.000000000 +0000
++++ src/config_manager.cc
+@@ -576,6 +576,7 @@ String ConfigManager::createDefaultConfi
      Ref<Element> ext2mt(new Element(_("extension-mimetype")));
      ext2mt->setAttribute(_("ignore-unknown"), _(DEFAULT_IGNORE_UNKNOWN_EXTENSIONS));
      ext2mt->appendElementChild(map_from_to(_("mp3"), _("audio/mpeg")));
 +    ext2mt->appendElementChild(map_from_to(_("mp4"), _("video/mp4")));
-     ext2mt->appendElementChild(map_from_to(_("ogg"), _("application/ogg")));
-     ext2mt->appendElementChild(map_from_to(_("asf"), _("video/x-ms-asf")));
-     ext2mt->appendElementChild(map_from_to(_("asx"), _("video/x-ms-asf")));
+     ext2mt->appendElementChild(map_from_to(_("ogx"), _("application/ogg")));
+     ext2mt->appendElementChild(map_from_to(_("ogv"), _("video/ogg")));
+     ext2mt->appendElementChild(map_from_to(_("oga"), _("audio/ogg")));
diff --git a/multimedia/mediatomb/patches/patch-ah b/multimedia/mediatomb/patches/patch-ah
deleted file mode 100644
index 304b3f8fa40..00000000000
--- a/multimedia/mediatomb/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2009/01/09 10:17:35 tron Exp $
-
-Fix compilation with newer version of "curl", see here:
-
-http://sourceforge.net/tracker/index.php?func=detail&aid=1978210&group_id=129766&atid=715780
-
---- src/url.cc.orig	2008-03-01 22:48:36.000000000 +0000
-+++ src/url.cc	2009-01-09 10:09:10.000000000 +0000
-@@ -75,7 +75,7 @@
- 
-     if (only_header)
-     {
--        curl_easy_setopt(curl_handle, CURLOPT_NOBODY);
-+        curl_easy_setopt(curl_handle, CURLOPT_NOBODY, 1);
-         curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl);
-         curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, 
-                          (void *)buffer.getPtr());
diff --git a/multimedia/mediatomb/patches/patch-ai b/multimedia/mediatomb/patches/patch-ai
deleted file mode 100644
index 612d768d873..00000000000
--- a/multimedia/mediatomb/patches/patch-ai
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2009/01/27 04:05:50 jmcneill Exp $
-
---- configure.ac.orig	2009-01-26 22:50:22.000000000 -0500
-+++ configure.ac	2009-01-26 22:50:40.000000000 -0500
-@@ -2327,7 +2327,7 @@ AC_LANG_C
- if test "x$FFMPEG_OK" = xyes; then
-     if test -n "$FFMPEG_SEARCH_HEADERS" ; then
-         CPPFLAGS="-I$FFMPEG_SEARCH_HEADERS"
--        AC_CHECK_HEADER($FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h,
-+        AC_CHECK_HEADER($FFMPEG_SEARCH_HEADERS/libavformat/avformat.h,
-                 [
-                     FFMPEG_CXXFLAGS="-I$FFMPEG_SEARCH_HEADERS"
-                 ],
-@@ -2340,12 +2340,12 @@ if test "x$FFMPEG_OK" = xyes; then
-                 ]
-         )
-     else 
--        AC_CHECK_HEADER(ffmpeg/avformat.h,
-+        AC_CHECK_HEADER(libavformat/avformat.h,
-             [],
-             [
-                 CPPFLAGS="-I$SEARCH_DIR_HEADERS"
-                 unset ac_cv_header_ffmpeg_avformat_h
--                AC_CHECK_HEADER($SEARCH_DIR_HEADERS/ffmpeg/avformat.h,
-+                AC_CHECK_HEADER($SEARCH_DIR_HEADERS/libavformat/avformat.h,
-                     [
-                         FFMPEG_CXXFLAGS="-I$SEARCH_DIR_HEADERS"
-                     ],
-@@ -2447,7 +2447,7 @@ if test "x$FFMPEG_OK" = xyes; then
-             [
-                 #define __STDC_CONSTANT_MACROS
-                 #include <stdint.h>
--                #include <ffmpeg/avformat.h>
-+                #include <libavformat/avformat.h>
-             ],
-             [
-                 av_register_all();
-@@ -2462,7 +2462,7 @@ if test "x$FFMPEG_OK" = xyes; then
-                     #define __STDC_CONSTANT_MACROS
-                     #include <stdint.h>
-                     extern "C" {
--                        #include <ffmpeg/avformat.h>
-+                        #include <libavformat/avformat.h>
-                     }
-                 ],
-                 [
diff --git a/multimedia/mediatomb/patches/patch-aj b/multimedia/mediatomb/patches/patch-aj
deleted file mode 100644
index ac96a769cb9..00000000000
--- a/multimedia/mediatomb/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2009/01/27 04:05:50 jmcneill Exp $
-
---- src/metadata/ffmpeg_handler.cc.orig	2009-01-26 22:51:12.000000000 -0500
-+++ src/metadata/ffmpeg_handler.cc	2009-01-26 22:51:27.000000000 -0500
-@@ -47,7 +47,7 @@
- #ifdef HAVE_FFMPEG
- 
- // ffmpeg needs the following sources
--// INT64_C is not defined in ffmpeg/avformat.h but is needed
-+// INT64_C is not defined in libavformat/avformat.h but is needed
- #define __STDC_CONSTANT_MACROS
- #include <stdint.h>
- 
-@@ -56,7 +56,7 @@ extern "C" 
- {
- #endif
- 
--#include <ffmpeg/avformat.h>
-+#include <libavformat/avformat.h>
- 
- #ifdef FFMPEG_NEEDS_EXTERN_C
- } // extern "C"
diff --git a/multimedia/mediatomb/patches/patch-ba b/multimedia/mediatomb/patches/patch-ba
index ad310b1f4d4..8781b4fbd50 100644
--- a/multimedia/mediatomb/patches/patch-ba
+++ b/multimedia/mediatomb/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1 2009/03/30 17:07:46 drochner Exp $
+$NetBSD: patch-ba,v 1.2 2010/11/27 06:30:24 agc Exp $
 
---- src/storage/sql_storage.h.orig	2008-03-01 23:48:34.000000000 +0100
+--- src/storage/sql_storage.h.orig	2010-10-02 22:07:24.000000000 +0000
 +++ src/storage/sql_storage.h
-@@ -78,6 +78,7 @@ public:
+@@ -79,6 +79,7 @@ public:
      virtual zmm::String quote(unsigned int val) = 0;
      virtual zmm::String quote(long val) = 0;
      virtual zmm::String quote(unsigned long val) = 0;
diff --git a/multimedia/mediatomb/patches/patch-bb b/multimedia/mediatomb/patches/patch-bb
index bec86e6ed94..5fc8d170a9c 100644
--- a/multimedia/mediatomb/patches/patch-bb
+++ b/multimedia/mediatomb/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.1 2009/03/30 17:07:46 drochner Exp $
+$NetBSD: patch-bb,v 1.2 2010/11/27 06:30:24 agc Exp $
 
---- src/storage/sqlite3/sqlite3_storage.h.orig	2008-03-01 23:48:34.000000000 +0100
+--- src/storage/sqlite3/sqlite3_storage.h.orig	2010-10-02 22:09:43.000000000 +0000
 +++ src/storage/sqlite3/sqlite3_storage.h
-@@ -148,6 +148,7 @@ private:
+@@ -158,6 +158,7 @@ private:
      virtual inline zmm::String quote(unsigned int val) { return zmm::String::from(val); }
      virtual inline zmm::String quote(long val) { return zmm::String::from(val); }
      virtual inline zmm::String quote(unsigned long val) { return zmm::String::from(val); }
diff --git a/multimedia/mediatomb/patches/patch-bc b/multimedia/mediatomb/patches/patch-bc
index 98aa9594445..4f5773fa6b9 100644
--- a/multimedia/mediatomb/patches/patch-bc
+++ b/multimedia/mediatomb/patches/patch-bc
@@ -1,8 +1,8 @@
-$NetBSD: patch-bc,v 1.1 2009/03/30 17:07:46 drochner Exp $
+$NetBSD: patch-bc,v 1.2 2010/11/27 06:30:24 agc Exp $
 
---- src/storage/sql_storage.cc.orig	2008-03-01 23:48:34.000000000 +0100
+--- src/storage/sql_storage.cc.orig	2010-10-02 22:11:55.000000000 +0000
 +++ src/storage/sql_storage.cc
-@@ -1908,7 +1908,7 @@ void SQLStorage::autoscanUpdateLM(Ref<Au
+@@ -2133,7 +2133,7 @@ void SQLStorage::autoscanUpdateLM(Ref<Au
              throw _Exception(_("autoscanUpdateLM called with adir with illegal objectID and location"));
      }
      */