mediatomb stable port information

Package: mediatomb
Version: 0.12.1
Revision: 1
Architecture: x86_64, i386, powerpc
Description: UPnP Media Server w/ Web Interface
License: GPL
Maintainer: Benjamin Reed

Depends: <<
file,
file-shlibs,
expat1-shlibs,
libcurl4-shlibs,
libexif12-shlibs,
libiconv,
nspr.0d-shlibs,
spidermonkey-shlibs,
sqlite3-shlibs,
taglib-shlibs
<<
BuildDepends: <<
file-dev,
fink (>= 0.30.2-1),
expat1,
libcurl4,
libexif12,
libiconv-dev,
libssh2.1,
nspr.0d,
spidermonkey-dev,
sqlite3-dev,
taglib
<<
GCC: 4.0

Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: e927dd5dc52d3cfcebd8ca1af6f0d3c2
PatchFile: mediatomb.patch
PatchFile-MD5: a7eb0d118029a85533b2330453aae389

SetCPPFLAGS: -DXP_UNIX=1
UseMaxBuildJobs: true
ConfigureParams: --disable-dependency-tracking --disable-mysql --with-js-h=%p/include/js --with-js-libs=%p/lib

InstallScript: make -j1 install DESTDIR=%d

Homepage: http://mediatomb.cc/
DescDetail: <<
MediaTomb is an open source (GPL) UPnP MediaServer with a nice 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 implements the UPnP MediaServer V 1.0 specification that
can be found on http://www.upnp.org/. The current implementation
focuses on parts that are required by the specification, however we
look into extending the functionality to cover the optional parts of
the spec as well.

MediaTomb should work with any UPnP compliant MediaRenderer.
<<

mediatomb stable port .patch

diff -Nurd mediatomb-0.12.1/src/hash/dbo_hash.h mediatomb-0.12.1-new/src/hash/dbo_hash.h
--- mediatomb-0.12.1/src/hash/dbo_hash.h 2010-03-25 10:58:07.000000000 -0400
+++ mediatomb-0.12.1-new/src/hash/dbo_hash.h 2011-08-01 13:50:09.000000000 -0400
@@ -106,7 +106,7 @@
inline bool remove(KT key)
{
struct dbo_hash_slot *slot;
- if (! search(key, &slot))
+ if (! this->search(key, &slot))
return false;
slot->key = deletedKey;
slot->value->release();
@@ -136,7 +136,7 @@
inline void put(KT key, zmm::Ref value)
{
struct dbo_hash_slot *slot;
- search(key, &slot);
+ this->search(key, &slot);
put(key, (hash_slot_t)slot, value);
}
void put(KT key, hash_slot_t destSlot, zmm::Ref value)
@@ -162,7 +162,7 @@
inline zmm::Ref get(KT key)
{
struct dbo_hash_slot *slot;
- bool found = search(key, &slot);
+ bool found = this->search(key, &slot);
if (found)
return zmm::Ref(slot->value);
else
@@ -174,7 +174,7 @@
inline zmm::Ref get(KT key, hash_slot_t *destSlot)
{
struct dbo_hash_slot **slot = (struct dbo_hash_slot **)destSlot;
- bool found = search(key, slot);
+ bool found = this->search(key, slot);
if (found)
return zmm::Ref((*slot)->value);
else
diff -Nurd mediatomb-0.12.1/src/hash/dbr_hash.h mediatomb-0.12.1-new/src/hash/dbr_hash.h
--- mediatomb-0.12.1/src/hash/dbr_hash.h 2010-03-25 10:58:07.000000000 -0400
+++ mediatomb-0.12.1-new/src/hash/dbr_hash.h 2011-08-01 13:50:09.000000000 -0400
@@ -124,7 +124,7 @@
inline bool remove(KT key)
{
struct dbr_hash_slot *slot;
- if (! search(key, &slot))
+ if (! this->search(key, &slot))
return false;
slot->key = deletedKey;
int array_slot = slot->array_slot;
@@ -134,7 +134,7 @@
return true;
}
data_array[array_slot] = data_array[--this->count];
- if (! search(data_array[array_slot], &slot))
+ if (! this->search(data_array[array_slot], &slot))
{
log_debug("DBR-Hash-Error: (%d; array_slot=%d; count=%d)\n", data_array[array_slot], array_slot, this->count);
throw zmm::Exception(_("DBR-Hash-Error: key in data_array not found in hashtable"));
@@ -146,7 +146,7 @@
inline void put(KT key)
{
struct dbr_hash_slot *slot;
- if (! search(key, &slot))
+ if (! this->search(key, &slot))
{
#ifdef TOMBDEBUG
if (this->count >= realCapacity)
@@ -194,7 +194,7 @@
inline bool exists(KT key)
{
struct dbr_hash_slot *slot;
- return search(key, &slot);
+ return this->search(key, &slot);
}

/*
@@ -202,7 +202,7 @@

inline bool exists(KT key, hash_slot_t *destSlot)
{
- return search(key, (KT **)destSlot);
+ return this->search(key, (KT **)destSlot);
}
*/
};
diff -Nurd mediatomb-0.12.1/src/hash/dso_hash.h mediatomb-0.12.1-new/src/hash/dso_hash.h
--- mediatomb-0.12.1/src/hash/dso_hash.h 2010-03-25 10:58:07.000000000 -0400
+++ mediatomb-0.12.1-new/src/hash/dso_hash.h 2011-08-01 13:50:09.000000000 -0400
@@ -100,7 +100,7 @@
inline bool remove(zmm::String key)
{
struct dso_hash_slot *slot;
- if (! search(key, &slot))
+ if (! this->search(key, &slot))
return false;
slot->key->release();
slot->value->release();
@@ -112,7 +112,7 @@
inline void put(zmm::String key, zmm::Ref value)
{
struct dso_hash_slot *slot;
- search(key, &slot);
+ this->search(key, &slot);
put(key, (hash_slot_t)slot, value);
}
void put(zmm::String key, hash_slot_t destSlot, zmm::Ref value)
@@ -141,7 +141,7 @@
inline zmm::Ref get(zmm::String key)
{
struct dso_hash_slot *slot;
- bool found = search(key, &slot);
+ bool found = this->search(key, &slot);
if (found)
return zmm::Ref(slot->value);
else
@@ -153,7 +153,7 @@
inline zmm::Ref get(zmm::String key, hash_slot_t *destSlot)
{
struct dso_hash_slot **slot = (struct dso_hash_slot **)destSlot;
- bool found = search(key, slot);
+ bool found = this->search(key, slot);
if (found)
return zmm::Ref((*slot)->value);
else
diff -Nurd mediatomb-0.12.1/tombupnp/upnp/src/genlib/net/http/webserver.c mediatomb-0.12.1-new/tombupnp/upnp/src/genlib/net/http/webserver.c
--- mediatomb-0.12.1/tombupnp/upnp/src/genlib/net/http/webserver.c 2010-03-25 10:58:12.000000000 -0400
+++ mediatomb-0.12.1-new/tombupnp/upnp/src/genlib/net/http/webserver.c 2011-08-01 13:52:07.000000000 -0400
@@ -310,7 +310,7 @@
* 0 - On Sucess
* UPNP_E_OUTOF_MEMORY - on memory allocation failures
************************************************************************/
-XINLINE int
+static XINLINE int
get_content_type( IN const char *filename,
OUT DOMString * content_type )
{

mediatomb _unstable_ port .patch