From nobody Mon Jan 8 10:52:34 2024 X-Original-To: dev-commits-ports-all@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 4T7rVp4wrPz55Lbd; Mon, 8 Jan 2024 10:52:34 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T7rVp3ckGz4xK7; Mon, 8 Jan 2024 10:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704711154; 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=wU37Ej0nASNqSIX9JwOHhNPSP5M5T80OpIztBQUl+5o=; b=Y6ESZD5RSndau8ipBa29W9R9iyL53sR0azi7f0r8MywkDXxVQYVT1PdTWZsccYrkWDKyg9 JHtpp/0+eSBQWrV5KQvDEKGvQ0ZZqt8BN62n71IN5wLE4pprTheXn87q3Bh8qxeIKFM6hK bX/4ICJPnN1tbLZIqalBJjjV4noyNhzxC2J8Mwq+P6xovTZHDK/1RpU57lvzlGt6Na7Pkx zdylkOuuyszhoSXmITQiycd4s9fdjHuPxvReV5CGY0Ew8rfcPwCwVB0hFKm40ziUmGyaH/ BW7VxTm+GKTwiJAq22EaUuYTWe/hlfXbDi+p1x2wBf+gQwWR4xOMOFWMcuyzuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704711154; 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=wU37Ej0nASNqSIX9JwOHhNPSP5M5T80OpIztBQUl+5o=; b=Dmg/m8DEVpaRsvjR0lAgnmDFunNPKt097DDY+1jFv/hYzrV42qZX+ZHcPCi81YX8fEv25E 3Uq8PtjsIMJSFbjuJA8XwLkpeBLjbq2Wwb5dOFCRfrL0cSyW02H7F9lCoL0y5qkW/C2oOT 7ixKDoIC5gA2U0WObCvatkkdRU5V9y+q2+O8jggV1y006AozsEjoy4ZJjzNDALPnQ07Cyg IqAQALpzBdbIVos1FNmEIvUiPcuFQ9gz2d5HI/unv2kVl+OjPIugbCC1CiF0hVS8WbCFmd PmlZzP1tL1RM81XWmFvPL4Cc+5Z0ghjEus/NI5GPPNcC95HGckKMyI0lsybr1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704711154; a=rsa-sha256; cv=none; b=sEaq5PW4NjQToQ38GK+g54q1QWIU8ByQLOzdZh63V2hrnmLvgInEeb8ieKFSn3id7M3UU4 yueBPNyaoE+H26zF9fxq6A54NaSjxqIG6SGHwCYYTwmC4aXD9Cad1vuYm3Oq1LgDOxesok kDMl9qI8TYwz/QKYocNjgOFqvViAxiBbC66uvslc7tvSkH1MBmYTl4sDSmkzPtyG5rEIn9 sg3UeG7wZybFD1JXfAFuDUCn26P8yf+s6YZ4Miw3kv7KsTPr5sqvMeOqDfueJIytVMH6+M 5y77ZMhc9tKalcWNyGrsdG891I+vBQf0So15j23C9VeS2ygR4dTZ7BiGJKVQBw== 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 4T7rVp2QwFz14Zt; Mon, 8 Jan 2024 10:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 408AqYGK046795; Mon, 8 Jan 2024 10:52:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 408AqYgC046792; Mon, 8 Jan 2024 10:52:34 GMT (envelope-from git) Date: Mon, 8 Jan 2024 10:52:34 GMT Message-Id: <202401081052.408AqYgC046792@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 1719e290f6d2 - 2024Q1 - net/freerdp: use GNOME helper for cairo, make NEON default option for armv7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2024Q1 X-Git-Reftype: branch X-Git-Commit: 1719e290f6d22acdac7ca9895d70184a47a2ac32 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=1719e290f6d22acdac7ca9895d70184a47a2ac32 commit 1719e290f6d22acdac7ca9895d70184a47a2ac32 Author: Vladimir Druzenko AuthorDate: 2024-01-08 10:12:08 +0000 Commit: Vladimir Druzenko CommitDate: 2024-01-08 10:52:14 +0000 net/freerdp: use GNOME helper for cairo, make NEON default option for armv7 And remove unnessecary tabs in files/mntent_compat.c Approved by: arrowd (mentor, implicit) MFH: 2024Q1 (cherry picked from commit 6a76108e97e58728da3fb3905098eb66938543cf) --- net/freerdp/Makefile | 8 +++++--- net/freerdp/files/mntent_compat.c | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile index f33ad9a3b578..3700f7448b58 100644 --- a/net/freerdp/Makefile +++ b/net/freerdp/Makefile @@ -1,6 +1,6 @@ PORTNAME= freerdp DISTVERSION= 2.11.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net comms MASTER_SITES= https://pub.freerdp.com/releases/ \ https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/ @@ -47,12 +47,13 @@ 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_amd64= SSE OPTIONS_DEFINE_i386= SSE OPTIONS_DEFAULT_aarch64= NEON OPTIONS_DEFAULT_amd64= SSE +OPTIONS_DEFAULT_armv7= NEON ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= WITH_ALSA @@ -61,8 +62,9 @@ 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_LIB_DEPENDS= libcairo.so:graphics/cairo CAIRO_CMAKE_BOOL= WITH_CAIRO +CAIRO_USES= gnome +CAIRO_USE= gnome=cairo CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_CMAKE_BOOL= WITH_CUPS diff --git a/net/freerdp/files/mntent_compat.c b/net/freerdp/files/mntent_compat.c index 6169936f2a46..076f5c4cabeb 100644 --- a/net/freerdp/files/mntent_compat.c +++ b/net/freerdp/files/mntent_compat.c @@ -139,7 +139,7 @@ static struct mntent * statfs_to_mntent (struct statfs *mntbuf) { static char opts_buf[40], *tmp; - + _mntent.mnt_fsname = mntbuf->f_mntfromname; _mntent.mnt_dir = mntbuf->f_mntonname; _mntent.mnt_type = mntbuf->f_fstypename; @@ -151,7 +151,7 @@ statfs_to_mntent (struct statfs *mntbuf) } else { *opts_buf = '\0'; } - _mntent.mnt_opts = opts_buf; + _mntent.mnt_opts = opts_buf; _mntent.mnt_freq = _mntent.mnt_passno = 0; return (&_mntent); }