From 19d36304673e98163ea8fbe416d1305d4eb3c9f1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 8 Aug 2021 12:11:18 +0200 Subject: [PATCH 1/3] freerdp: build freerdp-server --- common/shlibs | 3 +++ srcpkgs/freerdp-server | 1 + srcpkgs/freerdp-server-devel | 1 + srcpkgs/freerdp/template | 49 +++++++++++++++++++++++++++++++++--- srcpkgs/libfreerdp-server | 1 + 5 files changed, 51 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/freerdp-server create mode 120000 srcpkgs/freerdp-server-devel create mode 120000 srcpkgs/libfreerdp-server diff --git a/common/shlibs b/common/shlibs index b8fda590d5f31d..78a1fb451de9af 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1605,6 +1605,9 @@ libfreerdp-codec.so.1.0 libfreerdp-2.2.0_3 libfreerdp-gdi.so.1.0 libfreerdp-2.2.0_3 libfreerdp-cache.so.1.0 libfreerdp-2.2.0_3 libuwac0.so.0 libfreerdp-2.2.0_3 +libfreerdp-server2.so.2 libfreerdp-server-2.4.0_1 +libfreerdp-shadow-subsystem2.so.2 libfreerdp-server-2.4.0_1 +libfreerdp-shadow2.so.2 libfreerdp-server-2.4.0_1 libcppunit-1.15.so.1 libcppunit-1.15.1_1 libcalc.so.2.12.7.1 libcalc-2.12.7.1_1 libcustcalc.so.2.12.7.1 libcalc-2.12.7.1_1 diff --git a/srcpkgs/freerdp-server b/srcpkgs/freerdp-server new file mode 120000 index 00000000000000..ff5b2c64c02a44 --- /dev/null +++ b/srcpkgs/freerdp-server @@ -0,0 +1 @@ +freerdp \ No newline at end of file diff --git a/srcpkgs/freerdp-server-devel b/srcpkgs/freerdp-server-devel new file mode 120000 index 00000000000000..ff5b2c64c02a44 --- /dev/null +++ b/srcpkgs/freerdp-server-devel @@ -0,0 +1 @@ +freerdp \ No newline at end of file diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template index bf89ee95bf1712..dd0ad5e3492e49 100644 --- a/srcpkgs/freerdp/template +++ b/srcpkgs/freerdp/template @@ -1,32 +1,41 @@ # Template file for 'freerdp' pkgname=freerdp version=2.4.0 -revision=1 +revision=2 wrksrc="FreeRDP-${version}" build_style=cmake configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON -DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON -DWITH_LIBSYSTEMD=OFF -DWITH_PCSC=OFF -DWITH_PULSE=ON -DWITH_WAYLAND=ON -DWITH_XCURSOR=ON -DWITH_XEXT=ON -DWITH_XI=ON -DWITH_XINERAMA=ON - -DWITH_XKBFILE=ON -DWITH_XRENDER=ON -DWITH_XV=ON + -DWITH_XKBFILE=ON -DWITH_XRENDER=ON -DWITH_XV=ON -DWITH_SERVER=ON -DWAYLAND_SCANNER=/usr/bin/wayland-scanner" hostmakedepends="pkg-config xmlto wayland-devel" makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel - libXcursor-devel libXinerama-devel libXrandr-devel libXv-devel + libXcursor-devel libXinerama-devel libXrandr-devel libXv-devel libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel - libxkbcommon-devel wayland-devel cairo-devel" + libxkbcommon-devel wayland-devel cairo-devel libXdamage-devel" short_desc="Free RDP (Remote Desktop Protocol) client" maintainer="Orphaned " license="Apache-2.0" homepage="https://www.freerdp.com/" distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz" checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52 +CFLAGS="-Wno-dev" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";; armv5tel*) configure_args+=" -DWITH_NEON=OFF";; esac +post_install() { + rm -f ${DESTDIR}/usr/lib64 +} + +# first we want to separate -server, everything else then goes to client +subpackages="libfreerdp-server freerdp-server freerdp-server-devel libfreerdp + freerdp-devel" + libfreerdp_package() { replaces="${sourcepkg}<1.0.2_2" short_desc+=" - runtime libraries" @@ -45,3 +54,35 @@ freerdp-devel_package() { vmove "usr/lib/*.so" } } + +libfreerdp-server_package() { + short_desc="Free RDP (Remote Desktop Protocol) server - runtime files" + depends="libfreerdp>=${version}_${revision}" + pkg_install() { + vmove "usr/lib/libfreerdp-server*.so.*" + vmove "usr/lib/libfreerdp-shadow*.so.*" + } +} + +freerdp-server_package() { + short_desc="Free RDP (Remote Desktop Protocol) server" + depends="libfreerdp-server>=${version}_${revision}" + pkg_install() { + vmove usr/bin/freerdp-proxy + vmove usr/bin/freerdp-shadow-cli + vmove usr/share/man/man1/freerdp-shadow-cli.1 + } +} + +freerdp-server-devel_package() { + depends="libfreerdp-server>=${version}_${revision}" + short_desc="Free RDP (Remote Desktop Protocol) server - development files" + pkg_install() { + vmove usr/lib/cmake/FreeRDP-Server2 + vmove usr/lib/cmake/FreeRDP-Shadow2 + vmove usr/lib/pkgconfig/freerdp-server2.pc + vmove usr/lib/pkgconfig/freerdp-shadow2.pc + vmove "usr/lib/libfreerdp-server*.so" + vmove "usr/lib/libfreerdp-shadow*.so" + } +} diff --git a/srcpkgs/libfreerdp-server b/srcpkgs/libfreerdp-server new file mode 120000 index 00000000000000..ff5b2c64c02a44 --- /dev/null +++ b/srcpkgs/libfreerdp-server @@ -0,0 +1 @@ +freerdp \ No newline at end of file From 8b7da537f3336a1f35651c2c3358e6a71f3a770c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 7 Aug 2021 17:41:55 +0200 Subject: [PATCH 2/3] New package: gnome-remote-desktop-40.1 --- srcpkgs/gnome-remote-desktop/template | 37 +++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 srcpkgs/gnome-remote-desktop/template diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template new file mode 100644 index 00000000000000..af0df3ee46eeb8 --- /dev/null +++ b/srcpkgs/gnome-remote-desktop/template @@ -0,0 +1,37 @@ +# Template file for 'gnome-remote-desktop' +pkgname=gnome-remote-desktop +version=40.1 +revision=1 +build_style=meson +configure_args="$(vopt_bool rdp rdp) $(vopt_bool vnc vnc) + -Dsystemd_user_unit_dir=/tmp" +hostmakedepends="pkg-config glib-devel" +makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel + $(vopt_if rdp "freerdp-devel freerdp-server-devel fuse3-devel") + $(vopt_if vnc libvncserver-devel)" +short_desc="GNOME remote desktop server" +maintainer="Michal Vasilek " +license="GPL-2.0-or-later" +homepage="https://gitlab.gnome.org/GNOME/gnome-remote-desktop/" +distfiles="https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/archive/$version/gnome-remote-desktop-$version.tar.gz" +checksum=3c8466cd40405a6887171ada556a800e467d85bb52a506a33409c803b2d4f746 +make_check=no # xvfb failed to start + +build_options="rdp vnc" +desc_option_rdp="RDP support" +desc_option_vnc="VNC support" +# RDP doesn't currently have GUI in gcs, so it's disabled by default +build_options_default="vnc" + +pre_configure() { + if [ -z "$build_option_rdp" ] && [ -z "$build_option_vnc" ]; then + echo at least one of vnc and rdp options has to be enabled + exit 1 + fi + + vsed -e '/systemd_dep/d' -i meson.build +} + +post_install() { + rm -rf ${DESTDIR}/tmp +} From 024b6f65cfc683361c4fb7c93a28accd7aa9e0bd Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 8 Aug 2021 12:35:44 +0200 Subject: [PATCH 3/3] gnome: add gnome-remote-desktop --- srcpkgs/gnome/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 40d17718204534..bd3cd44df890ad 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,7 +1,7 @@ # Template file for 'gnome' pkgname=gnome version=40.0 -revision=1 +revision=2 build_style=meta short_desc="GNOME meta-package for Void Linux" maintainer="Enno Boland " @@ -25,6 +25,7 @@ depends=" gnome-font-viewer>=40.0 gnome-maps>=40.0 gnome-music>=40.0 + gnome-remote-desktop>=40.1 gnome-screenshot>=40.0 gnome-system-monitor>=40.0 gnome-terminal>=3.40.0