diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2021-04-13 00:14:46 +0200 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2021-04-17 00:36:54 +0200 |
commit | 69e51d3473d168264c0f5c071dcb1e800e0173f1 (patch) | |
tree | ee2db7a140c8728a37ff87ea7177dff24e47a20e /net-misc/xrdp | |
parent | net-misc/xrdp: fix preinst (diff) | |
download | dilfridge-69e51d3473d168264c0f5c071dcb1e800e0173f1.tar.gz dilfridge-69e51d3473d168264c0f5c071dcb1e800e0173f1.tar.bz2 dilfridge-69e51d3473d168264c0f5c071dcb1e800e0173f1.zip |
net-misc/xrdp: Should be mostly ok now
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Diffstat (limited to 'net-misc/xrdp')
-rw-r--r-- | net-misc/xrdp/files/xrdp-0.9.15-flags.patch | 17 | ||||
-rw-r--r-- | net-misc/xrdp/metadata.xml | 3 | ||||
-rw-r--r-- | net-misc/xrdp/xrdp-0.9.15.ebuild | 30 |
3 files changed, 43 insertions, 7 deletions
diff --git a/net-misc/xrdp/files/xrdp-0.9.15-flags.patch b/net-misc/xrdp/files/xrdp-0.9.15-flags.patch new file mode 100644 index 0000000..49dfd62 --- /dev/null +++ b/net-misc/xrdp/files/xrdp-0.9.15-flags.patch @@ -0,0 +1,17 @@ +diff -ruN xrdp-0.9.15.orig/configure.ac xrdp-0.9.15/configure.ac +--- xrdp-0.9.15.orig/configure.ac 2020-12-28 15:03:43.000000000 +0100 ++++ xrdp-0.9.15/configure.ac 2021-04-13 00:00:48.367314011 +0200 +@@ -156,13 +156,6 @@ + AX_CFLAGS_WARN_ALL + AX_APPEND_COMPILE_FLAGS([-Wwrite-strings]) + +-AM_COND_IF([LINUX], +- [AX_APPEND_COMPILE_FLAGS([-Werror])]) # bsd has warnings that have not been fixed yet +- +-AM_COND_IF([XRDP_DEBUG], +- [AX_APPEND_COMPILE_FLAGS([-g -O0])], +- [AX_APPEND_COMPILE_FLAGS([-O2])]) +- + # Don't fail without working nasm if rfxcodec is not enabled + if test "x$enable_rfxcodec" != xyes; then + with_simd=no diff --git a/net-misc/xrdp/metadata.xml b/net-misc/xrdp/metadata.xml index ce12a2a..86c18dd 100644 --- a/net-misc/xrdp/metadata.xml +++ b/net-misc/xrdp/metadata.xml @@ -3,9 +3,10 @@ <pkgmetadata> <maintainer type="person"> <email>dilfridge@gentoo.org</email> - <name>Andreas K. Huettel</name> + <name>Andreas K. Hüttel</name> </maintainer> <use> <flag name="fuse">Enable clipboard file / device redirection via <pkg>sys-fs/fuse</pkg></flag> + <flag name="pixman">Use pixman library <pkg>x11-libs/pixman</pkg></flag> </use> </pkgmetadata> diff --git a/net-misc/xrdp/xrdp-0.9.15.ebuild b/net-misc/xrdp/xrdp-0.9.15.ebuild index aa21c62..0963dca 100644 --- a/net-misc/xrdp/xrdp-0.9.15.ebuild +++ b/net-misc/xrdp/xrdp-0.9.15.ebuild @@ -12,28 +12,40 @@ SRC_URI="https://github.com/neutrinolabs/xrdp/releases/download/v${PV}/${P}.tar. LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug fuse kerberos jpeg pam pulseaudio" +IUSE="aac debug fuse ipv6 kerberos jpeg lame opus pam pixman pulseaudio" RDEPEND="dev-libs/openssl:0= x11-libs/libX11:0= x11-libs/libXfixes:0= x11-libs/libXrandr:0= + aac? ( media-libs/fdk-aac:0= ) fuse? ( sys-fs/fuse:0= ) jpeg? ( virtual/jpeg:0= ) kerberos? ( virtual/krb5:0= ) + lame? ( media-sound/lame:0= ) + opus? ( media-libs/libopusenc:0= ) pam? ( sys-libs/pam:0= ) - pulseaudio? ( media-sound/pulseaudio:0= )" -DEPEND=${RDEPEND} + pixman? ( x11-libs/pixman:0= ) + pulseaudio? ( media-sound/pulseaudio:0= ) +" +BDEPEND="${RDEPEND} + virtual/pkgconfig +" PDEPEND=" || ( net-misc/tigervnc[server,xorgmodule] net-misc/xorgxrdp - )" + ) +" # does not work with gentoo version of freerdp # neutrinordp? ( net-misc/freerdp:0= ) -# incompatible with current ffmpeg/libav (surprising, isn't it?) -# xrdpvr? ( virtual/ffmpeg:0= ) +# does not work +# xrdpvr? ( media-video/ffmpeg:0= ) + +PATCHES=( + "${FILESDIR}/${P}-flags.patch" +) src_prepare() { default @@ -53,6 +65,7 @@ src_configure() { # -- authentication backends -- # kerberos is inside !SESMAN_NOPAM conditional for no reason + # (is this still correct?) $(use pam || use kerberos || echo --enable-nopam) $(usex kerberos --enable-kerberos '') @@ -75,6 +88,11 @@ src_configure() { # $(usex xrdpvr --enable-xrdpvr '') --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(usex ipv6 --enable-ipv6 '') + $(usex aac --enable-fdkaac '') + $(usex opus --enable-opus '') + $(usex lame --enable-mp3lame '') + $(usex pixman --enable-pixman '') ) econf "${myconf[@]}" |