Date: Wed, 5 Feb 2014 10:40:14 GMT From: RyoTa SimaMoto <liangtai.s16@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/186476: audio/wildmidi version 0.3.3 Message-ID: <201402051040.s15AeEIj011859@oldred.freebsd.org> Resent-Message-ID: <201402051050.s15Ao0w7056967@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186476
>Category: ports
>Synopsis: audio/wildmidi version 0.3.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 05 10:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: RyoTa SimaMoto
>Release: 10-STABLE
>Organization:
>Environment:
FreeBSD takiba.fakenet 10.0-STABLE FreeBSD 10.0-STABLE #0 r261024M: Fri Jan 24 14:19:45 JST 2014 liangtai@takiba.fakenet:/usr/obj/usr/src/sys/VAIO i386
>Description:
Update audio/wildmidi -- version 0.3.3
About two years stagnation after the latest release
version 0.2.3.5, new developer Bret Curtis takes over
maintainance, then refined and enhanced versions
have been released.
* Optional build: simple midi player, and static library
* For player, output system is selectable from
audio/alsa-lib or OSS kernel module
* Debug build available by WITH_DEBUG
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: audio/wildmidi/Makefile
===================================================================
--- audio/wildmidi/Makefile (revision 342536)
+++ audio/wildmidi/Makefile (working copy)
@@ -1,39 +1,69 @@
# $FreeBSD$
PORTNAME= wildmidi
-PORTVERSION= 0.2.3.5
-PORTREVISION= 1
+PORTVERSION= 0.3.3
CATEGORIES= audio
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
MAINTAINER= liangtai.s16@gmail.com
COMMENT= Simple software midi player and core softsynth library
# player: GPLv3, library: LGPL3
-LICENSE= GPLv3 LGPL3
-LICENSE_COMB= multi
+LICENSE= LGPL3
-MAKE_JOBS_UNSAFE= yes
-
-USES= compiler gmake
+USE_GITHUB= yes
+GH_ACCOUNT= psi29a
+GH_PROJECT= wildmidi
+GH_TAGNAME= ${PORTNAME}-${PORTVERSION}
+GH_COMMIT= ee0c788
+USES= gmake cmake:outsource
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-.include <bsd.port.pre.mk>
+OPTIONS_SUB= yes
+OPTIONS_SINGLE= BACKEND
+OPTIONS_SINGLE_BACKEND= ALSA OSS
+OPTIONS_DEFINE= PLAYER STATIC
+OPTIONS_DEFAULT= ALSA PLAYER
-.if ${COMPILER_TYPE} == clang
-CONFIGURE_ARGS+= --disable-optimize
+STATIC_CMAKE_ON= -DWANT_STATIC:BOOL=ON
+STATIC_CMAKE_OFF= -DWANT_STATIC:BOOL=OFF
+
+PLAYER_DESC= Build and install simple player
+BACKEND_DESC= Sound system for output of player
+PLAYER_CMAKE_ON= -DWANT_PLAYER:BOOL=ON
+PLAYER_CMAKE_OFF= -DWANT_PLAYER:BOOL=OFF
+ALSA_CMAKE_ON= -DWANT_ALSA:BOOL=ON
+ALSA_CMAKE_OFF= -DWANT_ALSA:BOOL=OFF
+OSS_CMAKE_ON= -DWANT_OSS:BOOL=ON
+OSS_CMAKE_OFF= -DWANT_OSS:BOOL=OFF
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MPLAYER} && ${PORT_OPTIONS:MALSA}
+LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
.endif
+.if ${PORT_OPTIONS:MPLAYER}
+LICENSE+= GPLv3
+LICENSE_COMB= multi
+.endif
post-patch:
- @${REINPLACE_CMD} -e 's@/etc/@${DATADIR}/@' \
- ${WRKSRC}/docs/wildmidi.1 \
- ${WRKSRC}/docs/wildmidi.cfg.5
- @${REINPLACE_CMD} -e 's@/usr/local/share/wildmidi/@${DATADIR}/@' \
- -e 's@default_timifityconf@default_wildmidiconf@' \
- -e 's@$${\(.*\)-unset} = unset@x"$${\1}" = x@' \
- ${WRKSRC}/configure
- @${REINPLACE_CMD} -e '/WM_MixerOptions/s/ \&\& / \& /' \
- ${WRKSRC}/src/wildmidi_lib.c
+ @${GREP} -L ${LOCALBASE} ${WRKSRC}/cfg/wildmidi.cfg | xargs \
+ ${REINPLACE_CMD} -e "/^dir \/usr\/share\//{" \
+ -e "s|/usr/share/midi/freepats|${LOCALBASE}/share/freepats|;" \
+ -e "h; x; s|^|# |; s|freepats|guspat|; H; s|guspat|eawpats|; H;" \
+ -e "s|eawpats|eawplus|; H; x;}"
+ @${GREP} -L ${LOCALBASE} ${WRKSRC}/docs/man/man1/wildmidi.1 \
+ ${WRKSRC}/docs/man/man5/wildmidi.cfg.5 \
+ ${WRKSRC}/CMakeLists.txt | xargs \
+ ${REINPLACE_CMD} -e 's@/etc/wildmidi/@${DATADIR}/@' \
+ -e 's@/etc/@${DATADIR}/@'
+ @${GREP} -l share/man ${WRKSRC}/src/CMakeLists.txt | xargs \
+ ${REINPLACE_CMD} '/INSTALL/s@share/man@man@'
-.include <bsd.port.post.mk>
+pre-install:
+ @${RM} -f ${WRKSRC}/docs/man/man1/wildmidi.1${REINPLACE_ARGS:S/-i//} \
+ ${WRKSRC}/docs/man/man5/wildmidi.cfg.5${REINPLACE_ARGS:S/-i//}
+ ${MKDIR} ${STAGEDIR}${DATADIR} ; \
+ ${CP} ${WRKSRC}/cfg/wildmidi.cfg ${STAGEDIR}${DATADIR}/wildmidi.cfg.sample
+
+.include <bsd.port.mk>
Index: audio/wildmidi/distinfo
===================================================================
--- audio/wildmidi/distinfo (revision 342536)
+++ audio/wildmidi/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (wildmidi-0.2.3.5.tar.gz) = 00642702d3475d134596b19531c9e589043dcac482011494e42b035b4739e554
-SIZE (wildmidi-0.2.3.5.tar.gz) = 375792
+SHA256 (wildmidi-0.3.3.tar.gz) = 1166c4d9f9f0e76b625a585f8850ce3f737b16b1db05c1aed1b064f192da2dbd
+SIZE (wildmidi-0.3.3.tar.gz) = 116220
Index: audio/wildmidi/files/patch-wildmidi.c--typecasting
===================================================================
--- audio/wildmidi/files/patch-wildmidi.c--typecasting (revision 342536)
+++ audio/wildmidi/files/patch-wildmidi.c--typecasting (working copy)
@@ -1,27 +0,0 @@
---- src/wildmidi.c.orig 2010-07-30 09:33:46.000000000 +0900
-+++ src/wildmidi.c 2011-05-28 23:13:47.000000000 +0900
-@@ -618,7 +618,7 @@
- return -1;
- }
-
-- buffer = (unsigned char *) mmap(NULL, max_buffer, mmmode, mmflags, audio_fd, 0);
-+ buffer = (char *) mmap(NULL, max_buffer, mmmode, mmflags, audio_fd, 0);
- if (buffer == MAP_FAILED) {
- printf("couldn't mmap %s\r\n",strerror(errno));
- shutdown_output();
-@@ -659,12 +659,13 @@
- shutdown_output();
- return -1;
- }
-- if ((count.ptr < counter) || (count.ptr >= (counter+4))) {
-+ if (((unsigned long int)count.ptr < counter) ||
-+ ((unsigned long int)count.ptr >= (counter+4))) {
- break;
- }
- usleep(500);
- }
-- if (count.ptr < counter) {
-+ if ((unsigned long int)count.ptr < counter) {
- free_size = max_buffer - counter;
- } else {
- free_size = count.ptr - counter;
Index: audio/wildmidi/pkg-descr
===================================================================
--- audio/wildmidi/pkg-descr (revision 342536)
+++ audio/wildmidi/pkg-descr (working copy)
@@ -12,4 +12,4 @@
The wildmidi player is a demonstration program to show the capabilities of
libWildMidi.
-WWW: http://wildmidi.sourceforge.net/
+WWW: http://www.mindwerks.net/projects/wildmidi/
Index: audio/wildmidi/pkg-plist
===================================================================
--- audio/wildmidi/pkg-plist (revision 342536)
+++ audio/wildmidi/pkg-plist (working copy)
@@ -1,8 +1,9 @@
-bin/wildmidi
+%%PLAYER%%bin/wildmidi
include/wildmidi_lib.h
-lib/libWildMidi.la
-lib/libWildMidi.so.2
+%%STATIC%%lib/libWildMidi.a
lib/libWildMidi.so
+lib/libWildMidi.so.1
+lib/libWildMidi.so.1.0.2
man/man1/wildmidi.1.gz
man/man3/WildMidi_Close.3.gz
man/man3/WildMidi_FastSeek.3.gz
@@ -10,6 +11,7 @@
man/man3/WildMidi_GetOutput.3.gz
man/man3/WildMidi_GetString.3.gz
man/man3/WildMidi_Init.3.gz
+man/man3/WildMidi_Live.3.gz
man/man3/WildMidi_MasterVolume.3.gz
man/man3/WildMidi_Open.3.gz
man/man3/WildMidi_OpenBuffer.3.gz
@@ -16,3 +18,4 @@
man/man3/WildMidi_SetOption.3.gz
man/man3/WildMidi_Shutdown.3.gz
man/man5/wildmidi.cfg.5.gz
+%%DATADIR%%/wildmidi.cfg.sample
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402051040.s15AeEIj011859>