Index: branches/2020Q3/net/freerdp/Makefile =================================================================== --- branches/2020Q3/net/freerdp/Makefile (revision 543626) +++ branches/2020Q3/net/freerdp/Makefile (revision 543627) @@ -1,176 +1,170 @@ # Created by: Alexander Logvinov # $FreeBSD$ PORTNAME= freerdp -DISTVERSION= 2.1.1 +DISTVERSION= 2.2.0 PORTREVISION= 0 CATEGORIES= net comms +MASTER_SITES= https://pub.freerdp.com/releases/ \ + https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/ -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -# FreeBSD doesn't have O_TMPFILE, must use shm_open w/ SHM_ANON instead. -PATCHFILES= 1b5e234135b0.patch:-p1 - MAINTAINER= kevans@FreeBSD.org COMMENT= Free implementation of Remote Desktop Protocol LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_SSL= libressl-devel BROKEN_SSL_REASON_libressl-devel= fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st' LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libepoll-shim.so:devel/libepoll-shim \ libudev.so:devel/libudev-devd \ libuuid.so:misc/e2fsprogs-libuuid USES= alias cmake compiler:c++11-lib cpe gettext gnome localbase pathfix pkgconfig ssl USE_LDCONFIG= yes CPE_VENDOR= freerdp_project PATCHVERSION= ${PORTVERSION} MAJORVERSION= ${PORTVERSION:R:R} PLIST_SUB+= PATCHVERSION="${PATCHVERSION}" PLIST_SUB+= MAJORVERSION="${MAJORVERSION}" - -USE_GITHUB= yes -GH_ACCOUNT= FreeRDP -GH_PROJECT= ${GH_ACCOUNT} CMAKE_ARGS+= -DWITH_CHANNELS:BOOL=ON \ -DWITH_DIRECTFB:BOOL=OFF \ -DWITH_DSP_EXPERIMENTAL:BOOL=OFF \ -DWITH_DSP_FFMPEG:BOOL=OFF -DWITH_GPROF:BOOL=OFF \ -DWITH_GSTREAMER_0_10:BOOL=OFF -DWITH_IPP:BOOL=OFF \ -DWITH_JPEG:BOOL=OFF -DWITH_LIBSYSTEMD:BOOL=OFF \ -DWITH_MBEDTLS:BOOL=OFF -DWITH_OPENSLES=OFF \ -DWITH_OPENSSL:BOOL=ON -DWITH_OSS=ON \ -DWITH_PROFILER:BOOL=OFF -DWITH_SAMPLE:BOOL=OFF \ -DWITH_SANITIZE_ADDRESS:BOOL=OFF \ -DWITH_SANITIZE_MEMORY:BOOL=OFF \ -DWITH_SANITIZE_THREAD:BOOL=OFF -DWITH_SERVER:BOOL=OFF \ -DWITH_SERVER_INTERFACE:BOOL=OFF \ -DWITH_SMARTCARD_INSPECT:BOOL=OFF \ -DWITH_THIRD_PARTY:BOOL=OFF \ -DWITH_VALGRIND_MEMCHECK:BOOL=OFF -DWITH_X264:BOOL=OFF \ -DWITH_ZLIB:BOOL=ON \ -DCHANNEL_URBDRC_CLIENT:BOOL=ON \ ${CMAKE_ARGS_${ARCH}} CMAKE_ARGS_aarch64= -DWITH_NEON=ON CFLAGS_aarch64= -D__ARM_NEON__=__ARM_NEON # clang OPTIONS_DEFINE= ALSA CUPS FAAC FAAD FFMPEG GSM \ GSTREAMER ICU KERBEROS LAME MANPAGES OPENH264 \ PCSC PULSEAUDIO SOXR WAYLAND X11 OPTIONS_DEFAULT= CUPS GSTREAMER ICU KERBEROS MANPAGES WAYLAND X11 OPTIONS_SUB= yes OPTIONS_DEFINE_armv6= NEON OPTIONS_DEFINE_armv7= NEON OPTIONS_DEFINE_amd64= SSE OPTIONS_DEFINE_i386= SSE OPTIONS_DEFAULT_amd64= SSE ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= WITH_ALSA CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_CMAKE_BOOL= WITH_CUPS FAAC_LIB_DEPENDS= libfaac.so:audio/faac FAAC_CMAKE_BOOL= WITH_FAAC FAAD_LIB_DEPENDS= libfaad.so:audio/faad FAAD_CMAKE_BOOL= WITH_FAAD2 FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg FFMPEG_CMAKE_BOOL= WITH_FFMPEG GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CMAKE_BOOL= WITH_GSM GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0 GSTREAMER_USES= gnome xorg GSTREAMER_USE= gnome=glib20 gstreamer1=yes xorg=x11,xext,xorgproto,xrandr GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1 ICU_LIB_DEPENDS= libicuuc.so:devel/icu ICU_CMAKE_BOOL= WITH_ICU KERBEROS_CMAKE_BOOL= WITH_GSSAPI_HEIMDAL LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CMAKE_BOOL= WITH_LAME MANPAGES_BUILD_DEPENDS= xmlto:textproc/xmlto MANPAGES_CMAKE_BOOL= WITH_MANPAGES MANPAGES_CMAKE_OFF= -DWITH_MANPAGES=OFF NEON_DESC= Enable Media Processing Engine instructions NEON_CMAKE_BOOL= WITH_NEON .if ! ${CFLAGS:M-march*} NEON_CFLAGS= -march=armv7-a .endif OPENH264_DESC= H.264 video codec support via OpenH264 OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264 OPENH264_CMAKE_BOOL= WITH_OPENH264 PCSC_DESC= Smart card support (smart card device redirection) PCSC_LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite PCSC_CMAKE_BOOL= WITH_PCSC PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= WITH_PULSE SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr SOXR_CMAKE_BOOL= WITH_SOXR SSE_CMAKE_BOOL= WITH_SSE2 WAYLAND_DESC= Build FreeRDP Wayland client WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libwayland-cursor.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon WAYLAND_CMAKE_BOOL= WITH_WAYLAND X11_DESC= Build FreeRDP X11 client X11_CMAKE_ON= -DWITH_X11:BOOL=ON -DWITH_XCURSOR:BOOL=ON \ -DWITH_XEXT:BOOL=ON -DWITH_XFIXES:BOOL=ON \ -DWITH_XI:BOOL=ON -DWITH_XINERAMA:BOOL=ON \ -DWITH_XKBFILE:BOOL=ON -DWITH_XRANDR:BOOL=ON \ -DWITH_XRENDER:BOOL=ON -DWITH_XSHM:BOOL=ON \ -DWITH_XV:BOOL=ON X11_CMAKE_OFF= -DWITH_X11:BOOL=OFF -DWITH_XKBFILE:BOOL=OFF X11_USES= xorg X11_USE= xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv post-patch: @${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's/Linux/Linux|FreeBSD/' \ ${WRKSRC}/winpr/CMakeLists.txt @${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \ ${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h @${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake @${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/cmake|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules|' \ ${WRKSRC}/client/CMakeLists.txt \ ${WRKSRC}/winpr/CMakeLists.txt \ ${WRKSRC}/uwac/CMakeLists.txt \ ${WRKSRC}/server/CMakeLists.txt \ ${WRKSRC}/server/shadow/CMakeLists.txt \ ${WRKSRC}/libfreerdp/CMakeLists.txt @${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \ ${WRKSRC}/cmake/FindGSM.cmake \ ${WRKSRC}/libfreerdp/codec/dsp.c pre-configure: ${CP} ${FILESDIR}/mntent.h ${WRKSRC}/rdtk/include ${CP} ${FILESDIR}/mntent_compat.c ${WRKSRC}/channels/rdpdr/client .include Index: branches/2020Q3/net/freerdp/distinfo =================================================================== --- branches/2020Q3/net/freerdp/distinfo (revision 543626) +++ branches/2020Q3/net/freerdp/distinfo (revision 543627) @@ -1,5 +1,3 @@ -TIMESTAMP = 1591628011 -SHA256 (FreeRDP-FreeRDP-2.1.1_GH0.tar.gz) = ce363a6578530cf508df802bb980a8dd49a874919bfa33b8c61d992ad0882bfb -SIZE (FreeRDP-FreeRDP-2.1.1_GH0.tar.gz) = 6828178 -SHA256 (1b5e234135b0.patch) = a7991aa963405ffabd5bd7eebf61f36dd1b7a9aa767ca0f52b230c8008e90701 -SIZE (1b5e234135b0.patch) = 1304 +TIMESTAMP = 1595498870 +SHA256 (freerdp-2.2.0.tar.gz) = 19b30759e324ce7a9767af880116a4c571761e9ad9c5d6c98c5b302ff8c24c6c +SIZE (freerdp-2.2.0.tar.gz) = 6878427 Index: branches/2020Q3/net/freerdp/pkg-plist =================================================================== --- branches/2020Q3/net/freerdp/pkg-plist (revision 543626) +++ branches/2020Q3/net/freerdp/pkg-plist (revision 543627) @@ -1,251 +1,252 @@ bin/winpr-hash bin/winpr-makecert %%WAYLAND%%bin/wlfreerdp %%X11%%bin/xfreerdp include/freerdp2/freerdp/addin.h include/freerdp2/freerdp/altsec.h include/freerdp2/freerdp/api.h include/freerdp2/freerdp/assistance.h include/freerdp2/freerdp/autodetect.h include/freerdp2/freerdp/build-config.h include/freerdp2/freerdp/cache/bitmap.h include/freerdp2/freerdp/cache/brush.h include/freerdp2/freerdp/cache/cache.h include/freerdp2/freerdp/cache/glyph.h include/freerdp2/freerdp/cache/nine_grid.h include/freerdp2/freerdp/cache/offscreen.h include/freerdp2/freerdp/cache/palette.h include/freerdp2/freerdp/cache/pointer.h include/freerdp2/freerdp/channels/audin.h include/freerdp2/freerdp/channels/channels.h include/freerdp2/freerdp/channels/cliprdr.h include/freerdp2/freerdp/channels/disp.h include/freerdp2/freerdp/channels/encomsp.h include/freerdp2/freerdp/channels/geometry.h include/freerdp2/freerdp/channels/log.h include/freerdp2/freerdp/channels/rail.h include/freerdp2/freerdp/channels/rdpdr.h include/freerdp2/freerdp/channels/rdpei.h include/freerdp2/freerdp/channels/rdpgfx.h include/freerdp2/freerdp/channels/rdpsnd.h include/freerdp2/freerdp/channels/remdesk.h include/freerdp2/freerdp/channels/tsmf.h include/freerdp2/freerdp/channels/urbdrc.h include/freerdp2/freerdp/channels/video.h include/freerdp2/freerdp/channels/wtsvc.h include/freerdp2/freerdp/client.h include/freerdp2/freerdp/client/audin.h include/freerdp2/freerdp/client/channels.h include/freerdp2/freerdp/client/cliprdr.h include/freerdp2/freerdp/client/cmdline.h include/freerdp2/freerdp/client/disp.h include/freerdp2/freerdp/client/drdynvc.h include/freerdp2/freerdp/client/encomsp.h include/freerdp2/freerdp/client/file.h include/freerdp2/freerdp/client/geometry.h include/freerdp2/freerdp/client/printer.h include/freerdp2/freerdp/client/rail.h include/freerdp2/freerdp/client/rdpei.h include/freerdp2/freerdp/client/rdpgfx.h include/freerdp2/freerdp/client/rdpsnd.h include/freerdp2/freerdp/client/remdesk.h include/freerdp2/freerdp/client/sshagent.h include/freerdp2/freerdp/client/tsmf.h include/freerdp2/freerdp/client/video.h include/freerdp2/freerdp/codec/audio.h include/freerdp2/freerdp/codec/bitmap.h include/freerdp2/freerdp/codec/bulk.h include/freerdp2/freerdp/codec/clear.h include/freerdp2/freerdp/codec/color.h include/freerdp2/freerdp/codec/dsp.h include/freerdp2/freerdp/codec/h264.h include/freerdp2/freerdp/codec/interleaved.h include/freerdp2/freerdp/codec/jpeg.h include/freerdp2/freerdp/codec/mppc.h include/freerdp2/freerdp/codec/ncrush.h include/freerdp2/freerdp/codec/nsc.h include/freerdp2/freerdp/codec/planar.h include/freerdp2/freerdp/codec/progressive.h include/freerdp2/freerdp/codec/region.h include/freerdp2/freerdp/codec/rfx.h include/freerdp2/freerdp/codec/xcrush.h include/freerdp2/freerdp/codec/yuv.h include/freerdp2/freerdp/codec/zgfx.h include/freerdp2/freerdp/codecs.h include/freerdp2/freerdp/constants.h include/freerdp2/freerdp/crypto/ber.h include/freerdp2/freerdp/crypto/certificate.h include/freerdp2/freerdp/crypto/crypto.h include/freerdp2/freerdp/crypto/der.h include/freerdp2/freerdp/crypto/er.h include/freerdp2/freerdp/crypto/per.h include/freerdp2/freerdp/crypto/tls.h include/freerdp2/freerdp/display.h include/freerdp2/freerdp/dvc.h include/freerdp2/freerdp/error.h include/freerdp2/freerdp/event.h include/freerdp2/freerdp/extension.h include/freerdp2/freerdp/freerdp.h include/freerdp2/freerdp/gdi/bitmap.h include/freerdp2/freerdp/gdi/dc.h include/freerdp2/freerdp/gdi/gdi.h include/freerdp2/freerdp/gdi/gfx.h include/freerdp2/freerdp/gdi/pen.h include/freerdp2/freerdp/gdi/region.h include/freerdp2/freerdp/gdi/shape.h include/freerdp2/freerdp/gdi/video.h include/freerdp2/freerdp/graphics.h +include/freerdp2/freerdp/heartbeat.h include/freerdp2/freerdp/input.h include/freerdp2/freerdp/license.h include/freerdp2/freerdp/listener.h include/freerdp2/freerdp/locale/keyboard.h include/freerdp2/freerdp/locale/locale.h include/freerdp2/freerdp/log.h include/freerdp2/freerdp/message.h include/freerdp2/freerdp/metrics.h include/freerdp2/freerdp/peer.h include/freerdp2/freerdp/pointer.h include/freerdp2/freerdp/primary.h include/freerdp2/freerdp/primitives.h include/freerdp2/freerdp/rail.h include/freerdp2/freerdp/scancode.h include/freerdp2/freerdp/secondary.h include/freerdp2/freerdp/server/audin.h include/freerdp2/freerdp/server/channels.h include/freerdp2/freerdp/server/cliprdr.h include/freerdp2/freerdp/server/disp.h include/freerdp2/freerdp/server/drdynvc.h include/freerdp2/freerdp/server/echo.h include/freerdp2/freerdp/server/encomsp.h include/freerdp2/freerdp/server/rail.h include/freerdp2/freerdp/server/rdpdr.h include/freerdp2/freerdp/server/rdpei.h include/freerdp2/freerdp/server/rdpgfx.h include/freerdp2/freerdp/server/rdpsnd.h include/freerdp2/freerdp/server/remdesk.h include/freerdp2/freerdp/server/server-common.h include/freerdp2/freerdp/server/shadow.h include/freerdp2/freerdp/session.h include/freerdp2/freerdp/settings.h include/freerdp2/freerdp/svc.h include/freerdp2/freerdp/types.h include/freerdp2/freerdp/update.h include/freerdp2/freerdp/utils/passphrase.h include/freerdp2/freerdp/utils/pcap.h include/freerdp2/freerdp/utils/profiler.h include/freerdp2/freerdp/utils/ringbuffer.h include/freerdp2/freerdp/utils/signal.h include/freerdp2/freerdp/utils/stopwatch.h include/freerdp2/freerdp/version.h include/freerdp2/freerdp/window.h %%WAYLAND%%include/uwac0/uwac/uwac-tools.h %%WAYLAND%%include/uwac0/uwac/uwac.h include/winpr2/winpr/asn1.h include/winpr2/winpr/bcrypt.h include/winpr2/winpr/bitstream.h include/winpr2/winpr/clipboard.h include/winpr2/winpr/cmdline.h include/winpr2/winpr/collections.h include/winpr2/winpr/comm.h include/winpr2/winpr/credentials.h include/winpr2/winpr/credui.h include/winpr2/winpr/crt.h include/winpr2/winpr/crypto.h include/winpr2/winpr/debug.h include/winpr2/winpr/dsparse.h include/winpr2/winpr/endian.h include/winpr2/winpr/environment.h include/winpr2/winpr/error.h include/winpr2/winpr/file.h include/winpr2/winpr/handle.h include/winpr2/winpr/heap.h include/winpr2/winpr/image.h include/winpr2/winpr/ini.h include/winpr2/winpr/input.h include/winpr2/winpr/interlocked.h include/winpr2/winpr/intrin.h include/winpr2/winpr/io.h include/winpr2/winpr/library.h include/winpr2/winpr/locale.h include/winpr2/winpr/memory.h include/winpr2/winpr/midl.h include/winpr2/winpr/ndr.h include/winpr2/winpr/nt.h include/winpr2/winpr/ntlm.h include/winpr2/winpr/pack.h include/winpr2/winpr/path.h include/winpr2/winpr/pipe.h include/winpr2/winpr/platform.h include/winpr2/winpr/pool.h include/winpr2/winpr/print.h include/winpr2/winpr/registry.h include/winpr2/winpr/rpc.h include/winpr2/winpr/sam.h include/winpr2/winpr/schannel.h include/winpr2/winpr/security.h include/winpr2/winpr/shell.h include/winpr2/winpr/smartcard.h include/winpr2/winpr/spec.h include/winpr2/winpr/ssl.h include/winpr2/winpr/sspi.h include/winpr2/winpr/sspicli.h include/winpr2/winpr/stream.h include/winpr2/winpr/string.h include/winpr2/winpr/strlst.h include/winpr2/winpr/synch.h include/winpr2/winpr/sysinfo.h include/winpr2/winpr/tchar.h include/winpr2/winpr/thread.h include/winpr2/winpr/timezone.h include/winpr2/winpr/tools/makecert.h include/winpr2/winpr/user.h include/winpr2/winpr/version.h include/winpr2/winpr/windows.h include/winpr2/winpr/winhttp.h include/winpr2/winpr/winpr.h include/winpr2/winpr/winsock.h include/winpr2/winpr/wlog.h include/winpr2/winpr/wnd.h include/winpr2/winpr/wtsapi.h include/winpr2/winpr/wtypes.h lib/libfreerdp-client2.so lib/libfreerdp-client2.so.%%MAJORVERSION%% lib/libfreerdp-client2.so.%%PATCHVERSION%% lib/libfreerdp2.so lib/libfreerdp2.so.%%MAJORVERSION%% lib/libfreerdp2.so.%%PATCHVERSION%% %%WAYLAND%%lib/libuwac0.so %%WAYLAND%%lib/libuwac0.so.0 %%WAYLAND%%lib/libuwac0.so.0.1.1 lib/libwinpr-tools2.so lib/libwinpr-tools2.so.%%MAJORVERSION%% lib/libwinpr-tools2.so.%%PATCHVERSION%% lib/libwinpr2.so lib/libwinpr2.so.%%MAJORVERSION%% lib/libwinpr2.so.%%PATCHVERSION%% libdata/pkgconfig/freerdp-client2.pc libdata/pkgconfig/freerdp2.pc %%WAYLAND%%libdata/pkgconfig/uwac0.pc libdata/pkgconfig/winpr-tools2.pc libdata/pkgconfig/winpr2.pc %%MANPAGES%%man/man1/winpr-hash.1.gz %%MANPAGES%%man/man1/winpr-makecert.1.gz %%WAYLAND%%%%MANPAGES%%man/man1/wlfreerdp.1.gz %%X11%%%%MANPAGES%%man/man1/xfreerdp.1.gz %%MANPAGES%%man/man7/wlog.7.gz share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfig.cmake share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfigVersion.cmake share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientTargets-%%CMAKE_BUILD_TYPE%%.cmake share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientTargets.cmake share/cmake/Modules/FreeRDP2/FreeRDPConfig.cmake share/cmake/Modules/FreeRDP2/FreeRDPConfigVersion.cmake share/cmake/Modules/FreeRDP2/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake share/cmake/Modules/FreeRDP2/FreeRDPTargets.cmake share/cmake/Modules/WinPR2/WinPRConfig.cmake share/cmake/Modules/WinPR2/WinPRConfigVersion.cmake share/cmake/Modules/WinPR2/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake share/cmake/Modules/WinPR2/WinPRTargets.cmake %%WAYLAND%%share/cmake/Modules/uwac0/uwac-%%CMAKE_BUILD_TYPE%%.cmake %%WAYLAND%%share/cmake/Modules/uwac0/uwac.cmake %%WAYLAND%%share/cmake/Modules/uwac0/uwacConfig.cmake %%WAYLAND%%share/cmake/Modules/uwac0/uwacConfigVersion.cmake Index: branches/2020Q3 =================================================================== --- branches/2020Q3 (revision 543626) +++ branches/2020Q3 (revision 543627) Property changes on: branches/2020Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r543571