Attachment #146595 for bug #193154




# $FreeBSD: head/audio/gogglesmm/Makefile 366661 2014-08-30 18:21:47Z adamw $

PORTNAME=	gogglesmm
PORTVERSION=	0.13.3
CATEGORIES=	audio
MASTER_SITES=	GH

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Music collection manager and player


USE_GITHUB=	yes
GH_ACCOUNT=	${PORTNAME}
GH_COMMIT=	259f253

USES=		compiler:c++0x desktop-file-utils gmake pkgconfig
USE_SQLITE=	yes
HAS_CONFIGURE=	yes
CONFIGURE_ENV=	LINK="${CXX}" \

		--without-rsound --without-mpcdec
INSTALLS_ICONS=	yes

CFLAGS+=	-Wno-error=return-type
CFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib -pthread


WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
WAVPACK_CONFIGURE_OFF=	--without-wavpack

.include <bsd.port.pre.mk>

.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 34
USE_GCC=	yes
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		's|share/man|man|' ${WRKSRC}/configure

	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gogglesmm/libgap_*.so

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)audio/gogglesmm/distinfo (-2 / +2 lines)
1	SHA256 (gogglesmm-0.13.2.tar.gz) = d6f577c06b420dcab813a56672c07434b034f30aad0cfc379b9b2a6c20d75e3f	1	SHA256 (gogglesmm-0.13.3.tar.gz) = e52695d3e2d328e047ba127bdc960e3935f2f19cfeb8bf99ecc202826ca09ea8
2	SIZE (gogglesmm-0.13.2.tar.gz) = 1336120	2	SIZE (gogglesmm-0.13.3.tar.gz) = 1336269




--- src/gap/ap_reactor.cpp.orig
+++ src/gap/ap_reactor.cpp
@@ -98,17 +98,27 @@
 #ifndef WIN32
   FXint n;
   if (timeout>=0) {
+#ifdef _GNU_SOURCE
     struct timespec ts;
     ts.tv_sec  = timeout / 1000000000;
     ts.tv_nsec = timeout % 1000000000;
+#endif
     do {
+#ifdef _GNU_SOURCE
       n = ppoll(pfds,nfds,&ts,NULL);
+#else
+      n = poll(pfds,nfds,-1);
+#endif
       }
     while(n==-1 && errno==EINTR);
     }
   else {
     do {
+#ifdef _GNU_SOURCE
       n = ppoll(pfds,nfds,NULL,NULL);
+#else
+      n = poll(pfds,nfds,0);
+#endif
       }
     while(n==-1 && errno==EINTR);
     }    

Lines 1-10 Link Here

(-)audio/gogglesmm/files/patch-src__gap__ap_socket.cpp (-7 / +16 lines)
1	--- src/gap/ap_socket.cpp.orig	1	--- src/gap/ap_socket.cpp.orig
2	+++ src/gap/ap_socket.cpp	2	+++ src/gap/ap_socket.cpp
3	@@ -18,6 +18,7 @@	3	@@ -41,14 +41,14 @@
4	********************************************************************************/	4	#ifndef SOCK_CLOEXEC
5	#include "ap_defs.h"	5	if (!ap_set_closeonexec(device)){
6	#include "ap_socket.h"	6	::close(device);
7	+#include "ap_utils.h"	7	- return BadHandle;
		8	+ return;
		9	}
		10	#endif
8		11
9		12	#ifndef SOCK_NONBLOCK
10	#ifndef WIN32	13	if (access&FXIO::NonBlocking && !ap_set_nonblocking(device)){
		14	::close(device);
		15	- return BadHandle;
		16	+ return;
		17	}
		18	#endif
		19	}




--- src/gap/ap_utils.cpp.orig
+++ src/gap/ap_utils.cpp
@@ -247,17 +247,27 @@
     nfds=2;
     }
   if (timeout) {
+#ifdef _GNU_SOURCE
     struct timespec ts;
     ts.tv_sec  = (timeout / 1000000000);
     ts.tv_nsec = (timeout % 1000000000);
+#endif
     do {
+#ifdef _GNU_SOURCE
       n=ppoll(fds,nfds,&ts,NULL);
+#else
+      n=poll(fds,nfds,-1);
+#endif
       }
     while(n==-1 && (errno==EAGAIN || errno==EINTR));
     }
   else {
     do {
+#ifdef _GNU_SOURCE
       n=ppoll(fds,nfds,NULL,NULL);
+#else
+      n=poll(fds,nfds,0);
+#endif
       }
     while(n==-1 && (errno==EAGAIN || errno==EINTR));
     }

Lines 1-11 Link Here

(-)audio/gogglesmm/files/patch-src__gap__plugins__ap_oss_plugin.cpp (-11 lines)
1	--- src/gap/plugins/ap_oss_plugin.cpp.orig
2	+++ src/gap/plugins/ap_oss_plugin.cpp
3	@@ -117,7 +117,7 @@
4	#ifdef SNDCTL_DSP_COOKEDMODE
5	/// Turn off automatic resampling.
6	FXint enabled=(config.flags&OSSConfig::DeviceNoResample) ? 0 : 1;
7	- if (ioctl(fd,SNDCTL_DSP_COOKEDMODE,&enabled)==-1)
8	+ if (ioctl(handle,SNDCTL_DSP_COOKEDMODE,&enabled)==-1)
9	GM_DEBUG_PRINT("[oss] unable to set cooked mode\n");
10	#endif
11

Return to bug 193154

Lines 2-9 Link Here

(-)audio/gogglesmm/Makefile (-5 / +11 lines)
2	# $FreeBSD: head/audio/gogglesmm/Makefile 366661 2014-08-30 18:21:47Z adamw $	2	# $FreeBSD: head/audio/gogglesmm/Makefile 366661 2014-08-30 18:21:47Z adamw $
3		3
4	PORTNAME= gogglesmm	4	PORTNAME= gogglesmm
5	PORTVERSION= 0.13.2	5	PORTVERSION= 0.13.3
6	CATEGORIES= audio	6	CATEGORIES= audio
		7	MASTER_SITES= GH
7		8
8	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
9	COMMENT= Music collection manager and player	10	COMMENT= Music collection manager and player
Lines 17-25 Link Here
17		18
18	USE_GITHUB= yes	19	USE_GITHUB= yes
19	GH_ACCOUNT= ${PORTNAME}	20	GH_ACCOUNT= ${PORTNAME}
20	GH_COMMIT= ea16b55	21	GH_COMMIT= 259f253
21		22
22	USES= compiler:c++11-lang desktop-file-utils gmake pkgconfig	23	USES= compiler:c++0x desktop-file-utils gmake pkgconfig
23	USE_SQLITE= yes	24	USE_SQLITE= yes
24	HAS_CONFIGURE= yes	25	HAS_CONFIGURE= yes
25	CONFIGURE_ENV= LINK="${CXX}" \	26	CONFIGURE_ENV= LINK="${CXX}" \
Lines 30-36 Link Here
30	--without-rsound --without-mpcdec	31	--without-rsound --without-mpcdec
31	INSTALLS_ICONS= yes	32	INSTALLS_ICONS= yes
32		33
33	CFLAGS+= -Wno-error=return-type
34	CFLAGS+= -I${LOCALBASE}/include	34	CFLAGS+= -I${LOCALBASE}/include
35	LDFLAGS+= -L${LOCALBASE}/lib -pthread	35	LDFLAGS+= -L${LOCALBASE}/lib -pthread
36		36
Lines 85-90 Link Here
85	WAVPACK_LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack	85	WAVPACK_LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack
86	WAVPACK_CONFIGURE_OFF= --without-wavpack	86	WAVPACK_CONFIGURE_OFF= --without-wavpack
87		87
		88	.include <bsd.port.pre.mk>
		89
		90	.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 34
		91	USE_GCC= yes
		92	.endif
		93
88	post-patch:	94	post-patch:
89	@${REINPLACE_CMD} -e \	95	@${REINPLACE_CMD} -e \
90	's\|share/man\|man\|' ${WRKSRC}/configure	96	's\|share/man\|man\|' ${WRKSRC}/configure
Lines 111-114 Link Here
111	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}	117	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
112	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gogglesmm/libgap_*.so	118	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gogglesmm/libgap_*.so
113		119
114	.include <bsd.port.mk>	120	.include <bsd.port.post.mk>

Lines 1-30 Link Here

(-)audio/gogglesmm/files/patch-src__gap__ap_reactor.cpp (-30 lines)
1	--- src/gap/ap_reactor.cpp.orig
2	+++ src/gap/ap_reactor.cpp
3	@@ -98,17 +98,27 @@
4	#ifndef WIN32
5	FXint n;
6	if (timeout>=0) {
7	+#ifdef _GNU_SOURCE
8	struct timespec ts;
9	ts.tv_sec = timeout / 1000000000;
10	ts.tv_nsec = timeout % 1000000000;
11	+#endif
12	do {
13	+#ifdef _GNU_SOURCE
14	n = ppoll(pfds,nfds,&ts,NULL);
15	+#else
16	+ n = poll(pfds,nfds,-1);
17	+#endif
18	}
19	while(n==-1 && errno==EINTR);
20	}
21	else {
22	do {
23	+#ifdef _GNU_SOURCE
24	n = ppoll(pfds,nfds,NULL,NULL);
25	+#else
26	+ n = poll(pfds,nfds,0);
27	+#endif
28	}
29	while(n==-1 && errno==EINTR);
30	}

Lines 1-30 Link Here

(-)audio/gogglesmm/files/patch-src__gap__ap_utils.cpp (-30 lines)
1	--- src/gap/ap_utils.cpp.orig
2	+++ src/gap/ap_utils.cpp
3	@@ -247,17 +247,27 @@
4	nfds=2;
5	}
6	if (timeout) {
7	+#ifdef _GNU_SOURCE
8	struct timespec ts;
9	ts.tv_sec = (timeout / 1000000000);
10	ts.tv_nsec = (timeout % 1000000000);
11	+#endif
12	do {
13	+#ifdef _GNU_SOURCE
14	n=ppoll(fds,nfds,&ts,NULL);
15	+#else
16	+ n=poll(fds,nfds,-1);
17	+#endif
18	}
19	while(n==-1 && (errno==EAGAIN \|\| errno==EINTR));
20	}
21	else {
22	do {
23	+#ifdef _GNU_SOURCE
24	n=ppoll(fds,nfds,NULL,NULL);
25	+#else
26	+ n=poll(fds,nfds,0);
27	+#endif
28	}
29	while(n==-1 && (errno==EAGAIN \|\| errno==EINTR));
30	}