Skip to content

Commit

Permalink
freerdp3: update to 3.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
chrysos349 committed Dec 21, 2024
1 parent 252a680 commit e88b296
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 19 deletions.
27 changes: 13 additions & 14 deletions srcpkgs/freerdp3/patches/fix-cross.patch
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
diff --git a/client/common/man/CMakeLists.txt b/client/common/man/CMakeLists.txt
index 798957c78..c14d22319 100644
index 40c7e3d8..68d18451 100644
--- a/client/common/man/CMakeLists.txt
+++ b/client/common/man/CMakeLists.txt
@@ -1,6 +1,3 @@
-if(CMAKE_CROSSCOMPILING)
- find_package(GenerateArgumentManpage)
- find_package(GenerateArgumentManpage)
-else()
include_directories(${CMAKE_BINARY_DIR}/include/)
include_directories(${CMAKE_BINARY_DIR}/include/)

add_executable(generate_argument_manpage
@@ -9,14 +6,13 @@ else()
)
export(TARGETS generate_argument_manpage FILE
"${CMAKE_BINARY_DIR}/GenerateArgumentManpageConfig.cmake")
add_executable(generate_argument_manpage generate_argument_manpage.c ../cmdline.h)
@@ -15,13 +12,12 @@ else()
endif()

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
- OUTPUT ${MAN_OPTIONS_FILE} COMMAND $<TARGET_FILE:generate_argument_manpage> "${MAN_OPTIONS_FILE}"
+ OUTPUT ${MAN_OPTIONS_FILE} COMMAND generate_argument_manpage "${MAN_OPTIONS_FILE}"
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS generate_argument_manpage
)
add_custom_target(
10 changes: 5 additions & 5 deletions srcpkgs/freerdp3/template
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Template file for 'freerdp3'
pkgname=freerdp3
version=3.9.0
version=3.10.0
revision=1
build_style=cmake
build_helper=qemu
configure_args="-DCHANNEL_URBDRC_CLIENT=ON
configure_args="-Wno-dev -DCMAKE_BUILD_TYPE=Release -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
Expand All @@ -19,7 +19,8 @@ configure_args="-DCHANNEL_URBDRC_CLIENT=ON
-DWITH_FFMPEG=$(vopt_if ffmpeg ON OFF) -DWITH_PCSC=$(vopt_if smartcard ON OFF)
-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)"
-DWITH_CLIENT_SDL_VERSIONED=$(vopt_if sdl2 ON OFF) -DWITH_VERBOSE_WINPR_ASSERT=OFF
-DWITH_INTERNAL_MD4=ON -DWITH_INTERNAL_RC4=ON"
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
Expand All @@ -35,8 +36,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=a1d2946c67037bf6bb8aa2f0441c7cacd5e92c835d776cecffb4fcdbaa45ec4f
CFLAGS="-Wno-dev"
checksum=fb776f1f7ef401f8ceb54eb9fce5457c1e2ac04230d62fbc31dc25d9bdca0b1a

# wayland - deprecated, sdl2 - experimental
build_options="aad ffmpeg sdl2 smartcard wayland webview"
Expand Down

0 comments on commit e88b296

Please sign in to comment.