Attachment #53623 for bug #81120

View | Details | Raw Unified | Return to bug 81120
Collapse All | Expand All




#

PORTNAME=	libopendaap
PORTVERSION=	0.4.0
PORTREVISION=	1
CATEGORIES=	devel net
MASTER_SITES=	http://craz.net/programs/itunes/files/


COMMENT=	C lib used to connect to iTunes(R) music shares

USE_BZIP2=	yes
USE_REINPLACE=	yes
USE_GNOME=	gnomehack gnometarget pkgconfig
USE_REINPLACE=	yes
USE_LIBTOOL_VER=	15
MAN3=		libopendaap.3

CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}"

INSTALLS_SHLIB=	yes

MAN3=		libopendaap.3
# Broken libtool fix
	@cd ${WRKSRC} && \
		${LIBTOOLIZE} --force

post-patch:
.for file in Makefile.in opendaap.pc.in
	@${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/${file}
.endfor
		${WRKSRC}/opendaap.pc.in

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/libopendaap/distinfo (-2 / +2 lines)
1	MD5 (libopendaap-0.3.0.tar.bz2) = a722ee6171f946a1f415d7c4d88f150a	1	MD5 (libopendaap-0.4.0.tar.bz2) = 4edf92ac18c6ab8c05be7a4eb64a8a8d
2	SIZE (libopendaap-0.3.0.tar.bz2) = 365682	2	SIZE (libopendaap-0.4.0.tar.bz2) = 241953




--- 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);




--- 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);




--- 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




--- 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;

Return to bug 81120

Lines 6-13 Link Here

(-)devel/libopendaap/Makefile (-17 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= libopendaap	8	PORTNAME= libopendaap
9	PORTVERSION= 0.3.0	9	PORTVERSION= 0.4.0
10	PORTREVISION= 1
11	CATEGORIES= devel net	10	CATEGORIES= devel net
12	MASTER_SITES= http://craz.net/programs/itunes/files/	11	MASTER_SITES= http://craz.net/programs/itunes/files/
13		12
Lines 15-39 Link Here
15	COMMENT= C lib used to connect to iTunes(R) music shares	14	COMMENT= C lib used to connect to iTunes(R) music shares
16		15
17	USE_BZIP2= yes	16	USE_BZIP2= yes
18	USE_REINPLACE= yes
19	USE_GNOME= gnomehack gnometarget pkgconfig	17	USE_GNOME= gnomehack gnometarget pkgconfig
20	USE_INC_LIBTOOL_VER=15	18	USE_REINPLACE= yes
21	USE_GCC= 3.4	19	USE_LIBTOOL_VER= 15
22	MAN3= libopendaap.3
23
24	CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}"
25
26	INSTALLS_SHLIB= yes	20	INSTALLS_SHLIB= yes
27		21
28	pre-configure:	22	MAN3= libopendaap.3
29	# Broken libtool fix
30	@cd ${WRKSRC} && \
31	${LIBTOOLIZE} --force
32		23
33	post-patch:	24	post-patch:
34	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|' \	25	.for file in Makefile.in opendaap.pc.in
35	${WRKSRC}/Makefile.am \	26	@${REINPLACE_CMD} -e 's\|-lpthread\|\|g' ${WRKSRC}/${file}
36	${WRKSRC}/Makefile.in \	27	.endfor
37	${WRKSRC}/opendaap.pc.in
38		28
39	.include <bsd.port.mk>	29	.include <bsd.port.mk>

Line 0 Link Here

(-)devel/libopendaap/files/patch-client.c (+28 lines)
	1	--- client.c.orig Thu May 12 15:46:29 2005
	2	+++ client.c Mon May 16 19:20:04 2005
	3	@@ -1380,10 +1380,10 @@
	4
	5	HTTP_Connection *http_connection;
	6
	7	- if (strlen(songformat) > 4) return -1;
	8	-
	9	HTTP_GetResult *httpRes;
	10
	11	+ if (strlen(songformat) > 4) return -1;
	12	+
	13	if (pCHThis->version_major != 3)
	14	{
	15	buf = safe_sprintf(songUrl_42, databaseid, songid, songformat,
	16	@@ -1643,10 +1643,11 @@
	17	static void AsyncWaitUpdate(void pv_pCHThis, void unused)
	18	{
	19	DAAP_SClientHost pCHThis = (DAAP_SClientHost)pv_pCHThis;
	20	- TRACE("()\n");
	21	char hash[33] = {0};
	22	char updateUrl[] = "/update?session-id=%i&revision-number=%i&delta=%i";
	23	char *buf;
	24	+
	25	+ TRACE("()\n");
	26
	27	buf = safe_sprintf(updateUrl, pCHThis->sessionid, pCHThis->revision_number,
	28	pCHThis->revision_number);

Line 0 Link Here

(-)devel/libopendaap/files/patch-ioloop.c (+13 lines)
	1	--- ioloop.c.orig Tue Dec 14 13:39:31 2004
	2	+++ ioloop.c Mon May 16 19:24:20 2005
	3	@@ -113,9 +113,9 @@
	4
	5	void fd_event_reset(fd_event *event)
	6	{
	7	- event->signalled = 0;
	8	char buf[1] = {0};
	9	int flags;
	10	+ event->signalled = 0;
	11
	12	/* set non-blocking on read pipe */
	13	flags = fcntl(event->pipe[0], F_GETFL, 0);

Lines 1-13 Link Here

(-)devel/libopendaap/files/patch-mDNS-mDNSClientAPI.h (-13 lines)
1	--- mDNS/mDNSClientAPI.h.orig Wed Mar 17 23:45:20 2004
2	+++ mDNS/mDNSClientAPI.h Wed Mar 17 23:45:36 2004
3	@@ -480,8 +480,8 @@
4	typedef unsigned char mDNSu8;
5	typedef signed short mDNSs16;
6	typedef unsigned short mDNSu16;
7	-typedef signed long mDNSs32;
8	-typedef unsigned long mDNSu32;
9	+typedef signed int mDNSs32;
10	+typedef unsigned int mDNSu32;
11
12	// To enforce useful type checking, we make mDNSInterfaceID be a pointer to a dummy struct
13	// This way, mDNSInterfaceIDs can be assigned, and compared with each other, but not with other types

Line 0 Link Here

(-)devel/libopendaap/files/patch-threadpool.c (+14 lines)
	1	--- threadpool.c.orig Tue Dec 14 13:56:23 2004
	2	+++ threadpool.c Mon May 16 19:23:22 2005
	3	@@ -279,9 +279,9 @@
	4	void CP_ThreadPool_QueueWorkItem(CP_SThreadPool *pTPThis, CP_TPfnJob pfnCallback,
	5	void arg1, void arg2)
	6	{
	7	- ts_mutex_lock(pTPThis->mtJobQueueMutex);
	8	-
	9	CP_STPJobQueue *pTPJQNewJob = malloc(sizeof(CP_STPJobQueue));
	10	+
	11	+ ts_mutex_lock(pTPThis->mtJobQueueMutex);
	12
	13	pTPJQNewJob->fnJobCallback = pfnCallback;
	14	pTPJQNewJob->arg1 = arg1;