View | Details | Raw Unified | Return to bug 186476 | Differences between
and this patch

Collapse All | Expand All

(-)audio/wildmidi/Makefile (-22 / +63 lines)
Lines 1-39 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	wildmidi
3
PORTNAME=	wildmidi
4
PORTVERSION=	0.2.3.5
4
PORTVERSION=	0.3.7
5
PORTREVISION=	2
6
CATEGORIES=	audio
5
CATEGORIES=	audio
7
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
8
6
9
MAINTAINER=	liangtai.s16@gmail.com
7
MAINTAINER=	liangtai.s16@gmail.com
10
COMMENT=	Simple software midi player and core softsynth library
8
COMMENT=	Simple software midi player and core softsynth library
11
9
12
# player: GPLv3, library: LGPL3
10
# player: GPLv3, library: LGPL3
13
LICENSE=	GPLv3 LGPL3
11
LICENSE=	LGPL3
14
LICENSE_COMB=	multi
15
12
16
MAKE_JOBS_UNSAFE=	yes
13
USE_GITHUB=	yes
17
14
GH_ACCOUNT=	Mindwerks
18
USES=		compiler gmake libtool
15
GH_PROJECT=	wildmidi
16
GH_TAGNAME=	${PORTNAME}-${PORTVERSION:R}
17
GH_COMMIT=	d008350
18
USES=		gmake cmake:outsource
19
USE_LDCONFIG=	yes
19
USE_LDCONFIG=	yes
20
GNU_CONFIGURE=	yes
21
20
22
.include <bsd.port.pre.mk>
21
OPTIONS_SUB=	yes
22
OPTIONS_SINGLE=	BACKEND
23
OPTIONS_SINGLE_BACKEND=	ALSA OSS OPENAL OPENALSOFT
24
OPTIONS_DEFINE=	PLAYER PLAYERSTATIC STATIC
25
OPTIONS_DEFAULT=	ALSA PLAYER
23
26
24
.if ${COMPILER_TYPE} == clang
27
STATIC_CMAKE_ON=	-DWANT_STATIC:BOOL=ON
25
CONFIGURE_ARGS+=	--disable-optimize
28
STATIC_CMAKE_OFF=	-DWANT_STATIC:BOOL=OFF
29
30
PLAYER_DESC=	Simple player
31
PLAYERSTATIC_DESC=	Simple player using STATIC libWildMidi
32
BACKEND_DESC=	Sound system the player uses
33
PLAYER_CMAKE_ON=	-DWANT_PLAYER:BOOL=ON
34
PLAYER_CMAKE_OFF=	-DWANT_PLAYER:BOOL=OFF
35
PLAYERSTATIC_CMAKE_ON=	-DWANT_PLAYERSTATIC:BOOL=ON
36
PLAYERSTATIC_CMAKE_OFF=	-DWANT_PLAYERSTATIC:BOOL=OFF
37
ALSA_CMAKE_ON=	-DWANT_ALSA:BOOL=ON
38
ALSA_CMAKE_OFF=	-DWANT_ALSA:BOOL=OFF
39
OSS_CMAKE_ON=	-DWANT_OSS:BOOL=ON
40
OSS_CMAKE_OFF=	-DWANT_OSS:BOOL=OFF
41
OPENALSOFT_DESC=	OpenAL support
42
43
.include <bsd.port.options.mk>
44
45
.if ${PORT_OPTIONS:MPLAYER} || ${PORT_OPTIONS:MPLAYERSTATIC}
46
LICENSE+=	GPLv3
47
LICENSE_COMB=	multi
48
CMAKE_ARGS+=	-DWANT_OPENAL:BOOL=OFF
49
.  if ${PORT_OPTIONS:MALSA}
50
LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
51
.  elif ${PORT_OPTIONS:MOPENALSOFT}
52
LIB_DEPENDS+=	libopenal.so:${PORTSDIR}/audio/openal-soft
53
CMAKE_ARGS+=	-DWANT_OPENAL:BOOL=ON
54
.  elif ${PORT_OPTIONS:MOPENAL}
55
LIB_DEPENDS+=	libopenal.so:${PORTSDIR}/audio/openal
56
CMAKE_ARGS+=	-DWANT_OPENAL:BOOL=ON
57
.  endif
26
.endif
58
.endif
27
59
28
post-patch:
60
post-patch:
29
		@${REINPLACE_CMD} -e 's@/etc/@${DATADIR}/@' \
61
	@${GREP} -L ${LOCALBASE} ${WRKSRC}/cfg/wildmidi.cfg | ${XARGS} \
30
			${WRKSRC}/docs/wildmidi.1 \
62
		${REINPLACE_CMD} -e "/^dir \/usr\/share\//{" \
31
			${WRKSRC}/docs/wildmidi.cfg.5
63
		-e "s|/usr/share/midi/freepats|${LOCALBASE}/share/freepats|;" \
32
		@${REINPLACE_CMD} -e 's@/usr/local/share/wildmidi/@${DATADIR}/@' \
64
		-e "h; x; s|^|# |; s|freepats|guspat|; H; s|guspat|eawpats|; H;" \
33
			-e 's@default_timifityconf@default_wildmidiconf@' \
65
		-e "s|eawpats|eawplus|; H; x;}"
34
			-e 's@$${\(.*\)-unset} = unset@x"$${\1}" = x@' \
66
	@${GREP} -L ${LOCALBASE} ${WRKSRC}/docs/man/man1/wildmidi.1 \
35
			${WRKSRC}/configure
67
		${WRKSRC}/docs/man/man5/wildmidi.cfg.5 \
36
		@${REINPLACE_CMD} -e '/WM_MixerOptions/s/ \&\& / \& /' \
68
		${WRKSRC}/CMakeLists.txt | ${XARGS} \
37
			${WRKSRC}/src/wildmidi_lib.c
69
		${REINPLACE_CMD} -e 's@/etc/wildmidi/@${DATADIR}/@' \
70
		-e 's@/etc/@${DATADIR}/@'
71
	@${GREP} -l share/man ${WRKSRC}/src/CMakeLists.txt | ${XARGS} \
72
		${REINPLACE_CMD} '/INSTALL/s@share/man@man@'
38
73
39
.include <bsd.port.post.mk>
74
pre-install:
75
	@${RM} -f ${WRKSRC}/docs/man/man1/wildmidi.1${REINPLACE_ARGS:S/-i//} \
76
		${WRKSRC}/docs/man/man5/wildmidi.cfg.5${REINPLACE_ARGS:S/-i//}
77
	${MKDIR} ${STAGEDIR}${DATADIR} ; \
78
	${CP} ${WRKSRC}/cfg/wildmidi.cfg ${STAGEDIR}${DATADIR}/wildmidi.cfg.sample
79
80
.include <bsd.port.mk>
(-)audio/wildmidi/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (wildmidi-0.2.3.5.tar.gz) = 00642702d3475d134596b19531c9e589043dcac482011494e42b035b4739e554
1
SHA256 (wildmidi-0.3.7.tar.gz) = 9c96a615c179dbf7158e3b6d0f02d605fd62440be99eb487d7620083233b81a5
2
SIZE (wildmidi-0.2.3.5.tar.gz) = 375792
2
SIZE (wildmidi-0.3.7.tar.gz) = 121610
(-)audio/wildmidi/files/patch-wildmidi.c--typecasting (-27 lines)
Lines 1-27 Link Here
1
--- src/wildmidi.c.orig	2010-07-30 09:33:46.000000000 +0900
2
+++ src/wildmidi.c	2011-05-28 23:13:47.000000000 +0900
3
@@ -618,7 +618,7 @@
4
 		return -1;
5
 	}
6
 
7
-	buffer = (unsigned char *) mmap(NULL, max_buffer, mmmode, mmflags, audio_fd, 0);
8
+	buffer = (char *) mmap(NULL, max_buffer, mmmode, mmflags, audio_fd, 0);
9
 	if (buffer == MAP_FAILED) {
10
 		printf("couldn't mmap %s\r\n",strerror(errno));
11
 		shutdown_output();
12
@@ -659,12 +659,13 @@
13
 				shutdown_output();
14
 				return -1;
15
 			}
16
-			if ((count.ptr < counter) || (count.ptr >= (counter+4))) {
17
+			if (((unsigned long int)count.ptr < counter) ||
18
+			    ((unsigned long int)count.ptr >= (counter+4))) {
19
 				break;
20
 			}
21
 			usleep(500);
22
 		}
23
-		if (count.ptr < counter) {
24
+		if ((unsigned long int)count.ptr < counter) {
25
 			free_size = max_buffer - counter;
26
 		} else {
27
 			free_size = count.ptr - counter;
(-)audio/wildmidi/pkg-descr (-1 / +1 lines)
Lines 12-15 Link Here
12
The wildmidi player is a demonstration program to show the capabilities of
12
The wildmidi player is a demonstration program to show the capabilities of
13
libWildMidi.
13
libWildMidi.
14
14
15
WWW: http://wildmidi.sourceforge.net/
15
WWW: http://www.mindwerks.net/projects/wildmidi/
(-)audio/wildmidi/pkg-plist (-3 / +6 lines)
Lines 1-8 Link Here
1
bin/wildmidi
1
%%PLAYER%%bin/wildmidi
2
%%PLAYERSTATIC%%bin/wildmidi-static
2
include/wildmidi_lib.h
3
include/wildmidi_lib.h
4
%%STATIC%%lib/libWildMidi.a
5
lib/libWildMidi.so
3
lib/libWildMidi.so.1
6
lib/libWildMidi.so.1
4
lib/libWildMidi.so.1.1.0
7
lib/libWildMidi.so.1.1.2
5
lib/libWildMidi.so
6
man/man1/wildmidi.1.gz
8
man/man1/wildmidi.1.gz
7
man/man3/WildMidi_Close.3.gz
9
man/man3/WildMidi_Close.3.gz
8
man/man3/WildMidi_FastSeek.3.gz
10
man/man3/WildMidi_FastSeek.3.gz
Lines 16-18 Link Here
16
man/man3/WildMidi_SetOption.3.gz
18
man/man3/WildMidi_SetOption.3.gz
17
man/man3/WildMidi_Shutdown.3.gz
19
man/man3/WildMidi_Shutdown.3.gz
18
man/man5/wildmidi.cfg.5.gz
20
man/man5/wildmidi.cfg.5.gz
21
%%DATADIR%%/wildmidi.cfg.sample

Return to bug 186476