- Update to 0.4.0

PR:		ports/81120
Submitted by:	Ports Fury
This commit is contained in:
Michael Johnson 2005-05-16 18:21:37 +00:00
parent 757e510008
commit e1e371b707
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=135387
6 changed files with 64 additions and 32 deletions

View file

@ -6,8 +6,7 @@
# #
PORTNAME= libopendaap PORTNAME= libopendaap
PORTVERSION= 0.3.0 PORTVERSION= 0.4.0
PORTREVISION= 1
CATEGORIES= devel net CATEGORIES= devel net
MASTER_SITES= http://craz.net/programs/itunes/files/ MASTER_SITES= http://craz.net/programs/itunes/files/
@ -15,25 +14,16 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= C lib used to connect to iTunes(R) music shares COMMENT= C lib used to connect to iTunes(R) music shares
USE_BZIP2= yes USE_BZIP2= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack gnometarget pkgconfig USE_GNOME= gnomehack gnometarget pkgconfig
USE_INC_LIBTOOL_VER=15 USE_REINPLACE= yes
USE_GCC= 3.4 USE_LIBTOOL_VER= 15
MAN3= libopendaap.3
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}"
INSTALLS_SHLIB= yes INSTALLS_SHLIB= yes
pre-configure: MAN3= libopendaap.3
# Broken libtool fix
@cd ${WRKSRC} && \
${LIBTOOLIZE} --force
post-patch: post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ .for file in Makefile.in opendaap.pc.in
${WRKSRC}/Makefile.am \ @${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/${file}
${WRKSRC}/Makefile.in \ .endfor
${WRKSRC}/opendaap.pc.in
.include <bsd.port.mk> .include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
MD5 (libopendaap-0.3.0.tar.bz2) = a722ee6171f946a1f415d7c4d88f150a MD5 (libopendaap-0.4.0.tar.bz2) = 4edf92ac18c6ab8c05be7a4eb64a8a8d
SIZE (libopendaap-0.3.0.tar.bz2) = 365682 SIZE (libopendaap-0.4.0.tar.bz2) = 241953

View file

@ -0,0 +1,28 @@
--- client.c.orig Thu May 12 15:46:29 2005
+++ client.c Mon May 16 19:20:04 2005
@@ -1380,10 +1380,10 @@
HTTP_Connection *http_connection;
- if (strlen(songformat) > 4) return -1;
-
HTTP_GetResult *httpRes;
+ if (strlen(songformat) > 4) return -1;
+
if (pCHThis->version_major != 3)
{
buf = safe_sprintf(songUrl_42, databaseid, songid, songformat,
@@ -1643,10 +1643,11 @@
static void AsyncWaitUpdate(void *pv_pCHThis, void *unused)
{
DAAP_SClientHost *pCHThis = (DAAP_SClientHost*)pv_pCHThis;
- TRACE("()\n");
char hash[33] = {0};
char updateUrl[] = "/update?session-id=%i&revision-number=%i&delta=%i";
char *buf;
+
+ TRACE("()\n");
buf = safe_sprintf(updateUrl, pCHThis->sessionid, pCHThis->revision_number,
pCHThis->revision_number);

View file

@ -0,0 +1,13 @@
--- ioloop.c.orig Tue Dec 14 13:39:31 2004
+++ ioloop.c Mon May 16 19:24:20 2005
@@ -113,9 +113,9 @@
void fd_event_reset(fd_event *event)
{
- event->signalled = 0;
char buf[1] = {0};
int flags;
+ event->signalled = 0;
/* set non-blocking on read pipe */
flags = fcntl(event->pipe[0], F_GETFL, 0);

View file

@ -1,13 +0,0 @@
--- mDNS/mDNSClientAPI.h.orig Wed Mar 17 23:45:20 2004
+++ mDNS/mDNSClientAPI.h Wed Mar 17 23:45:36 2004
@@ -480,8 +480,8 @@
typedef unsigned char mDNSu8;
typedef signed short mDNSs16;
typedef unsigned short mDNSu16;
-typedef signed long mDNSs32;
-typedef unsigned long mDNSu32;
+typedef signed int mDNSs32;
+typedef unsigned int mDNSu32;
// To enforce useful type checking, we make mDNSInterfaceID be a pointer to a dummy struct
// This way, mDNSInterfaceIDs can be assigned, and compared with each other, but not with other types

View file

@ -0,0 +1,14 @@
--- threadpool.c.orig Tue Dec 14 13:56:23 2004
+++ threadpool.c Mon May 16 19:23:22 2005
@@ -279,9 +279,9 @@
void CP_ThreadPool_QueueWorkItem(CP_SThreadPool *pTPThis, CP_TPfnJob pfnCallback,
void *arg1, void *arg2)
{
- ts_mutex_lock(pTPThis->mtJobQueueMutex);
-
CP_STPJobQueue *pTPJQNewJob = malloc(sizeof(CP_STPJobQueue));
+
+ ts_mutex_lock(pTPThis->mtJobQueueMutex);
pTPJQNewJob->fnJobCallback = pfnCallback;
pTPJQNewJob->arg1 = arg1;