ports/110129: [PATCH] Update port: multimedia/audacious-plugins Fix FLAC support.

[Roland Smith]

>Number:         110129
>Category:       ports
>Synopsis:       [PATCH] Update port: multimedia/audacious-plugins Fix FLAC support.
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 09 13:30:19 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Roland Smith
>Release:        FreeBSD 6.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD slackbox.xs4all.nl 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Tue Jan 16 13:05:50 CET 2007 rsmith at slackbox.xs4all.nl:/usr/obj/usr/src/sys/RFS amd64


	
>Description:
	Version 1.3.0 of the audacious-plugins port didn't play FLAC
	files. The reason stated in the port was that the FLAC port on
	FreeBSD was too old. This turns out not to be the
	case. Audacious-plugins contains it's own copy of the FLAC library,
	so it doesn't rely on the FLAC port at all. But the compilation of
	this library was b0rken because it didn't reference the FLAC
	include files when building in src/flac/plugin_common. The patch
	I've added fixes this.
>How-To-Repeat:
	Try building audacious-plugins with FLAC support.
>Fix:
	Apply the following patch to the port:
--------------- audacious-plugins fix FLAC patch ---------------
diff -ruN audacious-plugins.orig/Makefile audacious-plugins/Makefile
--- audacious-plugins.orig/Makefile	Fri Mar  9 14:05:53 2007
+++ audacious-plugins/Makefile	Fri Mar  9 14:16:38 2007
@@ -16,7 +16,7 @@
 
 BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
 LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
-		
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
@@ -24,7 +24,7 @@
 		CFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--disable-evdevplug --disable-alsa --disable-amidiplug \
 		--disable-pulse --disable-coreaudio --disable-projectm \
-		--disable-flac
+		--enable-flac
 WANT_GNOME=	yes
 WANT_SDL=	yes
 
@@ -34,8 +34,9 @@
 #		PULSE		"Enable PulseAudio output plugin"	off \
 #		COREAUDIO	"Enable CoreAudio output plugin"	off \
 #		PROJECTM	"Enable projectM vis plugin"		off \
-# to old ports:
-#		FLAC		"Enable flac input plugin"		off \
+#
+# This port uses an internal copy of the FLAC library for FLAC support. It
+# just needs a little patch to actually work.
 
 OPTIONS=	ESOUND		"Enable Esound output output"		off \
 		MP3		"Enable mp3 plugin"			on  \
@@ -136,17 +137,9 @@
 .if !defined(WITHOUT_VORBIS)
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=	VORBISPLUGIN=""
-#.if !defined(WITHOUT_FLAC)
-#LIB_DEPENDS+=   FLAC.7:${PORTSDIR}/audio/flac
-#CONFIGURE_ARGS+=--enable-flac
-#PLIST_SUB+=	FLACPLUGIN=""
-#.else
-#CONFIGURE_ARGS+=--disable-flac
-#PLIST_SUB+=	FLACPLUGIN="@comment "
-#.endif
 .else
-CONFIGURE_ARGS+=--disable-vorbis #--disable-flac
-PLIST_SUB+=	VORBISPLUGIN="@comment " #FLACPLUGIN="@comment "
+CONFIGURE_ARGS+=--disable-vorbis
+PLIST_SUB+=	VORBISPLUGIN="@comment "
 .endif
 
 .if !defined(WITHOUT_WAVPACK)
diff -ruN audacious-plugins.orig/files/patch-src-flac-plugin_common-Makefile audacious-plugins/files/patch-src-flac-plugin_common-Makefile
--- audacious-plugins.orig/files/patch-src-flac-plugin_common-Makefile	Thu Jan  1 01:00:00 1970
+++ audacious-plugins/files/patch-src-flac-plugin_common-Makefile	Fri Mar  9 14:01:43 2007
@@ -0,0 +1,11 @@
+--- src/flac/plugin_common/Makefile.orig	Fri Mar  9 13:56:08 2007
++++ src/flac/plugin_common/Makefile	Fri Mar  9 14:01:01 2007
+@@ -22,6 +22,8 @@
+ 
+ OBJECTS = ${SOURCES:.c=.o}
+ 
++CFLAGS+= -I../libflac
++
+ libplugin_common.a: $(OBJECTS)
+ 	$(AR) cq $@ $(OBJECTS)
+ 
--------------- audacious-plugins fix FLAC patch ---------------




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