Attachment #82849 for bug #118464

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




MASTER_SITES=		${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=		gahr@gahr.ch
COMMENT=		A program for finding and playing free music from the Internet

LIB_DEPENDS=		sigc-2.0:${PORTSDIR}/devel/libsigc++20 \

USE_LDCONFIG=		yes
LIBTOOLFLAGS=		--tag=CXX
CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
						LDFLAGS="-L${LOCALBASE}/lib"

.include <bsd.port.pre.mk>

.if ${OSVERSION} >= 700042
BROKEN=		Broken with gcc 4.2
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|CCLD = $$(CC)|CCLD = $$(CXX)|; \
		s|-lpthread|${PTHREAD_LIBS}|' \
		${WRKSRC}/roboradio/mp3/Makefile.in
	@${REINPLACE_CMD} -e 's|static char|static const char|' \
		${WRKSRC}/gnomoradio/*.xpm

.include <bsd.port.mk>

Added Link Here

(-)files/patch-gnomoradio_browser-link.cc (+11 lines)
1	--- gnomoradio/browser-link.cc.orig 2007-12-06 15:46:11.000000000 +0100
2	+++ gnomoradio/browser-link.cc 2007-12-06 15:48:02.000000000 +0100
3	@@ -32,7 +32,7 @@
4	{
5	gchar *my_url = g_strdup(Glib::locale_from_utf8(url).c_str());
6	if (fork() == 0) {
7	- char *const argv[] = {"gnome-moz-remote", "--newwin", my_url, 0};
8	+ char const argv[] = {(char )"gnome-moz-remote", (char *)"--newwin", my_url, 0};
9	execvp(argv[0], argv);
10
11	// if we made it here something went wrong




--- roboradio/audio/prober.cc.orig	2007-12-06 15:39:58.000000000 +0100
+++ roboradio/audio/prober.cc	2007-12-06 15:40:19.000000000 +0100
@@ -21,6 +21,30 @@
 #include "../mp3/esd-audio.h"
 }
 
+namespace Roboradio
+{
+   namespace Audio
+   {
+      gboolean probe (gpointer s)
+      {
+         Prober *sng = static_cast<Prober*>(s);
+         if (esdout_playing()) {
+            int pos = sng->get_position();
+            if (pos >= 0)
+               sng->signal_position_changed(pos);
+            return true;
+         } else if (sng->get_position() >= 0) {
+            return true;
+         } else {
+            sng->stop();
+            sng->signal_done();
+            sng->activated = false;
+            return false;
+         }
+      }
+   }
+}
+
 Roboradio::Audio::Prober::Prober ()
 	: activated(false)
 {
@@ -31,24 +55,6 @@
 	stop_prober();
 }
 
-gboolean Roboradio::Audio::probe (gpointer s)
-{
-	Prober *sng = static_cast<Prober*>(s);
-	if (esdout_playing()) {
-		int pos = sng->get_position();
-		if (pos >= 0)
-			sng->signal_position_changed(pos);
-		return true;
-	} else if (sng->get_position() >= 0) {
-		return true;
-	} else {
-		sng->stop();
-		sng->signal_done();
-		sng->activated = false;
-		return false;
-	}
-}
-
 void Roboradio::Audio::Prober::start_prober ()
 {
 	if (activated)

Return to bug 118464

Lines 12-18 Link Here

(-)Makefile (-9 / +5 lines)
12	MASTER_SITES= ${MASTER_SITE_SAVANNAH}	12	MASTER_SITES= ${MASTER_SITE_SAVANNAH}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= gahr@gahr.ch
16	COMMENT= A program for finding and playing free music from the Internet	16	COMMENT= A program for finding and playing free music from the Internet
17		17
18	LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \	18	LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
Lines 29-45 Link Here
29	USE_LDCONFIG= yes	29	USE_LDCONFIG= yes
30	LIBTOOLFLAGS= --tag=CXX	30	LIBTOOLFLAGS= --tag=CXX
31	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	31	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
32	LDFLAGS="-L${LOCALBASE}/lib"	32	LDFLAGS="-L${LOCALBASE}/lib"
33
34	.include <bsd.port.pre.mk>
35
36	.if ${OSVERSION} >= 700042
37	BROKEN= Broken with gcc 4.2
38	.endif
39		33
40	post-patch:	34	post-patch:
41	@${REINPLACE_CMD} -e 's\|CCLD = $$(CC)\|CCLD = $$(CXX)\|; \	35	@${REINPLACE_CMD} -e 's\|CCLD = $$(CC)\|CCLD = $$(CXX)\|; \
42	s\|-lpthread\|${PTHREAD_LIBS}\|' \	36	s\|-lpthread\|${PTHREAD_LIBS}\|' \
43	${WRKSRC}/roboradio/mp3/Makefile.in	37	${WRKSRC}/roboradio/mp3/Makefile.in
		38	@${REINPLACE_CMD} -e 's\|static char\|static const char\|' \
		39	${WRKSRC}/gnomoradio/*.xpm
44		40
45	.include <bsd.port.post.mk>	41	.include <bsd.port.mk>

Added Link Here

(-)files/patch-roboradio-audio_prober.cc (+58 lines)
1	--- roboradio/audio/prober.cc.orig 2007-12-06 15:39:58.000000000 +0100
2	+++ roboradio/audio/prober.cc 2007-12-06 15:40:19.000000000 +0100
3	@@ -21,6 +21,30 @@
4	#include "../mp3/esd-audio.h"
5	}
6
7	+namespace Roboradio
8	+{
9	+ namespace Audio
10	+ {
11	+ gboolean probe (gpointer s)
12	+ {
13	+ Prober sng = static_cast<Prober>(s);
14	+ if (esdout_playing()) {
15	+ int pos = sng->get_position();
16	+ if (pos >= 0)
17	+ sng->signal_position_changed(pos);
18	+ return true;
19	+ } else if (sng->get_position() >= 0) {
20	+ return true;
21	+ } else {
22	+ sng->stop();
23	+ sng->signal_done();
24	+ sng->activated = false;
25	+ return false;
26	+ }
27	+ }
28	+ }
29	+}
30	+
31	Roboradio::Audio::Prober::Prober ()
32	: activated(false)
33	{
34	@@ -31,24 +55,6 @@
35	stop_prober();
36	}
37
38	-gboolean Roboradio::Audio::probe (gpointer s)
39	-{
40	- Prober sng = static_cast<Prober>(s);
41	- if (esdout_playing()) {
42	- int pos = sng->get_position();
43	- if (pos >= 0)
44	- sng->signal_position_changed(pos);
45	- return true;
46	- } else if (sng->get_position() >= 0) {
47	- return true;
48	- } else {
49	- sng->stop();
50	- sng->signal_done();
51	- sng->activated = false;
52	- return false;
53	- }
54	-}
55	-
56	void Roboradio::Audio::Prober::start_prober ()
57	{
58	if (activated)