Page MenuHomeFreeBSD
Files F144458889

D16621.id54425.diff
No OneTemporary
Actions

D16621.id54425.diff
View Options

Index: head/audio/Makefile
===================================================================
--- head/audio/Makefile
+++ head/audio/Makefile
@@ -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
Index: head/audio/pulseaudio-module-xrdp/Makefile
===================================================================
--- head/audio/pulseaudio-module-xrdp/Makefile
+++ head/audio/pulseaudio-module-xrdp/Makefile
@@ -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>
Index: head/audio/pulseaudio-module-xrdp/distinfo
===================================================================
--- head/audio/pulseaudio-module-xrdp/distinfo
+++ head/audio/pulseaudio-module-xrdp/distinfo
@@ -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
Index: head/audio/pulseaudio-module-xrdp/pkg-descr
===================================================================
--- head/audio/pulseaudio-module-xrdp/pkg-descr
+++ head/audio/pulseaudio-module-xrdp/pkg-descr
@@ -0,0 +1,3 @@
+PulseAudio module which enables xrdp to use audio redirection
+
+WWW: https://github.com/neutrinolabs/pulseaudio-module-xrdp
Index: head/net/xrdp/Makefile
===================================================================
--- head/net/xrdp/Makefile
+++ head/net/xrdp/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xrdp
PORTVERSION= 0.9.7
+PORTREVISION= 1
DISTVERSIONPREFIX= v
PORTEPOCH= 1
CATEGORIES= net
@@ -14,9 +15,7 @@
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 @@
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
Index: head/net/xrdp/pkg-plist
===================================================================
--- head/net/xrdp/pkg-plist
+++ head/net/xrdp/pkg-plist
@@ -19,8 +19,6 @@
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

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 1:28 PM (8 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28584004
Default Alt Text
D16621.id54425.diff (4 KB)

Event Timeline