From: chrysos349 <chrysos349@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] New package: freerdp3-3.5.0
Date: Mon, 22 Apr 2024 13:33:01 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-49982@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 799 bytes --]
There is a new 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: 9610 bytes --]
From b1e5ec35cdca36b32319f2958f7457c6d8949608 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-memory-leak.patch | 21 ---------------------
srcpkgs/cJSON/template | 12 +++++++++---
2 files changed, 9 insertions(+), 24 deletions(-)
delete mode 100644 srcpkgs/cJSON/patches/fix-memory-leak.patch
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..e1b317093853cd 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,14 +1,20 @@
# 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
+
+# help cmake find headers when cross-compiling
+post_patch() {
+ vsed -i CMakeLists.txt library_config/cJSONConfig.cmake.in \
+ -e "/CMAKE_INSTALL/s/_FULL//g"
+}
post_install() {
vlicense LICENSE
From b07f60e9105aba25d6eebeff7b6bbcf0fdb09730 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/freerdp-server3 | 1 +
srcpkgs/freerdp-server3-devel | 1 +
srcpkgs/freerdp3-devel | 1 +
srcpkgs/freerdp3/template | 143 ++++++++++++++++++++++++++++++++++
srcpkgs/libfreerdp-server3 | 1 +
srcpkgs/libfreerdp3 | 1 +
7 files changed, 156 insertions(+)
create mode 120000 srcpkgs/freerdp-server3
create mode 120000 srcpkgs/freerdp-server3-devel
create mode 120000 srcpkgs/freerdp3-devel
create mode 100644 srcpkgs/freerdp3/template
create mode 120000 srcpkgs/libfreerdp-server3
create mode 120000 srcpkgs/libfreerdp3
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/freerdp-server3 b/srcpkgs/freerdp-server3
new file mode 120000
index 00000000000000..d8e6da3ebcadf3
--- /dev/null
+++ b/srcpkgs/freerdp-server3
@@ -0,0 +1 @@
+freerdp3
\ No newline at end of file
diff --git a/srcpkgs/freerdp-server3-devel b/srcpkgs/freerdp-server3-devel
new file mode 120000
index 00000000000000..d8e6da3ebcadf3
--- /dev/null
+++ b/srcpkgs/freerdp-server3-devel
@@ -0,0 +1 @@
+freerdp3
\ No newline at end of file
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/template b/srcpkgs/freerdp3/template
new file mode 100644
index 00000000000000..f9e86170dcb905
--- /dev/null
+++ b/srcpkgs/freerdp3/template
@@ -0,0 +1,143 @@
+# 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"
+
+# help cmake generate manuals when cross-compiling
+post_patch() {
+ vsed -i cmake/InstallFreeRDPMan.cmake \
+ -e '/generate_argument_docbook/s/COMMAND/& \${CMAKE_CROSSCOMPILING_EMULATOR}/'
+}
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ export CXX="$XBPS_WRAPPERDIR/${XBPS_CROSS_TRIPLET}-c++"
+ configure_args+="
+ -DCMAKE_CXX_COMPILER_AR=/usr/bin/${XBPS_CROSS_TRIPLET}-ar
+ -DCMAKE_CXX_COMPILER_RANLIB=/usr/bin/${XBPS_CROSS_TRIPLET}-ranlib"
+ fi
+}
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
+ armv5tel*) configure_args+=" -DWITH_NEON=OFF";;
+esac
+
+# first we want to separate -server, everything else then goes to client
+subpackages="libfreerdp-server3 freerdp-server3 freerdp-server3-devel
+ 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>=${version}_${revision}
+ openssl-devel"
+ pkg_install() {
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ }
+}
+
+libfreerdp-server3_package() {
+ short_desc="Free RDP (Remote Desktop Protocol) server - runtime files"
+ depends="libfreerdp3>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/freerdp3/server/proxy/plugins"
+ vmove "usr/lib/libfreerdp-server*.so.*"
+ vmove "usr/lib/libfreerdp-shadow*.so.*"
+ }
+}
+
+freerdp-server3_package() {
+ short_desc="Free RDP (Remote Desktop Protocol) server"
+ depends="libfreerdp-server3>=${version}_${revision}"
+ 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
+ }
+}
+
+freerdp-server3-devel_package() {
+ depends="libfreerdp-server3>=${version}_${revision}
+ freerdp3-devel>=${version}_${revision}"
+ short_desc="Free RDP (Remote Desktop Protocol) server - development files"
+ pkg_install() {
+ vmove "usr/lib/libfreerdp-server*.so"
+ vmove "usr/lib/libfreerdp-shadow*.so"
+ vmove usr/lib/cmake/FreeRDP-Proxy3
+ vmove usr/lib/cmake/FreeRDP-Server3
+ vmove usr/lib/cmake/FreeRDP-Shadow3
+ vmove usr/lib/pkgconfig/freerdp-server-proxy3.pc
+ vmove usr/lib/pkgconfig/freerdp-server3.pc
+ vmove usr/lib/pkgconfig/freerdp-shadow3.pc
+ }
+}
diff --git a/srcpkgs/libfreerdp-server3 b/srcpkgs/libfreerdp-server3
new file mode 120000
index 00000000000000..d8e6da3ebcadf3
--- /dev/null
+++ b/srcpkgs/libfreerdp-server3
@@ -0,0 +1 @@
+freerdp3
\ No newline at end of file
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
next reply other threads:[~2024-04-22 11:33 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-22 11:33 chrysos349 [this message]
2024-04-22 12:17 ` [PR REVIEW] " ahesford
2024-04-22 12:17 ` ahesford
2024-04-22 12:17 ` ahesford
2024-04-22 12:17 ` ahesford
2024-04-22 12:17 ` ahesford
2024-04-22 12:17 ` ahesford
2024-04-22 12:17 ` ahesford
2024-04-22 12:17 ` ahesford
2024-04-22 12:17 ` ahesford
2024-04-22 12:17 ` ahesford
2024-04-22 12:20 ` ahesford
2024-04-22 12:41 ` fanyx
2024-04-22 12:42 ` fanyx
2024-04-22 12:57 ` [PR PATCH] [Updated] " chrysos349
2024-04-22 13:10 ` chrysos349
2024-04-22 13:15 ` [PR PATCH] [Updated] " chrysos349
2024-04-22 13:20 ` chrysos349
2024-04-22 13:53 ` [PR PATCH] [Updated] " chrysos349
2024-04-22 14:44 ` [PR REVIEW] " ahesford
2024-04-22 14:46 ` ahesford
2024-04-22 14:47 ` ahesford
2024-04-22 15:58 ` [PR PATCH] [Updated] " chrysos349
2024-04-22 15:58 ` chrysos349
2024-04-22 15:59 ` [PR REVIEW] " chrysos349
2024-04-22 21:08 ` [PR PATCH] [Updated] " chrysos349
2024-04-22 21:23 ` chrysos349
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-49982@inbox.vuxu.org \
--to=chrysos349@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).