ports/147277: [PATCH] Add option for amidi plugin for multimedia/audacious-plugins and fix pkg-plist

[Denny Lin]

>Number:         147277
>Category:       ports
>Synopsis:       [PATCH] Add option for amidi plugin for multimedia/audacious-plugins and fix pkg-plist
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 01 12:20:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Denny Lin
>Release:        FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD cnmc32.hs.ntnu.edu.tw 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Sat Feb 13 21:10:50 CST 2010 root at cnmc32.hs.ntnu.edu.tw:/usr/obj/usr/src/sys/CNMC32 amd64


	
>Description:
Audacious has a plugin, amidi, for playing MIDI files. However, it is currently disabled, leaving users unable to play MIDI files.

Also fix a plist problem.
	
>How-To-Repeat:
	
>Fix:
This patch adds an option to enable/disable the amidi plugin (pulls in audio/fluidsynth).

Please note that a SoundFont file must be configured after installation for the amidi plugin to work properly. If no SoundFont file is specified, there will be no sound.

The file can be set from Preferences/Plugins, select AMIDI-Plug then click Preferences. After that, go to the FluidSynth backend.

The SoundFont file from this website works fine: http://www.schristiancollins.com/generaluser.php.

If multimedia/ffmpeg is installed, the port will create and install an extra plugin that isn't listed in pkg-plist: ffaudio. I've added --disable-ffaudio as a workaround.

	

--- audacious-amidi.patch begins here ---
diff -ru ports/multimedia/audacious-plugins.orig/Makefile ports/multimedia/audacious-plugins/Makefile
--- ports/multimedia/audacious-plugins.orig/Makefile	2010-05-30 22:39:05.000000000 +0800
+++ ports/multimedia/audacious-plugins/Makefile	2010-06-01 19:54:16.000000000 +0800
@@ -23,7 +23,7 @@
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib" \
 		CFLAGS="-I${LOCALBASE}/include" \
 		CPP=${CPP}
-CONFIGURE_ARGS=	--disable-evdevplug --disable-alsa --disable-amidiplug \
+CONFIGURE_ARGS=	--disable-evdevplug --disable-alsa --disable-ffaudio \
 		--disable-pulse --disable-projectm --disable-projectm-1.0
 WANT_GNOME=	yes
 WANT_EFL=	yes
@@ -63,7 +63,8 @@
 		GNOME		"Build with gnomevfs/gconf support"	off \
 		NLS		"Native Language Support"		on  \
 		SSE2		"Enable SSE2 support"			on  \
-		RESAMPLE	"Enable resample support"		off
+		RESAMPLE	"Enable resample support"		off \
+		AMIDI		"Enable amidi support"			off
 
 .include <bsd.port.pre.mk>
 
@@ -335,6 +336,15 @@
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.if defined(WITH_AMIDI)
+LIB_DEPENDS+=	fluidsynth.4:${PORTSDIR}/audio/fluidsynth
+CONFIGURE_ARGS+=--enable-amidiplug --enable-amidiplug-flsyn
+PLIST_SUB+=	AMIDIPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-amidiplug
+PLIST_SUB+=	AMIDIPLUGIN="@comment "
+.endif
+
 pre-everything::
 .if defined(WITH_AUDIOCD) && !exists(${LOCALBASE}/lib/libcdio_cdda.so)
 	@${ECHO_CMD} ""
diff -ru ports/multimedia/audacious-plugins.orig/pkg-plist ports/multimedia/audacious-plugins/pkg-plist
--- ports/multimedia/audacious-plugins.orig/pkg-plist	2010-06-01 19:29:06.000000000 +0800
+++ ports/multimedia/audacious-plugins/pkg-plist	2010-06-01 19:44:33.000000000 +0800
@@ -23,6 +23,8 @@
 lib/audacious/General/vfstrace.so
 %%AACPLUGIN%%lib/audacious/Input/aac.so
 %%ADPLUGPLUGIN%%lib/audacious/Input/adplug.so
+%%AMIDIPLUGIN%%lib/audacious/Input/amidi-plug/ap-fluidsynth.so
+%%AMIDIPLUGIN%%lib/audacious/Input/amidi-plug.so
 %%CDAUDIOPLUGIN%%lib/audacious/Input/cdaudio-ng.so
 lib/audacious/Input/console.so
 %%FLACPLUGIN%%lib/audacious/Input/flacng.so
@@ -322,6 +324,7 @@
 @dirrm lib/audacious/Effect
 @dirrm lib/audacious/Container
 @dirrm lib/audacious/General
+%%AMIDIPLUGIN%%@dirrm lib/audacious/Input/amidi-plug
 @dirrm lib/audacious/Input
 @dirrm lib/audacious/Output
 @dirrm lib/audacious/Transport
--- audacious-amidi.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: