Re: [PR PATCH] [Updated] freerdp split (2.11.5, 3.5.0, libuwac0)

[fanyx <fanyx@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 621 bytes --]

There is an updated pull request by fanyx against master on the void-packages repository

https://github.com/fanyx/void-packages freerdp3
https://github.com/void-linux/void-packages/pull/49572

freerdp split (2.11.5, 3.5.0, libuwac0)
Required for `gnome-remote-desktop-46.1`

#### Testing the changes
- I tested the changes in this PR: **NO**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):


A patch file from https://github.com/void-linux/void-packages/pull/49572.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freerdp3-49572.patch --]
[-- Type: text/x-diff, Size: 9006 bytes --]

From 951c3f32dd0d4dbc0eee6dff1200f671f645dd5d Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 28 Mar 2024 17:05:28 +0100
Subject: [PATCH 1/3] New package: freerdp3-3.5.0

---
 common/shlibs                 |  3 ++
 srcpkgs/freerdp3-devel        |  1 +
 srcpkgs/freerdp3-server       |  1 +
 srcpkgs/freerdp3-server-devel |  1 +
 srcpkgs/freerdp3/template     | 94 +++++++++++++++++++++++++++++++++++
 srcpkgs/libfreerdp3           |  1 +
 srcpkgs/libfreerdp3-server    |  1 +
 7 files changed, 102 insertions(+)
 create mode 120000 srcpkgs/freerdp3-devel
 create mode 120000 srcpkgs/freerdp3-server
 create mode 120000 srcpkgs/freerdp3-server-devel
 create mode 100644 srcpkgs/freerdp3/template
 create mode 120000 srcpkgs/libfreerdp3
 create mode 120000 srcpkgs/libfreerdp3-server

diff --git a/common/shlibs b/common/shlibs
index 61a28fdc5b7436..7b5f224c0c8c6c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1571,6 +1571,9 @@ libZXing.so.3 zxing-cpp-2.0.0_1
 libfreerdp-client2.so.2 libfreerdp-2.2.0_3
 libfreerdp2.so.2 libfreerdp-2.2.0_3
 libwinpr2.so.2 libfreerdp-2.2.0_3
+libfreerdp-client3.so.3 libfreerdp3-3.4.0_1
+libfreerdp3.so.3 libfreerdp3-3.4.0_1
+libwinpr3.so.3 libfreerdp3-3.4.0_1
 libwinpr-tools2.so.2 libfreerdp-2.2.0_3
 libfreerdp-core.so.1.0 libfreerdp-2.2.0_3
 libfreerdp-channels.so.1.0 libfreerdp-2.2.0_3
diff --git a/srcpkgs/freerdp3-devel b/srcpkgs/freerdp3-devel
new file mode 120000
index 00000000000000..d8e6da3ebcadf3
--- /dev/null
+++ b/srcpkgs/freerdp3-devel
@@ -0,0 +1 @@
+freerdp3
\ No newline at end of file
diff --git a/srcpkgs/freerdp3-server b/srcpkgs/freerdp3-server
new file mode 120000
index 00000000000000..d8e6da3ebcadf3
--- /dev/null
+++ b/srcpkgs/freerdp3-server
@@ -0,0 +1 @@
+freerdp3
\ No newline at end of file
diff --git a/srcpkgs/freerdp3-server-devel b/srcpkgs/freerdp3-server-devel
new file mode 120000
index 00000000000000..d8e6da3ebcadf3
--- /dev/null
+++ b/srcpkgs/freerdp3-server-devel
@@ -0,0 +1 @@
+freerdp3
\ No newline at end of file
diff --git a/srcpkgs/freerdp3/template b/srcpkgs/freerdp3/template
new file mode 100644
index 00000000000000..f80d442372cd99
--- /dev/null
+++ b/srcpkgs/freerdp3/template
@@ -0,0 +1,94 @@
+# Template file for 'freerdp3'
+pkgname=freerdp3
+version=3.5.0
+revision=1
+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_SERVER=ON
+ -DWAYLAND_SCANNER=/usr/bin/wayland-scanner -DWITH_CAIRO=ON
+ -DRDTK_FORCE_STATIC_BUILD=ON -DUWAC_FORCE_STATIC_BUILD=ON
+ -DWITH_BINARY_VERSIONING=ON"
+hostmakedepends="pkg-config xmlto wayland-devel"
+makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
+ libXcursor-devel libXinerama-devel libXrandr-devel libXv-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
+ libxkbcommon-devel wayland-devel cairo-devel libXdamage-devel
+ pkcs11-helper-devel mit-krb5-devel icu-devel fuse3-devel SDL2-devel
+ SDL2_ttf-devel webkit2gtk-devel"
+short_desc="Free RDP (Remote Desktop Protocol) client"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/3.5.0/ChangeLog"
+distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
+checksum=03323b383980ee91decbed88270bac061ffb17fd04e52576c70da7885601ecbe
+conflicts="freerdp libfreerdp-server freerdp-server freerdp-server-devel
+ libfreerdp freerdp-devel"
+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="libfreerdp3-server freerdp3-server freerdp3-server-devel
+ libfreerdp3 freerdp3-devel"
+
+libfreerdp3_package() {
+	replaces="${sourcepkg}<1.0.2_2"
+	short_desc+=" - runtime libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
+freerdp3-devel_package() {
+	short_desc+=" - development files"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
+
+libfreerdp3-server_package() {
+	short_desc="Free RDP (Remote Desktop Protocol) server - runtime files"
+	depends="libfreerdp3>=${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/libfreerdp-server*.so.*"
+		vmove "usr/lib/libfreerdp-shadow*.so.*"
+	}
+}
+
+freerdp3-server_package() {
+	short_desc="Free RDP (Remote Desktop Protocol) server"
+	depends="libfreerdp3-server>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/freerdp-proxy3
+		vmove usr/bin/freerdp-shadow-cli3
+		vmove usr/share/man/man1/freerdp-shadow-cli3.1
+	}
+}
+
+freerdp3-server-devel_package() {
+	depends="libfreerdp3-server>=${version}_${revision}"
+	short_desc="Free RDP (Remote Desktop Protocol) server - development files"
+	pkg_install() {
+		vmove usr/lib/cmake/FreeRDP-Server3
+		vmove usr/lib/cmake/FreeRDP-Shadow3
+		vmove usr/lib/pkgconfig/freerdp-server3.pc
+		vmove usr/lib/pkgconfig/freerdp-shadow3.pc
+		vmove "usr/lib/libfreerdp-server*.so"
+		vmove "usr/lib/libfreerdp-shadow*.so"
+	}
+}
diff --git a/srcpkgs/libfreerdp3 b/srcpkgs/libfreerdp3
new file mode 120000
index 00000000000000..d8e6da3ebcadf3
--- /dev/null
+++ b/srcpkgs/libfreerdp3
@@ -0,0 +1 @@
+freerdp3
\ No newline at end of file
diff --git a/srcpkgs/libfreerdp3-server b/srcpkgs/libfreerdp3-server
new file mode 120000
index 00000000000000..d8e6da3ebcadf3
--- /dev/null
+++ b/srcpkgs/libfreerdp3-server
@@ -0,0 +1 @@
+freerdp3
\ No newline at end of file

From de06e2ed19052eff3c9186dd01ecae4c8049e801 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Sun, 21 Apr 2024 19:36:27 +0200
Subject: [PATCH 2/3] New package: libuwac-2.11.5

---
 srcpkgs/freerdp/template | 24 +++++++++++++++++++++---
 srcpkgs/libuwac          |  1 +
 srcpkgs/libuwac-devel    |  1 +
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/libuwac
 create mode 120000 srcpkgs/libuwac-devel

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 16fddfbe8f5287..ab3217b0f45331 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -32,9 +32,10 @@ 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"
+# first we want to separate -server, then libuwac
+# everything else then goes to client
+subpackages="libfreerdp-server freerdp-server freerdp-server-devel
+ libuwac libuwac-devel libfreerdp freerdp-devel"
 
 libfreerdp_package() {
 	replaces="${sourcepkg}<1.0.2_2"
@@ -86,3 +87,20 @@ freerdp-server-devel_package() {
 		vmove "usr/lib/libfreerdp-shadow*.so"
 	}
 }
+
+libuwac_package() {
+	short_desc="Using wayland as client - runtime libraries"
+	pkg_install() {
+		vmove "usr/lib/libuwac*.so.*"
+	}
+}
+
+libuwac-devel_package() {
+	short_desc="Using wayland as client - development files"
+	pkg_install() {
+		vmove usr/include/uwac0
+		vmove usr/lib/cmake/uwac0
+		vmove usr/lib/pkgconfig/uwac0.pc
+		vmove "usr/lib/libuwac*.so"
+	}
+}
diff --git a/srcpkgs/libuwac b/srcpkgs/libuwac
new file mode 120000
index 00000000000000..ff5b2c64c02a44
--- /dev/null
+++ b/srcpkgs/libuwac
@@ -0,0 +1 @@
+freerdp
\ No newline at end of file
diff --git a/srcpkgs/libuwac-devel b/srcpkgs/libuwac-devel
new file mode 120000
index 00000000000000..ff5b2c64c02a44
--- /dev/null
+++ b/srcpkgs/libuwac-devel
@@ -0,0 +1 @@
+freerdp
\ No newline at end of file

From 932eed7f541b5fa741bbee29ec7088de0b6d0382 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Mon, 22 Apr 2024 12:30:53 +0200
Subject: [PATCH 3/3] freerdp: update to 2.11.5.

---
 srcpkgs/freerdp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index ab3217b0f45331..2b327afbb51ef8 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,6 +1,6 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.11.4
+version=2.11.5
 revision=1
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -20,7 +20,7 @@ license="Apache-2.0"
 homepage="https://www.freerdp.com/"
 changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/2.10.0/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=6ce0cd682515cc0ed6a8f43413ddf68351b2cd11e7ff9297bc2b558a607350fc
+checksum=8c2300545cd360889ac5420ba5c201532403b800188368c5b28bde9c9e3eec85
 CFLAGS="-Wno-dev"
 
 case "$XBPS_TARGET_MACHINE" in