* [PR PATCH] freerdp3: update to 3.9.0
@ 2024-10-22 19:39 chrysos349
2024-11-01 1:10 ` [PR PATCH] [Merged]: " classabbyamp
0 siblings, 1 reply; 2+ messages in thread
From: chrysos349 @ 2024-10-22 19:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 594 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/52744
freerdp3: update to 3.9.0
#### Testing the changes
- I tested the changes in this PR: **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 x
- armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/52744.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freerdp3-52744.patch --]
[-- Type: text/x-diff, Size: 7277 bytes --]
From 3d3c6c1283d3c2e11cc5a55a4bc00389e23e610c Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Tue, 22 Oct 2024 22:38:05 +0300
Subject: [PATCH] freerdp3: update to 3.9.0
---
srcpkgs/freerdp3/patches/fix-cross.patch | 52 +++++++++----------
.../patches/undo-fix-cross-compilation.patch | 43 ---------------
srcpkgs/freerdp3/template | 10 ++--
3 files changed, 31 insertions(+), 74 deletions(-)
delete mode 100644 srcpkgs/freerdp3/patches/undo-fix-cross-compilation.patch
diff --git a/srcpkgs/freerdp3/patches/fix-cross.patch b/srcpkgs/freerdp3/patches/fix-cross.patch
index 37bef15c804f1d..d7d5b8cfe5cfdc 100644
--- a/srcpkgs/freerdp3/patches/fix-cross.patch
+++ b/srcpkgs/freerdp3/patches/fix-cross.patch
@@ -1,27 +1,27 @@
-help cmake run executables when cross-compiling
-diff --git a/client/SDL/common/res/CMakeLists.txt b/client/SDL/common/res/CMakeLists.txt
-index fdb80b79b..08f922968 100644
---- a/client/SDL/common/res/CMakeLists.txt
-+++ b/client/SDL/common/res/CMakeLists.txt
-@@ -51,7 +51,7 @@ list(APPEND FACTORY_CLASSES
- add_custom_command(
- OUTPUT ${FILE_BYPRODUCTS}
- COMMAND ${CMAKE_COMMAND} -E make_directory ${FILE_BIN_DIR}
-- COMMAND $<TARGET_FILE:sdl-common-res2bin> ${FILE} ${FILE_TYPE} ${TARGET_NAME} ${FILE_BIN_DIR}
-+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:sdl-common-res2bin> ${FILE} ${FILE_TYPE} ${TARGET_NAME} ${FILE_BIN_DIR}
- COMMENT "create image resources"
- DEPENDS sdl-common-res2bin
- DEPENDS ${FILE}
-diff --git a/cmake/InstallFreeRDPMan.cmake b/cmake/InstallFreeRDPMan.cmake
-index 758d673d6..a00cdf5eb 100644
---- a/cmake/InstallFreeRDPMan.cmake
-+++ b/cmake/InstallFreeRDPMan.cmake
-@@ -54,7 +54,7 @@ function(generate_and_install_freerdp_man_from_xml target section dependencies)
+diff --git a/client/common/man/CMakeLists.txt b/client/common/man/CMakeLists.txt
+index 798957c78..c14d22319 100644
+--- a/client/common/man/CMakeLists.txt
++++ b/client/common/man/CMakeLists.txt
+@@ -1,6 +1,3 @@
+-if(CMAKE_CROSSCOMPILING)
+- find_package(GenerateArgumentManpage)
+-else()
+ include_directories(${CMAKE_BINARY_DIR}/include/)
- 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
+ add_executable(generate_argument_manpage
+@@ -9,14 +6,13 @@ else()
+ )
+ export(TARGETS generate_argument_manpage FILE
+ "${CMAKE_BINARY_DIR}/GenerateArgumentManpageConfig.cmake")
+-endif()
+
+ set(MAN_OPTIONS_FILE "${CMAKE_CURRENT_BINARY_DIR}/freerdp-global-options.1")
+ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${MAN_OPTIONS_FILE})
+
+ add_custom_command(
+ OUTPUT ${MAN_OPTIONS_FILE}
+- COMMAND ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_manpage "${MAN_OPTIONS_FILE}"
++ COMMAND generate_argument_manpage "${MAN_OPTIONS_FILE}"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS
+ generate_argument_manpage
diff --git a/srcpkgs/freerdp3/patches/undo-fix-cross-compilation.patch b/srcpkgs/freerdp3/patches/undo-fix-cross-compilation.patch
deleted file mode 100644
index 34bed655824b71..00000000000000
--- a/srcpkgs/freerdp3/patches/undo-fix-cross-compilation.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-undo commit '[cmake] fix cross compilation' because it requires native tools
-https://github.com/FreeRDP/FreeRDP/commit/46bced61fb2f76d71b737349c851b8f9924278d5
-diff --git a/client/SDL/common/res/CMakeLists.txt b/client/SDL/common/res/CMakeLists.txt
-index fdb80b79b..44edf0553 100644
---- a/client/SDL/common/res/CMakeLists.txt
-+++ b/client/SDL/common/res/CMakeLists.txt
-@@ -15,16 +15,9 @@
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
--if(CMAKE_CROSSCOMPILING)
-- find_package(SdlCommonRes2bin)
--else()
-- add_executable(sdl-common-res2bin
-- convert_res_to_c.cpp
-- )
-- export(TARGETS sdl-common-res2bin FILE
-- "${CMAKE_BINARY_DIR}/SdlCommonRes2binConfig.cmake")
--endif()
--
-+add_executable(sdl-common-res2bin
-+ convert_res_to_c.cpp
-+)
-
- set(FACTORY_SRCS "")
- set(FACTORY_HDR "")
-diff --git a/client/common/man/CMakeLists.txt b/client/common/man/CMakeLists.txt
-index a611cc22e..b601f1dfd 100644
---- a/client/common/man/CMakeLists.txt
-+++ b/client/common/man/CMakeLists.txt
-@@ -1,9 +1,3 @@
--if(CMAKE_CROSSCOMPILING)
-- find_package(GenerateArgumentDocbook)
--else()
-- add_executable(generate_argument_docbook
-- generate_argument_docbook.c
-- )
-- export(TARGETS generate_argument_docbook FILE
-- "${CMAKE_BINARY_DIR}/GenerateArgumentDocbookConfig.cmake")
--endif()
-+add_executable(generate_argument_docbook
-+ generate_argument_docbook.c
-+)
diff --git a/srcpkgs/freerdp3/template b/srcpkgs/freerdp3/template
index 9cf486203f2e66..41fbe1551f463f 100644
--- a/srcpkgs/freerdp3/template
+++ b/srcpkgs/freerdp3/template
@@ -1,13 +1,13 @@
# Template file for 'freerdp3'
pkgname=freerdp3
-version=3.8.0
+version=3.9.0
revision=1
build_style=cmake
build_helper=qemu
-configure_args="-DCHANNEL_URBDRC_CLIENT=ON -DDOCBOOKXSL_DIR=/usr/share/xsl/docbook
+configure_args="-DCHANNEL_URBDRC_CLIENT=ON
-DPKG_CONFIG_RELOCATABLE=OFF -DPROXY_PLUGINDIR=/usr/lib/${pkgname}/server/proxy/plugins
-DRDTK_FORCE_STATIC_BUILD=ON -DWAYLAND_SCANNER=/usr/bin/wayland-scanner
- -DWITH_BINARY_VERSIONING=ON -DXSLTPROC_EXECUTABLE=/usr/bin/xsltproc
+ -DWITH_BINARY_VERSIONING=ON
-DWITH_ALSA=ON -DWITH_CHANNELS=ON -DWITH_CLIENT_CHANNELS=ON -DWITH_CUPS=ON
-DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON -DWITH_FUSE=ON -DWITH_GSTREAMER_1_0=OFF
-DWITH_ICU=ON -DWITH_JPEG=ON -DWITH_LIBSYSTEMD=OFF -DWITH_PULSE=ON -DWITH_SAMPLE=OFF
@@ -20,7 +20,7 @@ configure_args="-DCHANNEL_URBDRC_CLIENT=ON -DDOCBOOKXSL_DIR=/usr/share/xsl/docbo
-DWITH_PKCS11=$(vopt_if smartcard ON OFF) -DWITH_SWSCALE=$(vopt_if ffmpeg ON OFF)
-DWITH_WAYLAND=$(vopt_if wayland ON OFF) -DWITH_WEBVIEW=$(vopt_if webview ON OFF)
-DWITH_CLIENT_SDL_VERSIONED=$(vopt_if sdl2 ON OFF)"
-hostmakedepends="pkg-config xmlto $(vopt_if wayland wayland-devel)"
+hostmakedepends="pkg-config $(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
@@ -35,7 +35,7 @@ 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=e313934a77a0bcca3af803455dd9ea1aa2f657c598e3397325aa48e6effd450d
+checksum=a1d2946c67037bf6bb8aa2f0441c7cacd5e92c835d776cecffb4fcdbaa45ec4f
CFLAGS="-Wno-dev"
# wayland - deprecated, sdl2 - experimental
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: freerdp3: update to 3.9.0
2024-10-22 19:39 [PR PATCH] freerdp3: update to 3.9.0 chrysos349
@ 2024-11-01 1:10 ` classabbyamp
0 siblings, 0 replies; 2+ messages in thread
From: classabbyamp @ 2024-11-01 1:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 436 bytes --]
There's a merged pull request on the void-packages repository
freerdp3: update to 3.9.0
https://github.com/void-linux/void-packages/pull/52744
Description:
#### Testing the changes
- I tested the changes in this PR: **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 x
- armv6l-musl
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-11-01 1:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-10-22 19:39 [PR PATCH] freerdp3: update to 3.9.0 chrysos349
2024-11-01 1:10 ` [PR PATCH] [Merged]: " classabbyamp
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).