diff --git a/net/freerdp3/Makefile b/net/freerdp3/Makefile index 245c0d9bec08..48c9b6b381ca 100644 --- a/net/freerdp3/Makefile +++ b/net/freerdp3/Makefile @@ -1,194 +1,200 @@ PORTNAME= freerdp DISTVERSION= 3.1.0 CATEGORIES= net comms MASTER_SITES= https://pub.freerdp.com/releases/ \ https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/ PKGNAMESUFFIX= 3 +PATCH_SITES= https://github.com/FreeRDP/FreeRDP/commit/ +PATCHFILES+= 78cdb555c57c33b7f331cb280ac2f615cb87fa74.patch:-p1 # Use NEON instructions on all platforms + # https://github.com/FreeRDP/FreeRDP/issues/9746 +PATCHFILES+= a371309672bfb1a8de4f558422ea8e7ee08190ea.patch:-p1 # enable wayland on BSD + # https://github.com/FreeRDP/FreeRDP/pull/9730 + MAINTAINER= vvd@FreeBSD.org COMMENT= Free implementation of Remote Desktop Protocol WWW= https://www.freerdp.com/ 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= libepoll-shim.so:devel/libepoll-shim USES= alias cmake compiler:c++11-lib cpe localbase:ldflags pathfix pkgconfig ssl xorg USE_XORG= ice sm x11 xext USE_LDCONFIG= yes PATCHVERSION= ${DISTVERSION} MAJORVERSION= ${DISTVERSION:R:R} CMAKE_ARGS+= ${CMAKE_ARGS_${ARCH}} CMAKE_ON= CHANNEL_URBDRC_CLIENT RDTK_FORCE_STATIC_BUILD UWAC_FORCE_STATIC_BUILD \ WITH_BINARY_VERSIONING WITH_CHANNELS WITH_OPENSSL WITH_OSS WITH_ZLIB \ WITH_FREERDP_DEPRECATED WITH_FREERDP_DEPRECATED_COMMANDLINE WITH_WINPR_DEPRECATED CMAKE_OFF= WITH_DSP_EXPERIMENTAL WITH_FUSE WITH_GPROF WITH_GSTREAMER_0_10 WITH_IPP \ WITH_LIBSYSTEMD WITH_MBEDTLS WITH_OPENCL WITH_OPENSLES WITH_PROFILER \ WITH_SAMPLE WITH_SANITIZE_ADDRESS WITH_SANITIZE_MEMORY \ WITH_SANITIZE_THREAD WITH_SERVER WITH_SERVER_INTERFACE \ WITH_SMARTCARD_INSPECT WITH_THIRD_PARTY WITH_VALGRIND_MEMCHECK PLIST_SUB+= PATCHVERSION="${PATCHVERSION}" PLIST_SUB+= MAJORVERSION="${MAJORVERSION}" OPTIONS_DEFINE= AAD ALSA BROKENFOCUS CUPS FAAC FAAD FFMPEG \ GSM GSTREAMER ICU JPEG LAME MANPAGES OPENH264 OPUS PCSC \ PKCS11 PULSEAUDIO SDL SOXR URIPARSER WAYLAND X11 OPTIONS_DEFAULT= AAD CUPS GSSAPI_HEIMDAL GSTREAMER ICU MANPAGES \ SDL SWSCALE WAYLAND X11 OPTIONS_RADIO= GSSAPI SCALE OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT OPTIONS_RADIO_SCALE= CAIRO SWSCALE OPTIONS_SUB= yes OPTIONS_DEFINE_aarch64= NEON OPTIONS_DEFINE_amd64= SSE OPTIONS_DEFINE_armv6= NEON OPTIONS_DEFINE_armv7= NEON OPTIONS_DEFINE_i386= SSE OPTIONS_DEFAULT_aarch64= NEON OPTIONS_DEFAULT_amd64= SSE OPTIONS_DEFAULT_armv7= NEON AAD_DESC= Compile with support for Azure AD authentication AAD_LIB_DEPENDS= libcjson.so:devel/libcjson \ libcjson_utils.so:devel/libcjson AAD_CMAKE_BOOL= WITH_AAD ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= WITH_ALSA BROKENFOCUS_DESC= Work around focus bug in some WMs (PR \#254908) BROKENFOCUS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-focusbug.diff CAIRO_DESC= Use CAIRO image library for screen resizing CAIRO_CMAKE_BOOL= WITH_CAIRO CAIRO_USES= gnome CAIRO_USE= gnome=cairo SDL_DESC= Build FreeRDP SDL client SDL_LIB_DEPENDS= libatk-1.0.so:accessibility/at-spi2-core \ libsoup-2.4.so:devel/libsoup \ libharfbuzz.so:print/harfbuzz \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 SDL_CMAKE_BOOL= WITH_CLIENT_SDL WITH_SDL_IMAGE_DIALOGS SDL_USES= gettext gnome sdl SDL_USE= gnome=cairo,gdkpixbuf2,glib20,gtk30,pango sdl=sdl2,ttf2,image2 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 WITH_DSP_FFMPEG GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CMAKE_BOOL= WITH_GSM GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1 GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0 CHANNEL_TSMF GSTREAMER_USES= gettext gnome gstreamer xorg GSTREAMER_USE= gnome=glib20 xorg=x11,xext,xorgproto,xrandr GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit ICU_LIB_DEPENDS= libicuuc.so:devel/icu ICU_CMAKE_ON= -DWITH_UNICODE_BUILTIN=OFF ICU_CMAKE_OFF= -DWITH_UNICODE_BUILTIN=ON JPEG_CMAKE_BOOL= WITH_JPEG JPEG_USES= jpeg LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CMAKE_BOOL= WITH_LAME MANPAGES_BUILD_DEPENDS= xmlto:textproc/xmlto MANPAGES_CMAKE_BOOL= WITH_MANPAGES NEON_DESC= Enable Media Processing Engine instructions NEON_CMAKE_BOOL= WITH_NEON OPENH264_DESC= H.264 video codec support via OpenH264 OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264 OPENH264_CMAKE_BOOL= WITH_OPENH264 OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_CMAKE_BOOL= WITH_OPUS PCSC_DESC= Smart card support (smart card device redirection) # LoadLibraryA("libpcsclite.so") PCSC_LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite PCSC_CMAKE_BOOL= WITH_PCSC PKCS11_DESC= Use security/pkcs11-helper PKCS11_BUILD_DEPENDS= ${LOCALBASE}/include/pkcs11-helper-1.0/pkcs11.h:security/pkcs11-helper PKCS11_CMAKE_BOOL= WITH_PKCS11 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 SWSCALE_DESC= Use SWScale image library for screen resizing (recommended) SWSCALE_LIB_DEPENDS= libswscale.so:multimedia/ffmpeg SWSCALE_CMAKE_BOOL= WITH_SWSCALE URIPARSER_DESC= Use uriparser RFC 3986 URI parsing library to handle URIs URIPARSER_LIB_DEPENDS= liburiparser.so:net/uriparser URIPARSER_CMAKE_BOOL= WITH_URIPARSER WAYLAND_DESC= Build FreeRDP Wayland client WAYLAND_CATEGORIES= wayland WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ wayland-scanner:graphics/wayland WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libwayland-cursor.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon WAYLAND_RUN_DEPENDS= wayland-scanner:graphics/wayland 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 .include .if ${PORT_OPTIONS:MGSSAPI_HEIMDAL} || ${PORT_OPTIONS:MGSSAPI_MIT} CMAKE_ON+= WITH_KRB5 .else CMAKE_OFF+= WITH_KRB5 .endif post-patch: @${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}/winpr/include ${CP} ${FILESDIR}/mntent_compat.c ${WRKSRC}/channels/rdpdr/client .include diff --git a/net/freerdp3/distinfo b/net/freerdp3/distinfo index c76816174b9b..7b67ffcf12d2 100644 --- a/net/freerdp3/distinfo +++ b/net/freerdp3/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1703304844 +TIMESTAMP = 1704958062 SHA256 (freerdp-3.1.0.tar.gz) = ae8f499049d6e1735dc318c258887e383f613a2ffda1d70c38326df21d40affc SIZE (freerdp-3.1.0.tar.gz) = 8462182 +SHA256 (78cdb555c57c33b7f331cb280ac2f615cb87fa74.patch) = d49ea1c5a0fdb644b32fd61479dfca6770c0bb6446bbe9d274e5ae4f62f0a00b +SIZE (78cdb555c57c33b7f331cb280ac2f615cb87fa74.patch) = 966 +SHA256 (a371309672bfb1a8de4f558422ea8e7ee08190ea.patch) = 29814af240a184665c4a6caa8ae904929324c1440581554695c0d9d034c087d2 +SIZE (a371309672bfb1a8de4f558422ea8e7ee08190ea.patch) = 697 diff --git a/net/freerdp3/files/patch-CMakeLists.txt b/net/freerdp3/files/patch-CMakeLists.txt deleted file mode 100644 index 32d51662b455..000000000000 --- a/net/freerdp3/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2024-01-05 17:52:01 UTC -+++ CMakeLists.txt -@@ -494,7 +494,7 @@ else() - unset(FREERDP_HAVE_VALGRIND_MEMCHECK_H CACHE) - endif() - --if((UNIX OR CYGWIN) AND NOT BSD) -+if(UNIX OR CYGWIN) - set(WAYLAND_FEATURE_TYPE "RECOMMENDED") - else() - set(WAYLAND_FEATURE_TYPE "DISABLED") diff --git a/net/freerdp3/files/patch-winpr_libwinpr_sysinfo_sysinfo.c b/net/freerdp3/files/patch-winpr_libwinpr_sysinfo_sysinfo.c deleted file mode 100644 index 99bd543a4f03..000000000000 --- a/net/freerdp3/files/patch-winpr_libwinpr_sysinfo_sysinfo.c +++ /dev/null @@ -1,19 +0,0 @@ ---- winpr/libwinpr/sysinfo/sysinfo.c.orig 2023-12-22 16:29:20 UTC -+++ winpr/libwinpr/sysinfo/sysinfo.c -@@ -800,13 +800,15 @@ BOOL IsProcessorFeaturePresent(DWORD ProcessorFeature) - break; - } - --#elif defined(__APPLE__) // __linux__ -+#else // __linux__ - - switch (ProcessorFeature) - { - case PF_ARM_NEON_INSTRUCTIONS_AVAILABLE: - case PF_ARM_NEON: -+#ifdef __ARM_NEON - ret = TRUE; -+#endif - break; - } -