head 1.3; access; symbols pkgsrc-2026Q2:1.3.0.32 pkgsrc-2026Q2-base:1.3 pkgsrc-2026Q1:1.3.0.30 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.28 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.26 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.24 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.22 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.20 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.18 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.16 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.14 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.12 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.10 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.8 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.6 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.4 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.2 pkgsrc-2022Q3-base:1.3; locks; strict; comment @# @; 1.3 date 2022.08.29.10.36.51; author nia; state Exp; branches; next 1.2; commitid C4cFgMySB9gXiLRD; 1.2 date 2022.08.15.20.05.12; author tnn; state Exp; branches; next 1.1; commitid ZDAYLrhicWTRT0QD; 1.1 date 2022.08.06.08.02.27; author nia; state Exp; branches; next ; commitid 5V682LvKHwHFbNOD; desc @@ 1.3 log @freerdp2: Fix eventfd detection when epoll-shim is used. Fixes building on NetBSD 9. @ text @$NetBSD: patch-CMakeLists.txt,v 1.2 2022/08/15 20:05:12 tnn Exp $ Find epoll-shim using pkg-config on all BSDs. --- CMakeLists.txt.orig 2021-03-15 12:29:35.000000000 +0000 +++ CMakeLists.txt @@@@ -205,6 +205,7 @@@@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD") if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") set(OPENBSD TRUE) endif() + pkg_check_modules (EPOLLSHIM REQUIRED epoll-shim) endif() if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") @@@@ -212,11 +213,6 @@@@ if(${CMAKE_SYSTEM_NAME} MATCHES "DragonF set(FREEBSD TRUE) endif() -if(FREEBSD) - find_path(EPOLLSHIM_INCLUDE_DIR NAMES sys/epoll.h sys/timerfd.h HINTS /usr/local/include/libepoll-shim) - find_library(EPOLLSHIM_LIBS NAMES epoll-shim libepoll-shim HINTS /usr/local/lib) -endif() - # 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) @ 1.2 log @freerdp2: try to fix epoll detection @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.1 2022/08/06 08:02:27 nia Exp $ d11 1 a11 1 + pkg_check_modules (EPOLL_SHIM REQUIRED epoll-shim) d27 23 @ 1.1 log @freerdp2: Fix epoll-shim usage, wayland support, and man page installation @ text @d1 1 a1 1 $NetBSD$ a6 9 @@@@ -39,7 +39,7 @@@@ set(CMAKE_COLOR_MAKEFILE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) # Include our extra modules -set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/) +set (CMAKE_MODULE_PATH "/encrypt/src/pkgsrc/net/freerdp2/work/.buildlink/cmake-Modules" ${CMAKE_SOURCE_DIR}/cmake/) if((CMAKE_SYSTEM_NAME MATCHES "WindowsStore") AND (CMAKE_SYSTEM_VERSION MATCHES "10.0")) set(UWP 1) @