Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory vz-cvs-3.sog:/tmp/cvs-serv30256/10.4/unstable/main/finkinfo/net
Modified Files:
mediatomb.info mediatomb.patch
Log Message:
new upstream libexif and mediatomb, and move a few things to 10.7
Index: mediatomb.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/mediatomb.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mediatomb.info 9 May 2010 15:11:33 -0000 1.12
+++ mediatomb.info 1 Aug 2011 18:27:49 -0000 1.13
@@ -1,10 +1,10 @@
Package: mediatomb
-Version: 0.11.0
-Revision: 6
-Architecture: i386, powerpc
+Version: 0.12.1
+Revision: 1
+Architecture: x86_64, i386, powerpc
Description: UPnP Media Server w/ Web Interface
License: GPL
-Maintainer: Benjamin Reed <mediat...@fink.racoonfink.com>
+Maintainer: Benjamin Reed <mediat...@fink.raccoonfink.com>
Depends: <<
file,
@@ -13,20 +13,20 @@
libcurl4-shlibs,
libexif12-shlibs,
libiconv,
- nspr-shlibs,
+ nspr.0d-shlibs,
spidermonkey-shlibs,
sqlite3-shlibs,
taglib-shlibs
<<
BuildDepends: <<
file-dev,
- fink (>= 0.26.0-1),
+ fink (>= 0.30.2-1),
expat1,
libcurl4,
libexif12,
libiconv-dev,
libssh2.1,
- nspr,
+ nspr.0d,
spidermonkey-dev,
sqlite3-dev,
taglib
@@ -34,11 +34,12 @@
GCC: 4.0
Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 661f08933830d920de21436fe122fb15
-PatchFile: %n.patch
-PatchFile-MD5: 9496ffba98766e7f45d5804f9d59a84e
+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
Index: mediatomb.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/mediatomb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mediatomb.patch 29 May 2008 19:01:07 -0000 1.1
+++ mediatomb.patch 1 Aug 2011 18:27:49 -0000 1.2
@@ -1,12 +1,138 @@
-diff -Nurd mediatomb-0.11.0/src/url.cc mediatomb-0.11.0-new/src/url.cc
---- mediatomb-0.11.0/src/url.cc 2008-03-01 17:48:36.000000000 -0500
-+++ mediatomb-0.11.0-new/src/url.cc 2008-05-29 14:51:16.000000000 -0400
-@@ -75,7 +75,7 @@
-
- if (only_header)
+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)
{
-- 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());
+ struct dbo_hash_slot<KT, VT> *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<VT> value)
+ {
+ struct dbo_hash_slot<KT, VT> *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<VT> value)
+@@ -162,7 +162,7 @@
+ inline zmm::Ref<VT> get(KT key)
+ {
+ struct dbo_hash_slot<KT, VT> *slot;
+- bool found = search(key, &slot);
++ bool found = this->search(key, &slot);
+ if (found)
+ return zmm::Ref<VT>(slot->value);
+ else
+@@ -174,7 +174,7 @@
+ inline zmm::Ref<VT> get(KT key, hash_slot_t *destSlot)
+ {
+ struct dbo_hash_slot<KT, VT> **slot = (struct dbo_hash_slot<KT, VT>
**)destSlot;
+- bool found = search(key, slot);
++ bool found = this->search(key, slot);
+ if (found)
+ return zmm::Ref<VT>((*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<KT> *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<KT> *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<KT> *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<VT> *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<VT> value)
+ {
+ struct dso_hash_slot<VT> *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<VT> value)
+@@ -141,7 +141,7 @@
+ inline zmm::Ref<VT> get(zmm::String key)
+ {
+ struct dso_hash_slot<VT> *slot;
+- bool found = search(key, &slot);
++ bool found = this->search(key, &slot);
+ if (found)
+ return zmm::Ref<VT>(slot->value);
+ else
+@@ -153,7 +153,7 @@
+ inline zmm::Ref<VT> get(zmm::String key, hash_slot_t *destSlot)
+ {
+ struct dso_hash_slot<VT> **slot = (struct dso_hash_slot<VT>
**)destSlot;
+- bool found = search(key, slot);
++ bool found = this->search(key, slot);
+ if (found)
+ return zmm::Ref<VT>((*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 )
+ {
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
