Changes 0.3.0:

* Many many bug fixes.
* Supports connecting to mt-daapd daap servers.
* Watch remote hosts for updates
* Fix problem where iTunes would no longer serve our requests.
* Improved debugging support.

6 files changed, 46 insertions, 56 deletions

diff --git a/audio/libopendaap/Makefile b/audio/libopendaap/Makefile
index 86693ff925e..864632a163d 100644
--- a/audio/libopendaap/Makefile
+++ b/audio/libopendaap/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:07 tv Exp $
-#
+# $NetBSD: Makefile,v 1.3 2005/03/07 15:30:44 adam Exp $
 
-DISTNAME=		libopendaap-0.2.1
-PKGREVISION=		1
-CATEGORIES=		audio
-MASTER_SITES=		http://crazney.net/programs/itunes/files/
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	libopendaap-0.3.0
+CATEGORIES=	audio
+MASTER_SITES=	http://crazney.net/programs/itunes/files/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://crazney.net/programs/itunes/libopendaap.html
-COMMENT=		DAAP client library
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://crazney.net/programs/itunes/libopendaap.html
+COMMENT=	DAAP client library
 
-GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/audio/libopendaap/PLIST b/audio/libopendaap/PLIST
index cd2f34f3ea8..8f9575c812c 100644
--- a/audio/libopendaap/PLIST
+++ b/audio/libopendaap/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/03/07 15:30:44 adam Exp $
 include/daap/client.h
+include/daap/portability.h
 lib/libopendaap.la
 lib/pkgconfig/opendaap.pc
+man/man3/libopendaap.3
 @dirrm include/daap
diff --git a/audio/libopendaap/distinfo b/audio/libopendaap/distinfo
index 4a1201186ff..87a1201ba4a 100644
--- a/audio/libopendaap/distinfo
+++ b/audio/libopendaap/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:47 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/03/07 15:30:44 adam Exp $
 
-SHA1 (libopendaap-0.2.1.tar.bz2) = 9e5d143087f7f5366250b47ba3444fa3ed46794d
-RMD160 (libopendaap-0.2.1.tar.bz2) = df657e9db0ea9df8d1155340626cefbb1895a5bc
-Size (libopendaap-0.2.1.tar.bz2) = 325586 bytes
-SHA1 (patch-aa) = 360e6173f943fe6283bc28b2ad9e5acd76041899
-SHA1 (patch-ab) = 44c6228eade8122da02972f6f73e34423457ded0
-SHA1 (patch-ac) = 0dbca4ad085ffe81bf707b97bbc77408faa9c6ca
-SHA1 (patch-ad) = 87735f1d47ddb9aa53a4220675060a31979cb771
+SHA1 (libopendaap-0.3.0.tar.bz2) = 21817a7886ffc8c4d88c621231569562c61356db
+RMD160 (libopendaap-0.3.0.tar.bz2) = 2218783e40e7f48a7b89b2e27145e4964f7dd687
+Size (libopendaap-0.3.0.tar.bz2) = 365682 bytes
+SHA1 (patch-ab) = 3bd01a3038505721149a8ea56f564442b035cee4
+SHA1 (patch-ac) = d723c22d11df6d511290d45ccb54861fbecc178d
+SHA1 (patch-ad) = 88b72f80e4a6ed68f7ae74ace3f3dbf07709c0b1
 SHA1 (patch-ae) = 606756fe07c6af4fc0361f5ae5f3f62b4a40d59e
diff --git a/audio/libopendaap/patches/patch-ab b/audio/libopendaap/patches/patch-ab
index d239fcfb978..5ae510b06d5 100644
--- a/audio/libopendaap/patches/patch-ab
+++ b/audio/libopendaap/patches/patch-ab
@@ -1,28 +1,28 @@
-$NetBSD: patch-ab,v 1.1 2004/08/01 16:13:32 kristerw Exp $
+$NetBSD: patch-ab,v 1.2 2005/03/07 15:30:44 adam Exp $
 
---- discover.c.orig	Sun Aug  1 18:05:09 2004
-+++ discover.c	Sun Aug  1 18:06:16 2004
-@@ -89,9 +89,10 @@
+--- discover.c.orig	2004-10-10 03:49:03.000000000 +0000
++++ discover.c
+@@ -90,9 +90,10 @@ static void NameCallback(mDNS *const m, 
      {
          domainlabel name;
          domainname type, domain;
-+	SDiscover_HostList *new;
-         pthread_mutex_lock(&pDiscover->mtObjectLock);
++        SDiscover_HostList *new;
+         ts_mutex_lock(pDiscover->mtObjectLock);
  
 -        SDiscover_HostList *new = malloc(sizeof(SDiscover_HostList));
 +        new = malloc(sizeof(SDiscover_HostList));
          memset(new, 0, sizeof(SDiscover_HostList));
  
-         new->next = pDiscover->prenamed;
-@@ -193,11 +194,10 @@
+         if (!AddRecord) new->lost = 1;
+@@ -217,11 +218,11 @@ static void CheckoutHostsWorker(void *pv
      SDiscover *pDiscover = (SDiscover *)pvDiscoverThis;
      SDiscover_HostList *cur, *next;
      int cmd;
 +    int finalized = 0;
  
-     pthread_mutex_lock(&pDiscover->mtWorkerLock);
-     pthread_mutex_lock(&pDiscover->mtObjectLock);
--
+     ts_mutex_lock(pDiscover->mtWorkerLock);
+     ts_mutex_lock(pDiscover->mtObjectLock);
+ 
 -    int finalized = 0;
  
      cur = pDiscover->prenamed;
diff --git a/audio/libopendaap/patches/patch-ac b/audio/libopendaap/patches/patch-ac
index b6b43076a0f..c83c96f2091 100644
--- a/audio/libopendaap/patches/patch-ac
+++ b/audio/libopendaap/patches/patch-ac
@@ -1,21 +1,12 @@
-$NetBSD: patch-ac,v 1.1 2004/08/01 16:13:32 kristerw Exp $
+$NetBSD: patch-ac,v 1.2 2005/03/07 15:30:44 adam Exp $
 
---- dmap_generics.c.orig	Sun Aug  1 18:06:33 2004
-+++ dmap_generics.c	Sun Aug  1 18:07:00 2004
-@@ -144,6 +144,7 @@
-     dmapGenericContainer *gc = (dmapGenericContainer*)scopeData;
-     const dmap_ContentCode *cc;
-     dmap_DataTypes type = DMAP_DATATYPE_INVALID;
-+    dmapGenericItem *newItem;
- 
-     if ((cc = dmap_lookupCodeFromFOURCC(&dmap_table, code)))
-     {
-@@ -163,7 +164,7 @@
-         return;
-     }
- 
--    dmapGenericItem *newItem = malloc(sizeof(dmapGenericItem));
-+    newItem = malloc(sizeof(dmapGenericItem));
-     newItem->cc = code;
-     newItem->data.type = type;
-     switch(type)
+--- http_client.c.orig	2005-03-07 16:25:15.000000000 +0000
++++ http_client.c
+@@ -36,6 +36,7 @@
+ # include <sys/types.h>
+ # include <sys/socket.h>
+ # include <sys/select.h>
++# include <netinet/in.h>
+ # include <netdb.h>
+ # include <fcntl.h>
+ #elif defined(SYSTEM_WIN32)
diff --git a/audio/libopendaap/patches/patch-ad b/audio/libopendaap/patches/patch-ad
index 4b9de028f65..d8e863df209 100644
--- a/audio/libopendaap/patches/patch-ad
+++ b/audio/libopendaap/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2004/08/01 16:13:32 kristerw Exp $
+$NetBSD: patch-ad,v 1.2 2005/03/07 15:30:44 adam Exp $
 
---- threadpool.c.orig	Sun Aug  1 18:07:35 2004
-+++ threadpool.c	Sun Aug  1 18:07:55 2004
-@@ -264,9 +264,10 @@
+--- threadpool.c.orig	2004-12-14 04:56:23.000000000 +0000
++++ threadpool.c
+@@ -279,9 +279,10 @@ unsigned int CP_ThreadPool_Release(CP_ST
  void CP_ThreadPool_QueueWorkItem(CP_SThreadPool *pTPThis, CP_TPfnJob pfnCallback,
                                   void *arg1, void *arg2)
  {
 +    CP_STPJobQueue *pTPJQNewJob;
-     pthread_mutex_lock(&pTPThis->mtJobQueueMutex);
+     ts_mutex_lock(pTPThis->mtJobQueueMutex);
  
 -    CP_STPJobQueue *pTPJQNewJob = malloc(sizeof(CP_STPJobQueue));
 +    pTPJQNewJob = malloc(sizeof(CP_STPJobQueue));