summaryrefslogtreecommitdiff
path: root/audio/libopendaap
diff options
context:
space:
mode:
authorkristerw <kristerw@pkgsrc.org>2004-08-01 16:13:32 +0000
committerkristerw <kristerw@pkgsrc.org>2004-08-01 16:13:32 +0000
commitf78c1f4e276189c69fc3573c7c62bbcec5dbd3b0 (patch)
treece14fb18e125b385739ab3087ee774f3508791e9 /audio/libopendaap
parent4e4f6fbc7e0e7ad35861368c68b17a3bf40b95b1 (diff)
downloadpkgsrc-f78c1f4e276189c69fc3573c7c62bbcec5dbd3b0.tar.gz
Convert some C99-isms to C89 to make this build with gcc 2.95.
Diffstat (limited to 'audio/libopendaap')
-rw-r--r--audio/libopendaap/distinfo6
-rw-r--r--audio/libopendaap/patches/patch-aa31
-rw-r--r--audio/libopendaap/patches/patch-ab29
-rw-r--r--audio/libopendaap/patches/patch-ac21
-rw-r--r--audio/libopendaap/patches/patch-ad16
5 files changed, 102 insertions, 1 deletions
diff --git a/audio/libopendaap/distinfo b/audio/libopendaap/distinfo
index 786138f7fae..f36bcf0e678 100644
--- a/audio/libopendaap/distinfo
+++ b/audio/libopendaap/distinfo
@@ -1,4 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/06/06 08:02:49 agc Exp $
+$NetBSD: distinfo,v 1.2 2004/08/01 16:13:32 kristerw Exp $
SHA1 (libopendaap-0.2.1.tar.bz2) = 9e5d143087f7f5366250b47ba3444fa3ed46794d
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
diff --git a/audio/libopendaap/patches/patch-aa b/audio/libopendaap/patches/patch-aa
new file mode 100644
index 00000000000..613df4eb72e
--- /dev/null
+++ b/audio/libopendaap/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1 2004/08/01 16:13:32 kristerw Exp $
+
+--- mDNS/mDNS.c.orig Sun Aug 1 18:03:05 2004
++++ mDNS/mDNS.c Sun Aug 1 18:04:13 2004
+@@ -5410,12 +5410,12 @@
+
+ for (i = 0; i < totalrecords && ptr && ptr < end; i++)
+ {
++ char buf[1000];
+ LargeCacheRecord pkt;
+ const mDNSu8 RecordType = (mDNSu8)((i < response->h.numAnswers) ? kDNSRecordTypePacketAns : kDNSRecordTypePacketAdd);
+ ptr = GetLargeResourceRecord(m, response, ptr, end, InterfaceID, RecordType, &pkt);
+ if (!ptr) break; // Break out of the loop and clean up our CacheFlushRecords list before exiting
+
+- char buf[1000];
+ ConvertDomainNameToCString(&pkt.r.resrec.name, buf);
+ verbosedebugf("%s\n", buf);
+ // 1. Check that this packet resource record does not conflict with any of ours
+@@ -5500,9 +5500,10 @@
+ // 2. See if we want to add this packet resource record to our cache
+ if (m->rrcache_size) // Only try to cache answers if we have a cache to put them in
+ {
+- verbosedebugf("caching\n");
+- mDNSu32 slot = HashSlot(&pkt.r.resrec.name);
++ mDNSu32 slot;
+ CacheRecord *rr;
++ verbosedebugf("caching\n");
++ slot = HashSlot(&pkt.r.resrec.name);
+ // 2a. Check if this packet resource record is already in our cache
+ for (rr = m->rrcache_hash[slot]; rr; rr=rr->next)
+ {
diff --git a/audio/libopendaap/patches/patch-ab b/audio/libopendaap/patches/patch-ab
new file mode 100644
index 00000000000..d239fcfb978
--- /dev/null
+++ b/audio/libopendaap/patches/patch-ab
@@ -0,0 +1,29 @@
+$NetBSD: patch-ab,v 1.1 2004/08/01 16:13:32 kristerw Exp $
+
+--- discover.c.orig Sun Aug 1 18:05:09 2004
++++ discover.c Sun Aug 1 18:06:16 2004
+@@ -89,9 +89,10 @@
+ {
+ domainlabel name;
+ domainname type, domain;
++ SDiscover_HostList *new;
+ pthread_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 @@
+ SDiscover *pDiscover = (SDiscover *)pvDiscoverThis;
+ SDiscover_HostList *cur, *next;
+ int cmd;
++ int finalized = 0;
+
+ pthread_mutex_lock(&pDiscover->mtWorkerLock);
+ pthread_mutex_lock(&pDiscover->mtObjectLock);
+-
+- int finalized = 0;
+
+ cur = pDiscover->prenamed;
+ pDiscover->prenamed = NULL;
diff --git a/audio/libopendaap/patches/patch-ac b/audio/libopendaap/patches/patch-ac
new file mode 100644
index 00000000000..b6b43076a0f
--- /dev/null
+++ b/audio/libopendaap/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1 2004/08/01 16:13:32 kristerw 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)
diff --git a/audio/libopendaap/patches/patch-ad b/audio/libopendaap/patches/patch-ad
new file mode 100644
index 00000000000..4b9de028f65
--- /dev/null
+++ b/audio/libopendaap/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2004/08/01 16:13:32 kristerw Exp $
+
+--- threadpool.c.orig Sun Aug 1 18:07:35 2004
++++ threadpool.c Sun Aug 1 18:07:55 2004
+@@ -264,9 +264,10 @@
+ void CP_ThreadPool_QueueWorkItem(CP_SThreadPool *pTPThis, CP_TPfnJob pfnCallback,
+ void *arg1, void *arg2)
+ {
++ CP_STPJobQueue *pTPJQNewJob;
+ pthread_mutex_lock(&pTPThis->mtJobQueueMutex);
+
+- CP_STPJobQueue *pTPJQNewJob = malloc(sizeof(CP_STPJobQueue));
++ pTPJQNewJob = malloc(sizeof(CP_STPJobQueue));
+
+ pTPJQNewJob->fnJobCallback = pfnCallback;
+ pTPJQNewJob->arg1 = arg1;