Attachment 183248 Details for Bug 219808 – mp3blaster.diff

[patch] mp3blaster.diff

mp3blaster.diff (text/plain), 5.33 KB, created by Tobias Kortkamp on 2017-06-06 00:15:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2017-06-06 00:15:48 UTC

Size: 5.33 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 442728)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mp3blaster
>-PORTVERSION=	3.2.5
>-PORTREVISION=	6
>+PORTVERSION=	3.2.6
> CATEGORIES=	audio
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
> 
>@@ -10,15 +9,13 @@
> MAINTAINER=	novel@FreeBSD.org
> COMMENT=	MP3 console ncurses-based player
> 
>-USES=		gmake ncurses
>+LICENSE=	GPLv2+
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+USES=		gmake localbase:ldflags ncurses
> GNU_CONFIGURE=	yes
>-WANT_GNOME=	yes
>-CONFIGURE_ARGS=	--with-cxxflags="${CXXFLAGS}"
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
>-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
>-
>-OPTIONS_DEFINE=	LIRC NAS SIDPLAY VORBIS DOCS ESOUND
>+OPTIONS_DEFINE=	DOCS ESOUND LIRC NAS SDL SIDPLAY VORBIS
> OPTIONS_DEFAULT=	SIDPLAY VORBIS
> SIDPLAY_DESC=	Sidplayer support
> 
>@@ -41,7 +38,7 @@
> NAS_LDFLAGS=		-laudio
> 
> ESOUND_CONFIGURE_WITH=	esd
>-ESOUND_GNOME=		esound
>+ESOUND_USE=		GNOME=esound
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/usr/local/share/mp3blaster/win2koi.tbl|${DATADIR}/charmap/win2koi.tbl|' \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 442728)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (mp3blaster-3.2.5.tar.gz) = 129115742c77362cc3508eb7782702cfb44af2463a5453e8d19ea68abccedc29
>-SIZE (mp3blaster-3.2.5.tar.gz) = 329407
>+TIMESTAMP = 1496705259
>+SHA256 (mp3blaster-3.2.6.tar.gz) = 43d9f656367d16aaac163f93dc323e9843c3dd565401567edef3e1e72b9e1ee0
>+SIZE (mp3blaster-3.2.6.tar.gz) = 354019
>Index: files/patch-mpegsound_nasplayer.cc
>===================================================================
>--- files/patch-mpegsound_nasplayer.cc	(nonexistent)
>+++ files/patch-mpegsound_nasplayer.cc	(working copy)
>@@ -0,0 +1,14 @@
>+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;
>
>Property changes on: files/patch-mpegsound_nasplayer.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src__global.cc
>===================================================================
>--- files/patch-src__global.cc	(revision 442728)
>+++ files/patch-src__global.cc	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/global.cc.orig	2016-09-12 14:29:38.335706000 -0400
>-+++ src/global.cc	2016-09-12 14:26:46.344490000 -0400
>-@@ -371,7 +371,7 @@
>- is_sid(const char *filename)
>- {
>- #ifdef HAVE_SIDPLAYER
>--	char *ext = strrchr(filename, '.');
>-+	const char *ext = strrchr(filename, '.');
>- 	if (ext) {
>- 		if (!strcasecmp(ext, ".psid")) return 1;
>- 		if (!strcasecmp(ext, ".sid")) return 1;
>
>Property changes on: files/patch-src__global.cc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src__main.cc
>===================================================================
>--- files/patch-src__main.cc	(revision 442728)
>+++ files/patch-src__main.cc	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/main.cc.orig	2009-01-24 15:25:10 UTC
>-+++ src/main.cc
>-@@ -5480,7 +5480,7 @@ main(int argc, char *argv[], char *envp[
>- 			{ 0, 0, 0, 0}
>- 		};
>- 		
>--		c = getopt_long(argc, argv, "28a:c:df:hl:m:no:p:qRr:s:t:v", long_options,
>-+		c = getopt_long_only(argc, argv, "28a:c:df:hl:m:no:p:qRr:s:t:v", long_options,
>- 			&long_index);
>- 
>- 		if (c == EOF)
>
>Property changes on: files/patch-src__main.cc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_main.cc
>===================================================================
>--- files/patch-src_main.cc	(nonexistent)
>+++ files/patch-src_main.cc	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/main.cc.orig	2017-05-15 22:14:13 UTC
>++++ src/main.cc
>+@@ -5480,7 +5480,7 @@ main(int argc, char *argv[], char *envp[])
>+ 			{ 0, 0, 0, 0}
>+ 		};
>+ 		
>+-		c = getopt_long(argc, argv, "28a:c:df:hl:m:no:p:qRr:s:t:v", long_options,
>++		c = getopt_long_only(argc, argv, "28a:c:df:hl:m:no:p:qRr:s:t:v", long_options,
>+ 			&long_index);
>+ 
>+ 		if (c == EOF)
>
>Property changes on: files/patch-src_main.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

tobik: maintainer-approval? (novel)

Actions: View | Diff

Attachments on bug 219808: 183248