From nobody Fri Feb 07 22:09:11 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YqSml1kFwz5my6l; Fri, 07 Feb 2025 22:09:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YqSml1Cqdz3gnG; Fri, 07 Feb 2025 22:09:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738966151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gzVxhEGxzfWeqtpGszwuaELJmLnJD5DiOknrPQ/MGaE=; b=AoSoxhs+C212RGfNKeuyxOv3viWfEhVoiX1PIn/Emr3NDeO3mCM86Id5RldjMl2FtviCRA NjFtcESmJ1X8rFySk1o97/6Wy0Tg8deWVl/Nr94O12p2/Y6UpOsPzZ/1vmkdK2dYdgGpfK HWcWH3py48zg0Tj32dkph269RkiDoNddj9xg2Ir2Q8g9MlorLC7l0huvW/aGdE5qRMKa76 QDwNp+hheakbT7CFrd51Ad6QcyriBFOHtnwJqWygIsieDdYnJpgBkIbQeEEgCNJvHTkMuP LnLA7lF+t0uQitE161sddjvI/b31+0ISZEerDb7sz27ytHcsnx/1dCk+Ag7YQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738966151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gzVxhEGxzfWeqtpGszwuaELJmLnJD5DiOknrPQ/MGaE=; b=qAh1DJECJQXQaMWoq5WGRpmFwxHJ0SX75UW0rn6h+R5t3xyWpCkBwZKo5eKJnHhQGfuPIK 2bv2hbifk4Mi79ZPCcrrEGVokLln0Cl031X9YlMXzVaVKAdq5N9SxOGp3+8bnhjFtYHp1O /GjF0oIt9LP+/IVHVdnX19ufMJNCLqBYqEkjdftqR66Dz0Jiy5GAgImYZM2Q30RBP4QZvX 0PqcVK23NxX/fBbZqoAtE2n0LnxrnluoowkaJEMCrOIdE/WbQICT/j+lxjJsD3tNM1MiSP Yis5UMQGttv5oBG2U/X5oyF9q+4gFj878c1Fywz+xVChIpFGp/XueiIIfXfrQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738966151; a=rsa-sha256; cv=none; b=qvCEC29oCLliwVdowzlaE5XZNkgPtsZ3iZMh5CiGc9SBWAdrVvrQk9IVK6UThGJ+SI5VPj 7lwnjK3l1jungXTSDqi6ubh4uIENQF8VCW0PYj6FQeRN5XPhs+RI+McDRtugOVKzgb3DFs ddfXNzvNSY5vRsxBDb4R4SAhNK4QDEuKUdUv39kTyFmOLC3fK2wpn8oypWv9iew37K5thP k1AH/jI15QZ1FcZCL0WO7yfy1HVMcDR1+wDq9k5Ud6bLZ84OkfQLij9Bno4npVlLVMXKqf ioe5L8pVgf0HSHzWVCqD3Ssbg/URoRkgXhQztxJOAyfvjch9fqjxxRo9e31YkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YqSml0dPjzk7b; Fri, 07 Feb 2025 22:09:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 517M9B52037618; Fri, 7 Feb 2025 22:09:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 517M9BWC037615; Fri, 7 Feb 2025 22:09:11 GMT (envelope-from git) Date: Fri, 7 Feb 2025 22:09:11 GMT Message-Id: <202502072209.517M9BWC037615@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 994addd0a939 - main - net/freerdp3: Add build SDL 3 client List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 994addd0a939f8ea313d99c7d4718b5f36e5c34d Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=994addd0a939f8ea313d99c7d4718b5f36e5c34d commit 994addd0a939f8ea313d99c7d4718b5f36e5c34d Author: Vladimir Druzenko AuthorDate: 2025-02-07 22:02:03 +0000 Commit: Vladimir Druzenko CommitDate: 2025-02-07 22:02:03 +0000 net/freerdp3: Add build SDL 3 client --- net/freerdp3/Makefile | 23 +++++++++++++++-------- net/freerdp3/pkg-plist | 12 ++++++++---- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/net/freerdp3/Makefile b/net/freerdp3/Makefile index bfc753efee94..6018cd5c6864 100644 --- a/net/freerdp3/Makefile +++ b/net/freerdp3/Makefile @@ -1,5 +1,6 @@ PORTNAME= freerdp DISTVERSION= 3.11.1 +PORTREVISION= 1 CATEGORIES= net comms MASTER_SITES= https://pub.freerdp.com/releases/ \ https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/ @@ -25,7 +26,8 @@ USE_XORG= ice sm x11 xext CMAKE_ON= CHANNEL_SERIAL CHANNEL_URBDRC_CLIENT RDTK_FORCE_STATIC_BUILD \ UWAC_FORCE_STATIC_BUILD WITH_BINARY_VERSIONING WITH_CHANNELS \ - WITH_FREERDP_DEPRECATED WITH_FREERDP_DEPRECATED_COMMANDLINE \ + WITH_CLIENT_SDL_VERSIONED WITH_FREERDP_DEPRECATED \ + WITH_FREERDP_DEPRECATED_COMMANDLINE \ WITH_INSTALL_CLIENT_DESKTOP_FILES WITH_OPENSSL WITH_OSS \ WITH_WINPR_DEPRECATED WITH_ZLIB CMAKE_OFF= CHANNEL_TSMF WITH_DSP_EXPERIMENTAL WITH_FUSE WITH_GPROF \ @@ -40,13 +42,13 @@ PLIST_SUB+= MAJORVERSION="${DISTVERSION:R:R}" OPTIONS_DEFINE= ALSA BROKENFOCUS CUPS FAAC FAAD FDKAAC FFMPEG GSM ICU \ JPEG LAME MANPAGES OPENH264 OPUS PCSC PKCS11 \ - PULSEAUDIO SDL SOXR URIPARSER WAYLAND X11 + PULSEAUDIO SDL2 SDL3 SOXR URIPARSER WAYLAND X11 OPTIONS_DEFINE_aarch64= SIMD OPTIONS_DEFINE_amd64= SIMD OPTIONS_DEFINE_armv7= SIMD OPTIONS_DEFINE_i386= SIMD OPTIONS_DEFAULT= AAD CUPS GSSAPI_HEIMDAL ICU JSON_C KEYBOARD_LAYOUT \ - MANPAGES SDL SWSCALE TIMEZONE_FILE WAYLAND WEBKIT X11 + MANPAGES SDL2 SDL3 SWSCALE TIMEZONE_FILE WAYLAND WEBKIT X11 OPTIONS_DEFAULT_aarch64= SIMD OPTIONS_DEFAULT_amd64= SIMD OPTIONS_DEFAULT_armv7= SIMD @@ -72,7 +74,8 @@ OPENH264_DESC= H.264 video codec support via OpenH264 PCSC_DESC= Smart card support (smart card device redirection) PKCS11_DESC= Use security/pkcs11-helper REQUIRE_JSON_DESC= Options that require JSON -SDL_DESC= Build FreeRDP SDL client +SDL2_DESC= Build FreeRDP SDL 2 client +SDL3_DESC= Build FreeRDP SDL 3 client SWSCALE_DESC= Use SWScale image library for screen resizing (recommended) TIMEZONE_FILE_DESC= Support timezones as JSON resources (if OFF, compiled in is used) URIPARSER_DESC= Use uriparser RFC 3986 URI parsing library to handle URIs @@ -80,7 +83,7 @@ WAYLAND_DESC= Build FreeRDP Wayland client WEBVIEW_DESC= Build with WebView support for AAD login popup browser X11_DESC= Build FreeRDP X11 client -AAD_IMPLIES= SDL +AAD_IMPLIES= SDL3 AAD_CMAKE_BOOL= WITH_AAD ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib @@ -157,9 +160,13 @@ PNG_CMAKE_BOOL= WINPR_UTILS_IMAGE_PNG PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= WITH_PULSE -SDL_USES= sdl -SDL_USE= sdl=sdl2,ttf2,image2 -SDL_CMAKE_BOOL= WITH_CLIENT_SDL WITH_SDL_IMAGE_DIALOGS +SDL2_USES= sdl +SDL2_USE= sdl=sdl2,ttf2,image2 +SDL2_CMAKE_BOOL= WITH_CLIENT_SDL2 WITH_SDL_IMAGE_DIALOGS + +SDL3_USES= sdl +SDL3_USE= sdl=sdl3,ttf3,image3 +SDL3_CMAKE_BOOL= WITH_CLIENT_SDL3 WITH_SDL_IMAGE_DIALOGS SIMD_CMAKE_BOOL= WITH_SIMD diff --git a/net/freerdp3/pkg-plist b/net/freerdp3/pkg-plist index 224b4f749f03..cfc687a900d0 100644 --- a/net/freerdp3/pkg-plist +++ b/net/freerdp3/pkg-plist @@ -1,6 +1,7 @@ bin/winpr-hash%%MAJORVERSION%% bin/winpr-makecert%%MAJORVERSION%% -%%SDL%%bin/sdl-freerdp%%MAJORVERSION%% +%%SDL2%%bin/sdl2-freerdp%%MAJORVERSION%% +%%SDL3%%bin/sdl3-freerdp%%MAJORVERSION%% %%WAYLAND%%bin/wlfreerdp%%MAJORVERSION%% %%X11%%bin/xfreerdp%%MAJORVERSION%% include/freerdp%%MAJORVERSION%%/freerdp/addin.h @@ -291,12 +292,15 @@ libdata/pkgconfig/winpr-tools%%MAJORVERSION%%.pc libdata/pkgconfig/winpr%%MAJORVERSION%%.pc %%JSON%%%%KEYBOARD_LAYOUT%%share/FreeRDP/KeyboardLayoutMap.json %%JSON%%%%TIMEZONE_FILE%%share/WinPR/TimeZoneNameMap.json -%%SDL%%share/applications/sdl-freerdp%%MAJORVERSION%%-file.desktop -%%SDL%%share/applications/sdl-freerdp%%MAJORVERSION%%.desktop +%%SDL2%%share/applications/sdl2-freerdp%%MAJORVERSION%%-file.desktop +%%SDL2%%share/applications/sdl2-freerdp%%MAJORVERSION%%.desktop +%%SDL3%%share/applications/sdl3-freerdp%%MAJORVERSION%%-file.desktop +%%SDL3%%share/applications/sdl3-freerdp%%MAJORVERSION%%.desktop %%X11%%share/applications/xfreerdp%%MAJORVERSION%%-file.desktop %%X11%%share/applications/xfreerdp%%MAJORVERSION%%.desktop share/icons/hicolor/scalable/apps/FreeRDP.svg -%%SDL%%%%MANPAGES%%share/man/man1/sdl-freerdp%%MAJORVERSION%%.1.gz +%%SDL2%%%%MANPAGES%%share/man/man1/sdl2-freerdp%%MAJORVERSION%%.1.gz +%%SDL3%%%%MANPAGES%%share/man/man1/sdl3-freerdp%%MAJORVERSION%%.1.gz %%MANPAGES%%share/man/man1/winpr-hash%%MAJORVERSION%%.1.gz %%MANPAGES%%share/man/man1/winpr-makecert%%MAJORVERSION%%.1.gz %%WAYLAND%%%%MANPAGES%%share/man/man1/wlfreerdp%%MAJORVERSION%%.1.gz