From nobody Mon Jan 8 10:48:15 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 4T7rPr3NXqz57Ynq; Mon, 8 Jan 2024 10:48:16 +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 4T7rPr1GGBz4wvP; Mon, 8 Jan 2024 10:48:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704710896; 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=DK0ra2gmCFf1kHfoLzYFIkrLtU5krPaTAy+SMy8KpE4=; b=fevRhAij4iN59i0myeYlGQtSxN0nD2yPNDftYPdM5wLNkAb4/1wyrE+uixKtAh2XD64rnF /AkyMCCpTNRs6kc94S/rpkG4xKh/pB3xOhgKbEyWvyXiIoZqLJJhhOGEBJyBllnXGcu4V5 4QZ0cXLutt/gKho3b3Zb8Mud5B3UYMbAdV7t31xWQXm0hu05EqsuKnd1eaCdTfGNSMYa8A SJswxh4KC0EHopyEIEQNF9XlbIewR1+nToGxAlTfIEzIBBnxrAmedSKj9BmhLmB0mLlbm+ qXneynd+ILgCOq5bSKA3AydiRf6ShiLgMhjEH980j2Br0B79S7GaTGhoQScj5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704710896; 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=DK0ra2gmCFf1kHfoLzYFIkrLtU5krPaTAy+SMy8KpE4=; b=FZ74ypvP7Td8eURHLGDrX7cGxSiMWAOox+2ho4NXhv5W8JY19u0+FOJA46Jy6YpMxugCou xzYKugsGtTUH4S58pvKq46Uv687mdYdMFOTdcrsbgV0a1KEUrs+HE4IYC14ViyVzzobxV5 LorLgvGV+n0ArVJLFUxrEYH9pnnY9rlZb0LKt61XJ2rzCSd34bvM4eseLdQBRJ1XNY3zOL 3wLiCdBcbY2SFYQOec9iHV3lFzZ4dbJte1goS8cVU6pvLDp3kMRVCxr4YIVZ9egd4bJoLx HcTITgmJDrhmJdqi8viQpiVthNHxTEz4nHAxpYA7OPlLq7aNSDAIf2BAKhrgZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704710896; a=rsa-sha256; cv=none; b=YQoUY4oQgmQclOKUJgCHUV5UBwEJwUDywahVd7c37IQwWCHvq+Bbglk1hnamtm6U5AEpZb sCrtL4SYXYH+T+OJEAq6mb77k4E4q3KMUYGmtR612toi5LEEN0K8QIy7yXGHvJ+g0/fpuX AgyoLNUoP4c5mRVxJgRsxncXb+8KiuT2VlzvDktMFW1kYroOj8ftC8N+Tzj6vnjGKF2zJj gVfzWcnINDqkfUU4FXhx0Y+UQgF8vHTwn1sZ8+895+PGYzKvSojKyi+tnc42GO2FhzMkcI H2ygXbaKGMmI9FGfJC3hvwUS4WBplxNg95dvrp9T+crnGdtCekTEGEd1J3P86g== 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 4T7rPr0L76z14Lf; Mon, 8 Jan 2024 10:48:16 +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 408AmFvC030779; Mon, 8 Jan 2024 10:48:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 408AmFMR030776; Mon, 8 Jan 2024 10:48:15 GMT (envelope-from git) Date: Mon, 8 Jan 2024 10:48:15 GMT Message-Id: <202401081048.408AmFMR030776@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: 6a76108e97e5 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 6a76108e97e58728da3fb3905098eb66938543cf Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a76108e97e58728da3fb3905098eb66938543cf commit 6a76108e97e58728da3fb3905098eb66938543cf Author: Vladimir Druzenko AuthorDate: 2024-01-08 10:12:08 +0000 Commit: Vladimir Druzenko CommitDate: 2024-01-08 10:47:39 +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 --- 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); }