Attachment #120611 for bug #163425

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




# Date created: 8 October 2010
# Whom: John Hixson <john@pcbsd.org>
#
# $FreeBSD: ports/audio/pianobar/Makefile,v 1.2 2010/11/08 18:23:57 jpaetzel Exp $
#

PORTNAME=	pianobar
PORTVERSION=	2011.12.11
CATEGORIES=	audio
MASTER_SITES=	http://6xq.net/static/projects/${PORTNAME}/


COMMENT=	Command line Pandora player

LIB_DEPENDS=	ao:${PORTSDIR}/audio/libao \
	faad:${PORTSDIR}/audio/faad \
	mad:${PORTSDIR}/audio/libmad \
	gnutls:${PORTSDIR}/security

LICENSE=	MIT

MAN1=	pianobar.1
MAN_COMPRESSED=	no

PLIST_FILES=	bin/pianobar

USE_BZIP2=	yes
USE_GMAKE=	yes

CFLAGS=	-I${LOCALBASE}/include
LDFLAGS=	-L${LOCALBASE}/lib

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)pianobar.new/distinfo (-2 / +2 lines)
1	SHA256 (pianobar-2011.11.11.tar.bz2) = c1f5df7813b543992b79ac1558d27ff3fb0198f7bfb2d5d2e39173df4fae951b	1	SHA256 (pianobar-2011.12.11.tar.bz2) = 6963d21376f201dfbf9f9ed403c84aebd23e64616d35b5a7d22cfd30a6755e6d
2	SIZE (pianobar-2011.11.11.tar.bz2) = 67778	2	SIZE (pianobar-2011.12.11.tar.bz2) = 68121




--- Makefile.orig	2011-12-11 10:39:27.000000000 -0800
+++ Makefile	2011-12-17 22:41:34.000000000 -0800
@@ -4,7 +4,7 @@
 BINDIR:=${PREFIX}/bin
 LIBDIR:=${PREFIX}/lib
 INCDIR:=${PREFIX}/include

 DYNLINK:=0
 
 # Respect environment variables set by user; does not work with :=
 ifeq (${CFLAGS},)
-	CFLAGS=-O2 -DNDEBUG
+	CFLAGS=-O2 -DNDEBUG -I/usr/local/include
 endif
 ifeq (${CC},cc)
 	CC=c99
@@ -74,7 +74,7 @@
 	LIBFAAD_LDFLAGS=
 else
 	LIBFAAD_CFLAGS=-DENABLE_FAAD
-	LIBFAAD_LDFLAGS=-lfaad
+	LIBFAAD_LDFLAGS=-L/usr/local/lib -lfaad
 endif
 
 ifeq (${DISABLE_MAD}, 1)
@@ -82,7 +82,7 @@
 	LIBMAD_LDFLAGS=
 else
 	LIBMAD_CFLAGS=-DENABLE_MAD
-	LIBMAD_LDFLAGS=-lmad
+	LIBMAD_LDFLAGS=-L/usr/local/lib -lmad
 endif
 
 # build pianobar




--- src/libwaitress/waitress.c.orig	2011-11-11 03:37:58.000000000 -0800
+++ src/libwaitress/waitress.c	2011-11-21 23:34:11.000000000 -0800
@@ -443,10 +443,11 @@
  *	@param write count bytes
  *	@return number of written bytes or -1 on error
  */
-static ssize_t WaitressPollWrite (WaitressHandle_t *waith,
-		const char *buf, size_t count) {
+static ssize_t WaitressPollWrite (void *wptr, const void *bptr, size_t count) {
 	int pollres = -1;
 	ssize_t retSize;
+	WaitressHandle_t *waith = wptr;
+	const char *buf = bptr;
 
 	assert (waith != NULL);
 	assert (buf != NULL);
@@ -489,10 +490,11 @@
  *	@param buffer size
  *	@return number of read bytes or -1 on error
  */
-static ssize_t WaitressPollRead (WaitressHandle_t *waith, char *buf,
-		size_t count) {
+static ssize_t WaitressPollRead (void *wptr, void *bptr, size_t count) {
 	int pollres = -1;
 	ssize_t retSize;
+	WaitressHandle_t *waith = wptr;
+	char *buf = bptr;
 
 	assert (waith != NULL);
 	assert (buf != NULL);
@@ -515,7 +517,7 @@
 }
 
 static WaitressReturn_t WaitressOrdinaryRead (WaitressHandle_t *waith,
-		char *buf, const size_t size, size_t *retSize) {
+		char *buf, const size_t size, ssize_t *retSize) {
 	const ssize_t ret = WaitressPollRead (waith, buf, size);
 	if (ret != -1) {
 		*retSize = ret;
@@ -524,7 +526,7 @@
 }
 
 static WaitressReturn_t WaitressGnutlsRead (WaitressHandle_t *waith,
-		char *buf, const size_t size, size_t *retSize) {
+		char *buf, const size_t size, ssize_t *retSize) {
 	ssize_t ret = gnutls_record_recv (waith->request.tlsSession, buf, size);
 	if (ret < 0) {
 		return WAITRESS_RET_TLS_READ_ERR;
@@ -809,7 +811,7 @@
 		/* set up proxy tunnel */
 		if (WaitressProxyEnabled (waith)) {
 			char buf[256];
-			size_t size;
+			ssize_t size;
 			snprintf (buf, sizeof (buf), "CONNECT %s:%s HTTP/"
 					WAITRESS_HTTP_VERSION "\r\n\r\n",
 					waith->url.host, WaitressDefaultPort (&waith->url));




--- src/libwaitress/waitress.h.orig	2011-11-11 03:37:58.000000000 -0800
+++ src/libwaitress/waitress.h	2011-11-21 23:34:09.000000000 -0800
@@ -82,7 +82,8 @@
 
 /*	reusable handle
  */
-typedef struct {
+struct WaitressHandle_t;
+typedef struct WaitressHandle_t {
 	WaitressUrl_t url;
 	WaitressMethod_t method;
 	const char *extraHeaders;
@@ -102,9 +103,9 @@
 		char *buf;
 		gnutls_session_t tlsSession;
 		/* first argument is WaitressHandle_t, but that's not defined here */
-		WaitressHandlerReturn_t (*dataHandler) (void *, char *, const size_t);
-		ssize_t (*read) (void *, char *, const size_t, ssize_t *);
-		ssize_t (*write) (void *, const char *, const size_t);
+		WaitressHandlerReturn_t (*dataHandler) (struct WaitressHandle_t *, char *, const size_t);
+		WaitressReturn_t (*read) (struct WaitressHandle_t *, char *, const size_t, ssize_t *);
+		WaitressReturn_t (*write) (struct WaitressHandle_t *, const char *, const size_t);
 		/* temporary return value storage */
 		WaitressReturn_t readWriteRet;
 	} request;

Return to bug 163425

Lines 2-12 Link Here

(-)pianobar.new/Makefile (-7 / +8 lines)
2	# Date created: 8 October 2010	2	# Date created: 8 October 2010
3	# Whom: John Hixson <john@pcbsd.org>	3	# Whom: John Hixson <john@pcbsd.org>
4	#	4	#
5	# $FreeBSD: ports/audio/pianobar/Makefile,v 1.7 2011/11/22 15:58:12 miwi Exp $	5	# $FreeBSD: ports/audio/pianobar/Makefile,v 1.2 2010/11/08 18:23:57 jpaetzel Exp $
6	#	6	#
7		7
8	PORTNAME= pianobar	8	PORTNAME= pianobar
9	PORTVERSION= 2011.11.11	9	PORTVERSION= 2011.12.11
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= http://6xq.net/static/projects/${PORTNAME}/	11	MASTER_SITES= http://6xq.net/static/projects/${PORTNAME}/
12		12
Lines 14-26 Link Here
14	COMMENT= Command line Pandora player	14	COMMENT= Command line Pandora player
15		15
16	LIB_DEPENDS= ao:${PORTSDIR}/audio/libao \	16	LIB_DEPENDS= ao:${PORTSDIR}/audio/libao \
17	faad:${PORTSDIR}/audio/faad \	17	faad:${PORTSDIR}/audio/faad \
18	mad:${PORTSDIR}/audio/libmad \	18	mad:${PORTSDIR}/audio/libmad \
19	gnutls.47:${PORTSDIR}/security/gnutls	19	gnutls:${PORTSDIR}/security
20		20
21	LICENSE= MIT	21	LICENSE= MIT
22		22
23	MAN1= pianobar.1	23	MAN1= pianobar.1
24	MAN_COMPRESSED= no	24	MAN_COMPRESSED= no
25		25
26	PLIST_FILES= bin/pianobar	26	PLIST_FILES= bin/pianobar
Lines 28-33 Link Here
28	USE_BZIP2= yes	28	USE_BZIP2= yes
29	USE_GMAKE= yes	29	USE_GMAKE= yes
30		30
31	CFLAGS=	31	CFLAGS= -I${LOCALBASE}/include
		32	LDFLAGS= -L${LOCALBASE}/lib
32		33
33	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)pianobar.new/files/patch-Makefile (-27 / +3 lines)
1	--- Makefile.orig 2011-09-22 03:34:19.000000000 -0700	1	--- Makefile.orig 2011-12-11 10:39:27.000000000 -0800
2	+++ Makefile 2011-09-22 22:58:18.000000000 -0700	2	+++ Makefile 2011-12-17 22:41:34.000000000 -0800
3	@@ -4,12 +4,12 @@	3	@@ -4,7 +4,7 @@
4	BINDIR:=${PREFIX}/bin	4	BINDIR:=${PREFIX}/bin
5	LIBDIR:=${PREFIX}/lib	5	LIBDIR:=${PREFIX}/lib
6	INCDIR:=${PREFIX}/include	6	INCDIR:=${PREFIX}/include
Lines 9-35 Link Here
9	DYNLINK:=0	9	DYNLINK:=0
10		10
11	# Respect environment variables set by user; does not work with :=	11	# Respect environment variables set by user; does not work with :=
12	ifeq (${CFLAGS},)
13	- CFLAGS=-O2 -DNDEBUG
14	+ CFLAGS=-O2 -DNDEBUG -I/usr/local/include
15	endif
16	ifeq (${CC},cc)
17	CC=c99
18	@@ -74,7 +74,7 @@
19	LIBFAAD_LDFLAGS=
20	else
21	LIBFAAD_CFLAGS=-DENABLE_FAAD
22	- LIBFAAD_LDFLAGS=-lfaad
23	+ LIBFAAD_LDFLAGS=-L/usr/local/lib -lfaad
24	endif
25
26	ifeq (${DISABLE_MAD}, 1)
27	@@ -82,7 +82,7 @@
28	LIBMAD_LDFLAGS=
29	else
30	LIBMAD_CFLAGS=-DENABLE_MAD
31	- LIBMAD_LDFLAGS=-lmad
32	+ LIBMAD_LDFLAGS=-L/usr/local/lib -lmad
33	endif
34
35	# build pianobar

Lines 1-57 Link Here

(-)pianobar.new/files/patch-waitress.c (-57 lines)
1	--- src/libwaitress/waitress.c.orig 2011-11-11 03:37:58.000000000 -0800
2	+++ src/libwaitress/waitress.c 2011-11-21 23:34:11.000000000 -0800
3	@@ -443,10 +443,11 @@
4	* @param write count bytes
5	* @return number of written bytes or -1 on error
6	*/
7	-static ssize_t WaitressPollWrite (WaitressHandle_t *waith,
8	- const char *buf, size_t count) {
9	+static ssize_t WaitressPollWrite (void wptr, const void bptr, size_t count) {
10	int pollres = -1;
11	ssize_t retSize;
12	+ WaitressHandle_t *waith = wptr;
13	+ const char *buf = bptr;
14
15	assert (waith != NULL);
16	assert (buf != NULL);
17	@@ -489,10 +490,11 @@
18	* @param buffer size
19	* @return number of read bytes or -1 on error
20	*/
21	-static ssize_t WaitressPollRead (WaitressHandle_t waith, char buf,
22	- size_t count) {
23	+static ssize_t WaitressPollRead (void wptr, void bptr, size_t count) {
24	int pollres = -1;
25	ssize_t retSize;
26	+ WaitressHandle_t *waith = wptr;
27	+ char *buf = bptr;
28
29	assert (waith != NULL);
30	assert (buf != NULL);
31	@@ -515,7 +517,7 @@
32	}
33
34	static WaitressReturn_t WaitressOrdinaryRead (WaitressHandle_t *waith,
35	- char buf, const size_t size, size_t retSize) {
36	+ char buf, const size_t size, ssize_t retSize) {
37	const ssize_t ret = WaitressPollRead (waith, buf, size);
38	if (ret != -1) {
39	*retSize = ret;
40	@@ -524,7 +526,7 @@
41	}
42
43	static WaitressReturn_t WaitressGnutlsRead (WaitressHandle_t *waith,
44	- char buf, const size_t size, size_t retSize) {
45	+ char buf, const size_t size, ssize_t retSize) {
46	ssize_t ret = gnutls_record_recv (waith->request.tlsSession, buf, size);
47	if (ret < 0) {
48	return WAITRESS_RET_TLS_READ_ERR;
49	@@ -809,7 +811,7 @@
50	/* set up proxy tunnel */
51	if (WaitressProxyEnabled (waith)) {
52	char buf[256];
53	- size_t size;
54	+ ssize_t size;
55	snprintf (buf, sizeof (buf), "CONNECT %s:%s HTTP/"
56	WAITRESS_HTTP_VERSION "\r\n\r\n",
57	waith->url.host, WaitressDefaultPort (&waith->url));

Lines 1-25 Link Here

(-)pianobar.new/files/patch-waitress.h (-25 lines)
1	--- src/libwaitress/waitress.h.orig 2011-11-11 03:37:58.000000000 -0800
2	+++ src/libwaitress/waitress.h 2011-11-21 23:34:09.000000000 -0800
3	@@ -82,7 +82,8 @@
4
5	/* reusable handle
6	*/
7	-typedef struct {
8	+struct WaitressHandle_t;
9	+typedef struct WaitressHandle_t {
10	WaitressUrl_t url;
11	WaitressMethod_t method;
12	const char *extraHeaders;
13	@@ -102,9 +103,9 @@
14	char *buf;
15	gnutls_session_t tlsSession;
16	/* first argument is WaitressHandle_t, but that's not defined here */
17	- WaitressHandlerReturn_t (dataHandler) (void , char *, const size_t);
18	- ssize_t (read) (void , char , const size_t, ssize_t );
19	- ssize_t (write) (void , const char *, const size_t);
20	+ WaitressHandlerReturn_t (dataHandler) (struct WaitressHandle_t , char *, const size_t);
21	+ WaitressReturn_t (read) (struct WaitressHandle_t , char , const size_t, ssize_t );
22	+ WaitressReturn_t (write) (struct WaitressHandle_t , const char *, const size_t);
23	/* temporary return value storage */
24	WaitressReturn_t readWriteRet;
25	} request;