diff --git a/srcpkgs/freerdp3/patches/fix-cross.patch b/srcpkgs/freerdp3/patches/fix-cross.patch index 37bef15c804..d7d5b8cfe5c 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 $ ${FILE} ${FILE_TYPE} ${TARGET_NAME} ${FILE_BIN_DIR} -+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $ ${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 34bed655824..00000000000 --- 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 9cf486203f2..41fbe1551f4 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