Sat Aug 6 08:02:28 2022 UTC ()
freerdp2: Fix epoll-shim usage, wayland support, and man page installation


(nia)
diff -r1.26 -r1.27 pkgsrc/net/freerdp2/Makefile
diff -r1.3 -r1.4 pkgsrc/net/freerdp2/PLIST
diff -r1.3 -r1.4 pkgsrc/net/freerdp2/options.mk
diff -r1.9 -r1.10 pkgsrc/net/freerdp2/distinfo
diff -r0 -r1.1 pkgsrc/net/freerdp2/patches/patch-CMakeLists.txt
diff -r0 -r1.1 pkgsrc/net/freerdp2/patches/patch-client_Wayland_wlf__input.c
diff -r0 -r1.1 pkgsrc/net/freerdp2/patches/patch-client_Wayland_wlfreerdp.c
diff -r0 -r1.1 pkgsrc/net/freerdp2/patches/patch-cmake_InstallFreeRDPMan.cmake
cvs diff -r1.26 -r1.27 pkgsrc/net/freerdp2/Makefile (expand / switch to unified diff)

--- pkgsrc/net/freerdp2/Makefile 2022/07/02 16:53:32 1.26
+++ pkgsrc/net/freerdp2/Makefile 2022/08/06 08:02:27 1.27
@@ -1,76 +1,62 @@ @@ -1,76 +1,62 @@
1# $NetBSD: Makefile,v 1.26 2022/07/02 16:53:32 ryoon Exp $ 1# $NetBSD: Makefile,v 1.27 2022/08/06 08:02:27 nia Exp $
2 2
3DISTNAME= freerdp-2.3.2 3DISTNAME= freerdp-2.3.2
4PKGNAME= ${DISTNAME:S/freerdp-/freerdp2-/1} 4PKGNAME= ${DISTNAME:S/freerdp-/freerdp2-/1}
5PKGREVISION= 4 5PKGREVISION= 5
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= https://pub.freerdp.com/releases/ 7MASTER_SITES= https://pub.freerdp.com/releases/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.freerdp.com/ 10HOMEPAGE= https://www.freerdp.com/
11COMMENT= Free implementation of the Remote Desktop Protocol (major version 2) 11COMMENT= Free implementation of the Remote Desktop Protocol (major version 2)
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 14TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
15TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 15TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
20 20
21CMAKE_ARGS+= -DWITH_SERVER=ON 21CMAKE_ARGS+= -DWITH_SERVER=ON
22CMAKE_ARGS+= -DWITH_CHANNELS=ON 22CMAKE_ARGS+= -DWITH_CHANNELS=ON
23CMAKE_ARGS+= -DWITH_JPEG=ON 23CMAKE_ARGS+= -DWITH_JPEG=ON
24CMAKE_ARGS+= -DWITH_WAYLAND=OFF # XXX needs epoll 
25CMAKE_ARGS+= -DWITH_GSTREAMER_1_0=OFF 24CMAKE_ARGS+= -DWITH_GSTREAMER_1_0=OFF
26 25
27CMAKE_ARGS+= -DAVCODEC_LIBRARY=${PREFIX}/lib/ffmpeg4/libavcodec.so 26CMAKE_ARGS+= -DAVCODEC_LIBRARY=${PREFIX}/lib/ffmpeg4/libavcodec.so
28 27
29CFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t -Du_int64_t=uint64_t 28CFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t -Du_int64_t=uint64_t
30 29
31.include "../../mk/oss.buildlink3.mk" 30.include "../../mk/oss.buildlink3.mk"
32 31
33.if ${OSS_TYPE} != "none" 32.if ${OSS_TYPE} != "none"
34CMAKE_ARGS+= -DWITH_OSS=ON 33CMAKE_ARGS+= -DWITH_OSS=ON
35LDFLAGS+= ${LIBOSSAUDIO} 34LDFLAGS+= ${LIBOSSAUDIO}
36.else 35.else
37CMAKE_ARGS+= -DWITH_OSS=OFF 36CMAKE_ARGS+= -DWITH_OSS=OFF
38.endif 37.endif
39 38
40.include "../../mk/bsd.prefs.mk" 39.include "../../mk/bsd.prefs.mk"
41 40
42.if ${OPSYS} == "NetBSD" 
43# backtrace(3) 41# backtrace(3)
44LDFLAGS.${OPSYS}+= -lexecinfo 42LDFLAGS.NetBSD+= -lexecinfo
45.endif 
46.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 
47NEED_EPOLLSHIM= # defined 
48LDFLAGS.${OPSYS}+= -lepoll-shim 
49.endif 
50 43
51PKGCONFIG_OVERRIDE+= freerdp.pc.in 44PKGCONFIG_OVERRIDE+= freerdp.pc.in
52 45
53INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man7 46INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man7
54 47
55post-install: 48post-install:
56.for page in freerdp-shadow-cli.1 winpr-hash.1 winpr-makecert.1 xfreerdp.1 
57 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/${page} \ 
58 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${page} || ${TRUE} 
59.endfor 
60 ${MV} ${DESTDIR}${PREFIX}/share/man/man7/wlog.7 \ 
61 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/wlog.7 || ${TRUE} 
62 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/xfreerdp.1 \ 
63 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xfreerdp2.1 || ${TRUE} 
64 ${MV} ${DESTDIR}${PREFIX}/bin/xfreerdp \ 49 ${MV} ${DESTDIR}${PREFIX}/bin/xfreerdp \
65 ${DESTDIR}${PREFIX}/bin/xfreerdp2 || ${TRUE} 50 ${DESTDIR}${PREFIX}/bin/xfreerdp2 || ${TRUE}
66 51
67.include "options.mk" 52.include "options.mk"
68.include "../../devel/libusb1/buildlink3.mk" 53.include "../../devel/libusb1/buildlink3.mk"
69.include "../../devel/zlib/buildlink3.mk" 54.include "../../devel/zlib/buildlink3.mk"
70.include "../../multimedia/ffmpeg4/buildlink3.mk" 55.include "../../multimedia/ffmpeg4/buildlink3.mk"
71.include "../../security/openssl/buildlink3.mk" 56.include "../../security/openssl/buildlink3.mk"
72.include "../../mk/jpeg.buildlink3.mk" 57.include "../../mk/jpeg.buildlink3.mk"
73.ifdef NEED_EPOLLSHIM 58.if defined(OPSYS_HAS_KQUEUE)
 59CFLAGS+= -I${BUILDLINK_DIR}/include/libepoll-shim
74.include "../../devel/libepoll-shim/buildlink3.mk" 60.include "../../devel/libepoll-shim/buildlink3.mk"
75.endif 61.endif
76.include "../../mk/bsd.pkg.mk" 62.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/net/freerdp2/PLIST (expand / switch to unified diff)

--- pkgsrc/net/freerdp2/PLIST 2021/05/03 18:35:07 1.3
+++ pkgsrc/net/freerdp2/PLIST 2022/08/06 08:02:27 1.4
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1@comment $NetBSD: PLIST,v 1.3 2021/05/03 18:35:07 jdolecek Exp $ 1@comment $NetBSD: PLIST,v 1.4 2022/08/06 08:02:27 nia Exp $
2bin/freerdp-proxy 2bin/freerdp-proxy
3bin/freerdp-shadow-cli 3bin/freerdp-shadow-cli
4bin/winpr-hash 4bin/winpr-hash
5bin/winpr-makecert 5bin/winpr-makecert
 6${PLIST.wayland}bin/wlfreerdp
6${PLIST.x11}bin/xfreerdp2 7${PLIST.x11}bin/xfreerdp2
7include/freerdp2/freerdp/addin.h 8include/freerdp2/freerdp/addin.h
8include/freerdp2/freerdp/altsec.h 9include/freerdp2/freerdp/altsec.h
9include/freerdp2/freerdp/api.h 10include/freerdp2/freerdp/api.h
10include/freerdp2/freerdp/assistance.h 11include/freerdp2/freerdp/assistance.h
11include/freerdp2/freerdp/autodetect.h 12include/freerdp2/freerdp/autodetect.h
12include/freerdp2/freerdp/build-config.h 13include/freerdp2/freerdp/build-config.h
13include/freerdp2/freerdp/cache/bitmap.h 14include/freerdp2/freerdp/cache/bitmap.h
14include/freerdp2/freerdp/cache/brush.h 15include/freerdp2/freerdp/cache/brush.h
15include/freerdp2/freerdp/cache/cache.h 16include/freerdp2/freerdp/cache/cache.h
16include/freerdp2/freerdp/cache/glyph.h 17include/freerdp2/freerdp/cache/glyph.h
17include/freerdp2/freerdp/cache/nine_grid.h 18include/freerdp2/freerdp/cache/nine_grid.h
18include/freerdp2/freerdp/cache/offscreen.h 19include/freerdp2/freerdp/cache/offscreen.h
@@ -132,26 +133,28 @@ include/freerdp2/freerdp/server/shadow.h @@ -132,26 +133,28 @@ include/freerdp2/freerdp/server/shadow.h
132include/freerdp2/freerdp/session.h 133include/freerdp2/freerdp/session.h
133include/freerdp2/freerdp/settings.h 134include/freerdp2/freerdp/settings.h
134include/freerdp2/freerdp/svc.h 135include/freerdp2/freerdp/svc.h
135include/freerdp2/freerdp/types.h 136include/freerdp2/freerdp/types.h
136include/freerdp2/freerdp/update.h 137include/freerdp2/freerdp/update.h
137include/freerdp2/freerdp/utils/passphrase.h 138include/freerdp2/freerdp/utils/passphrase.h
138include/freerdp2/freerdp/utils/pcap.h 139include/freerdp2/freerdp/utils/pcap.h
139include/freerdp2/freerdp/utils/profiler.h 140include/freerdp2/freerdp/utils/profiler.h
140include/freerdp2/freerdp/utils/ringbuffer.h 141include/freerdp2/freerdp/utils/ringbuffer.h
141include/freerdp2/freerdp/utils/signal.h 142include/freerdp2/freerdp/utils/signal.h
142include/freerdp2/freerdp/utils/stopwatch.h 143include/freerdp2/freerdp/utils/stopwatch.h
143include/freerdp2/freerdp/version.h 144include/freerdp2/freerdp/version.h
144include/freerdp2/freerdp/window.h 145include/freerdp2/freerdp/window.h
 146${PLIST.wayland}include/uwac0/uwac/uwac-tools.h
 147${PLIST.wayland}include/uwac0/uwac/uwac.h
145include/winpr2/winpr/asn1.h 148include/winpr2/winpr/asn1.h
146include/winpr2/winpr/bcrypt.h 149include/winpr2/winpr/bcrypt.h
147include/winpr2/winpr/bitstream.h 150include/winpr2/winpr/bitstream.h
148include/winpr2/winpr/clipboard.h 151include/winpr2/winpr/clipboard.h
149include/winpr2/winpr/cmdline.h 152include/winpr2/winpr/cmdline.h
150include/winpr2/winpr/collections.h 153include/winpr2/winpr/collections.h
151include/winpr2/winpr/comm.h 154include/winpr2/winpr/comm.h
152include/winpr2/winpr/credentials.h 155include/winpr2/winpr/credentials.h
153include/winpr2/winpr/credui.h 156include/winpr2/winpr/credui.h
154include/winpr2/winpr/crt.h 157include/winpr2/winpr/crt.h
155include/winpr2/winpr/crypto.h 158include/winpr2/winpr/crypto.h
156include/winpr2/winpr/debug.h 159include/winpr2/winpr/debug.h
157include/winpr2/winpr/dsparse.h 160include/winpr2/winpr/dsparse.h
@@ -220,45 +223,55 @@ lib/cmake/FreeRDP-Server2/FreeRDP-Server @@ -220,45 +223,55 @@ lib/cmake/FreeRDP-Server2/FreeRDP-Server
220lib/cmake/FreeRDP-Server2/FreeRDP-ServerTargets.cmake 223lib/cmake/FreeRDP-Server2/FreeRDP-ServerTargets.cmake
221lib/cmake/FreeRDP-Shadow2/FreeRDP-ShadowConfig.cmake 224lib/cmake/FreeRDP-Shadow2/FreeRDP-ShadowConfig.cmake
222lib/cmake/FreeRDP-Shadow2/FreeRDP-ShadowConfigVersion.cmake 225lib/cmake/FreeRDP-Shadow2/FreeRDP-ShadowConfigVersion.cmake
223lib/cmake/FreeRDP-Shadow2/FreeRDP-ShadowTargets-release.cmake 226lib/cmake/FreeRDP-Shadow2/FreeRDP-ShadowTargets-release.cmake
224lib/cmake/FreeRDP-Shadow2/FreeRDP-ShadowTargets.cmake 227lib/cmake/FreeRDP-Shadow2/FreeRDP-ShadowTargets.cmake
225lib/cmake/FreeRDP2/FreeRDPConfig.cmake 228lib/cmake/FreeRDP2/FreeRDPConfig.cmake
226lib/cmake/FreeRDP2/FreeRDPConfigVersion.cmake 229lib/cmake/FreeRDP2/FreeRDPConfigVersion.cmake
227lib/cmake/FreeRDP2/FreeRDPTargets-release.cmake 230lib/cmake/FreeRDP2/FreeRDPTargets-release.cmake
228lib/cmake/FreeRDP2/FreeRDPTargets.cmake 231lib/cmake/FreeRDP2/FreeRDPTargets.cmake
229lib/cmake/WinPR2/WinPRConfig.cmake 232lib/cmake/WinPR2/WinPRConfig.cmake
230lib/cmake/WinPR2/WinPRConfigVersion.cmake 233lib/cmake/WinPR2/WinPRConfigVersion.cmake
231lib/cmake/WinPR2/WinPRTargets-release.cmake 234lib/cmake/WinPR2/WinPRTargets-release.cmake
232lib/cmake/WinPR2/WinPRTargets.cmake 235lib/cmake/WinPR2/WinPRTargets.cmake
 236${PLIST.wayland}lib/cmake/uwac0/uwac-release.cmake
 237${PLIST.wayland}lib/cmake/uwac0/uwac.cmake
 238${PLIST.wayland}lib/cmake/uwac0/uwacConfig.cmake
 239${PLIST.wayland}lib/cmake/uwac0/uwacConfigVersion.cmake
233lib/libfreerdp-client2.so 240lib/libfreerdp-client2.so
234lib/libfreerdp-client2.so.2 241lib/libfreerdp-client2.so.2
235lib/libfreerdp-client2.so.${PKGVERSION} 242lib/libfreerdp-client2.so.${PKGVERSION}
236lib/libfreerdp-server2.so 243lib/libfreerdp-server2.so
237lib/libfreerdp-server2.so.2 244lib/libfreerdp-server2.so.2
238lib/libfreerdp-server2.so.${PKGVERSION} 245lib/libfreerdp-server2.so.${PKGVERSION}
239lib/libfreerdp-shadow-subsystem2.so 246lib/libfreerdp-shadow-subsystem2.so
240lib/libfreerdp-shadow-subsystem2.so.2 247lib/libfreerdp-shadow-subsystem2.so.2
241lib/libfreerdp-shadow-subsystem2.so.${PKGVERSION} 248lib/libfreerdp-shadow-subsystem2.so.${PKGVERSION}
242lib/libfreerdp-shadow2.so 249lib/libfreerdp-shadow2.so
243lib/libfreerdp-shadow2.so.2 250lib/libfreerdp-shadow2.so.2
244lib/libfreerdp-shadow2.so.${PKGVERSION} 251lib/libfreerdp-shadow2.so.${PKGVERSION}
245lib/libfreerdp2.so 252lib/libfreerdp2.so
246lib/libfreerdp2.so.2 253lib/libfreerdp2.so.2
247lib/libfreerdp2.so.${PKGVERSION} 254lib/libfreerdp2.so.${PKGVERSION}
 255${PLIST.wayland}lib/libuwac0.so
 256${PLIST.wayland}lib/libuwac0.so.0
 257${PLIST.wayland}lib/libuwac0.so.0.1.1
248lib/libwinpr-tools2.so 258lib/libwinpr-tools2.so
249lib/libwinpr-tools2.so.2 259lib/libwinpr-tools2.so.2
250lib/libwinpr-tools2.so.${PKGVERSION} 260lib/libwinpr-tools2.so.${PKGVERSION}
251lib/libwinpr2.so 261lib/libwinpr2.so
252lib/libwinpr2.so.2 262lib/libwinpr2.so.2
253lib/libwinpr2.so.${PKGVERSION} 263lib/libwinpr2.so.${PKGVERSION}
254lib/pkgconfig/freerdp-client2.pc 264lib/pkgconfig/freerdp-client2.pc
255lib/pkgconfig/freerdp-server2.pc 265lib/pkgconfig/freerdp-server2.pc
256lib/pkgconfig/freerdp-shadow2.pc 266lib/pkgconfig/freerdp-shadow2.pc
257lib/pkgconfig/freerdp2.pc 267lib/pkgconfig/freerdp2.pc
 268${PLIST.wayland}lib/pkgconfig/uwac0.pc
258lib/pkgconfig/winpr-tools2.pc 269lib/pkgconfig/winpr-tools2.pc
259lib/pkgconfig/winpr2.pc 270lib/pkgconfig/winpr2.pc
260man/man1/freerdp-shadow-cli.1 271man/man1/freerdp-shadow-cli.1
261man/man1/winpr-hash.1 272man/man1/winpr-hash.1
262man/man1/winpr-makecert.1 273man/man1/winpr-makecert.1
 274${PLIST.wayland}man/man1/wlfreerdp.1
263${PLIST.x11}man/man1/xfreerdp.1 275${PLIST.x11}man/man1/xfreerdp.1
264man/man7/wlog.7 276man/man7/wlog.7
 277@pkgdir share/man/man7
cvs diff -r1.3 -r1.4 pkgsrc/net/freerdp2/options.mk (expand / switch to unified diff)

--- pkgsrc/net/freerdp2/options.mk 2021/05/03 18:24:38 1.3
+++ pkgsrc/net/freerdp2/options.mk 2022/08/06 08:02:27 1.4
@@ -1,20 +1,25 @@ @@ -1,20 +1,25 @@
1# $NetBSD: options.mk,v 1.3 2021/05/03 18:24:38 jdolecek Exp $ 1# $NetBSD: options.mk,v 1.4 2022/08/06 08:02:27 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.freerdp2 3PKG_OPTIONS_VAR= PKG_OPTIONS.freerdp2
4PKG_SUPPORTED_OPTIONS= alsa pulseaudio cups x11 pcsc 4PKG_SUPPORTED_OPTIONS= alsa pcsc pulseaudio cups wayland x11
5PKG_SUGGESTED_OPTIONS= x11 pcsc 5PKG_SUGGESTED_OPTIONS= x11 pcsc
6PKG_SUGGESTED_OPTIONS.Linux= alsa 6PKG_SUGGESTED_OPTIONS.Linux= alsa
7 7
 8.include "../../devel/wayland/platform.mk"
 9.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
 10PKG_SUGGESTED_OPTIONS+= wayland
 11.endif
 12
8.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
9 14
10.if !empty(PKG_OPTIONS:Malsa) 15.if !empty(PKG_OPTIONS:Malsa)
11CMAKE_ARGS+= -DWITH_ALSA=ON 16CMAKE_ARGS+= -DWITH_ALSA=ON
12.include "../../audio/alsa-lib/buildlink3.mk" 17.include "../../audio/alsa-lib/buildlink3.mk"
13.else 18.else
14CMAKE_ARGS+= -DWITH_ALSA=OFF 19CMAKE_ARGS+= -DWITH_ALSA=OFF
15.endif 20.endif
16 21
17.if !empty(PKG_OPTIONS:Mpulseaudio) 22.if !empty(PKG_OPTIONS:Mpulseaudio)
18CMAKE_ARGS+= -DWITH_PULSE=ON 23CMAKE_ARGS+= -DWITH_PULSE=ON
19.include "../../audio/pulseaudio/buildlink3.mk" 24.include "../../audio/pulseaudio/buildlink3.mk"
20.else 25.else
@@ -45,13 +50,23 @@ CMAKE_ARGS+= -DWITH_X11=ON @@ -45,13 +50,23 @@ CMAKE_ARGS+= -DWITH_X11=ON
45.include "../../x11/libXtst/buildlink3.mk" 50.include "../../x11/libXtst/buildlink3.mk"
46.include "../../x11/libXv/buildlink3.mk" 51.include "../../x11/libXv/buildlink3.mk"
47.else 52.else
48CMAKE_ARGS+= -DWITH_X11=OFF 53CMAKE_ARGS+= -DWITH_X11=OFF
49.endif 54.endif
50 55
51.if !empty(PKG_OPTIONS:Mpcsc) 56.if !empty(PKG_OPTIONS:Mpcsc)
52. include "../../security/pcsc-lite/buildlink3.mk" 57. include "../../security/pcsc-lite/buildlink3.mk"
53CMAKE_ARGS+= -DWITH_PCSC=ON 58CMAKE_ARGS+= -DWITH_PCSC=ON
54PLIST.pcsc= yes 59PLIST.pcsc= yes
55.else 60.else
56CMAKE_ARGS+= -DWITH_PCSC=OFF 61CMAKE_ARGS+= -DWITH_PCSC=OFF
57.endif 62.endif
 63
 64PLIST_VARS+= wayland
 65.if !empty(PKG_OPTIONS:Mwayland)
 66. include "../../devel/wayland/buildlink3.mk"
 67. include "../../x11/libxkbcommon/buildlink3.mk"
 68PLIST.wayland= yes
 69CMAKE_ARGS+= -DWITH_WAYLAND=ON
 70.else
 71CMAKE_ARGS+= -DWITH_WAYLAND=OFF
 72.endif
cvs diff -r1.9 -r1.10 pkgsrc/net/freerdp2/distinfo (expand / switch to unified diff)

--- pkgsrc/net/freerdp2/distinfo 2021/10/26 11:05:37 1.9
+++ pkgsrc/net/freerdp2/distinfo 2022/08/06 08:02:27 1.10
@@ -1,7 +1,11 @@ @@ -1,7 +1,11 @@
1$NetBSD: distinfo,v 1.9 2021/10/26 11:05:37 nia Exp $ 1$NetBSD: distinfo,v 1.10 2022/08/06 08:02:27 nia Exp $
2 2
3BLAKE2s (freerdp-2.3.2.tar.gz) = b17b6a3127b36e4c8837f7542cf91e26c7828d55975dc7aab420f532e4e1fe93 3BLAKE2s (freerdp-2.3.2.tar.gz) = b17b6a3127b36e4c8837f7542cf91e26c7828d55975dc7aab420f532e4e1fe93
4SHA512 (freerdp-2.3.2.tar.gz) = b8502d34c73113a42bf2dc240431967829064d68f507cc42ff06432a784213eee4a2c001b174f1b970545aec75b3caf21ba5f4ee1ca8c07c7ef834131413204b 4SHA512 (freerdp-2.3.2.tar.gz) = b8502d34c73113a42bf2dc240431967829064d68f507cc42ff06432a784213eee4a2c001b174f1b970545aec75b3caf21ba5f4ee1ca8c07c7ef834131413204b
5Size (freerdp-2.3.2.tar.gz) = 7284490 bytes 5Size (freerdp-2.3.2.tar.gz) = 7284490 bytes
 6SHA1 (patch-CMakeLists.txt) = b836a6f13ca3ae654fd9c96aec43c01df237ad53
6SHA1 (patch-channels_rdpdr_client_rdpdr__main.c) = 4358d4cd4b9293a27f3edafb94e7759e133ecd5f 7SHA1 (patch-channels_rdpdr_client_rdpdr__main.c) = 4358d4cd4b9293a27f3edafb94e7759e133ecd5f
 8SHA1 (patch-client_Wayland_wlf__input.c) = c79c7359ce538021e09ffbec9e61a9acc63d24af
 9SHA1 (patch-client_Wayland_wlfreerdp.c) = c20ac99842d3ae0fda2a1b43807e65efd5121487
 10SHA1 (patch-cmake_InstallFreeRDPMan.cmake) = b2008b0e17acdbb352919f3bc45c81fc93dcf3cf
7SHA1 (patch-winpr_libwinpr_sysinfo_sysinfo.c) = b0fc583b02c3f416eb9d0f7cb140c4c69b3bdaef 11SHA1 (patch-winpr_libwinpr_sysinfo_sysinfo.c) = b0fc583b02c3f416eb9d0f7cb140c4c69b3bdaef
File Added: pkgsrc/net/freerdp2/patches/patch-CMakeLists.txt
$NetBSD: patch-CMakeLists.txt,v 1.1 2022/08/06 08:02:27 nia Exp $

Find epoll-shim using pkg-config on all BSDs.

--- CMakeLists.txt.orig	2021-03-15 12:29:35.000000000 +0000
+++ CMakeLists.txt
@@ -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)
@@ -205,6 +205,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
 	if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
 		set(OPENBSD TRUE)
 	endif()
+	pkg_check_modules (EPOLL_SHIM 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)
File Added: pkgsrc/net/freerdp2/patches/patch-client_Wayland_wlf__input.c
$NetBSD: patch-client_Wayland_wlf__input.c,v 1.1 2022/08/06 08:02:27 nia Exp $

Support building Wayland components on non-Linux.

--- client/Wayland/wlf_input.c.orig	2021-03-15 12:29:35.000000000 +0000
+++ client/Wayland/wlf_input.c
@@ -19,7 +19,17 @@
  */
 
 #include <stdlib.h>
+#ifdef __linux
 #include <linux/input.h>
+#else
+#ifndef BTN_LEFT
+#define BTN_LEFT	(0x110)
+#define BTN_RIGHT	(0x111)
+#define BTN_MIDDLE	(0x112)
+#define BTN_SIDE	(0x113)
+#define BTN_EXTRA	(0x114)
+#endif
+#endif
 
 #include <freerdp/locale/keyboard.h>
 #include <freerdp/client/rdpei.h>
File Added: pkgsrc/net/freerdp2/patches/patch-client_Wayland_wlfreerdp.c
$NetBSD: patch-client_Wayland_wlfreerdp.c,v 1.1 2022/08/06 08:02:27 nia Exp $

Support building Wayland components on non-Linux.

--- client/Wayland/wlfreerdp.c.orig	2021-03-15 12:29:35.000000000 +0000
+++ client/Wayland/wlfreerdp.c
@@ -31,7 +31,9 @@
 #include <freerdp/utils/signal.h>
 #include <freerdp/locale/keyboard.h>
 
+#ifdef __linux
 #include <linux/input.h>
+#endif
 
 #include <uwac/uwac.h>
File Added: pkgsrc/net/freerdp2/patches/patch-cmake_InstallFreeRDPMan.cmake
$NetBSD: patch-cmake_InstallFreeRDPMan.cmake,v 1.1 2022/08/06 08:02:27 nia Exp $

Install man pages to CMAKE_INSTALL_MANDIR on all OSes, per pkgsrc policy.

--- cmake/InstallFreeRDPMan.cmake.orig	2021-03-15 12:29:35.000000000 +0000
+++ cmake/InstallFreeRDPMan.cmake
@@ -1,9 +1,7 @@
+include(GNUInstallDirs)
+
 function(install_freerdp_man manpage section)
  if(WITH_MANPAGES)
-   if(OPENBSD OR FREEBSD)
-       install(FILES ${manpage} DESTINATION man/man${section})
-    else()
-       install(FILES ${manpage} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man${section})
-   endif()
+   install(FILES ${manpage} DESTINATION ${CMAKE_INSTALL_MANDIR}/man${section})
  endif()
 endfunction()