CVS commit: pkgsrc/net/freerdp2

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Aug 29 10:36:51 UTC 2022

Modified Files:
        pkgsrc/net/freerdp2: distinfo
        pkgsrc/net/freerdp2/patches: patch-CMakeLists.txt
            patch-cmake_InstallFreeRDPMan.cmake
Added Files:
        pkgsrc/net/freerdp2/patches: patch-winpr_libwinpr_CMakeLists.txt

Log Message:
freerdp2: Fix eventfd detection when epoll-shim is used.

Fixes building on NetBSD 9.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/freerdp2/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/freerdp2/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/freerdp2/patches/patch-cmake_InstallFreeRDPMan.cmake
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/freerdp2/patches/patch-winpr_libwinpr_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/freerdp2/distinfo
diff -u pkgsrc/net/freerdp2/distinfo:1.11 pkgsrc/net/freerdp2/distinfo:1.12
--- pkgsrc/net/freerdp2/distinfo:1.11   Mon Aug 15 20:05:12 2022
+++ pkgsrc/net/freerdp2/distinfo        Mon Aug 29 10:36:51 2022
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.11 2022/08/15 20:05:12 tnn Exp $
+$NetBSD: distinfo,v 1.12 2022/08/29 10:36:51 nia Exp $
 
 BLAKE2s (freerdp-2.3.2.tar.gz) = b17b6a3127b36e4c8837f7542cf91e26c7828d55975dc7aab420f532e4e1fe93
 SHA512 (freerdp-2.3.2.tar.gz) = b8502d34c73113a42bf2dc240431967829064d68f507cc42ff06432a784213eee4a2c001b174f1b970545aec75b3caf21ba5f4ee1ca8c07c7ef834131413204b
 Size (freerdp-2.3.2.tar.gz) = 7284490 bytes
-SHA1 (patch-CMakeLists.txt) = 1451870eee9dee3fed9b4166da6345de678d4848
+SHA1 (patch-CMakeLists.txt) = 4d20f409c501374a7366a37861eebe6fa06fd66f
 SHA1 (patch-channels_rdpdr_client_rdpdr__main.c) = 4358d4cd4b9293a27f3edafb94e7759e133ecd5f
 SHA1 (patch-client_Wayland_wlf__input.c) = c79c7359ce538021e09ffbec9e61a9acc63d24af
 SHA1 (patch-client_Wayland_wlfreerdp.c) = c20ac99842d3ae0fda2a1b43807e65efd5121487
-SHA1 (patch-cmake_InstallFreeRDPMan.cmake) = b2008b0e17acdbb352919f3bc45c81fc93dcf3cf
+SHA1 (patch-cmake_InstallFreeRDPMan.cmake) = 08cd5f6bdc0e1513b7f73ea71d3c77e45e3b3bc6
+SHA1 (patch-winpr_libwinpr_CMakeLists.txt) = b52f0202b4595cc58080baadc698ebd6b2cf1f2d
 SHA1 (patch-winpr_libwinpr_sysinfo_sysinfo.c) = b0fc583b02c3f416eb9d0f7cb140c4c69b3bdaef

Index: pkgsrc/net/freerdp2/patches/patch-CMakeLists.txt
diff -u pkgsrc/net/freerdp2/patches/patch-CMakeLists.txt:1.2 pkgsrc/net/freerdp2/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/net/freerdp2/patches/patch-CMakeLists.txt:1.2        Mon Aug 15 20:05:12 2022
+++ pkgsrc/net/freerdp2/patches/patch-CMakeLists.txt    Mon Aug 29 10:36:51 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2022/08/15 20:05:12 tnn Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2022/08/29 10:36:51 nia Exp $
 
 Find epoll-shim using pkg-config on all BSDs.
 
@@ -8,7 +8,7 @@ Find epoll-shim using pkg-config on all 
        if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
                set(OPENBSD TRUE)
        endif()
-+      pkg_check_modules (EPOLL_SHIM REQUIRED epoll-shim)
++      pkg_check_modules (EPOLLSHIM REQUIRED epoll-shim)
  endif()
  
  if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
@@ -24,3 +24,26 @@ Find epoll-shim using pkg-config on all 
  # Configure MSVC Runtime
  if(MSVC)
        include(MSVCRuntime)
+@@ -631,16 +627,16 @@ endif()
+ 
+ if(UNIX OR CYGWIN)
+       check_include_files(aio.h HAVE_AIO_H)
+-      check_include_files(sys/eventfd.h HAVE_SYS_EVENTFD_H)
+-      if (HAVE_SYS_EVENTFD_H)
+-              check_symbol_exists(eventfd_read sys/eventfd.h WITH_EVENTFD_READ_WRITE)
+-      endif()
+-      if (FREEBSD)
++      if (BSD)
+               list(APPEND CMAKE_REQUIRED_INCLUDES ${EPOLLSHIM_INCLUDE_DIR})
++              list(APPEND CMAKE_REQUIRED_LIBRARIES ${EPOLLSHIM_LIBRARIES})
+       endif()
++      check_include_files(sys/eventfd.h HAVE_SYS_EVENTFD_H)
+       check_include_files(sys/timerfd.h HAVE_SYS_TIMERFD_H)
+-      if (FREEBSD)
++      check_symbol_exists(eventfd_read sys/eventfd.h WITH_EVENTFD_READ_WRITE)
++      if (BSD)
+               list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES ${EPOLLSHIM_INCLUDE_DIR})
++              list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES ${EPOLLSHIM_LIBRARIES})
+       endif()
+       check_include_files(poll.h HAVE_POLL_H)
+       list(APPEND CMAKE_REQUIRED_LIBRARIES m)

Index: pkgsrc/net/freerdp2/patches/patch-cmake_InstallFreeRDPMan.cmake
diff -u pkgsrc/net/freerdp2/patches/patch-cmake_InstallFreeRDPMan.cmake:1.1 pkgsrc/net/freerdp2/patches/patch-cmake_InstallFreeRDPMan.cmake:1.2
--- pkgsrc/net/freerdp2/patches/patch-cmake_InstallFreeRDPMan.cmake:1.1 Sat Aug  6 08:02:27 2022
+++ pkgsrc/net/freerdp2/patches/patch-cmake_InstallFreeRDPMan.cmake     Mon Aug 29 10:36:51 2022
@@ -1,7 +1,9 @@
-$NetBSD: patch-cmake_InstallFreeRDPMan.cmake,v 1.1 2022/08/06 08:02:27 nia Exp $
+$NetBSD: patch-cmake_InstallFreeRDPMan.cmake,v 1.2 2022/08/29 10:36:51 nia Exp $
 
 Install man pages to CMAKE_INSTALL_MANDIR on all OSes, per pkgsrc policy.
 
+https://github.com/FreeRDP/FreeRDP/commit/8f44b9cf87d85de5cc2db0cf1d61771748f3249b
+
 --- cmake/InstallFreeRDPMan.cmake.orig 2021-03-15 12:29:35.000000000 +0000
 +++ cmake/InstallFreeRDPMan.cmake
 @@ -1,9 +1,7 @@

Added files:

Index: pkgsrc/net/freerdp2/patches/patch-winpr_libwinpr_CMakeLists.txt
diff -u /dev/null pkgsrc/net/freerdp2/patches/patch-winpr_libwinpr_CMakeLists.txt:1.1
--- /dev/null   Mon Aug 29 10:36:51 2022
+++ pkgsrc/net/freerdp2/patches/patch-winpr_libwinpr_CMakeLists.txt     Mon Aug 29 10:36:51 2022
@@ -0,0 +1,17 @@
+$NetBSD: patch-winpr_libwinpr_CMakeLists.txt,v 1.1 2022/08/29 10:36:51 nia Exp $
+
+Uses epoll/eventfd, so depend on epoll-shim.
+
+--- winpr/libwinpr/CMakeLists.txt.orig 2021-03-15 12:29:35.000000000 +0000
++++ winpr/libwinpr/CMakeLists.txt
+@@ -87,6 +87,10 @@ if (TIMER_CREATE AND TIMER_DELETE AND TI
+       winpr_library_add_private(rt)
+ endif()
+ 
++if (BSD)
++    winpr_library_add_private(${EPOLLSHIM_LIBRARIES})
++endif()
++
+ if (ANDROID)
+     winpr_library_add_private(log)
+ endif()