FreeBSD Bugzilla – Attachment 147311 Details for
Bug 186476
audio/wildmidi version 0.3.8
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
wildmidi-0.3.7
wildmidi.diff (text/plain), 6.16 KB, created by
SimaMoto,RyōTa
on 2014-09-14 12:37:03 UTC
(
hide
)
Description:
wildmidi-0.3.7
Filename:
MIME Type:
Creator:
SimaMoto,RyōTa
Created:
2014-09-14 12:37:03 UTC
Size:
6.16 KB
patch
obsolete
>Index: audio/wildmidi/Makefile >=================================================================== >--- audio/wildmidi/Makefile (revision 368126) >+++ audio/wildmidi/Makefile (working copy) >@@ -1,39 +1,80 @@ > # $FreeBSD$ > > PORTNAME= wildmidi >-PORTVERSION= 0.2.3.5 >-PORTREVISION= 2 >+PORTVERSION= 0.3.7 > 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 libtool >+USE_GITHUB= yes >+GH_ACCOUNT= Mindwerks >+GH_PROJECT= wildmidi >+GH_TAGNAME= ${PORTNAME}-${PORTVERSION:R} >+GH_COMMIT= d008350 >+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 OPENAL OPENALSOFT >+OPTIONS_DEFINE= PLAYER PLAYERSTATIC 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= Simple player >+PLAYERSTATIC_DESC= Simple player using STATIC libWildMidi >+BACKEND_DESC= Sound system the player uses >+PLAYER_CMAKE_ON= -DWANT_PLAYER:BOOL=ON >+PLAYER_CMAKE_OFF= -DWANT_PLAYER:BOOL=OFF >+PLAYERSTATIC_CMAKE_ON= -DWANT_PLAYERSTATIC:BOOL=ON >+PLAYERSTATIC_CMAKE_OFF= -DWANT_PLAYERSTATIC: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 >+OPENALSOFT_DESC= OpenAL support >+ >+.include <bsd.port.options.mk> >+ >+.if ${PORT_OPTIONS:MPLAYER} || ${PORT_OPTIONS:MPLAYERSTATIC} >+LICENSE+= GPLv3 >+LICENSE_COMB= multi >+CMAKE_ARGS+= -DWANT_OPENAL:BOOL=OFF >+. if ${PORT_OPTIONS:MALSA} >+LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib >+. elif ${PORT_OPTIONS:MOPENALSOFT} >+LIB_DEPENDS+= libopenal.so:${PORTSDIR}/audio/openal-soft >+CMAKE_ARGS+= -DWANT_OPENAL:BOOL=ON >+. elif ${PORT_OPTIONS:MOPENAL} >+LIB_DEPENDS+= libopenal.so:${PORTSDIR}/audio/openal >+CMAKE_ARGS+= -DWANT_OPENAL:BOOL=ON >+. endif > .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 368126) >+++ 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.7.tar.gz) = 9c96a615c179dbf7158e3b6d0f02d605fd62440be99eb487d7620083233b81a5 >+SIZE (wildmidi-0.3.7.tar.gz) = 121610 >Index: audio/wildmidi/files/patch-wildmidi.c--typecasting >=================================================================== >--- audio/wildmidi/files/patch-wildmidi.c--typecasting (revision 368126) >+++ 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 368126) >+++ 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 368126) >+++ audio/wildmidi/pkg-plist (working copy) >@@ -1,8 +1,10 @@ >-bin/wildmidi >+%%PLAYER%%bin/wildmidi >+%%PLAYERSTATIC%%bin/wildmidi-static > include/wildmidi_lib.h >+%%STATIC%%lib/libWildMidi.a >+lib/libWildMidi.so > lib/libWildMidi.so.1 >-lib/libWildMidi.so.1.1.0 >-lib/libWildMidi.so >+lib/libWildMidi.so.1.1.2 > man/man1/wildmidi.1.gz > man/man3/WildMidi_Close.3.gz > man/man3/WildMidi_FastSeek.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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 186476
:
140033
|
140034
|
140035
|
140036
|
143297
|
147311
|
149548
|
152258