Index: audio/Makefile =================================================================== --- audio/Makefile (revision 417096) +++ audio/Makefile (working copy) @@ -790,6 +790,7 @@ SUBDIR += wavplay SUBDIR += whysynth SUBDIR += wildmidi + SUBDIR += wildmidi03 SUBDIR += wmalbum SUBDIR += wmix SUBDIR += wmrecord Index: audio/musicpd/Makefile =================================================================== --- audio/musicpd/Makefile (revision 417096) +++ audio/musicpd/Makefile (working copy) @@ -126,7 +126,7 @@ WAVPACK_CONFIGURE_ENABLE=wavpack WAVPACK_LIB_DEPENDS=libwavpack.so:audio/wavpack WILDMIDI_CONFIGURE_ENABLE=wildmidi -WILDMIDI_LIB_DEPENDS=libWildMidi.so:audio/wildmidi +WILDMIDI_LIB_DEPENDS=libWildMidi.so.1:audio/wildmidi03 MPDUSER?= mpd MPDGROUP?= mpd Index: audio/wildmidi/Makefile =================================================================== --- audio/wildmidi/Makefile (revision 417096) +++ audio/wildmidi/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= wildmidi -PORTVERSION= 0.3.9 +PORTVERSION= 0.4.0 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= audio @@ -11,6 +11,9 @@ # player: GPLv3, library: LGPL3 LICENSE= LGPL3 +CONFLICTS= ${PORTNAME}03-0\.3.* +PORTSCOUT= limit:0\.4.* + USE_GITHUB= yes GH_ACCOUNT= Mindwerks @@ -19,7 +22,7 @@ OPTIONS_SUB= yes OPTIONS_RADIO= BACKEND -OPTIONS_RADIO_BACKEND= ALSA OSS OPENAL OPENALSOFT +OPTIONS_RADIO_BACKEND= ALSA OPENAL OSS OPTIONS_DEFINE= PLAYER PLAYERSTATIC STATIC OPTIONS_DEFAULT= ALSA PLAYER @@ -33,11 +36,13 @@ PLAYER_CMAKE_OFF= -DWANT_PLAYER:BOOL=OFF PLAYERSTATIC_CMAKE_ON= -DWANT_PLAYERSTATIC:BOOL=ON PLAYERSTATIC_CMAKE_OFF= -DWANT_PLAYERSTATIC:BOOL=OFF +PLAYERSTATIC_IMPLIES= STATIC ALSA_CMAKE_ON= -DWANT_ALSA:BOOL=ON ALSA_CMAKE_OFF= -DWANT_ALSA:BOOL=OFF +OPENAL_CMAKE_ON= -DWANT_OPENAL:BOOL=ON +OPENAL_CMAKE_OFF= -DWANT_OPENAL:BOOL=OFF OSS_CMAKE_ON= -DWANT_OSS:BOOL=ON OSS_CMAKE_OFF= -DWANT_OSS:BOOL=OFF -OPENALSOFT_DESC= OpenAL support .include @@ -44,17 +49,10 @@ .if ${PORT_OPTIONS:MPLAYER} || ${PORT_OPTIONS:MPLAYERSTATIC} LICENSE+= GPLv3 LICENSE_COMB= multi -. if ${PORT_OPTIONS:MOPENALSOFT} -LIB_DEPENDS+= libopenal.so:audio/openal-soft -CMAKE_ARGS+= -DWANT_OPENAL:BOOL=ON -. elif ${PORT_OPTIONS:MOPENAL} -LIB_DEPENDS+= libopenal.so:audio/openal -CMAKE_ARGS+= -DWANT_OPENAL:BOOL=ON -. else -CMAKE_ARGS+= -DWANT_OPENAL:BOOL=OFF -. if ${PORT_OPTIONS:MALSA} +. if ${PORT_OPTIONS:MOPENAL} +USES+= openal:al +. elif ${PORT_OPTIONS:MALSA} LIB_DEPENDS+= libasound.so:audio/alsa-lib -. endif . endif .endif Index: audio/wildmidi/distinfo =================================================================== --- audio/wildmidi/distinfo (revision 417096) +++ audio/wildmidi/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (Mindwerks-wildmidi-wildmidi-0.3.9_GH0.tar.gz) = 9773496d7cfee06502c8e13eb20a20f021c666b4759bb78fdf7b2a64ffd66cb9 -SIZE (Mindwerks-wildmidi-wildmidi-0.3.9_GH0.tar.gz) = 121689 +TIMESTAMP = 1466091419 +SHA256 (Mindwerks-wildmidi-wildmidi-0.4.0_GH0.tar.gz) = ca2064f6fbab37250ab4fff4aed00d6d4fa24254718661e3e2f56b1536015d23 +SIZE (Mindwerks-wildmidi-wildmidi-0.4.0_GH0.tar.gz) = 175575 Index: audio/wildmidi/pkg-plist =================================================================== --- audio/wildmidi/pkg-plist (revision 417096) +++ audio/wildmidi/pkg-plist (working copy) @@ -3,19 +3,28 @@ include/wildmidi_lib.h %%STATIC%%lib/libWildMidi.a lib/libWildMidi.so -lib/libWildMidi.so.1 -lib/libWildMidi.so.1.1.2 +lib/libWildMidi.so.2 +lib/libWildMidi.so.2.0.0 man/man1/wildmidi.1.gz +man/man3/WildMidi_ClearError.3.gz man/man3/WildMidi_Close.3.gz +man/man3/WildMidi_ConvertBufferToMidi.3.gz +man/man3/WildMidi_ConvertToMidi.3.gz man/man3/WildMidi_FastSeek.3.gz +man/man3/WildMidi_GetError.3.gz man/man3/WildMidi_GetInfo.3.gz +man/man3/WildMidi_GetLyric.3.gz +man/man3/WildMidi_GetMidiOutput.3.gz man/man3/WildMidi_GetOutput.3.gz man/man3/WildMidi_GetString.3.gz +man/man3/WildMidi_GetVersion.3.gz man/man3/WildMidi_Init.3.gz man/man3/WildMidi_MasterVolume.3.gz man/man3/WildMidi_Open.3.gz man/man3/WildMidi_OpenBuffer.3.gz +man/man3/WildMidi_SetCvtOption.3.gz man/man3/WildMidi_SetOption.3.gz man/man3/WildMidi_Shutdown.3.gz +man/man3/WildMidi_SongSeek.3.gz man/man5/wildmidi.cfg.5.gz @sample %%DATADIR%%/wildmidi.cfg.sample Index: audio/wildmidi03/Makefile =================================================================== --- audio/wildmidi03/Makefile (nonexistent) +++ audio/wildmidi03/Makefile (working copy) @@ -0,0 +1,80 @@ +# $FreeBSD$ + +PORTNAME= wildmidi +PORTVERSION= 0.3.9 +DISTVERSIONPREFIX= ${PORTNAME}- +CATEGORIES= audio +PKGNAMESUFFIX= 03 + +MAINTAINER= liangtai.s16@gmail.com +COMMENT= Simple software midi player and core softsynth library + +# player: GPLv3, library: LGPL3 +LICENSE= LGPL3 + +CONFLICTS= ${PORTNAME}-0\.4.* +PORTSCOUT= limit:0\.3\.9 + +USE_GITHUB= yes +GH_ACCOUNT= Mindwerks + +USES= gmake cmake:outsource +USE_LDCONFIG= yes + +OPTIONS_SUB= yes +OPTIONS_RADIO= BACKEND +OPTIONS_RADIO_BACKEND= ALSA OPENAL OSS +OPTIONS_DEFINE= PLAYER PLAYERSTATIC STATIC +OPTIONS_DEFAULT= ALSA PLAYER + +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 PLAYER and PLAYERSTATIC use +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 +PLAYERSTATIC_IMPLIES= STATIC +ALSA_CMAKE_ON= -DWANT_ALSA:BOOL=ON +ALSA_CMAKE_OFF= -DWANT_ALSA:BOOL=OFF +OPENAL_CMAKE_ON= -DWANT_OPENAL:BOOL=ON +OPENAL_CMAKE_OFF= -DWANT_OPENAL:BOOL=OFF +OSS_CMAKE_ON= -DWANT_OSS:BOOL=ON +OSS_CMAKE_OFF= -DWANT_OSS:BOOL=OFF + +.include + +.if ${PORT_OPTIONS:MPLAYER} || ${PORT_OPTIONS:MPLAYERSTATIC} +LICENSE+= GPLv3 +LICENSE_COMB= multi +. if ${PORT_OPTIONS:MOPENAL} +USES+= openal:al +. elif ${PORT_OPTIONS:MALSA} +LIB_DEPENDS+= libasound.so:audio/alsa-lib +. endif +.endif + +post-patch: + @${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@' + +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 Property changes on: audio/wildmidi03/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/wildmidi03/distinfo =================================================================== --- audio/wildmidi03/distinfo (nonexistent) +++ audio/wildmidi03/distinfo (working copy) @@ -0,0 +1,3 @@ +TIMESTAMP = 1457665395 +SHA256 (Mindwerks-wildmidi-wildmidi-0.3.9_GH0.tar.gz) = 9773496d7cfee06502c8e13eb20a20f021c666b4759bb78fdf7b2a64ffd66cb9 +SIZE (Mindwerks-wildmidi-wildmidi-0.3.9_GH0.tar.gz) = 121689 Property changes on: audio/wildmidi03/distinfo ___________________________________________________________________ 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: audio/wildmidi03/pkg-descr =================================================================== --- audio/wildmidi03/pkg-descr (nonexistent) +++ audio/wildmidi03/pkg-descr (working copy) @@ -0,0 +1,15 @@ +WildMIDI is a simple software midi player which has a core softsynth library +that can be used with other applications. + +The WildMIDI library uses Gravis Ultrasound patch files to convert MIDI files +into audio which is them passed back to the calling application for further +processing or output. The API of the library is designed so that it is easy to +include WildMIDI into applications that wish to include MIDI file playback. +With multiple MIDI file support you can develop applications to mix several +midi files together at the same time and with the next release you will be +able to use a different patch set for each MIDI file. + +The wildmidi player is a demonstration program to show the capabilities of +libWildMidi. + +WWW: http://www.mindwerks.net/projects/wildmidi/ Property changes on: audio/wildmidi03/pkg-descr ___________________________________________________________________ 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: audio/wildmidi03/pkg-plist =================================================================== --- audio/wildmidi03/pkg-plist (nonexistent) +++ audio/wildmidi03/pkg-plist (working copy) @@ -0,0 +1,21 @@ +%%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.2 +man/man1/wildmidi.1.gz +man/man3/WildMidi_Close.3.gz +man/man3/WildMidi_FastSeek.3.gz +man/man3/WildMidi_GetInfo.3.gz +man/man3/WildMidi_GetOutput.3.gz +man/man3/WildMidi_GetString.3.gz +man/man3/WildMidi_Init.3.gz +man/man3/WildMidi_MasterVolume.3.gz +man/man3/WildMidi_Open.3.gz +man/man3/WildMidi_OpenBuffer.3.gz +man/man3/WildMidi_SetOption.3.gz +man/man3/WildMidi_Shutdown.3.gz +man/man5/wildmidi.cfg.5.gz +@sample %%DATADIR%%/wildmidi.cfg.sample Property changes on: audio/wildmidi03/pkg-plist ___________________________________________________________________ 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: multimedia/qmmp/Makefile =================================================================== --- multimedia/qmmp/Makefile (revision 417096) +++ multimedia/qmmp/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= qmmp PORTVERSION= 0.9.10 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/ \ SF/qmmp-dev/${PORTNAME}/ @@ -163,7 +164,7 @@ LADSPA_CMAKE_OFF= -DUSE_LADSPA:BOOL=FALSE WILDMIDI_DESC= Support to playback MIDI files -WILDMIDI_LIB_DEPENDS= libWildMidi.so:audio/wildmidi +WILDMIDI_LIB_DEPENDS= libWildMidi.so.1:audio/wildmidi03 WILDMIDI_CMAKE_ON= -DUSE_MIDI:BOOL=TRUE WILDMIDI_CMAKE_OFF= -DUSE_MIDI:BOOL=FALSE Index: multimedia/qmmp-qt5/Makefile =================================================================== --- multimedia/qmmp-qt5/Makefile (revision 417096) +++ multimedia/qmmp-qt5/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= qmmp PORTVERSION= 1.0.10 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/ \ SF/qmmp-dev/${PORTNAME}/ @@ -163,7 +164,7 @@ LADSPA_CMAKE_OFF= -DUSE_LADSPA:BOOL=FALSE WILDMIDI_DESC= Support to playback MIDI files -WILDMIDI_LIB_DEPENDS= libWildMidi.so:audio/wildmidi +WILDMIDI_LIB_DEPENDS= libWildMidi.so.1:audio/wildmidi03 WILDMIDI_CMAKE_ON= -DUSE_MIDI:BOOL=TRUE WILDMIDI_CMAKE_OFF= -DUSE_MIDI:BOOL=FALSE