* [PR PATCH] freerdp: update to 3.4.0.
@ 2024-03-27 19:17 fanyx
2024-03-28 13:04 ` [PR PATCH] [Updated] " fanyx
` (21 more replies)
0 siblings, 22 replies; 29+ messages in thread
From: fanyx @ 2024-03-27 19:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 558 bytes --]
There is a new 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: update to 3.4.0.
#### 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: 2344 bytes --]
From 40ba6a5cd005fd30fb91a29f1da34ec2541f0250 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Wed, 27 Mar 2024 20:16:12 +0100
Subject: [PATCH] freerdp: update to 3.4.0.
---
srcpkgs/freerdp/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 16fddfbe8f5287..b74a13a6ddc338 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,6 +1,6 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.11.4
+version=3.4.0
revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,14 +13,15 @@ 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"
+ libxkbcommon-devel wayland-devel cairo-devel libXdamage-devel
+ pkcs11-helper-devel mit-krb5-devel icu-devel fuse3-devel SDL2-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/2.10.0/ChangeLog"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/3.4.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=6ce0cd682515cc0ed6a8f43413ddf68351b2cd11e7ff9297bc2b558a607350fc
+checksum=0fe77b2b838f32598a11c63ff4a1c0482d5bac0da7753ce6446039349ed96b00
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
@@ -78,10 +79,10 @@ 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/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"
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] freerdp: update to 3.4.0.
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
@ 2024-03-28 13:04 ` fanyx
2024-03-28 13:22 ` fanyx
` (20 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-03-28 13:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 607 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: update to 3.4.0.
Required for `gnome-remote-desktop-46.0`
#### 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: 2380 bytes --]
From 878893803ab93c7ef286fcb508c3eccc20324a64 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Wed, 27 Mar 2024 20:16:12 +0100
Subject: [PATCH] freerdp: update to 3.4.0.
---
srcpkgs/freerdp/template | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 16fddfbe8f5287..9d093d70b0a4ff 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,6 +1,6 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.11.4
+version=3.4.0
revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,14 +13,16 @@ 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"
+ 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/2.10.0/ChangeLog"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/3.4.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=6ce0cd682515cc0ed6a8f43413ddf68351b2cd11e7ff9297bc2b558a607350fc
+checksum=0fe77b2b838f32598a11c63ff4a1c0482d5bac0da7753ce6446039349ed96b00
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
@@ -78,10 +80,10 @@ 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/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"
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] freerdp: update to 3.4.0.
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
2024-03-28 13:04 ` [PR PATCH] [Updated] " fanyx
@ 2024-03-28 13:22 ` fanyx
2024-03-28 14:29 ` fanyx
` (19 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-03-28 13:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 607 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: update to 3.4.0.
Required for `gnome-remote-desktop-46.0`
#### 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: 3090 bytes --]
From a4521a6f83d19a9689d8fe82a14a9ded371b5fb5 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Wed, 27 Mar 2024 20:16:12 +0100
Subject: [PATCH] freerdp: update to 3.4.0.
---
common/shlibs | 6 +++---
srcpkgs/freerdp/template | 18 ++++++++++--------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 93b8afebaaa010..d41e7bdff75b8e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1574,9 +1574,9 @@ libKPipeWire.so.5 kpipewire-5.26.0_1
libKPipeWireRecord.so.5 kpipewire-5.27.0_1
libKPipeWireDmaBuf.so.5 kpipewire-5.27.0_1
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.2 libfreerdp-3.4.0_1
+libfreerdp3.so.2 libfreerdp-3.4.0_1
+libwinpr3.so.2 libfreerdp-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/freerdp/template b/srcpkgs/freerdp/template
index 16fddfbe8f5287..9d093d70b0a4ff 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,6 +1,6 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.11.4
+version=3.4.0
revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,14 +13,16 @@ 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"
+ 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/2.10.0/ChangeLog"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/3.4.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=6ce0cd682515cc0ed6a8f43413ddf68351b2cd11e7ff9297bc2b558a607350fc
+checksum=0fe77b2b838f32598a11c63ff4a1c0482d5bac0da7753ce6446039349ed96b00
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
@@ -78,10 +80,10 @@ 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/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"
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] freerdp: update to 3.4.0.
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
2024-03-28 13:04 ` [PR PATCH] [Updated] " fanyx
2024-03-28 13:22 ` fanyx
@ 2024-03-28 14:29 ` fanyx
2024-03-28 14:38 ` fanyx
` (18 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-03-28 14:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 607 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: update to 3.4.0.
Required for `gnome-remote-desktop-46.0`
#### 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: 3090 bytes --]
From 5eca611402dc7d671b1da3db1dc5d05cc2d21165 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Wed, 27 Mar 2024 20:16:12 +0100
Subject: [PATCH] freerdp: update to 3.4.0.
---
common/shlibs | 6 +++---
srcpkgs/freerdp/template | 18 ++++++++++--------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 93b8afebaaa010..005b1f176a75d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1574,9 +1574,9 @@ libKPipeWire.so.5 kpipewire-5.26.0_1
libKPipeWireRecord.so.5 kpipewire-5.27.0_1
libKPipeWireDmaBuf.so.5 kpipewire-5.27.0_1
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 libfreerdp-3.4.0_1
+libfreerdp3.so.3 libfreerdp-3.4.0_1
+libwinpr3.so.3 libfreerdp-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/freerdp/template b/srcpkgs/freerdp/template
index 16fddfbe8f5287..9d093d70b0a4ff 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,6 +1,6 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.11.4
+version=3.4.0
revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,14 +13,16 @@ 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"
+ 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/2.10.0/ChangeLog"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/3.4.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=6ce0cd682515cc0ed6a8f43413ddf68351b2cd11e7ff9297bc2b558a607350fc
+checksum=0fe77b2b838f32598a11c63ff4a1c0482d5bac0da7753ce6446039349ed96b00
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
@@ -78,10 +80,10 @@ 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/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"
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: freerdp: update to 3.4.0.
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (2 preceding siblings ...)
2024-03-28 14:29 ` fanyx
@ 2024-03-28 14:38 ` fanyx
2024-03-28 15:06 ` chrysos349
` (17 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-03-28 14:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New comment by fanyx on void-packages repository
https://github.com/void-linux/void-packages/pull/49572#issuecomment-2025381147
Comment:
`weston-13.0.0` requires freerdp2
`Run-time dependency freerdp2 found: NO (tried pkgconfig and cmake)`
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: freerdp: update to 3.4.0.
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (3 preceding siblings ...)
2024-03-28 14:38 ` fanyx
@ 2024-03-28 15:06 ` chrysos349
2024-03-28 15:49 ` fanyx
` (16 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: chrysos349 @ 2024-03-28 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/49572#issuecomment-2025451314
Comment:
> `weston-13.0.0` requires freerdp2
Create a new package `freerdp3` then.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: freerdp: update to 3.4.0.
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (4 preceding siblings ...)
2024-03-28 15:06 ` chrysos349
@ 2024-03-28 15:49 ` fanyx
2024-03-28 16:08 ` [PR PATCH] [Updated] " fanyx
` (15 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-03-28 15:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New comment by fanyx on void-packages repository
https://github.com/void-linux/void-packages/pull/49572#issuecomment-2025546189
Comment:
obviously ^^
just wanted to document one critical issue
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] freerdp: update to 3.4.0.
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (5 preceding siblings ...)
2024-03-28 15:49 ` fanyx
@ 2024-03-28 16:08 ` fanyx
2024-03-28 16:10 ` [PR PATCH] [Updated] New package: freerdp3-3.4.0 fanyx
` (14 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-03-28 16:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 607 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: update to 3.4.0.
Required for `gnome-remote-desktop-46.0`
#### 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: 5708 bytes --]
From 6ea1dc0fa09eb2e01ac6c0320e122d2ef5a15502 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 28 Mar 2024 17:05:28 +0100
Subject: [PATCH] New package: freerdp3
---
common/shlibs | 3 ++
srcpkgs/freerdp3-devel | 1 +
srcpkgs/freerdp3-server | 1 +
srcpkgs/freerdp3-server-devel | 1 +
srcpkgs/freerdp3/template | 90 +++++++++++++++++++++++++++++++++++
srcpkgs/libfreerdp3 | 1 +
srcpkgs/libfreerdp3-server | 1 +
7 files changed, 98 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 93b8afebaaa010..c032e789405273 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1577,6 +1577,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..476ecee37746a3
--- /dev/null
+++ b/srcpkgs/freerdp3/template
@@ -0,0 +1,90 @@
+# Template file for 'freerdp3'
+pkgname=freerdp3
+version=3.4.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"
+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.4.0/ChangeLog"
+distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
+checksum=0fe77b2b838f32598a11c63ff4a1c0482d5bac0da7753ce6446039349ed96b00
+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"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+freerdp-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"
+ }
+}
+
+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-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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: freerdp3-3.4.0
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (6 preceding siblings ...)
2024-03-28 16:08 ` [PR PATCH] [Updated] " fanyx
@ 2024-03-28 16:10 ` fanyx
2024-03-28 23:37 ` fanyx
` (13 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-03-28 16:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 609 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
New package: freerdp3-3.4.0
Required for `gnome-remote-desktop-46.0`
#### 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: 5719 bytes --]
From db9de5b05297c9466848a6de0f900c7ed023a4f2 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 28 Mar 2024 17:05:28 +0100
Subject: [PATCH] New package: freerdp3-3.4.0
---
common/shlibs | 3 ++
srcpkgs/freerdp3-devel | 1 +
srcpkgs/freerdp3-server | 1 +
srcpkgs/freerdp3-server-devel | 1 +
srcpkgs/freerdp3/template | 90 +++++++++++++++++++++++++++++++++++
srcpkgs/libfreerdp3 | 1 +
srcpkgs/libfreerdp3-server | 1 +
7 files changed, 98 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 93b8afebaaa010..c032e789405273 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1577,6 +1577,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..a621f0e1e8e90e
--- /dev/null
+++ b/srcpkgs/freerdp3/template
@@ -0,0 +1,90 @@
+# Template file for 'freerdp3'
+pkgname=freerdp3
+version=3.4.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"
+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.4.0/ChangeLog"
+distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
+checksum=0fe77b2b838f32598a11c63ff4a1c0482d5bac0da7753ce6446039349ed96b00
+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"
+
+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="libfreerdp>=${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="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
+ }
+}
+
+freerdp3-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-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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: freerdp3-3.4.0
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (7 preceding siblings ...)
2024-03-28 16:10 ` [PR PATCH] [Updated] New package: freerdp3-3.4.0 fanyx
@ 2024-03-28 23:37 ` fanyx
2024-03-28 23:50 ` fanyx
` (12 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-03-28 23:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 609 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
New package: freerdp3-3.4.0
Required for `gnome-remote-desktop-46.0`
#### 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: 5748 bytes --]
From a6b2b21607a746ce2a722ff80813e5c18b1537ee Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 28 Mar 2024 17:05:28 +0100
Subject: [PATCH] New package: freerdp3-3.4.0
---
common/shlibs | 3 ++
srcpkgs/freerdp3-devel | 1 +
srcpkgs/freerdp3-server | 1 +
srcpkgs/freerdp3-server-devel | 1 +
srcpkgs/freerdp3/template | 91 +++++++++++++++++++++++++++++++++++
srcpkgs/libfreerdp3 | 1 +
srcpkgs/libfreerdp3-server | 1 +
7 files changed, 99 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 93b8afebaaa010..c032e789405273 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1577,6 +1577,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..916ad58e8ce6e4
--- /dev/null
+++ b/srcpkgs/freerdp3/template
@@ -0,0 +1,91 @@
+# Template file for 'freerdp3'
+pkgname=freerdp3
+version=3.4.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"
+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.4.0/ChangeLog"
+distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
+checksum=0fe77b2b838f32598a11c63ff4a1c0482d5bac0da7753ce6446039349ed96b00
+conflicts="freerdp"
+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-proxy
+ vmove usr/bin/freerdp-shadow-cli
+ vmove usr/share/man/man1/freerdp-shadow-cli.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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: freerdp3-3.4.0
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (8 preceding siblings ...)
2024-03-28 23:37 ` fanyx
@ 2024-03-28 23:50 ` fanyx
2024-03-28 23:56 ` fanyx
` (11 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-03-28 23:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 609 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
New package: freerdp3-3.4.0
Required for `gnome-remote-desktop-46.0`
#### 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: 5830 bytes --]
From b6b5925cd1e51dfd60f52014bc605cd2c72489a4 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 28 Mar 2024 17:05:28 +0100
Subject: [PATCH] New package: freerdp3-3.4.0
---
common/shlibs | 3 ++
srcpkgs/freerdp3-devel | 1 +
srcpkgs/freerdp3-server | 1 +
srcpkgs/freerdp3-server-devel | 1 +
srcpkgs/freerdp3/template | 92 +++++++++++++++++++++++++++++++++++
srcpkgs/libfreerdp3 | 1 +
srcpkgs/libfreerdp3-server | 1 +
7 files changed, 100 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 93b8afebaaa010..c032e789405273 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1577,6 +1577,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..d186f6188bdd83
--- /dev/null
+++ b/srcpkgs/freerdp3/template
@@ -0,0 +1,92 @@
+# Template file for 'freerdp3'
+pkgname=freerdp3
+version=3.4.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"
+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.4.0/ChangeLog"
+distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
+checksum=0fe77b2b838f32598a11c63ff4a1c0482d5bac0da7753ce6446039349ed96b00
+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-proxy
+ vmove usr/bin/freerdp-shadow-cli
+ vmove usr/share/man/man1/freerdp-shadow-cli.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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: New package: freerdp3-3.4.0
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (9 preceding siblings ...)
2024-03-28 23:50 ` fanyx
@ 2024-03-28 23:56 ` fanyx
2024-04-20 13:38 ` [PR PATCH] [Updated] " fanyx
` (10 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-03-28 23:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by fanyx on void-packages repository
https://github.com/void-linux/void-packages/pull/49572#issuecomment-2026338083
Comment:
alright, this is where i'm stuck
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: freerdp3-3.4.0
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (10 preceding siblings ...)
2024-03-28 23:56 ` fanyx
@ 2024-04-20 13:38 ` fanyx
2024-04-20 14:42 ` New package: freerdp3-3.5.0 fanyx
` (9 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-04-20 13:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 609 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
New package: freerdp3-3.4.0
Required for `gnome-remote-desktop-46.0`
#### 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: 5830 bytes --]
From 5c74217ad1d2ce12b25de18b7c243dff868fa168 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Thu, 28 Mar 2024 17:05:28 +0100
Subject: [PATCH] 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 | 92 +++++++++++++++++++++++++++++++++++
srcpkgs/libfreerdp3 | 1 +
srcpkgs/libfreerdp3-server | 1 +
7 files changed, 100 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 531f1431305d49..a571a00323b1f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1574,6 +1574,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..6c379452cd46b4
--- /dev/null
+++ b/srcpkgs/freerdp3/template
@@ -0,0 +1,92 @@
+# 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"
+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.4.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-proxy
+ vmove usr/bin/freerdp-shadow-cli
+ vmove usr/share/man/man1/freerdp-shadow-cli.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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: New package: freerdp3-3.5.0
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (11 preceding siblings ...)
2024-04-20 13:38 ` [PR PATCH] [Updated] " fanyx
@ 2024-04-20 14:42 ` fanyx
2024-04-20 16:49 ` fanyx
` (8 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-04-20 14:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
New comment by fanyx on void-packages repository
https://github.com/void-linux/void-packages/pull/49572#issuecomment-2067694981
Comment:
https://packages.debian.org/sid/libuwac0-dev
sounds reasonable to extract libuwac to its own package
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: New package: freerdp3-3.5.0
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (12 preceding siblings ...)
2024-04-20 14:42 ` New package: freerdp3-3.5.0 fanyx
@ 2024-04-20 16:49 ` fanyx
2024-04-21 10:45 ` [PR PATCH] [Updated] " fanyx
` (7 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-04-20 16:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New comment by fanyx on void-packages repository
https://github.com/void-linux/void-packages/pull/49572#issuecomment-2067727184
Comment:
@oreo639 pinging as RFC
feel free to get others into the loop if necessary
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: freerdp3-3.5.0
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (13 preceding siblings ...)
2024-04-20 16:49 ` fanyx
@ 2024-04-21 10:45 ` fanyx
2024-04-22 10:29 ` fanyx
` (6 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-04-21 10:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 609 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
New package: freerdp3-3.5.0
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: 2252 bytes --]
From cd890733a071c0151dff0b0cfc846b3085ab628a Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Sun, 21 Apr 2024 12:45:25 +0200
Subject: [PATCH] freerdp: update to 3.5.0.
---
srcpkgs/freerdp/template | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 16fddfbe8f5287..3ef51d08fbf676 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,6 +1,6 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.11.4
+version=3.5.0
revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,14 +13,15 @@ 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"
+ libxkbcommon-devel wayland-devel cairo-devel libXdamage-devel
+ pkcs11-helper-devel mit-krb5-devel icu-devel fuse3-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/2.10.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=6ce0cd682515cc0ed6a8f43413ddf68351b2cd11e7ff9297bc2b558a607350fc
+checksum=03323b383980ee91decbed88270bac061ffb17fd04e52576c70da7885601ecbe
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
@@ -78,10 +79,10 @@ 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/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"
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: freerdp3-3.5.0
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (14 preceding siblings ...)
2024-04-21 10:45 ` [PR PATCH] [Updated] " fanyx
@ 2024-04-22 10:29 ` fanyx
2024-04-22 10:31 ` fanyx
` (5 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-04-22 10:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 622 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
New package: freerdp3-3.5.0
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):
[ci skip]
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: 8568 bytes --]
From 0248dbc23798314ed970e1d31104e69d19483a75 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..57fccd97dfaa49
--- /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-cli.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 f7a4f268c020c90c5295488f0f06d26da755802b 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 eb6f8ce6ca55f384ccdae8f9716699e6f79abab4 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Mon, 22 Apr 2024 12:29:15 +0200
Subject: [PATCH 3/3] freerdp: update to 2.11.5.
---
srcpkgs/freerdp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index ab3217b0f45331..bf042ce522b531 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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: freerdp3-3.5.0
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (15 preceding siblings ...)
2024-04-22 10:29 ` fanyx
@ 2024-04-22 10:31 ` fanyx
2024-04-22 10:41 ` [PR PATCH] [Updated] freerdp split (2.11.5, 3.5.0, libuwac0) fanyx
` (4 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-04-22 10:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 609 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
New package: freerdp3-3.5.0
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: 8568 bytes --]
From 0248dbc23798314ed970e1d31104e69d19483a75 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..57fccd97dfaa49
--- /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-cli.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 f7a4f268c020c90c5295488f0f06d26da755802b 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 662c43b67da3b16933518d8c8366efd283ba6005 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index ab3217b0f45331..bf042ce522b531 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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] freerdp split (2.11.5, 3.5.0, libuwac0)
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (16 preceding siblings ...)
2024-04-22 10:31 ` fanyx
@ 2024-04-22 10:41 ` fanyx
2024-04-22 10:56 ` fanyx
` (3 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-04-22 10:41 UTC (permalink / raw)
To: ml
[-- 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: 8569 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 583abf155651a2c6280d6cd8af77b752177a77b5 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index ab3217b0f45331..bf042ce522b531 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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] freerdp split (2.11.5, 3.5.0, libuwac0)
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (17 preceding siblings ...)
2024-04-22 10:41 ` [PR PATCH] [Updated] freerdp split (2.11.5, 3.5.0, libuwac0) fanyx
@ 2024-04-22 10:56 ` fanyx
2024-04-22 12:01 ` chrysos349
` (2 subsequent siblings)
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-04-22 10:56 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: freerdp split (2.11.5, 3.5.0, libuwac0)
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (18 preceding siblings ...)
2024-04-22 10:56 ` fanyx
@ 2024-04-22 12:01 ` chrysos349
2024-04-22 12:03 ` [PR PATCH] [Closed]: " fanyx
2024-04-22 12:03 ` fanyx
21 siblings, 0 replies; 29+ messages in thread
From: chrysos349 @ 2024-04-22 12:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/49572#issuecomment-2069217605
Comment:
here is my take on freerdp3 - #49982
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Closed]: freerdp split (2.11.5, 3.5.0, libuwac0)
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (19 preceding siblings ...)
2024-04-22 12:01 ` chrysos349
@ 2024-04-22 12:03 ` fanyx
2024-04-22 12:03 ` fanyx
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-04-22 12:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 468 bytes --]
There's a closed pull request on the void-packages repository
freerdp split (2.11.5, 3.5.0, libuwac0)
https://github.com/void-linux/void-packages/pull/49572
Description:
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):
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: freerdp split (2.11.5, 3.5.0, libuwac0)
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
` (20 preceding siblings ...)
2024-04-22 12:03 ` [PR PATCH] [Closed]: " fanyx
@ 2024-04-22 12:03 ` fanyx
21 siblings, 0 replies; 29+ messages in thread
From: fanyx @ 2024-04-22 12:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New comment by fanyx on void-packages repository
https://github.com/void-linux/void-packages/pull/49572#issuecomment-2069222033
Comment:
Much cleaner, thanks a giant ton
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: freerdp3-3.5.0
2024-04-22 11:33 [PR PATCH] New package: freerdp3-3.5.0 chrysos349
` (4 preceding siblings ...)
2024-04-22 21:08 ` chrysos349
@ 2024-04-22 21:23 ` chrysos349
5 siblings, 0 replies; 29+ messages in thread
From: chrysos349 @ 2024-04-22 21:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages freerdp3
https://github.com/void-linux/void-packages/pull/49982
New package: freerdp3-3.5.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/49982.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freerdp3-49982.patch --]
[-- Type: text/x-diff, Size: 17417 bytes --]
From 8043b204720428f51247dd10e416f2f0326bc822 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 20 Apr 2024 21:31:56 +0300
Subject: [PATCH 1/2] cJSON: update to 1.7.17
---
srcpkgs/cJSON/patches/fix-cross.patch | 97 +++++++++++++++++++++
srcpkgs/cJSON/patches/fix-memory-leak.patch | 21 -----
srcpkgs/cJSON/template | 6 +-
3 files changed, 100 insertions(+), 24 deletions(-)
create mode 100644 srcpkgs/cJSON/patches/fix-cross.patch
delete mode 100644 srcpkgs/cJSON/patches/fix-memory-leak.patch
diff --git a/srcpkgs/cJSON/patches/fix-cross.patch b/srcpkgs/cJSON/patches/fix-cross.patch
new file mode 100644
index 00000000000000..33340bd827c38f
--- /dev/null
+++ b/srcpkgs/cJSON/patches/fix-cross.patch
@@ -0,0 +1,97 @@
+help cmake find headers when cross-compiling
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d807ea62..aa2057c43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -146,25 +146,25 @@ endif()
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" @ONLY)
+
+-install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
+-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
++install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
++install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ install(TARGETS "${CJSON_LIB}"
+ EXPORT "${CJSON_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ if (BUILD_SHARED_AND_STATIC_LIBS)
+ install(TARGETS "${CJSON_LIB}-static"
+ EXPORT "${CJSON_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ endif()
+ if(ENABLE_TARGET_EXPORT)
+ # export library information for CMake projects
+- install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ if(ENABLE_CJSON_VERSION_SO)
+@@ -199,23 +199,23 @@ if(ENABLE_CJSON_UTILS)
+
+ install(TARGETS "${CJSON_UTILS_LIB}"
+ EXPORT "${CJSON_UTILS_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ if (BUILD_SHARED_AND_STATIC_LIBS)
+ install(TARGETS "${CJSON_UTILS_LIB}-static"
+ EXPORT "${CJSON_UTILS_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ endif()
+- install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
+- install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
++ install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
++ install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ if(ENABLE_TARGET_EXPORT)
+ # export library information for CMake projects
+- install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ if(ENABLE_CJSON_VERSION_SO)
+@@ -238,7 +238,7 @@ if(ENABLE_TARGET_EXPORT)
+ # Install package config files
+ install(FILES ${PROJECT_BINARY_DIR}/cJSONConfig.cmake
+ ${PROJECT_BINARY_DIR}/cJSONConfigVersion.cmake
+- DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ option(ENABLE_CJSON_TEST "Enable building cJSON test" ON)
+diff --git a/library_config/cJSONConfig.cmake.in b/library_config/cJSONConfig.cmake.in
+index 909f7a9ae..206566b39 100644
+--- a/library_config/cJSONConfig.cmake.in
++++ b/library_config/cJSONConfig.cmake.in
+@@ -2,8 +2,8 @@
+ set(CJSON_UTILS_FOUND @ENABLE_CJSON_UTILS@)
+
+ # The include directories used by cJSON
+-set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
+-set(CJSON_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
++set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_INCLUDEDIR@")
++set(CJSON_INCLUDE_DIR "@CMAKE_INSTALL_INCLUDEDIR@")
+
+ get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
diff --git a/srcpkgs/cJSON/patches/fix-memory-leak.patch b/srcpkgs/cJSON/patches/fix-memory-leak.patch
deleted file mode 100644
index 01556a6eb8e00e..00000000000000
--- a/srcpkgs/cJSON/patches/fix-memory-leak.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f50dafc7d0bfd4f45449ab5665bfea831a82f2eb Mon Sep 17 00:00:00 2001
-From: Alan Wang <948467222@qq.com>
-Date: Thu, 26 Aug 2021 14:13:42 +0800
-Subject: [PATCH] fix: potential memory leak in merge_patch() (#611)
-
----
- cJSON_Utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cJSON_Utils.c b/cJSON_Utils.c
-index c7c64391..63651dfb 100644
---- a/cJSON_Utils.c
-+++ b/cJSON_Utils.c
-@@ -1367,6 +1367,7 @@ static cJSON *merge_patch(cJSON *target, const cJSON * const patch, const cJSON_
- replacement = merge_patch(replace_me, patch_child, case_sensitive);
- if (replacement == NULL)
- {
-+ cJSON_Delete(target);
- return NULL;
- }
-
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index 63235062a77cb6..43a51a1be2d524 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,14 +1,14 @@
# Template file for 'cJSON'
pkgname=cJSON
-version=1.7.15
-revision=2
+version=1.7.17
+revision=1
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/DaveGamble/cJSON"
distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz"
-checksum=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2
+checksum=c91d1eeb7175c50d49f6ba2a25e69b46bd05cffb798382c19bfb202e467ec51c
post_install() {
vlicense LICENSE
From e65ccfe0b49d28d4d347ab9ca3bdc444c85a670a Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 20 Apr 2024 21:36:30 +0300
Subject: [PATCH 2/2] New package: freerdp3-3.5.1
---
common/shlibs | 8 +
srcpkgs/freerdp3-devel | 1 +
srcpkgs/freerdp3-server | 1 +
srcpkgs/freerdp3/patches/fix-cross.patch | 27 ++++
.../freerdp3/patches/use-webkit2gtk41.patch | 25 ++++
srcpkgs/freerdp3/template | 137 ++++++++++++++++++
srcpkgs/libfreerdp3 | 1 +
srcpkgs/libfreerdp3-server | 1 +
8 files changed, 201 insertions(+)
create mode 120000 srcpkgs/freerdp3-devel
create mode 120000 srcpkgs/freerdp3-server
create mode 100644 srcpkgs/freerdp3/patches/fix-cross.patch
create mode 100644 srcpkgs/freerdp3/patches/use-webkit2gtk41.patch
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..1e42374740f8bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1584,6 +1584,14 @@ 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
+libfreerdp-client3.so.3 libfreerdp3-3.5.1_1
+libfreerdp-server-proxy3.so.3 libfreerdp3-server-3.5.1_1
+libfreerdp-server3.so.3 libfreerdp3-server-3.5.1_1
+libfreerdp-shadow-subsystem3.so.3 libfreerdp3-server-3.5.1_1
+libfreerdp-shadow3.so.3 libfreerdp3-server-3.5.1_1
+libfreerdp3.so.3 libfreerdp3-3.5.1_1
+libwinpr-tools3.so.3 libfreerdp3-3.5.1_1
+libwinpr3.so.3 libfreerdp3-3.5.1_1
libcppunit-1.15.so.1 libcppunit-1.15.1_1
libcalc.so.2.14.3.5 libcalc-2.14.3.5_1
libcustcalc.so.2.14.3.5 libcalc-2.14.3.5_1
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/patches/fix-cross.patch b/srcpkgs/freerdp3/patches/fix-cross.patch
new file mode 100644
index 00000000000000..7aea0e91a92908
--- /dev/null
+++ b/srcpkgs/freerdp3/patches/fix-cross.patch
@@ -0,0 +1,27 @@
+help cmake run executables when cross-compiling
+diff --git a/cmake/InstallFreeRDPMan.cmake b/cmake/InstallFreeRDPMan.cmake
+index c333f6497..2dff84966 100644
+--- a/cmake/InstallFreeRDPMan.cmake
++++ b/cmake/InstallFreeRDPMan.cmake
+@@ -57,7 +57,7 @@ function(generate_and_install_freerdp_man_from_xml name_base section api depende
+
+ add_custom_command(
+ OUTPUT "${manpage}"
+- COMMAND ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_docbook
++ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_docbook
+ COMMAND ${XSLTPROC_EXECUTABLE} --path "${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}" ${DOCBOOKXSL_DIR}/manpages/docbook.xsl ${manpage}.xml
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS
+diff --git a/client/SDL/dialogs/res/CMakeLists.txt b/client/SDL/dialogs/res/CMakeLists.txt
+index 5591e4af6..0b0946534 100644
+--- a/client/SDL/dialogs/res/CMakeLists.txt
++++ b/client/SDL/dialogs/res/CMakeLists.txt
+@@ -33,7 +33,7 @@ macro(convert_to_bin FILE FILE_TYPE)
+ add_custom_command(
+ OUTPUT ${FILE_BYPRODUCTS}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${FILE_BIN_DIR}
+- COMMAND $<TARGET_FILE:freerdp-res2bin> ${FILE} ${FILE_TYPE} ${TARGET_NAME} ${FILE_BIN_DIR}
++ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:freerdp-res2bin> ${FILE} ${FILE_TYPE} ${TARGET_NAME} ${FILE_BIN_DIR}
+ COMMENT "create image resources"
+ DEPENDS freerdp-res2bin
+ DEPENDS ${FILE}
diff --git a/srcpkgs/freerdp3/patches/use-webkit2gtk41.patch b/srcpkgs/freerdp3/patches/use-webkit2gtk41.patch
new file mode 100644
index 00000000000000..432d9fdf414c62
--- /dev/null
+++ b/srcpkgs/freerdp3/patches/use-webkit2gtk41.patch
@@ -0,0 +1,25 @@
+From 3de172e7da393e8d544b7eb38ce9db7d18c468b1 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Mon, 25 Mar 2024 20:12:08 +0100
+Subject: [PATCH 1/1] Use webkit2gtk-4.1
+
+---
+ client/SDL/aad/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/SDL/aad/CMakeLists.txt b/client/SDL/aad/CMakeLists.txt
+index 228654262..d13fb907e 100644
+--- a/client/SDL/aad/CMakeLists.txt
++++ b/client/SDL/aad/CMakeLists.txt
+@@ -44,7 +44,7 @@ if (WITH_WEBVIEW)
+ )
+ else()
+ find_package(PkgConfig REQUIRED)
+- pkg_check_modules(WEBVIEW_GTK webkit2gtk-4.0 REQUIRED)
++ pkg_check_modules(WEBVIEW_GTK webkit2gtk-4.1 REQUIRED)
+ include_directories(${WEBVIEW_GTK_INCLUDE_DIRS})
+ list(APPEND LIBS
+ ${WEBVIEW_GTK_LIBRARIES}
+--
+2.44.0
+
diff --git a/srcpkgs/freerdp3/template b/srcpkgs/freerdp3/template
new file mode 100644
index 00000000000000..ec7217660627a8
--- /dev/null
+++ b/srcpkgs/freerdp3/template
@@ -0,0 +1,137 @@
+# Template file for 'freerdp3'
+pkgname=freerdp3
+version=3.5.1
+revision=1
+build_style=cmake
+build_helper=qemu
+configure_args="
+ -DCHANNEL_URBDRC_CLIENT=ON
+ -DPKG_CONFIG_RELOCATABLE=OFF
+ -DRDTK_FORCE_STATIC_BUILD=ON
+ -DWITH_BINARY_VERSIONING=ON
+ -DDOCBOOKXSL_DIR=/usr/share/xsl/docbook
+ -DPROXY_PLUGINDIR=/usr/lib/${pkgname}/server/proxy/plugins
+ -DXSLTPROC_EXECUTABLE=/usr/bin/xsltproc
+ -DWAYLAND_SCANNER=/usr/bin/wayland-scanner
+
+ -DUWAC_FORCE_STATIC_BUILD=$(vopt_if wayland ON OFF)
+ -DWITH_AAD=$(vopt_if aad ON OFF)
+ -DWITH_ALSA=ON
+ -DWITH_CAIRO=$(vopt_if ffmpeg OFF ON)
+ -DWITH_CHANNELS=ON
+ -DWITH_CLIENT_CHANNELS=ON
+ -DWITH_CLIENT_SDL=$(vopt_if sdl2 ON OFF)
+ -DWITH_CUPS=ON
+ -DWITH_DSP_FFMPEG=$(vopt_if ffmpeg ON OFF)
+ -DWITH_FFMPEG=$(vopt_if ffmpeg ON OFF)
+ -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
+ -DWITH_FUSE=ON
+ -DWITH_GSTREAMER_1_0=OFF
+ -DWITH_ICU=ON
+ -DWITH_JPEG=ON
+ -DWITH_LIBSYSTEMD=OFF
+ -DWITH_PCSC=$(vopt_if smartcard ON OFF)
+ -DWITH_PKCS11=$(vopt_if smartcard ON OFF)
+ -DWITH_PULSE=ON
+ -DWITH_SAMPLE=OFF
+ -DWITH_SERVER=ON
+ -DWITH_SERVER_CHANNELS=ON
+ -DWITH_SWSCALE=$(vopt_if ffmpeg ON OFF)
+ -DWITH_WAYLAND=$(vopt_if wayland ON OFF)
+ -DWITH_WEBVIEW=$(vopt_if webview ON OFF)
+ -DWITH_WINPR_TOOLS=ON
+ -DWITH_X11=ON
+ -DWITH_XCURSOR=ON
+ -DWITH_XEXT=ON
+ -DWITH_XI=ON
+ -DWITH_XINERAMA=ON
+ -DWITH_XKBFILE=ON
+ -DWITH_XRENDER=ON
+ -DWITH_XV=ON"
+hostmakedepends="pkg-config xmlto $(vopt_if wayland wayland-devel)"
+makedepends="alsa-lib-devel cups-devel fuse3-devel icu-devel libXcursor-devel
+ libXdamage-devel libXinerama-devel libXrandr-devel libXv-devel
+ libjpeg-turbo-devel libusb-devel libxkbfile-devel mit-krb5-devel openssl-devel
+ pulseaudio-devel uriparser-devel
+ $(vopt_if aad cJSON-devel)
+ $(vopt_if ffmpeg ffmpeg-devel cairo-devel)
+ $(vopt_if smartcard 'pcsclite-devel pkcs11-helper-devel')
+ $(vopt_if sdl2 SDL2_ttf-devel)
+ $(vopt_if wayland 'libxkbcommon-devel wayland-devel')
+ $(vopt_if webview libwebkit2gtk41-devel)"
+short_desc="Free RDP (Remote Desktop Protocol) client"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="Apache-2.0"
+homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
+distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
+checksum=bb40028c90c156799bc26a8b5837754a62805ee371e988efc61903c7263843b1
+CFLAGS="-Wno-dev"
+
+# wayland - deprecated, sdl2 - experimental
+build_options="aad ffmpeg sdl2 smartcard wayland webview"
+build_options_default="aad ffmpeg sdl2 smartcard"
+
+desc_option_aad="Compile with support for Azure AD authentication"
+desc_option_smartcard="Build with smartcard support"
+desc_option_webview="Build with WebView support for AAD login popup browser"
+
+if [ "$build_option_webview" -a -z "$build_option_sdl2" ]; then
+ broken="WebView requires SDL"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
+ armv5tel*) configure_args+=" -DWITH_NEON=OFF";;
+esac
+
+if [ "$CROSS_BUILD" ]; then
+ configure_args+="
+ -DCMAKE_CXX_COMPILER_AR=/usr/bin/${XBPS_CROSS_TRIPLET}-ar
+ -DCMAKE_CXX_COMPILER_RANLIB=/usr/bin/${XBPS_CROSS_TRIPLET}-ranlib"
+
+ pre_configure() {
+ export CXX="$XBPS_WRAPPERDIR/${XBPS_CROSS_TRIPLET}-c++"
+ }
+fi
+
+# first we want to separate -server, everything else then goes to client
+subpackages="libfreerdp3-server freerdp3-server libfreerdp3 freerdp3-devel"
+
+libfreerdp3_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+freerdp3-devel_package() {
+ short_desc+=" - development files"
+ depends="cJSON-devel libfreerdp3-server>=${version}_${revision}
+ libfreerdp3>=${version}_${revision} openssl-devel"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ }
+}
+
+libfreerdp3-server_package() {
+ short_desc="Free RDP (Remote Desktop Protocol) server - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/freerdp3/server/proxy/plugins"
+ vmove "usr/lib/libfreerdp-server*.so.*"
+ vmove "usr/lib/libfreerdp-shadow*.so.*"
+ }
+}
+
+freerdp3-server_package() {
+ short_desc="Free RDP (Remote Desktop Protocol) server"
+ pkg_install() {
+ vmove usr/bin/freerdp-proxy3
+ vmove usr/bin/freerdp-shadow-cli3
+ vmove usr/share/man/man1/freerdp-proxy3.1
+ vmove usr/share/man/man1/freerdp-shadow-cli3.1
+ }
+}
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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: freerdp3-3.5.0
2024-04-22 11:33 [PR PATCH] New package: freerdp3-3.5.0 chrysos349
` (3 preceding siblings ...)
2024-04-22 15:58 ` chrysos349
@ 2024-04-22 21:08 ` chrysos349
2024-04-22 21:23 ` chrysos349
5 siblings, 0 replies; 29+ messages in thread
From: chrysos349 @ 2024-04-22 21:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages freerdp3
https://github.com/void-linux/void-packages/pull/49982
New package: freerdp3-3.5.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/49982.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freerdp3-49982.patch --]
[-- Type: text/x-diff, Size: 17416 bytes --]
From 8043b204720428f51247dd10e416f2f0326bc822 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 20 Apr 2024 21:31:56 +0300
Subject: [PATCH 1/2] cJSON: update to 1.7.17
---
srcpkgs/cJSON/patches/fix-cross.patch | 97 +++++++++++++++++++++
srcpkgs/cJSON/patches/fix-memory-leak.patch | 21 -----
srcpkgs/cJSON/template | 6 +-
3 files changed, 100 insertions(+), 24 deletions(-)
create mode 100644 srcpkgs/cJSON/patches/fix-cross.patch
delete mode 100644 srcpkgs/cJSON/patches/fix-memory-leak.patch
diff --git a/srcpkgs/cJSON/patches/fix-cross.patch b/srcpkgs/cJSON/patches/fix-cross.patch
new file mode 100644
index 00000000000000..33340bd827c38f
--- /dev/null
+++ b/srcpkgs/cJSON/patches/fix-cross.patch
@@ -0,0 +1,97 @@
+help cmake find headers when cross-compiling
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d807ea62..aa2057c43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -146,25 +146,25 @@ endif()
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" @ONLY)
+
+-install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
+-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
++install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
++install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ install(TARGETS "${CJSON_LIB}"
+ EXPORT "${CJSON_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ if (BUILD_SHARED_AND_STATIC_LIBS)
+ install(TARGETS "${CJSON_LIB}-static"
+ EXPORT "${CJSON_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ endif()
+ if(ENABLE_TARGET_EXPORT)
+ # export library information for CMake projects
+- install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ if(ENABLE_CJSON_VERSION_SO)
+@@ -199,23 +199,23 @@ if(ENABLE_CJSON_UTILS)
+
+ install(TARGETS "${CJSON_UTILS_LIB}"
+ EXPORT "${CJSON_UTILS_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ if (BUILD_SHARED_AND_STATIC_LIBS)
+ install(TARGETS "${CJSON_UTILS_LIB}-static"
+ EXPORT "${CJSON_UTILS_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ endif()
+- install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
+- install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
++ install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
++ install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ if(ENABLE_TARGET_EXPORT)
+ # export library information for CMake projects
+- install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ if(ENABLE_CJSON_VERSION_SO)
+@@ -238,7 +238,7 @@ if(ENABLE_TARGET_EXPORT)
+ # Install package config files
+ install(FILES ${PROJECT_BINARY_DIR}/cJSONConfig.cmake
+ ${PROJECT_BINARY_DIR}/cJSONConfigVersion.cmake
+- DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ option(ENABLE_CJSON_TEST "Enable building cJSON test" ON)
+diff --git a/library_config/cJSONConfig.cmake.in b/library_config/cJSONConfig.cmake.in
+index 909f7a9ae..206566b39 100644
+--- a/library_config/cJSONConfig.cmake.in
++++ b/library_config/cJSONConfig.cmake.in
+@@ -2,8 +2,8 @@
+ set(CJSON_UTILS_FOUND @ENABLE_CJSON_UTILS@)
+
+ # The include directories used by cJSON
+-set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
+-set(CJSON_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
++set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_INCLUDEDIR@")
++set(CJSON_INCLUDE_DIR "@CMAKE_INSTALL_INCLUDEDIR@")
+
+ get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
diff --git a/srcpkgs/cJSON/patches/fix-memory-leak.patch b/srcpkgs/cJSON/patches/fix-memory-leak.patch
deleted file mode 100644
index 01556a6eb8e00e..00000000000000
--- a/srcpkgs/cJSON/patches/fix-memory-leak.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f50dafc7d0bfd4f45449ab5665bfea831a82f2eb Mon Sep 17 00:00:00 2001
-From: Alan Wang <948467222@qq.com>
-Date: Thu, 26 Aug 2021 14:13:42 +0800
-Subject: [PATCH] fix: potential memory leak in merge_patch() (#611)
-
----
- cJSON_Utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cJSON_Utils.c b/cJSON_Utils.c
-index c7c64391..63651dfb 100644
---- a/cJSON_Utils.c
-+++ b/cJSON_Utils.c
-@@ -1367,6 +1367,7 @@ static cJSON *merge_patch(cJSON *target, const cJSON * const patch, const cJSON_
- replacement = merge_patch(replace_me, patch_child, case_sensitive);
- if (replacement == NULL)
- {
-+ cJSON_Delete(target);
- return NULL;
- }
-
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index 63235062a77cb6..43a51a1be2d524 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,14 +1,14 @@
# Template file for 'cJSON'
pkgname=cJSON
-version=1.7.15
-revision=2
+version=1.7.17
+revision=1
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/DaveGamble/cJSON"
distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz"
-checksum=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2
+checksum=c91d1eeb7175c50d49f6ba2a25e69b46bd05cffb798382c19bfb202e467ec51c
post_install() {
vlicense LICENSE
From aded1c66b83c0c589230e0546c8d1d1c9210c962 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 20 Apr 2024 21:36:30 +0300
Subject: [PATCH 2/2] New package: freerdp3-3.5.0
---
common/shlibs | 8 +
srcpkgs/freerdp3-devel | 1 +
srcpkgs/freerdp3-server | 1 +
srcpkgs/freerdp3/patches/fix-cross.patch | 27 ++++
.../freerdp3/patches/use-webkit2gtk41.patch | 25 ++++
srcpkgs/freerdp3/template | 137 ++++++++++++++++++
srcpkgs/libfreerdp3 | 1 +
srcpkgs/libfreerdp3-server | 1 +
8 files changed, 201 insertions(+)
create mode 120000 srcpkgs/freerdp3-devel
create mode 120000 srcpkgs/freerdp3-server
create mode 100644 srcpkgs/freerdp3/patches/fix-cross.patch
create mode 100644 srcpkgs/freerdp3/patches/use-webkit2gtk41.patch
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..ec5bce88b6065e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1584,6 +1584,14 @@ 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
+libfreerdp-client3.so.3 libfreerdp3-3.5.0_1
+libfreerdp-server-proxy3.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp-server3.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp-shadow-subsystem3.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp-shadow3.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp3.so.3 libfreerdp3-3.5.0_1
+libwinpr-tools3.so.3 libfreerdp3-3.5.0_1
+libwinpr3.so.3 libfreerdp3-3.5.0_1
libcppunit-1.15.so.1 libcppunit-1.15.1_1
libcalc.so.2.14.3.5 libcalc-2.14.3.5_1
libcustcalc.so.2.14.3.5 libcalc-2.14.3.5_1
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/patches/fix-cross.patch b/srcpkgs/freerdp3/patches/fix-cross.patch
new file mode 100644
index 00000000000000..7aea0e91a92908
--- /dev/null
+++ b/srcpkgs/freerdp3/patches/fix-cross.patch
@@ -0,0 +1,27 @@
+help cmake run executables when cross-compiling
+diff --git a/cmake/InstallFreeRDPMan.cmake b/cmake/InstallFreeRDPMan.cmake
+index c333f6497..2dff84966 100644
+--- a/cmake/InstallFreeRDPMan.cmake
++++ b/cmake/InstallFreeRDPMan.cmake
+@@ -57,7 +57,7 @@ function(generate_and_install_freerdp_man_from_xml name_base section api depende
+
+ add_custom_command(
+ OUTPUT "${manpage}"
+- COMMAND ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_docbook
++ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_docbook
+ COMMAND ${XSLTPROC_EXECUTABLE} --path "${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}" ${DOCBOOKXSL_DIR}/manpages/docbook.xsl ${manpage}.xml
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS
+diff --git a/client/SDL/dialogs/res/CMakeLists.txt b/client/SDL/dialogs/res/CMakeLists.txt
+index 5591e4af6..0b0946534 100644
+--- a/client/SDL/dialogs/res/CMakeLists.txt
++++ b/client/SDL/dialogs/res/CMakeLists.txt
+@@ -33,7 +33,7 @@ macro(convert_to_bin FILE FILE_TYPE)
+ add_custom_command(
+ OUTPUT ${FILE_BYPRODUCTS}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${FILE_BIN_DIR}
+- COMMAND $<TARGET_FILE:freerdp-res2bin> ${FILE} ${FILE_TYPE} ${TARGET_NAME} ${FILE_BIN_DIR}
++ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:freerdp-res2bin> ${FILE} ${FILE_TYPE} ${TARGET_NAME} ${FILE_BIN_DIR}
+ COMMENT "create image resources"
+ DEPENDS freerdp-res2bin
+ DEPENDS ${FILE}
diff --git a/srcpkgs/freerdp3/patches/use-webkit2gtk41.patch b/srcpkgs/freerdp3/patches/use-webkit2gtk41.patch
new file mode 100644
index 00000000000000..432d9fdf414c62
--- /dev/null
+++ b/srcpkgs/freerdp3/patches/use-webkit2gtk41.patch
@@ -0,0 +1,25 @@
+From 3de172e7da393e8d544b7eb38ce9db7d18c468b1 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Mon, 25 Mar 2024 20:12:08 +0100
+Subject: [PATCH 1/1] Use webkit2gtk-4.1
+
+---
+ client/SDL/aad/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/SDL/aad/CMakeLists.txt b/client/SDL/aad/CMakeLists.txt
+index 228654262..d13fb907e 100644
+--- a/client/SDL/aad/CMakeLists.txt
++++ b/client/SDL/aad/CMakeLists.txt
+@@ -44,7 +44,7 @@ if (WITH_WEBVIEW)
+ )
+ else()
+ find_package(PkgConfig REQUIRED)
+- pkg_check_modules(WEBVIEW_GTK webkit2gtk-4.0 REQUIRED)
++ pkg_check_modules(WEBVIEW_GTK webkit2gtk-4.1 REQUIRED)
+ include_directories(${WEBVIEW_GTK_INCLUDE_DIRS})
+ list(APPEND LIBS
+ ${WEBVIEW_GTK_LIBRARIES}
+--
+2.44.0
+
diff --git a/srcpkgs/freerdp3/template b/srcpkgs/freerdp3/template
new file mode 100644
index 00000000000000..eb2d80641ac536
--- /dev/null
+++ b/srcpkgs/freerdp3/template
@@ -0,0 +1,137 @@
+# Template file for 'freerdp3'
+pkgname=freerdp3
+version=3.5.1
+revision=1
+build_style=cmake
+build_helper=qemu
+configure_args="
+ -DCHANNEL_URBDRC_CLIENT=ON
+ -DPKG_CONFIG_RELOCATABLE=OFF
+ -DRDTK_FORCE_STATIC_BUILD=ON
+ -DWITH_BINARY_VERSIONING=ON
+ -DDOCBOOKXSL_DIR=/usr/share/xsl/docbook
+ -DPROXY_PLUGINDIR=/usr/lib/${pkgname}/server/proxy/plugins
+ -DXSLTPROC_EXECUTABLE=/usr/bin/xsltproc
+ -DWAYLAND_SCANNER=/usr/bin/wayland-scanner
+
+ -DUWAC_FORCE_STATIC_BUILD=$(vopt_if wayland ON OFF)
+ -DWITH_AAD=$(vopt_if aad ON OFF)
+ -DWITH_ALSA=ON
+ -DWITH_CAIRO=$(vopt_if ffmpeg OFF ON)
+ -DWITH_CHANNELS=ON
+ -DWITH_CLIENT_CHANNELS=ON
+ -DWITH_CLIENT_SDL=$(vopt_if sdl2 ON OFF)
+ -DWITH_CUPS=ON
+ -DWITH_DSP_FFMPEG=$(vopt_if ffmpeg ON OFF)
+ -DWITH_FFMPEG=$(vopt_if ffmpeg ON OFF)
+ -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
+ -DWITH_FUSE=ON
+ -DWITH_GSTREAMER_1_0=ON
+ -DWITH_ICU=ON
+ -DWITH_JPEG=ON
+ -DWITH_LIBSYSTEMD=OFF
+ -DWITH_PCSC=$(vopt_if smartcard ON OFF)
+ -DWITH_PKCS11=$(vopt_if smartcard ON OFF)
+ -DWITH_PULSE=ON
+ -DWITH_SAMPLE=OFF
+ -DWITH_SERVER=ON
+ -DWITH_SERVER_CHANNELS=ON
+ -DWITH_SWSCALE=$(vopt_if ffmpeg ON OFF)
+ -DWITH_WAYLAND=$(vopt_if wayland ON OFF)
+ -DWITH_WEBVIEW=$(vopt_if webview ON OFF)
+ -DWITH_WINPR_TOOLS=ON
+ -DWITH_X11=ON
+ -DWITH_XCURSOR=ON
+ -DWITH_XEXT=ON
+ -DWITH_XI=ON
+ -DWITH_XINERAMA=ON
+ -DWITH_XKBFILE=ON
+ -DWITH_XRENDER=ON
+ -DWITH_XV=ON"
+hostmakedepends="pkg-config xmlto $(vopt_if wayland wayland-devel)"
+makedepends="alsa-lib-devel cups-devel fuse3-devel icu-devel libXcursor-devel
+ libXdamage-devel libXinerama-devel libXrandr-devel libXv-devel
+ libjpeg-turbo-devel libusb-devel libxkbfile-devel mit-krb5-devel openssl-devel
+ pulseaudio-devel uriparser-devel
+ $(vopt_if aad cJSON-devel)
+ $(vopt_if ffmpeg ffmpeg-devel cairo-devel)
+ $(vopt_if smartcard 'pcsclite-devel pkcs11-helper-devel')
+ $(vopt_if sdl2 SDL2_ttf-devel)
+ $(vopt_if wayland 'libxkbcommon-devel wayland-devel')
+ $(vopt_if webview libwebkit2gtk41-devel)"
+short_desc="Free RDP (Remote Desktop Protocol) client"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="Apache-2.0"
+homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
+distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
+checksum=bb40028c90c156799bc26a8b5837754a62805ee371e988efc61903c7263843b1
+CFLAGS="-Wno-dev"
+
+# wayland - deprecated, sdl2 - experimental
+build_options="aad ffmpeg sdl2 smartcard wayland webview"
+build_options_default="aad ffmpeg sdl2 smartcard"
+
+desc_option_aad="Compile with support for Azure AD authentication"
+desc_option_smartcard="Build with smartcard support"
+desc_option_webview="Build with WebView support for AAD login popup browser"
+
+if [ "$build_option_webview" -a -z "$build_option_sdl2" ]; then
+ broken="WebView requires SDL"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
+ armv5tel*) configure_args+=" -DWITH_NEON=OFF";;
+esac
+
+if [ "$CROSS_BUILD" ]; then
+ configure_args+="
+ -DCMAKE_CXX_COMPILER_AR=/usr/bin/${XBPS_CROSS_TRIPLET}-ar
+ -DCMAKE_CXX_COMPILER_RANLIB=/usr/bin/${XBPS_CROSS_TRIPLET}-ranlib"
+
+ pre_configure() {
+ export CXX="$XBPS_WRAPPERDIR/${XBPS_CROSS_TRIPLET}-c++"
+ }
+fi
+
+# first we want to separate -server, everything else then goes to client
+subpackages="libfreerdp3-server freerdp3-server libfreerdp3 freerdp3-devel"
+
+libfreerdp3_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+freerdp3-devel_package() {
+ short_desc+=" - development files"
+ depends="cJSON-devel libfreerdp3-server>=${version}_${revision}
+ libfreerdp3>=${version}_${revision} openssl-devel"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ }
+}
+
+libfreerdp3-server_package() {
+ short_desc="Free RDP (Remote Desktop Protocol) server - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/freerdp3/server/proxy/plugins"
+ vmove "usr/lib/libfreerdp-server*.so.*"
+ vmove "usr/lib/libfreerdp-shadow*.so.*"
+ }
+}
+
+freerdp3-server_package() {
+ short_desc="Free RDP (Remote Desktop Protocol) server"
+ pkg_install() {
+ vmove usr/bin/freerdp-proxy3
+ vmove usr/bin/freerdp-shadow-cli3
+ vmove usr/share/man/man1/freerdp-proxy3.1
+ vmove usr/share/man/man1/freerdp-shadow-cli3.1
+ }
+}
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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: freerdp3-3.5.0
2024-04-22 11:33 [PR PATCH] New package: freerdp3-3.5.0 chrysos349
` (2 preceding siblings ...)
2024-04-22 13:53 ` chrysos349
@ 2024-04-22 15:58 ` chrysos349
2024-04-22 21:08 ` chrysos349
2024-04-22 21:23 ` chrysos349
5 siblings, 0 replies; 29+ messages in thread
From: chrysos349 @ 2024-04-22 15:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages freerdp3
https://github.com/void-linux/void-packages/pull/49982
New package: freerdp3-3.5.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/49982.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freerdp3-49982.patch --]
[-- Type: text/x-diff, Size: 15172 bytes --]
From 8043b204720428f51247dd10e416f2f0326bc822 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 20 Apr 2024 21:31:56 +0300
Subject: [PATCH 1/2] cJSON: update to 1.7.17
---
srcpkgs/cJSON/patches/fix-cross.patch | 97 +++++++++++++++++++++
srcpkgs/cJSON/patches/fix-memory-leak.patch | 21 -----
srcpkgs/cJSON/template | 6 +-
3 files changed, 100 insertions(+), 24 deletions(-)
create mode 100644 srcpkgs/cJSON/patches/fix-cross.patch
delete mode 100644 srcpkgs/cJSON/patches/fix-memory-leak.patch
diff --git a/srcpkgs/cJSON/patches/fix-cross.patch b/srcpkgs/cJSON/patches/fix-cross.patch
new file mode 100644
index 00000000000000..33340bd827c38f
--- /dev/null
+++ b/srcpkgs/cJSON/patches/fix-cross.patch
@@ -0,0 +1,97 @@
+help cmake find headers when cross-compiling
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d807ea62..aa2057c43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -146,25 +146,25 @@ endif()
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" @ONLY)
+
+-install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
+-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
++install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
++install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ install(TARGETS "${CJSON_LIB}"
+ EXPORT "${CJSON_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ if (BUILD_SHARED_AND_STATIC_LIBS)
+ install(TARGETS "${CJSON_LIB}-static"
+ EXPORT "${CJSON_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ endif()
+ if(ENABLE_TARGET_EXPORT)
+ # export library information for CMake projects
+- install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ if(ENABLE_CJSON_VERSION_SO)
+@@ -199,23 +199,23 @@ if(ENABLE_CJSON_UTILS)
+
+ install(TARGETS "${CJSON_UTILS_LIB}"
+ EXPORT "${CJSON_UTILS_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ if (BUILD_SHARED_AND_STATIC_LIBS)
+ install(TARGETS "${CJSON_UTILS_LIB}-static"
+ EXPORT "${CJSON_UTILS_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ endif()
+- install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
+- install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
++ install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
++ install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ if(ENABLE_TARGET_EXPORT)
+ # export library information for CMake projects
+- install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ if(ENABLE_CJSON_VERSION_SO)
+@@ -238,7 +238,7 @@ if(ENABLE_TARGET_EXPORT)
+ # Install package config files
+ install(FILES ${PROJECT_BINARY_DIR}/cJSONConfig.cmake
+ ${PROJECT_BINARY_DIR}/cJSONConfigVersion.cmake
+- DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ option(ENABLE_CJSON_TEST "Enable building cJSON test" ON)
+diff --git a/library_config/cJSONConfig.cmake.in b/library_config/cJSONConfig.cmake.in
+index 909f7a9ae..206566b39 100644
+--- a/library_config/cJSONConfig.cmake.in
++++ b/library_config/cJSONConfig.cmake.in
+@@ -2,8 +2,8 @@
+ set(CJSON_UTILS_FOUND @ENABLE_CJSON_UTILS@)
+
+ # The include directories used by cJSON
+-set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
+-set(CJSON_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
++set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_INCLUDEDIR@")
++set(CJSON_INCLUDE_DIR "@CMAKE_INSTALL_INCLUDEDIR@")
+
+ get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
diff --git a/srcpkgs/cJSON/patches/fix-memory-leak.patch b/srcpkgs/cJSON/patches/fix-memory-leak.patch
deleted file mode 100644
index 01556a6eb8e00e..00000000000000
--- a/srcpkgs/cJSON/patches/fix-memory-leak.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f50dafc7d0bfd4f45449ab5665bfea831a82f2eb Mon Sep 17 00:00:00 2001
-From: Alan Wang <948467222@qq.com>
-Date: Thu, 26 Aug 2021 14:13:42 +0800
-Subject: [PATCH] fix: potential memory leak in merge_patch() (#611)
-
----
- cJSON_Utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cJSON_Utils.c b/cJSON_Utils.c
-index c7c64391..63651dfb 100644
---- a/cJSON_Utils.c
-+++ b/cJSON_Utils.c
-@@ -1367,6 +1367,7 @@ static cJSON *merge_patch(cJSON *target, const cJSON * const patch, const cJSON_
- replacement = merge_patch(replace_me, patch_child, case_sensitive);
- if (replacement == NULL)
- {
-+ cJSON_Delete(target);
- return NULL;
- }
-
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index 63235062a77cb6..43a51a1be2d524 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,14 +1,14 @@
# Template file for 'cJSON'
pkgname=cJSON
-version=1.7.15
-revision=2
+version=1.7.17
+revision=1
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/DaveGamble/cJSON"
distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz"
-checksum=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2
+checksum=c91d1eeb7175c50d49f6ba2a25e69b46bd05cffb798382c19bfb202e467ec51c
post_install() {
vlicense LICENSE
From 5cdd67689360f47a8854331d2a6b74e968909afd Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 20 Apr 2024 21:36:30 +0300
Subject: [PATCH 2/2] New package: freerdp3-3.5.0
---
common/shlibs | 8 ++
srcpkgs/freerdp3-devel | 1 +
srcpkgs/freerdp3-server | 1 +
srcpkgs/freerdp3/patches/fix-cross.patch | 27 ++++++
srcpkgs/freerdp3/template | 117 +++++++++++++++++++++++
srcpkgs/libfreerdp3 | 1 +
srcpkgs/libfreerdp3-server | 1 +
7 files changed, 156 insertions(+)
create mode 120000 srcpkgs/freerdp3-devel
create mode 120000 srcpkgs/freerdp3-server
create mode 100644 srcpkgs/freerdp3/patches/fix-cross.patch
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..ec5bce88b6065e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1584,6 +1584,14 @@ 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
+libfreerdp-client3.so.3 libfreerdp3-3.5.0_1
+libfreerdp-server-proxy3.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp-server3.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp-shadow-subsystem3.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp-shadow3.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp3.so.3 libfreerdp3-3.5.0_1
+libwinpr-tools3.so.3 libfreerdp3-3.5.0_1
+libwinpr3.so.3 libfreerdp3-3.5.0_1
libcppunit-1.15.so.1 libcppunit-1.15.1_1
libcalc.so.2.14.3.5 libcalc-2.14.3.5_1
libcustcalc.so.2.14.3.5 libcalc-2.14.3.5_1
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/patches/fix-cross.patch b/srcpkgs/freerdp3/patches/fix-cross.patch
new file mode 100644
index 00000000000000..7aea0e91a92908
--- /dev/null
+++ b/srcpkgs/freerdp3/patches/fix-cross.patch
@@ -0,0 +1,27 @@
+help cmake run executables when cross-compiling
+diff --git a/cmake/InstallFreeRDPMan.cmake b/cmake/InstallFreeRDPMan.cmake
+index c333f6497..2dff84966 100644
+--- a/cmake/InstallFreeRDPMan.cmake
++++ b/cmake/InstallFreeRDPMan.cmake
+@@ -57,7 +57,7 @@ function(generate_and_install_freerdp_man_from_xml name_base section api depende
+
+ add_custom_command(
+ OUTPUT "${manpage}"
+- COMMAND ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_docbook
++ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_docbook
+ COMMAND ${XSLTPROC_EXECUTABLE} --path "${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}" ${DOCBOOKXSL_DIR}/manpages/docbook.xsl ${manpage}.xml
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS
+diff --git a/client/SDL/dialogs/res/CMakeLists.txt b/client/SDL/dialogs/res/CMakeLists.txt
+index 5591e4af6..0b0946534 100644
+--- a/client/SDL/dialogs/res/CMakeLists.txt
++++ b/client/SDL/dialogs/res/CMakeLists.txt
+@@ -33,7 +33,7 @@ macro(convert_to_bin FILE FILE_TYPE)
+ add_custom_command(
+ OUTPUT ${FILE_BYPRODUCTS}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${FILE_BIN_DIR}
+- COMMAND $<TARGET_FILE:freerdp-res2bin> ${FILE} ${FILE_TYPE} ${TARGET_NAME} ${FILE_BIN_DIR}
++ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:freerdp-res2bin> ${FILE} ${FILE_TYPE} ${TARGET_NAME} ${FILE_BIN_DIR}
+ COMMENT "create image resources"
+ DEPENDS freerdp-res2bin
+ DEPENDS ${FILE}
diff --git a/srcpkgs/freerdp3/template b/srcpkgs/freerdp3/template
new file mode 100644
index 00000000000000..07b78c143fb17c
--- /dev/null
+++ b/srcpkgs/freerdp3/template
@@ -0,0 +1,117 @@
+# Template file for 'freerdp3'
+pkgname=freerdp3
+version=3.5.1
+revision=1
+build_style=cmake
+build_helper=qemu
+configure_args="
+ -DCHANNEL_URBDRC_CLIENT=ON
+ -DPKG_CONFIG_RELOCATABLE=OFF
+ -DRDTK_FORCE_STATIC_BUILD=ON
+ -DWITH_BINARY_VERSIONING=ON
+ -DDOCBOOKXSL_DIR=/usr/share/xsl/docbook
+ -DPROXY_PLUGINDIR=/usr/lib/${pkgname}/server/proxy/plugins
+ -DXSLTPROC_EXECUTABLE=/usr/bin/xsltproc
+
+ -DWITH_ALSA=ON
+ -DWITH_CAIRO=ON
+ -DWITH_CHANNELS=ON
+ -DWITH_CLIENT_CHANNELS=ON
+ -DWITH_CLIENT_SDL=ON
+ -DWITH_CUPS=ON
+ -DWITH_DSP_FFMPEG=ON
+ -DWITH_FFMPEG=ON
+ -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
+ -DWITH_FUSE=ON
+ -DWITH_GSTREAMER_1_0=ON
+ -DWITH_ICU=ON
+ -DWITH_JPEG=ON
+ -DWITH_PCSC=ON
+ -DWITH_PULSE=ON
+ -DWITH_SERVER=ON
+ -DWITH_SERVER_CHANNELS=ON
+ -DWITH_SWSCALE=ON
+ -DWITH_WINPR_TOOLS=ON
+ -DWITH_X11=ON
+ -DWITH_XCURSOR=ON
+ -DWITH_XEXT=ON
+ -DWITH_XI=ON
+ -DWITH_XINERAMA=ON
+ -DWITH_XKBFILE=ON
+ -DWITH_XRENDER=ON
+ -DWITH_XV=ON
+
+ -DWITH_LIBSYSTEMD=OFF
+ -DWITH_SAMPLE=OFF
+ -DWITH_WAYLAND=OFF
+ -DWITH_WEBVIEW=OFF"
+hostmakedepends="pkg-config xmlto"
+makedepends="alsa-lib-devel cJSON-devel cairo-devel cups-devel ffmpeg-devel
+ fuse3-devel icu-devel libXcursor-devel libXdamage-devel libXinerama-devel
+ libXrandr-devel libXv-devel libjpeg-turbo-devel libusb-devel libxkbcommon-devel
+ libxkbfile-devel mit-krb5-devel openssl-devel pcsclite-devel
+ pkcs11-helper-devel pulseaudio-devel uriparser-devel SDL2_ttf-devel"
+short_desc="Free RDP (Remote Desktop Protocol) client"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="Apache-2.0"
+homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
+distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
+checksum=bb40028c90c156799bc26a8b5837754a62805ee371e988efc61903c7263843b1
+CFLAGS="-Wno-dev"
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
+ armv5tel*) configure_args+=" -DWITH_NEON=OFF";;
+esac
+
+if [ "$CROSS_BUILD" ]; then
+ configure_args+="
+ -DCMAKE_CXX_COMPILER_AR=/usr/bin/${XBPS_CROSS_TRIPLET}-ar
+ -DCMAKE_CXX_COMPILER_RANLIB=/usr/bin/${XBPS_CROSS_TRIPLET}-ranlib"
+
+ pre_configure() {
+ export CXX="$XBPS_WRAPPERDIR/${XBPS_CROSS_TRIPLET}-c++"
+ }
+fi
+
+# first we want to separate -server, everything else then goes to client
+subpackages="libfreerdp3-server freerdp3-server libfreerdp3 freerdp3-devel"
+
+libfreerdp3_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+freerdp3-devel_package() {
+ short_desc+=" - development files"
+ depends="cJSON-devel libfreerdp3-server>=${version}_${revision}
+ libfreerdp3>=${version}_${revision} openssl-devel"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ }
+}
+
+libfreerdp3-server_package() {
+ short_desc="Free RDP (Remote Desktop Protocol) server - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/freerdp3/server/proxy/plugins"
+ vmove "usr/lib/libfreerdp-server*.so.*"
+ vmove "usr/lib/libfreerdp-shadow*.so.*"
+ }
+}
+
+freerdp3-server_package() {
+ short_desc="Free RDP (Remote Desktop Protocol) server"
+ pkg_install() {
+ vmove usr/bin/freerdp-proxy3
+ vmove usr/bin/freerdp-shadow-cli3
+ vmove usr/share/man/man1/freerdp-proxy3.1
+ vmove usr/share/man/man1/freerdp-shadow-cli3.1
+ }
+}
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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: freerdp3-3.5.0
2024-04-22 11:33 [PR PATCH] New package: freerdp3-3.5.0 chrysos349
2024-04-22 12:57 ` [PR PATCH] [Updated] " chrysos349
2024-04-22 13:15 ` chrysos349
@ 2024-04-22 13:53 ` chrysos349
2024-04-22 15:58 ` chrysos349
` (2 subsequent siblings)
5 siblings, 0 replies; 29+ messages in thread
From: chrysos349 @ 2024-04-22 13:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages freerdp3
https://github.com/void-linux/void-packages/pull/49982
New package: freerdp3-3.5.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/49982.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freerdp3-49982.patch --]
[-- Type: text/x-diff, Size: 14495 bytes --]
From 8043b204720428f51247dd10e416f2f0326bc822 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 20 Apr 2024 21:31:56 +0300
Subject: [PATCH 1/2] cJSON: update to 1.7.17
---
srcpkgs/cJSON/patches/fix-cross.patch | 97 +++++++++++++++++++++
srcpkgs/cJSON/patches/fix-memory-leak.patch | 21 -----
srcpkgs/cJSON/template | 6 +-
3 files changed, 100 insertions(+), 24 deletions(-)
create mode 100644 srcpkgs/cJSON/patches/fix-cross.patch
delete mode 100644 srcpkgs/cJSON/patches/fix-memory-leak.patch
diff --git a/srcpkgs/cJSON/patches/fix-cross.patch b/srcpkgs/cJSON/patches/fix-cross.patch
new file mode 100644
index 00000000000000..33340bd827c38f
--- /dev/null
+++ b/srcpkgs/cJSON/patches/fix-cross.patch
@@ -0,0 +1,97 @@
+help cmake find headers when cross-compiling
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d807ea62..aa2057c43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -146,25 +146,25 @@ endif()
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" @ONLY)
+
+-install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
+-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
++install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
++install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ install(TARGETS "${CJSON_LIB}"
+ EXPORT "${CJSON_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ if (BUILD_SHARED_AND_STATIC_LIBS)
+ install(TARGETS "${CJSON_LIB}-static"
+ EXPORT "${CJSON_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ endif()
+ if(ENABLE_TARGET_EXPORT)
+ # export library information for CMake projects
+- install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ if(ENABLE_CJSON_VERSION_SO)
+@@ -199,23 +199,23 @@ if(ENABLE_CJSON_UTILS)
+
+ install(TARGETS "${CJSON_UTILS_LIB}"
+ EXPORT "${CJSON_UTILS_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ if (BUILD_SHARED_AND_STATIC_LIBS)
+ install(TARGETS "${CJSON_UTILS_LIB}-static"
+ EXPORT "${CJSON_UTILS_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ endif()
+- install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
+- install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
++ install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
++ install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ if(ENABLE_TARGET_EXPORT)
+ # export library information for CMake projects
+- install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ if(ENABLE_CJSON_VERSION_SO)
+@@ -238,7 +238,7 @@ if(ENABLE_TARGET_EXPORT)
+ # Install package config files
+ install(FILES ${PROJECT_BINARY_DIR}/cJSONConfig.cmake
+ ${PROJECT_BINARY_DIR}/cJSONConfigVersion.cmake
+- DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ option(ENABLE_CJSON_TEST "Enable building cJSON test" ON)
+diff --git a/library_config/cJSONConfig.cmake.in b/library_config/cJSONConfig.cmake.in
+index 909f7a9ae..206566b39 100644
+--- a/library_config/cJSONConfig.cmake.in
++++ b/library_config/cJSONConfig.cmake.in
+@@ -2,8 +2,8 @@
+ set(CJSON_UTILS_FOUND @ENABLE_CJSON_UTILS@)
+
+ # The include directories used by cJSON
+-set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
+-set(CJSON_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
++set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_INCLUDEDIR@")
++set(CJSON_INCLUDE_DIR "@CMAKE_INSTALL_INCLUDEDIR@")
+
+ get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
diff --git a/srcpkgs/cJSON/patches/fix-memory-leak.patch b/srcpkgs/cJSON/patches/fix-memory-leak.patch
deleted file mode 100644
index 01556a6eb8e00e..00000000000000
--- a/srcpkgs/cJSON/patches/fix-memory-leak.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f50dafc7d0bfd4f45449ab5665bfea831a82f2eb Mon Sep 17 00:00:00 2001
-From: Alan Wang <948467222@qq.com>
-Date: Thu, 26 Aug 2021 14:13:42 +0800
-Subject: [PATCH] fix: potential memory leak in merge_patch() (#611)
-
----
- cJSON_Utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cJSON_Utils.c b/cJSON_Utils.c
-index c7c64391..63651dfb 100644
---- a/cJSON_Utils.c
-+++ b/cJSON_Utils.c
-@@ -1367,6 +1367,7 @@ static cJSON *merge_patch(cJSON *target, const cJSON * const patch, const cJSON_
- replacement = merge_patch(replace_me, patch_child, case_sensitive);
- if (replacement == NULL)
- {
-+ cJSON_Delete(target);
- return NULL;
- }
-
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index 63235062a77cb6..43a51a1be2d524 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,14 +1,14 @@
# Template file for 'cJSON'
pkgname=cJSON
-version=1.7.15
-revision=2
+version=1.7.17
+revision=1
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/DaveGamble/cJSON"
distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz"
-checksum=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2
+checksum=c91d1eeb7175c50d49f6ba2a25e69b46bd05cffb798382c19bfb202e467ec51c
post_install() {
vlicense LICENSE
From 5a09637ed8e5c26c7cef6d5627252f49cb29ade8 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 20 Apr 2024 21:36:30 +0300
Subject: [PATCH 2/2] New package: freerdp3-3.5.0
---
common/shlibs | 8 ++
srcpkgs/freerdp3-devel | 1 +
srcpkgs/freerdp3-server | 1 +
srcpkgs/freerdp3/patches/fix-cross.patch | 14 +++
srcpkgs/freerdp3/template | 119 +++++++++++++++++++++++
srcpkgs/libfreerdp3 | 1 +
srcpkgs/libfreerdp3-server | 1 +
7 files changed, 145 insertions(+)
create mode 120000 srcpkgs/freerdp3-devel
create mode 120000 srcpkgs/freerdp3-server
create mode 100644 srcpkgs/freerdp3/patches/fix-cross.patch
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..ec5bce88b6065e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1584,6 +1584,14 @@ 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
+libfreerdp-client3.so.3 libfreerdp3-3.5.0_1
+libfreerdp-server-proxy3.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp-server3.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp-shadow-subsystem3.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp-shadow3.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp3.so.3 libfreerdp3-3.5.0_1
+libwinpr-tools3.so.3 libfreerdp3-3.5.0_1
+libwinpr3.so.3 libfreerdp3-3.5.0_1
libcppunit-1.15.so.1 libcppunit-1.15.1_1
libcalc.so.2.14.3.5 libcalc-2.14.3.5_1
libcustcalc.so.2.14.3.5 libcalc-2.14.3.5_1
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/patches/fix-cross.patch b/srcpkgs/freerdp3/patches/fix-cross.patch
new file mode 100644
index 00000000000000..9fa7f37f7b1f71
--- /dev/null
+++ b/srcpkgs/freerdp3/patches/fix-cross.patch
@@ -0,0 +1,14 @@
+help cmake generate manuals when cross-compiling
+diff --git a/cmake/InstallFreeRDPMan.cmake b/cmake/InstallFreeRDPMan.cmake
+index c333f6497..2dff84966 100644
+--- a/cmake/InstallFreeRDPMan.cmake
++++ b/cmake/InstallFreeRDPMan.cmake
+@@ -57,7 +57,7 @@ function(generate_and_install_freerdp_man_from_xml name_base section api depende
+
+ add_custom_command(
+ OUTPUT "${manpage}"
+- COMMAND ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_docbook
++ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_docbook
+ COMMAND ${XSLTPROC_EXECUTABLE} --path "${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}" ${DOCBOOKXSL_DIR}/manpages/docbook.xsl ${manpage}.xml
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS
diff --git a/srcpkgs/freerdp3/template b/srcpkgs/freerdp3/template
new file mode 100644
index 00000000000000..1b91fe6973f0eb
--- /dev/null
+++ b/srcpkgs/freerdp3/template
@@ -0,0 +1,119 @@
+# Template file for 'freerdp3'
+pkgname=freerdp3
+version=3.5.0
+revision=1
+build_style=cmake
+build_helper=qemu
+configure_args="
+ -DRDTK_FORCE_STATIC_BUILD=ON
+ -DUWAC_FORCE_STATIC_BUILD=ON
+ -DWITH_BINARY_VERSIONING=ON
+
+ -DCHANNEL_URBDRC_CLIENT=ON
+ -DDOCBOOKXSL_DIR=/usr/share/xsl/docbook
+ -DPROXY_PLUGINDIR=/usr/lib/${pkgname}/server/proxy/plugins
+ -DWAYLAND_SCANNER=/usr/bin/wayland-scanner
+ -DXSLTPROC_EXECUTABLE=/usr/bin/xsltproc
+
+ -DPKG_CONFIG_RELOCATABLE=NO
+ -DWITH_ALSA=ON
+ -DWITH_CAIRO=ON
+ -DWITH_CHANNELS=ON
+ -DWITH_CLIENT_CHANNELS=ON
+ -DWITH_CLIENT_SDL=ON
+ -DWITH_CUPS=ON
+ -DWITH_DSP_FFMPEG=ON
+ -DWITH_FFMPEG=ON
+ -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
+ -DWITH_FUSE=ON
+ -DWITH_GSTREAMER_1_0=ON
+ -DWITH_ICU=ON
+ -DWITH_JPEG=ON
+ -DWITH_PCSC=ON
+ -DWITH_PULSE=ON
+ -DWITH_SERVER=ON
+ -DWITH_SERVER_CHANNELS=ON
+ -DWITH_SWSCALE=ON
+ -DWITH_WAYLAND=ON
+ -DWITH_WINPR_TOOLS=ON
+ -DWITH_X11=ON
+ -DWITH_XCURSOR=ON
+ -DWITH_XEXT=ON
+ -DWITH_XI=ON
+ -DWITH_XINERAMA=ON
+ -DWITH_XKBFILE=ON
+ -DWITH_XRENDER=ON
+ -DWITH_XV=ON
+
+ -DWITH_LIBSYSTEMD=OFF
+ -DWITH_SAMPLE=OFF"
+hostmakedepends="pkg-config wayland-devel xmlto"
+makedepends="alsa-lib-devel cJSON-devel cairo-devel cups-devel ffmpeg-devel
+ fuse3-devel icu-devel libXcursor-devel libXdamage-devel libXinerama-devel
+ libXrandr-devel libXv-devel libjpeg-turbo-devel libusb-devel libxkbcommon-devel
+ libxkbfile-devel mit-krb5-devel openssl-devel pcsclite-devel
+ pkcs11-helper-devel pulseaudio-devel uriparser-devel wayland-devel"
+short_desc="Free RDP (Remote Desktop Protocol) client"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+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
+CFLAGS="-Wno-dev"
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
+ armv5tel*) configure_args+=" -DWITH_NEON=OFF";;
+esac
+
+if [ "$CROSS_BUILD" ]; then
+ configure_args+="
+ -DCMAKE_CXX_COMPILER_AR=/usr/bin/${XBPS_CROSS_TRIPLET}-ar
+ -DCMAKE_CXX_COMPILER_RANLIB=/usr/bin/${XBPS_CROSS_TRIPLET}-ranlib"
+
+ pre_configure() {
+ export CXX="$XBPS_WRAPPERDIR/${XBPS_CROSS_TRIPLET}-c++"
+ }
+fi
+
+# first we want to separate -server, everything else then goes to client
+subpackages="libfreerdp3-server freerdp3-server libfreerdp3 freerdp3-devel"
+
+libfreerdp3_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+freerdp3-devel_package() {
+ short_desc+=" - development files"
+ depends="cJSON-devel libfreerdp3-server>=${version}_${revision}
+ libfreerdp3>=${version}_${revision} openssl-devel"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ }
+}
+
+libfreerdp3-server_package() {
+ short_desc="Free RDP (Remote Desktop Protocol) server - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/freerdp3/server/proxy/plugins"
+ vmove "usr/lib/libfreerdp-server*.so.*"
+ vmove "usr/lib/libfreerdp-shadow*.so.*"
+ }
+}
+
+freerdp3-server_package() {
+ short_desc="Free RDP (Remote Desktop Protocol) server"
+ pkg_install() {
+ vmove usr/bin/freerdp-proxy3
+ vmove usr/bin/freerdp-shadow-cli3
+ vmove usr/share/man/man1/freerdp-proxy3.1
+ vmove usr/share/man/man1/freerdp-shadow-cli3.1
+ }
+}
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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: freerdp3-3.5.0
2024-04-22 11:33 [PR PATCH] New package: freerdp3-3.5.0 chrysos349
2024-04-22 12:57 ` [PR PATCH] [Updated] " chrysos349
@ 2024-04-22 13:15 ` chrysos349
2024-04-22 13:53 ` chrysos349
` (3 subsequent siblings)
5 siblings, 0 replies; 29+ messages in thread
From: chrysos349 @ 2024-04-22 13:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages freerdp3
https://github.com/void-linux/void-packages/pull/49982
New package: freerdp3-3.5.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/49982.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freerdp3-49982.patch --]
[-- Type: text/x-diff, Size: 14495 bytes --]
From 8043b204720428f51247dd10e416f2f0326bc822 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 20 Apr 2024 21:31:56 +0300
Subject: [PATCH 1/2] cJSON: update to 1.7.17
---
srcpkgs/cJSON/patches/fix-cross.patch | 97 +++++++++++++++++++++
srcpkgs/cJSON/patches/fix-memory-leak.patch | 21 -----
srcpkgs/cJSON/template | 6 +-
3 files changed, 100 insertions(+), 24 deletions(-)
create mode 100644 srcpkgs/cJSON/patches/fix-cross.patch
delete mode 100644 srcpkgs/cJSON/patches/fix-memory-leak.patch
diff --git a/srcpkgs/cJSON/patches/fix-cross.patch b/srcpkgs/cJSON/patches/fix-cross.patch
new file mode 100644
index 00000000000000..33340bd827c38f
--- /dev/null
+++ b/srcpkgs/cJSON/patches/fix-cross.patch
@@ -0,0 +1,97 @@
+help cmake find headers when cross-compiling
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d807ea62..aa2057c43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -146,25 +146,25 @@ endif()
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" @ONLY)
+
+-install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
+-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
++install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
++install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ install(TARGETS "${CJSON_LIB}"
+ EXPORT "${CJSON_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ if (BUILD_SHARED_AND_STATIC_LIBS)
+ install(TARGETS "${CJSON_LIB}-static"
+ EXPORT "${CJSON_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ endif()
+ if(ENABLE_TARGET_EXPORT)
+ # export library information for CMake projects
+- install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ if(ENABLE_CJSON_VERSION_SO)
+@@ -199,23 +199,23 @@ if(ENABLE_CJSON_UTILS)
+
+ install(TARGETS "${CJSON_UTILS_LIB}"
+ EXPORT "${CJSON_UTILS_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ if (BUILD_SHARED_AND_STATIC_LIBS)
+ install(TARGETS "${CJSON_UTILS_LIB}-static"
+ EXPORT "${CJSON_UTILS_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ endif()
+- install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
+- install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
++ install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
++ install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ if(ENABLE_TARGET_EXPORT)
+ # export library information for CMake projects
+- install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ if(ENABLE_CJSON_VERSION_SO)
+@@ -238,7 +238,7 @@ if(ENABLE_TARGET_EXPORT)
+ # Install package config files
+ install(FILES ${PROJECT_BINARY_DIR}/cJSONConfig.cmake
+ ${PROJECT_BINARY_DIR}/cJSONConfigVersion.cmake
+- DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ option(ENABLE_CJSON_TEST "Enable building cJSON test" ON)
+diff --git a/library_config/cJSONConfig.cmake.in b/library_config/cJSONConfig.cmake.in
+index 909f7a9ae..206566b39 100644
+--- a/library_config/cJSONConfig.cmake.in
++++ b/library_config/cJSONConfig.cmake.in
+@@ -2,8 +2,8 @@
+ set(CJSON_UTILS_FOUND @ENABLE_CJSON_UTILS@)
+
+ # The include directories used by cJSON
+-set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
+-set(CJSON_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
++set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_INCLUDEDIR@")
++set(CJSON_INCLUDE_DIR "@CMAKE_INSTALL_INCLUDEDIR@")
+
+ get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
diff --git a/srcpkgs/cJSON/patches/fix-memory-leak.patch b/srcpkgs/cJSON/patches/fix-memory-leak.patch
deleted file mode 100644
index 01556a6eb8e00e..00000000000000
--- a/srcpkgs/cJSON/patches/fix-memory-leak.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f50dafc7d0bfd4f45449ab5665bfea831a82f2eb Mon Sep 17 00:00:00 2001
-From: Alan Wang <948467222@qq.com>
-Date: Thu, 26 Aug 2021 14:13:42 +0800
-Subject: [PATCH] fix: potential memory leak in merge_patch() (#611)
-
----
- cJSON_Utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cJSON_Utils.c b/cJSON_Utils.c
-index c7c64391..63651dfb 100644
---- a/cJSON_Utils.c
-+++ b/cJSON_Utils.c
-@@ -1367,6 +1367,7 @@ static cJSON *merge_patch(cJSON *target, const cJSON * const patch, const cJSON_
- replacement = merge_patch(replace_me, patch_child, case_sensitive);
- if (replacement == NULL)
- {
-+ cJSON_Delete(target);
- return NULL;
- }
-
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index 63235062a77cb6..43a51a1be2d524 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,14 +1,14 @@
# Template file for 'cJSON'
pkgname=cJSON
-version=1.7.15
-revision=2
+version=1.7.17
+revision=1
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/DaveGamble/cJSON"
distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz"
-checksum=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2
+checksum=c91d1eeb7175c50d49f6ba2a25e69b46bd05cffb798382c19bfb202e467ec51c
post_install() {
vlicense LICENSE
From 822cdb134ab57a8370c28b817234e00b3e4c90ed Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 20 Apr 2024 21:36:30 +0300
Subject: [PATCH 2/2] New package: freerdp3-3.5.0
---
common/shlibs | 8 ++
srcpkgs/freerdp3-devel | 1 +
srcpkgs/freerdp3-server | 1 +
srcpkgs/freerdp3/patches/fix-cross.patch | 14 +++
srcpkgs/freerdp3/template | 119 +++++++++++++++++++++++
srcpkgs/libfreerdp3 | 1 +
srcpkgs/libfreerdp3-server | 1 +
7 files changed, 145 insertions(+)
create mode 120000 srcpkgs/freerdp3-devel
create mode 120000 srcpkgs/freerdp3-server
create mode 100644 srcpkgs/freerdp3/patches/fix-cross.patch
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..119671bd0b870a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1584,6 +1584,14 @@ 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
+libfreerdp-client3.so.3 libfreerdp3-3.5.0_1
+libfreerdp-server-proxy3.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp3-server.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp-shadow-subsystem3.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp-shadow3.so.3 libfreerdp3-server-3.5.0_1
+libfreerdp3.so.3 libfreerdp3-3.5.0_1
+libwinpr-tools3.so.3 libfreerdp3-3.5.0_1
+libwinpr3.so.3 libfreerdp3-3.5.0_1
libcppunit-1.15.so.1 libcppunit-1.15.1_1
libcalc.so.2.14.3.5 libcalc-2.14.3.5_1
libcustcalc.so.2.14.3.5 libcalc-2.14.3.5_1
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/patches/fix-cross.patch b/srcpkgs/freerdp3/patches/fix-cross.patch
new file mode 100644
index 00000000000000..9fa7f37f7b1f71
--- /dev/null
+++ b/srcpkgs/freerdp3/patches/fix-cross.patch
@@ -0,0 +1,14 @@
+help cmake generate manuals when cross-compiling
+diff --git a/cmake/InstallFreeRDPMan.cmake b/cmake/InstallFreeRDPMan.cmake
+index c333f6497..2dff84966 100644
+--- a/cmake/InstallFreeRDPMan.cmake
++++ b/cmake/InstallFreeRDPMan.cmake
+@@ -57,7 +57,7 @@ function(generate_and_install_freerdp_man_from_xml name_base section api depende
+
+ add_custom_command(
+ OUTPUT "${manpage}"
+- COMMAND ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_docbook
++ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_docbook
+ COMMAND ${XSLTPROC_EXECUTABLE} --path "${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}" ${DOCBOOKXSL_DIR}/manpages/docbook.xsl ${manpage}.xml
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS
diff --git a/srcpkgs/freerdp3/template b/srcpkgs/freerdp3/template
new file mode 100644
index 00000000000000..1b91fe6973f0eb
--- /dev/null
+++ b/srcpkgs/freerdp3/template
@@ -0,0 +1,119 @@
+# Template file for 'freerdp3'
+pkgname=freerdp3
+version=3.5.0
+revision=1
+build_style=cmake
+build_helper=qemu
+configure_args="
+ -DRDTK_FORCE_STATIC_BUILD=ON
+ -DUWAC_FORCE_STATIC_BUILD=ON
+ -DWITH_BINARY_VERSIONING=ON
+
+ -DCHANNEL_URBDRC_CLIENT=ON
+ -DDOCBOOKXSL_DIR=/usr/share/xsl/docbook
+ -DPROXY_PLUGINDIR=/usr/lib/${pkgname}/server/proxy/plugins
+ -DWAYLAND_SCANNER=/usr/bin/wayland-scanner
+ -DXSLTPROC_EXECUTABLE=/usr/bin/xsltproc
+
+ -DPKG_CONFIG_RELOCATABLE=NO
+ -DWITH_ALSA=ON
+ -DWITH_CAIRO=ON
+ -DWITH_CHANNELS=ON
+ -DWITH_CLIENT_CHANNELS=ON
+ -DWITH_CLIENT_SDL=ON
+ -DWITH_CUPS=ON
+ -DWITH_DSP_FFMPEG=ON
+ -DWITH_FFMPEG=ON
+ -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
+ -DWITH_FUSE=ON
+ -DWITH_GSTREAMER_1_0=ON
+ -DWITH_ICU=ON
+ -DWITH_JPEG=ON
+ -DWITH_PCSC=ON
+ -DWITH_PULSE=ON
+ -DWITH_SERVER=ON
+ -DWITH_SERVER_CHANNELS=ON
+ -DWITH_SWSCALE=ON
+ -DWITH_WAYLAND=ON
+ -DWITH_WINPR_TOOLS=ON
+ -DWITH_X11=ON
+ -DWITH_XCURSOR=ON
+ -DWITH_XEXT=ON
+ -DWITH_XI=ON
+ -DWITH_XINERAMA=ON
+ -DWITH_XKBFILE=ON
+ -DWITH_XRENDER=ON
+ -DWITH_XV=ON
+
+ -DWITH_LIBSYSTEMD=OFF
+ -DWITH_SAMPLE=OFF"
+hostmakedepends="pkg-config wayland-devel xmlto"
+makedepends="alsa-lib-devel cJSON-devel cairo-devel cups-devel ffmpeg-devel
+ fuse3-devel icu-devel libXcursor-devel libXdamage-devel libXinerama-devel
+ libXrandr-devel libXv-devel libjpeg-turbo-devel libusb-devel libxkbcommon-devel
+ libxkbfile-devel mit-krb5-devel openssl-devel pcsclite-devel
+ pkcs11-helper-devel pulseaudio-devel uriparser-devel wayland-devel"
+short_desc="Free RDP (Remote Desktop Protocol) client"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+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
+CFLAGS="-Wno-dev"
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
+ armv5tel*) configure_args+=" -DWITH_NEON=OFF";;
+esac
+
+if [ "$CROSS_BUILD" ]; then
+ configure_args+="
+ -DCMAKE_CXX_COMPILER_AR=/usr/bin/${XBPS_CROSS_TRIPLET}-ar
+ -DCMAKE_CXX_COMPILER_RANLIB=/usr/bin/${XBPS_CROSS_TRIPLET}-ranlib"
+
+ pre_configure() {
+ export CXX="$XBPS_WRAPPERDIR/${XBPS_CROSS_TRIPLET}-c++"
+ }
+fi
+
+# first we want to separate -server, everything else then goes to client
+subpackages="libfreerdp3-server freerdp3-server libfreerdp3 freerdp3-devel"
+
+libfreerdp3_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+freerdp3-devel_package() {
+ short_desc+=" - development files"
+ depends="cJSON-devel libfreerdp3-server>=${version}_${revision}
+ libfreerdp3>=${version}_${revision} openssl-devel"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ }
+}
+
+libfreerdp3-server_package() {
+ short_desc="Free RDP (Remote Desktop Protocol) server - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/freerdp3/server/proxy/plugins"
+ vmove "usr/lib/libfreerdp-server*.so.*"
+ vmove "usr/lib/libfreerdp-shadow*.so.*"
+ }
+}
+
+freerdp3-server_package() {
+ short_desc="Free RDP (Remote Desktop Protocol) server"
+ pkg_install() {
+ vmove usr/bin/freerdp-proxy3
+ vmove usr/bin/freerdp-shadow-cli3
+ vmove usr/share/man/man1/freerdp-proxy3.1
+ vmove usr/share/man/man1/freerdp-shadow-cli3.1
+ }
+}
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
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] New package: freerdp3-3.5.0
2024-04-22 11:33 [PR PATCH] New package: freerdp3-3.5.0 chrysos349
@ 2024-04-22 12:57 ` chrysos349
2024-04-22 13:15 ` chrysos349
` (4 subsequent siblings)
5 siblings, 0 replies; 29+ messages in thread
From: chrysos349 @ 2024-04-22 12:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages freerdp3
https://github.com/void-linux/void-packages/pull/49982
New package: freerdp3-3.5.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/49982.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freerdp3-49982.patch --]
[-- Type: text/x-diff, Size: 14495 bytes --]
From 8043b204720428f51247dd10e416f2f0326bc822 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 20 Apr 2024 21:31:56 +0300
Subject: [PATCH 1/2] cJSON: update to 1.7.17
---
srcpkgs/cJSON/patches/fix-cross.patch | 97 +++++++++++++++++++++
srcpkgs/cJSON/patches/fix-memory-leak.patch | 21 -----
srcpkgs/cJSON/template | 6 +-
3 files changed, 100 insertions(+), 24 deletions(-)
create mode 100644 srcpkgs/cJSON/patches/fix-cross.patch
delete mode 100644 srcpkgs/cJSON/patches/fix-memory-leak.patch
diff --git a/srcpkgs/cJSON/patches/fix-cross.patch b/srcpkgs/cJSON/patches/fix-cross.patch
new file mode 100644
index 00000000000000..33340bd827c38f
--- /dev/null
+++ b/srcpkgs/cJSON/patches/fix-cross.patch
@@ -0,0 +1,97 @@
+help cmake find headers when cross-compiling
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d807ea62..aa2057c43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -146,25 +146,25 @@ endif()
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" @ONLY)
+
+-install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
+-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
++install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
++install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ install(TARGETS "${CJSON_LIB}"
+ EXPORT "${CJSON_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ if (BUILD_SHARED_AND_STATIC_LIBS)
+ install(TARGETS "${CJSON_LIB}-static"
+ EXPORT "${CJSON_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ endif()
+ if(ENABLE_TARGET_EXPORT)
+ # export library information for CMake projects
+- install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ if(ENABLE_CJSON_VERSION_SO)
+@@ -199,23 +199,23 @@ if(ENABLE_CJSON_UTILS)
+
+ install(TARGETS "${CJSON_UTILS_LIB}"
+ EXPORT "${CJSON_UTILS_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ if (BUILD_SHARED_AND_STATIC_LIBS)
+ install(TARGETS "${CJSON_UTILS_LIB}-static"
+ EXPORT "${CJSON_UTILS_LIB}"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+- INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ endif()
+- install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
+- install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
++ install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
++ install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ if(ENABLE_TARGET_EXPORT)
+ # export library information for CMake projects
+- install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ if(ENABLE_CJSON_VERSION_SO)
+@@ -238,7 +238,7 @@ if(ENABLE_TARGET_EXPORT)
+ # Install package config files
+ install(FILES ${PROJECT_BINARY_DIR}/cJSONConfig.cmake
+ ${PROJECT_BINARY_DIR}/cJSONConfigVersion.cmake
+- DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+ endif()
+
+ option(ENABLE_CJSON_TEST "Enable building cJSON test" ON)
+diff --git a/library_config/cJSONConfig.cmake.in b/library_config/cJSONConfig.cmake.in
+index 909f7a9ae..206566b39 100644
+--- a/library_config/cJSONConfig.cmake.in
++++ b/library_config/cJSONConfig.cmake.in
+@@ -2,8 +2,8 @@
+ set(CJSON_UTILS_FOUND @ENABLE_CJSON_UTILS@)
+
+ # The include directories used by cJSON
+-set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
+-set(CJSON_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
++set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_INCLUDEDIR@")
++set(CJSON_INCLUDE_DIR "@CMAKE_INSTALL_INCLUDEDIR@")
+
+ get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
diff --git a/srcpkgs/cJSON/patches/fix-memory-leak.patch b/srcpkgs/cJSON/patches/fix-memory-leak.patch
deleted file mode 100644
index 01556a6eb8e00e..00000000000000
--- a/srcpkgs/cJSON/patches/fix-memory-leak.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f50dafc7d0bfd4f45449ab5665bfea831a82f2eb Mon Sep 17 00:00:00 2001
-From: Alan Wang <948467222@qq.com>
-Date: Thu, 26 Aug 2021 14:13:42 +0800
-Subject: [PATCH] fix: potential memory leak in merge_patch() (#611)
-
----
- cJSON_Utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cJSON_Utils.c b/cJSON_Utils.c
-index c7c64391..63651dfb 100644
---- a/cJSON_Utils.c
-+++ b/cJSON_Utils.c
-@@ -1367,6 +1367,7 @@ static cJSON *merge_patch(cJSON *target, const cJSON * const patch, const cJSON_
- replacement = merge_patch(replace_me, patch_child, case_sensitive);
- if (replacement == NULL)
- {
-+ cJSON_Delete(target);
- return NULL;
- }
-
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index 63235062a77cb6..43a51a1be2d524 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,14 +1,14 @@
# Template file for 'cJSON'
pkgname=cJSON
-version=1.7.15
-revision=2
+version=1.7.17
+revision=1
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/DaveGamble/cJSON"
distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz"
-checksum=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2
+checksum=c91d1eeb7175c50d49f6ba2a25e69b46bd05cffb798382c19bfb202e467ec51c
post_install() {
vlicense LICENSE
From ee5627e599ba720c7787ddb5c65e1c67a9197f49 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 20 Apr 2024 21:36:30 +0300
Subject: [PATCH 2/2] New package: freerdp3-3.5.0
---
common/shlibs | 8 ++
srcpkgs/freerdp3-devel | 1 +
srcpkgs/freerdp3-server | 1 +
srcpkgs/freerdp3/patches/fix-cross.patch | 14 +++
srcpkgs/freerdp3/template | 119 +++++++++++++++++++++++
srcpkgs/libfreerdp3 | 1 +
srcpkgs/libfreerdp3-server | 1 +
7 files changed, 145 insertions(+)
create mode 120000 srcpkgs/freerdp3-devel
create mode 120000 srcpkgs/freerdp3-server
create mode 100644 srcpkgs/freerdp3/patches/fix-cross.patch
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..24c47ea63c0f53 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1584,6 +1584,14 @@ 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
+libfreerdp-client3.so.3 libfreerdp3-3.5.0_1
+libfreerdp-server-proxy3.so.3 libfreerdp-server3-3.5.0_1
+libfreerdp-server3.so.3 libfreerdp-server3-3.5.0_1
+libfreerdp-shadow-subsystem3.so.3 libfreerdp-server3-3.5.0_1
+libfreerdp-shadow3.so.3 libfreerdp-server3-3.5.0_1
+libfreerdp3.so.3 libfreerdp3-3.5.0_1
+libwinpr-tools3.so.3 libfreerdp3-3.5.0_1
+libwinpr3.so.3 libfreerdp3-3.5.0_1
libcppunit-1.15.so.1 libcppunit-1.15.1_1
libcalc.so.2.14.3.5 libcalc-2.14.3.5_1
libcustcalc.so.2.14.3.5 libcalc-2.14.3.5_1
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/patches/fix-cross.patch b/srcpkgs/freerdp3/patches/fix-cross.patch
new file mode 100644
index 00000000000000..9fa7f37f7b1f71
--- /dev/null
+++ b/srcpkgs/freerdp3/patches/fix-cross.patch
@@ -0,0 +1,14 @@
+help cmake generate manuals when cross-compiling
+diff --git a/cmake/InstallFreeRDPMan.cmake b/cmake/InstallFreeRDPMan.cmake
+index c333f6497..2dff84966 100644
+--- a/cmake/InstallFreeRDPMan.cmake
++++ b/cmake/InstallFreeRDPMan.cmake
+@@ -57,7 +57,7 @@ function(generate_and_install_freerdp_man_from_xml name_base section api depende
+
+ add_custom_command(
+ OUTPUT "${manpage}"
+- COMMAND ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_docbook
++ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_docbook
+ COMMAND ${XSLTPROC_EXECUTABLE} --path "${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}" ${DOCBOOKXSL_DIR}/manpages/docbook.xsl ${manpage}.xml
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS
diff --git a/srcpkgs/freerdp3/template b/srcpkgs/freerdp3/template
new file mode 100644
index 00000000000000..1b91fe6973f0eb
--- /dev/null
+++ b/srcpkgs/freerdp3/template
@@ -0,0 +1,119 @@
+# Template file for 'freerdp3'
+pkgname=freerdp3
+version=3.5.0
+revision=1
+build_style=cmake
+build_helper=qemu
+configure_args="
+ -DRDTK_FORCE_STATIC_BUILD=ON
+ -DUWAC_FORCE_STATIC_BUILD=ON
+ -DWITH_BINARY_VERSIONING=ON
+
+ -DCHANNEL_URBDRC_CLIENT=ON
+ -DDOCBOOKXSL_DIR=/usr/share/xsl/docbook
+ -DPROXY_PLUGINDIR=/usr/lib/${pkgname}/server/proxy/plugins
+ -DWAYLAND_SCANNER=/usr/bin/wayland-scanner
+ -DXSLTPROC_EXECUTABLE=/usr/bin/xsltproc
+
+ -DPKG_CONFIG_RELOCATABLE=NO
+ -DWITH_ALSA=ON
+ -DWITH_CAIRO=ON
+ -DWITH_CHANNELS=ON
+ -DWITH_CLIENT_CHANNELS=ON
+ -DWITH_CLIENT_SDL=ON
+ -DWITH_CUPS=ON
+ -DWITH_DSP_FFMPEG=ON
+ -DWITH_FFMPEG=ON
+ -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
+ -DWITH_FUSE=ON
+ -DWITH_GSTREAMER_1_0=ON
+ -DWITH_ICU=ON
+ -DWITH_JPEG=ON
+ -DWITH_PCSC=ON
+ -DWITH_PULSE=ON
+ -DWITH_SERVER=ON
+ -DWITH_SERVER_CHANNELS=ON
+ -DWITH_SWSCALE=ON
+ -DWITH_WAYLAND=ON
+ -DWITH_WINPR_TOOLS=ON
+ -DWITH_X11=ON
+ -DWITH_XCURSOR=ON
+ -DWITH_XEXT=ON
+ -DWITH_XI=ON
+ -DWITH_XINERAMA=ON
+ -DWITH_XKBFILE=ON
+ -DWITH_XRENDER=ON
+ -DWITH_XV=ON
+
+ -DWITH_LIBSYSTEMD=OFF
+ -DWITH_SAMPLE=OFF"
+hostmakedepends="pkg-config wayland-devel xmlto"
+makedepends="alsa-lib-devel cJSON-devel cairo-devel cups-devel ffmpeg-devel
+ fuse3-devel icu-devel libXcursor-devel libXdamage-devel libXinerama-devel
+ libXrandr-devel libXv-devel libjpeg-turbo-devel libusb-devel libxkbcommon-devel
+ libxkbfile-devel mit-krb5-devel openssl-devel pcsclite-devel
+ pkcs11-helper-devel pulseaudio-devel uriparser-devel wayland-devel"
+short_desc="Free RDP (Remote Desktop Protocol) client"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+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
+CFLAGS="-Wno-dev"
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
+ armv5tel*) configure_args+=" -DWITH_NEON=OFF";;
+esac
+
+if [ "$CROSS_BUILD" ]; then
+ configure_args+="
+ -DCMAKE_CXX_COMPILER_AR=/usr/bin/${XBPS_CROSS_TRIPLET}-ar
+ -DCMAKE_CXX_COMPILER_RANLIB=/usr/bin/${XBPS_CROSS_TRIPLET}-ranlib"
+
+ pre_configure() {
+ export CXX="$XBPS_WRAPPERDIR/${XBPS_CROSS_TRIPLET}-c++"
+ }
+fi
+
+# first we want to separate -server, everything else then goes to client
+subpackages="libfreerdp3-server freerdp3-server libfreerdp3 freerdp3-devel"
+
+libfreerdp3_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+freerdp3-devel_package() {
+ short_desc+=" - development files"
+ depends="cJSON-devel libfreerdp3-server>=${version}_${revision}
+ libfreerdp3>=${version}_${revision} openssl-devel"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ }
+}
+
+libfreerdp3-server_package() {
+ short_desc="Free RDP (Remote Desktop Protocol) server - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/freerdp3/server/proxy/plugins"
+ vmove "usr/lib/libfreerdp-server*.so.*"
+ vmove "usr/lib/libfreerdp-shadow*.so.*"
+ }
+}
+
+freerdp3-server_package() {
+ short_desc="Free RDP (Remote Desktop Protocol) server"
+ pkg_install() {
+ vmove usr/bin/freerdp-proxy3
+ vmove usr/bin/freerdp-shadow-cli3
+ vmove usr/share/man/man1/freerdp-proxy3.1
+ vmove usr/share/man/man1/freerdp-shadow-cli3.1
+ }
+}
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
^ permalink raw reply [flat|nested] 29+ messages in thread
end of thread, other threads:[~2024-04-22 21:23 UTC | newest]
Thread overview: 29+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-27 19:17 [PR PATCH] freerdp: update to 3.4.0 fanyx
2024-03-28 13:04 ` [PR PATCH] [Updated] " fanyx
2024-03-28 13:22 ` fanyx
2024-03-28 14:29 ` fanyx
2024-03-28 14:38 ` fanyx
2024-03-28 15:06 ` chrysos349
2024-03-28 15:49 ` fanyx
2024-03-28 16:08 ` [PR PATCH] [Updated] " fanyx
2024-03-28 16:10 ` [PR PATCH] [Updated] New package: freerdp3-3.4.0 fanyx
2024-03-28 23:37 ` fanyx
2024-03-28 23:50 ` fanyx
2024-03-28 23:56 ` fanyx
2024-04-20 13:38 ` [PR PATCH] [Updated] " fanyx
2024-04-20 14:42 ` New package: freerdp3-3.5.0 fanyx
2024-04-20 16:49 ` fanyx
2024-04-21 10:45 ` [PR PATCH] [Updated] " fanyx
2024-04-22 10:29 ` fanyx
2024-04-22 10:31 ` fanyx
2024-04-22 10:41 ` [PR PATCH] [Updated] freerdp split (2.11.5, 3.5.0, libuwac0) fanyx
2024-04-22 10:56 ` fanyx
2024-04-22 12:01 ` chrysos349
2024-04-22 12:03 ` [PR PATCH] [Closed]: " fanyx
2024-04-22 12:03 ` fanyx
2024-04-22 11:33 [PR PATCH] New package: freerdp3-3.5.0 chrysos349
2024-04-22 12:57 ` [PR PATCH] [Updated] " chrysos349
2024-04-22 13:15 ` chrysos349
2024-04-22 13:53 ` chrysos349
2024-04-22 15:58 ` chrysos349
2024-04-22 21:08 ` chrysos349
2024-04-22 21:23 ` chrysos349
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).