Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Mar 2016 16:41:13 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r409886 - in head: Mk audio/alure audio/musicpd audio/openal-soft audio/sdl2_mixer games/scummvm games/slade games/stratagus games/wyrmgus
Message-ID:  <201603011641.u21GfDpL044695@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Tue Mar  1 16:41:13 2016
New Revision: 409886
URL: https://svnweb.freebsd.org/changeset/ports/409886

Log:
  Add FLUIDSYNTH option generic description, and remove ad-hoc setting in
  ports where it is applicable (alongside with other shared descriptions).

Modified:
  head/Mk/bsd.options.desc.mk
  head/audio/alure/Makefile
  head/audio/musicpd/Makefile
  head/audio/openal-soft/Makefile
  head/audio/sdl2_mixer/Makefile
  head/games/scummvm/Makefile
  head/games/slade/Makefile
  head/games/stratagus/Makefile
  head/games/wyrmgus/Makefile

Modified: head/Mk/bsd.options.desc.mk
==============================================================================
--- head/Mk/bsd.options.desc.mk	Tue Mar  1 16:40:55 2016	(r409885)
+++ head/Mk/bsd.options.desc.mk	Tue Mar  1 16:41:13 2016	(r409886)
@@ -90,6 +90,7 @@ FINGER_DESC?=		finger(1) user informatio
 FIREBIRD_DESC?=		Firebird (Interbase) database support
 FLAC_DESC?=		FLAC lossless audio codec support
 FLICKR_DESC?=		Flickr support via flickcurl
+FLUIDSYNTH_DESC?=	MIDI playback support via FluidSynth
 FONTCONFIG_DESC?=	X11 font configuration support
 FORTRAN_DESC?=		Fortran language support
 FPECTL_DESC?=		Floating point exception handling

Modified: head/audio/alure/Makefile
==============================================================================
--- head/audio/alure/Makefile	Tue Mar  1 16:40:55 2016	(r409885)
+++ head/audio/alure/Makefile	Tue Mar  1 16:41:13 2016	(r409886)
@@ -23,8 +23,6 @@ OPTIONS_DEFINE=		DOCS DUMB EXAMPLES FLAC
 OPTIONS_DEFAULT=	DUMB FLAC VORBIS SNDFILE
 
 DUMB_DESC=		DUMB audio library decoding support
-FLUIDSYNTH_DESC=	MIDI support via FluidSynth
-MODPLUG_DESC=		MOD decoding via ModPlug
 
 DOCS_BUILD_DEPENDS=	NaturalDocs:${PORTSDIR}/devel/naturaldocs
 DUMB_BUILD_DEPENDS=	${LOCALBASE}/include/dumb.h:${PORTSDIR}/audio/dumb

Modified: head/audio/musicpd/Makefile
==============================================================================
--- head/audio/musicpd/Makefile	Tue Mar  1 16:40:55 2016	(r409885)
+++ head/audio/musicpd/Makefile	Tue Mar  1 16:41:13 2016	(r409886)
@@ -46,7 +46,6 @@ OPTIONS_GROUP=	PLAYBACK
 OPTIONS_GROUP_PLAYBACK=	AO CURL HTTPD JACK OPENAL OSS PIPE PULSEAUDIO SHOUTCAST
 
 ADPLUG_DESC=	AdPlug support
-FLUIDSYNTH_DESC=FludSynth support (MIDI files)
 GME_DESC=	GME support (video game music files)
 LAME_DESC=	Support for MP3 Icecast Streams
 PIPE_DESC=	Support for writing PCM audio to a pipe

Modified: head/audio/openal-soft/Makefile
==============================================================================
--- head/audio/openal-soft/Makefile	Tue Mar  1 16:40:55 2016	(r409885)
+++ head/audio/openal-soft/Makefile	Tue Mar  1 16:41:13 2016	(r409886)
@@ -26,8 +26,7 @@ CMAKE_ARGS+=	-DALSOFT_REQUIRE_OSS:BOOL=O
 
 OPTIONS_DEFINE=		FLUIDSYNTH CONFIG PORTAUDIO PULSEAUDIO
 OPTIONS_SUB=		yes
-CONFIG_DESC=		Install the configuration utility (needs QT)
-FLUIDSYNTH_DESC=	Enable FluidSynth MIDI support
+CONFIG_DESC=		Install configuration utility (needs Qt 4.x)
 
 #ALSA_CMAKE_ON=		-DALSOFT_REQUIRE_ALSA:BOOL=ON
 #ALSA_CMAKE_OFF=		-DALSOFT_BACKEND_ALSA:BOOL=OFF

Modified: head/audio/sdl2_mixer/Makefile
==============================================================================
--- head/audio/sdl2_mixer/Makefile	Tue Mar  1 16:40:55 2016	(r409885)
+++ head/audio/sdl2_mixer/Makefile	Tue Mar  1 16:41:13 2016	(r409886)
@@ -24,12 +24,7 @@ OPTIONS_DEFAULT=	FLUIDSYNTH MODPLUG FLAC
 OPTIONS_RADIO=		MOD
 OPTIONS_RADIO_MOD=	MIKMOD MODPLUG
 
-FLUIDSYNTH_DESC=	Enable SoundFont2 Midi support via fluidsynth
-MIKMOD_DESC=	Enable MOD music via libMikMod
-MODPLUG_DESC=	Enable MOD music via libModPlug
-FLAC_DESC=	Enable FLAC encoding support via flac
-SMPEG_DESC=	Enable MP3 music via SMPEG2
-VORBIS_DESC=	Enable Ogg Vorbis music
+SMPEG_DESC=	MP3 audio support via SMPEG2
 
 MIKMOD_LIB_DEPENDS=		libmikmod.so:${PORTSDIR}/audio/libmikmod
 MIKMOD_CONFIGURE_ENABLE=	music-mod-mikmod

Modified: head/games/scummvm/Makefile
==============================================================================
--- head/games/scummvm/Makefile	Tue Mar  1 16:40:55 2016	(r409885)
+++ head/games/scummvm/Makefile	Tue Mar  1 16:41:13 2016	(r409886)
@@ -29,7 +29,6 @@ CONFIGURE_ARGS+=	--enable-verbose-build
 LDFLAGS+=	-lpthread
 
 OPTIONS_DEFINE=	VORBIS MP3 PNG FLAC FLUIDSYNTH MT32EMU DOCS
-FLUIDSYNTH_DESC=	FluidSynth MIDI synthesizer
 MT32EMU_DESC=	MT-32 emulator
 OPTIONS_DEFAULT=	VORBIS MP3 PNG MT32EMU
 

Modified: head/games/slade/Makefile
==============================================================================
--- head/games/slade/Makefile	Tue Mar  1 16:40:55 2016	(r409885)
+++ head/games/slade/Makefile	Tue Mar  1 16:41:13 2016	(r409886)
@@ -26,7 +26,6 @@ PLIST_FILES=	bin/slade share/slade3/slad
 OPTIONS_DEFINE=	FLUIDSYNTH
 OPTIONS_DEFAULT=	FLUIDSYNTH
 
-FLUIDSYNTH_DESC=	MIDI playback support via FluidSynth
 FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
 FLUIDSYNTH_CMAKE_OFF=	-DNO_FLUIDSYNTH:BOOL=ON
 

Modified: head/games/stratagus/Makefile
==============================================================================
--- head/games/stratagus/Makefile	Tue Mar  1 16:40:55 2016	(r409885)
+++ head/games/stratagus/Makefile	Tue Mar  1 16:41:13 2016	(r409886)
@@ -52,7 +52,6 @@ X11_USE=		XORG=x11
 X11_CMAKE_ON=		-DWITH_X11:BOOL=ON
 X11_CMAKE_OFF=		-DWITH_X11:BOOL=OFF
 
-FLUIDSYNTH_DESC=	FluidSynth sound library support
 FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
 FLUIDSYNTH_CMAKE_ON=	-DWITH_FLUIDSYNTH:BOOL=ON
 FLUIDSYNTH_CMAKE_OFF=	-DWITH_FLUIDSYNTH:BOOL=OFF

Modified: head/games/wyrmgus/Makefile
==============================================================================
--- head/games/wyrmgus/Makefile	Tue Mar  1 16:40:55 2016	(r409885)
+++ head/games/wyrmgus/Makefile	Tue Mar  1 16:41:13 2016	(r409886)
@@ -58,7 +58,6 @@ X11_USE=		XORG=x11
 X11_CMAKE_ON=		-DWITH_X11:BOOL=ON
 X11_CMAKE_OFF=		-DWITH_X11:BOOL=OFF
 
-FLUIDSYNTH_DESC=	FluidSynth sound library support
 FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
 FLUIDSYNTH_CMAKE_ON=	-DWITH_FLUIDSYNTH:BOOL=ON
 FLUIDSYNTH_CMAKE_OFF=	-DWITH_FLUIDSYNTH:BOOL=OFF



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603011641.u21GfDpL044695>