Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Mar 2007 22:43:18 +0600 (NOVT)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/110722: [PATCH] audio/flac -- allow to build XMMS plugin
Message-ID:  <200703231643.l2NGhIBt002180@regency.nsu.ru>
Resent-Message-ID: <200703231710.l2NHA5JI075707@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         110722
>Category:       ports
>Synopsis:       [PATCH] audio/flac -- allow to build XMMS plugin
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 23 17:10:05 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Alexey Dokuchaev
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
CNIT NSU
>Environment:
System: FreeBSD regency.nsu.ru 4.11-STABLE FreeBSD 4.11-STABLE #3: Fri Dec 16 19:17:19 NOVT 2005 root@regency.nsu.ru:/usr/obj/usr/src/sys/REGENCY i386
>Description:
Allow to build with XMMS plugin.
>How-To-Repeat:
N/A
>Fix:
Index: Makefile
===================================================================
RCS file: /mnt/fbsd/development/FreeBSD-CVS/ports/audio/flac/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- Makefile	1 Feb 2007 02:41:17 -0000	1.39
+++ Makefile	23 Mar 2007 16:18:27 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	flac
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,15 +17,17 @@
 
 LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
+OPTIONS=	XMMS_PLUGIN "Build and install XMMS plugin" off
+
 USE_AUTOTOOLS=	libtool:15
 USE_ICONV=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-sse \
 		--with-libiconv-prefix="${LOCALBASE}" \
-		--with-ogg="${LOCALBASE}"
-CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include" \
-		ac_cv_path_XMMS_CONFIG=no
+		--with-ogg="${LOCALBASE}" \
+		--with-xmms-prefix="${X11BASE}"
+CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include"
 
 .if defined(NOPORTDOCS)
 MAKE_ENV=	DOC=""
@@ -42,12 +44,26 @@
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 .endif
 
+.if defined(WITH_XMMS_PLUGIN)
+LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
+PLIST_SUB+=	XMMS=""
+.else
+PLIST_SUB+=	XMMS="@comment "
+.endif
+
 # "obj" is magic to our make(1)
 post-configure:
 	@${RM} -rf ${WRKSRC}/obj
 
 post-build:
-	${REINPLACE_CMD} 's:%%PREFIX%%:${PREFIX}:' ${WRKSRC}/man/flac.1
+	@${REINPLACE_CMD} 's:%%PREFIX%%:${PREFIX}:' ${WRKSRC}/man/flac.1
+	@${REINPLACE_CMD} '/$$(XMMS_DIRS)/d' ${WRKSRC}/src/Makefile
+
+post-install:
+.if defined(WITH_XMMS_PLUGIN)
+	${INSTALL_PROGRAM} ${WRKSRC}/src/plugin_xmms/.libs/libxmms-flac.so \
+		${X11BASE}/lib/xmms/Input/libflac.so
+.endif
 
 test: build
 	@cd ${WRKSRC}; ${MAKE} check
Index: pkg-plist
===================================================================
RCS file: /mnt/fbsd/development/FreeBSD-CVS/ports/audio/flac/pkg-plist,v
retrieving revision 1.13
diff -u -r1.13 pkg-plist
--- pkg-plist	23 Feb 2006 10:34:27 -0000	1.13
+++ pkg-plist	23 Mar 2007 16:18:11 -0000
@@ -321,3 +321,5 @@
 @dirrm include/OggFLAC
 @dirrm include/FLAC++
 @dirrm include/FLAC
+%%XMMS%%@cwd %%X11BASE%%
+%%XMMS%%lib/xmms/Input/libflac.so
>Release-Note:
>Audit-Trail:
>Unformatted:



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