Date: Wed, 19 May 2010 07:33:20 +0400 (MSD) From: Yuri Pankov <yuri.pankov@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: obrien@FreeBSD.org Subject: ports/146720: [PATCH] net/rdesktop: add LIBAO and LIBSAMPLERATE options Message-ID: <201005190333.o4J3XKOu015640@darklight.org.ru> Resent-Message-ID: <201005190340.o4J3e21d029475@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 146720
>Category: ports
>Synopsis: [PATCH] net/rdesktop: add LIBAO and LIBSAMPLERATE options
>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: Wed May 19 03:40:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Yuri Pankov
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD darklight.org.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #1: Tue May 18 07:17:39 MSD 2010
>Description:
Make audio/libao and audio/libsamplerate dependencies optional, otherwise they
are not registered as such (and can't be disabled with configure flags).
Port maintainer (obrien@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- rdesktop-1.6.0_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/rdesktop/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile 22 Aug 2009 00:31:42 -0000 1.47
+++ Makefile 19 May 2010 03:16:18 -0000
@@ -7,7 +7,7 @@
PORTNAME= rdesktop
PORTVERSION= 1.6.0
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= net comms ipv6
MASTER_SITES= SF
@@ -30,6 +30,14 @@
CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE}
.endif
+.if defined(WITH_LIBAO)
+LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao
+.endif
+
+.if defined(WITH_LIBSAMPLERATE)
+LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate
+.endif
+
.if defined(WITH_RDESKTOP_DEBUG)
CONFIGURE_ARGS+= --with-debug\
--with-debug-kbd\
@@ -38,10 +46,20 @@
--with-debug-sound\
--with-debug-channel\
--with-debug-seamless
+.endif
post-configure:
+.if defined(WITH_RDESKTOP_DEBUG)
${ECHO} "#define WITH_DEBUG_SERIAL 1" >> ${WRKSRC}/rdesktop.h
.endif
+.if !defined(WITH_LIBAO)
+ @${REINPLACE_CMD} -e 's|-DRDPSND_LIBAO=1||;s|rdpsnd_libao.o||;s|-lao||' \
+ ${WRKSRC}/Makefile
+.endif
+.if !defined(WITH_LIBSAMPLERATE)
+ @${REINPLACE_CMD} -e 's|-DHAVE_LIBSAMPLERATE=1||;s|-lsamplerate||' \
+ ${WRKSRC}/Makefile
+.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin
--- rdesktop-1.6.0_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005190333.o4J3XKOu015640>