Attachment #183248 for bug #219808

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




# $FreeBSD$

PORTNAME=	mp3blaster
PORTVERSION=	3.2.6
PORTREVISION=	6
CATEGORIES=	audio
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}


MAINTAINER=	novel@FreeBSD.org
COMMENT=	MP3 console ncurses-based player

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		gmake localbase:ldflags ncurses
GNU_CONFIGURE=	yes
WANT_GNOME=	yes
CONFIGURE_ARGS=	--with-cxxflags="${CXXFLAGS}"

OPTIONS_DEFINE=	DOCS ESOUND LIRC NAS SDL SIDPLAY VORBIS
LDFLAGS+=	-lpthread -L${LOCALBASE}/lib

OPTIONS_DEFINE=	LIRC NAS SIDPLAY VORBIS DOCS ESOUND
OPTIONS_DEFAULT=	SIDPLAY VORBIS
SIDPLAY_DESC=	Sidplayer support


NAS_LDFLAGS=		-laudio

ESOUND_CONFIGURE_WITH=	esd
ESOUND_USE=		GNOME=esound

post-patch:
	@${REINPLACE_CMD} -e 's|/usr/local/share/mp3blaster/win2koi.tbl|${DATADIR}/charmap/win2koi.tbl|' \

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (mp3blaster-3.2.5.tar.gz) = 129115742c77362cc3508eb7782702cfb44af2463a5453e8d19ea68abccedc29	1	TIMESTAMP = 1496705259
2	SIZE (mp3blaster-3.2.5.tar.gz) = 329407	2	SHA256 (mp3blaster-3.2.6.tar.gz) = 43d9f656367d16aaac163f93dc323e9843c3dd565401567edef3e1e72b9e1ee0
		3	SIZE (mp3blaster-3.2.6.tar.gz) = 354019




nasplayer.cc:37:23: error: out-of-line definition of 'opendevice' does not match any declaration in 'NASplayer'
NASplayer *NASplayer::opendevice(char *server)
                      ^~~~~~~~~~
--- mpegsound/nasplayer.cc.orig	2017-06-06 00:05:37 UTC
+++ mpegsound/nasplayer.cc
@@ -34,7 +34,7 @@ NASplayer::~NASplayer()
 	}
 }
 
-NASplayer *NASplayer::opendevice(char *server)
+NASplayer *NASplayer::opendevice(const char *server)
 {
 	AuServer *aud;
 	char *return_status;

Lines 1-11 Link Here

(-)files/patch-src__global.cc (-11 lines)
1	--- src/global.cc.orig 2016-09-12 14:29:38.335706000 -0400
2	+++ src/global.cc 2016-09-12 14:26:46.344490000 -0400
3	@@ -371,7 +371,7 @@
4	is_sid(const char *filename)
5	{
6	#ifdef HAVE_SIDPLAYER
7	- char *ext = strrchr(filename, '.');
8	+ const char *ext = strrchr(filename, '.');
9	if (ext) {
10	if (!strcasecmp(ext, ".psid")) return 1;
11	if (!strcasecmp(ext, ".sid")) return 1;

Lines 1-11 Link Here

(-)files/patch-src__main.cc (-11 lines)
1	--- src/main.cc.orig 2009-01-24 15:25:10 UTC
2	+++ src/main.cc
3	@@ -5480,7 +5480,7 @@ main(int argc, char argv[], char envp[
4	{ 0, 0, 0, 0}
5	};
6
7	- c = getopt_long(argc, argv, "28a:c:df:hl:m:no:p:qRr:s:t:v", long_options,
8	+ c = getopt_long_only(argc, argv, "28a:c:df:hl:m:no:p:qRr:s:t:v", long_options,
9	&long_index);
10
11	if (c == EOF)

Line 0 Link Here

(-)files/patch-src_main.cc (+11 lines)
	1	--- src/main.cc.orig 2017-05-15 22:14:13 UTC
	2	+++ src/main.cc
	3	@@ -5480,7 +5480,7 @@ main(int argc, char argv[], char envp[])
	4	{ 0, 0, 0, 0}
	5	};
	6
	7	- c = getopt_long(argc, argv, "28a:c:df:hl:m:no:p:qRr:s:t:v", long_options,
	8	+ c = getopt_long_only(argc, argv, "28a:c:df:hl:m:no:p:qRr:s:t:v", long_options,
	9	&long_index);
	10
	11	if (c == EOF)

Return to bug 219808

Lines 2-9 Link Here

(-)Makefile (-10 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mp3blaster	4	PORTNAME= mp3blaster
5	PORTVERSION= 3.2.5	5	PORTVERSION= 3.2.6
6	PORTREVISION= 6
7	CATEGORIES= audio	6	CATEGORIES= audio
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
9		8
Lines 10-24 Link Here
10	MAINTAINER= novel@FreeBSD.org	9	MAINTAINER= novel@FreeBSD.org
11	COMMENT= MP3 console ncurses-based player	10	COMMENT= MP3 console ncurses-based player
12		11
13	USES= gmake ncurses	12	LICENSE= GPLv2+
		13	LICENSE_FILE= ${WRKSRC}/COPYING
		14
		15	USES= gmake localbase:ldflags ncurses
14	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
15	WANT_GNOME= yes
16	CONFIGURE_ARGS= --with-cxxflags="${CXXFLAGS}"
17		17
18	CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT	18	OPTIONS_DEFINE= DOCS ESOUND LIRC NAS SDL SIDPLAY VORBIS
19	LDFLAGS+= -lpthread -L${LOCALBASE}/lib
20
21	OPTIONS_DEFINE= LIRC NAS SIDPLAY VORBIS DOCS ESOUND
22	OPTIONS_DEFAULT= SIDPLAY VORBIS	19	OPTIONS_DEFAULT= SIDPLAY VORBIS
23	SIDPLAY_DESC= Sidplayer support	20	SIDPLAY_DESC= Sidplayer support
24		21
Lines 41-47 Link Here
41	NAS_LDFLAGS= -laudio	38	NAS_LDFLAGS= -laudio
42		39
43	ESOUND_CONFIGURE_WITH= esd	40	ESOUND_CONFIGURE_WITH= esd
44	ESOUND_GNOME= esound	41	ESOUND_USE= GNOME=esound
45		42
46	post-patch:	43	post-patch:
47	@${REINPLACE_CMD} -e 's\|/usr/local/share/mp3blaster/win2koi.tbl\|${DATADIR}/charmap/win2koi.tbl\|' \	44	@${REINPLACE_CMD} -e 's\|/usr/local/share/mp3blaster/win2koi.tbl\|${DATADIR}/charmap/win2koi.tbl\|' \

Line 0 Link Here

(-)files/patch-mpegsound_nasplayer.cc (+14 lines)
	1	nasplayer.cc:37:23: error: out-of-line definition of 'opendevice' does not match any declaration in 'NASplayer'
	2	NASplayer NASplayer::opendevice(char server)
	3	^~~~~~~~~~
	4	--- mpegsound/nasplayer.cc.orig 2017-06-06 00:05:37 UTC
	5	+++ mpegsound/nasplayer.cc
	6	@@ -34,7 +34,7 @@ NASplayer::~NASplayer()
	7	}
	8	}
	9
	10	-NASplayer NASplayer::opendevice(char server)
	11	+NASplayer NASplayer::opendevice(const char server)
	12	{
	13	AuServer *aud;
	14	char *return_status;