Date: Thu, 16 Aug 2018 01:51:04 +0000 (UTC) From: Koichiro Iwao <meta@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477306 - in head: audio audio/pulseaudio-module-xrdp net/xrdp Message-ID: <201808160151.w7G1p4A9025211@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: meta Date: Thu Aug 16 01:51:04 2018 New Revision: 477306 URL: https://svnweb.freebsd.org/changeset/ports/477306 Log: New port: audio/pulseaudio-module-xrdp: separate PulseAudio modules from net/xrdp This update separates PulseAudio modules from net/xrdp port. There're two reasons to separete them. The one is upstream now provides them as separated repositories. The another one is PulseAudio modules need to be rebuilt after the version of audio/pulseaudio changed but the most part of net/xrdp port doesn't need rebuild. This minimizes time for rebuilding. Approved by: hrs (mentor) Differential Revision: https://reviews.freebsd.org/D16621 Added: head/audio/pulseaudio-module-xrdp/ head/audio/pulseaudio-module-xrdp/Makefile (contents, props changed) head/audio/pulseaudio-module-xrdp/distinfo (contents, props changed) head/audio/pulseaudio-module-xrdp/pkg-descr (contents, props changed) Modified: head/audio/Makefile head/net/xrdp/Makefile head/net/xrdp/pkg-plist Modified: head/audio/Makefile ============================================================================== --- head/audio/Makefile Thu Aug 16 01:26:36 2018 (r477305) +++ head/audio/Makefile Thu Aug 16 01:51:04 2018 (r477306) @@ -664,6 +664,7 @@ SUBDIR += puddletag SUBDIR += pulseaudio SUBDIR += pulseaudio-module-sndio + SUBDIR += pulseaudio-module-xrdp SUBDIR += py-SoundFile SUBDIR += py-al SUBDIR += py-ao Added: head/audio/pulseaudio-module-xrdp/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/pulseaudio-module-xrdp/Makefile Thu Aug 16 01:51:04 2018 (r477306) @@ -0,0 +1,36 @@ +# $FreeBSD$ + +PORTNAME= pulseaudio-module-xrdp +PORTVERSION= 0.0.20180808 +CATEGORIES= audio + +MAINTAINER= meta@FreeBSD.org +COMMENT= PulseAudio module which enables xrdp to use audio redirection + +LICENSE= APACHE20 + +BUILD_DEPENDS= ${NONEXISTENT}:audio/pulseaudio:configure \ + ${LOCALBASE}/include/xrdp_constants.h:net/xrdp +LIB_DEPENDS= libpulse.so:audio/pulseaudio + +USES= autoreconf:build libtool pkgconfig +GNU_CONFIGURE= yes +USE_GITHUB= yes +GH_ACCOUNT= neutrinolabs +GH_PROJECT= pulseaudio-module-xrdp +GH_TAGNAME= 0d80384 + +PLIST_FILES= `${PULSE_MODDIR}`/module-xrdp-sink.so \ + `${PULSE_MODDIR}`/module-xrdp-source.so + +CONFIGURE_ARGS= PULSE_DIR=${WRKDIR}/pulseaudio-`${PULSE_VERSION}` + +PULSE_VERSION= pkg-config --modversion libpulse +PULSE_MODDIR= pkg-config --variable=modlibexecdir libpulse +PULSE_WRKSRC= ${MAKE} -C ${PORTSDIR}/audio/pulseaudio -VWRKSRC + +pre-configure: + @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap.sh + @${CP} -r "`${PULSE_WRKSRC}`" ${WRKDIR} + +.include <bsd.port.mk> Added: head/audio/pulseaudio-module-xrdp/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/pulseaudio-module-xrdp/distinfo Thu Aug 16 01:51:04 2018 (r477306) @@ -0,0 +1,3 @@ +TIMESTAMP = 1533702829 +SHA256 (neutrinolabs-pulseaudio-module-xrdp-0.0.20180808-0d80384_GH0.tar.gz) = 9e3a4c1164c43e87c1f603589afc0134324ae95da138b60ea3c550358f9d3812 +SIZE (neutrinolabs-pulseaudio-module-xrdp-0.0.20180808-0d80384_GH0.tar.gz) = 10267 Added: head/audio/pulseaudio-module-xrdp/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/pulseaudio-module-xrdp/pkg-descr Thu Aug 16 01:51:04 2018 (r477306) @@ -0,0 +1,3 @@ +PulseAudio module which enables xrdp to use audio redirection + +WWW: https://github.com/neutrinolabs/pulseaudio-module-xrdp Modified: head/net/xrdp/Makefile ============================================================================== --- head/net/xrdp/Makefile Thu Aug 16 01:26:36 2018 (r477305) +++ head/net/xrdp/Makefile Thu Aug 16 01:51:04 2018 (r477306) @@ -3,6 +3,7 @@ PORTNAME= xrdp PORTVERSION= 0.9.7 +PORTREVISION= 1 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= net @@ -14,9 +15,7 @@ COMMENT= Open source Remote Desktop Protocol (RDP) ser LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING -# pulseaudio's configured source is required for audio redirection -BUILD_DEPENDS= ${NONEXISTENT}:audio/pulseaudio:configure \ - ${LOCALBASE}/bin/nasm:devel/nasm +BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:devel/nasm RUN_DEPENDS= ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp USES= autoreconf:build jpeg localbase libtool pkgconfig ssl @@ -57,38 +56,13 @@ MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame OPUS_CONFIGURE_ENABLE= opus OPUS_LIB_DEPENDS= libopus.so:audio/opus -# don't forget to increase PORTREVISION after pulseaudio update -PULSE_VERSION= ${MAKE} -C ${PORTSDIR}/audio/pulseaudio -VPORTVERSION -PULSE_WRKSRC= ${MAKE} -C ${PORTSDIR}/audio/pulseaudio -VWRKSRC - post-extract: # librfxcodec is provided as git submodule @${CP} -r ${WRKSRC_librfxcodec}/ ${WRKSRC}/librfxcodec/ @${CP} -r ${WRKSRC_libpainter}/ ${WRKSRC}/libpainter/ -post-patch: - @${REINPLACE_CMD} \ - -e "s|^PULSE_DIR = .*|PULSE_DIR = `${PULSE_WRKSRC}`|" \ - -e "s|-Wall -O2|-Wall -O2 -I${LOCALBASE}/include|" \ - ${WRKSRC}/sesman/chansrv/pulse/Makefile - pre-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap - -post-build: - # build pulseaudio module - @${CP} -r "`${PULSE_WRKSRC}`" ${WRKDIR} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -C sesman/chansrv/pulse - -post-install: - # install pulseaudio module - ${MKDIR} "${STAGEDIR}${PREFIX}/lib/pulse-`${PULSE_VERSION}`/modules/" -.for f in module-xrdp-sink.so module-xrdp-source.so - ${INSTALL_LIB} -m 0755 ${WRKSRC}/sesman/chansrv/pulse/$f \ - "${STAGEDIR}${PREFIX}/lib/pulse-`${PULSE_VERSION}`/modules/" -.endfor - # substitute pkg-plist not using PLIST_SUB - ${REINPLACE_CMD} -e "s|%%PULSE_VERSION%%|`${PULSE_VERSION}`|g" ${TMPPLIST} post-stage: @${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/rsakeys.ini Modified: head/net/xrdp/pkg-plist ============================================================================== --- head/net/xrdp/pkg-plist Thu Aug 16 01:26:36 2018 (r477305) +++ head/net/xrdp/pkg-plist Thu Aug 16 01:51:04 2018 (r477306) @@ -19,8 +19,6 @@ include/xrdp_client_info.h include/xrdp_constants.h include/xrdp_rail.h include/xrdp_sockets.h -lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-sink.so -lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-source.so libdata/pkgconfig/libpainter.pc libdata/pkgconfig/rfxcodec.pc libdata/pkgconfig/xrdp.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808160151.w7G1p4A9025211>