aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Druzenko <vvd@FreeBSD.org>2024-01-08 13:12:08 +0300
committerVladimir Druzenko <vvd@FreeBSD.org>2024-01-08 13:47:39 +0300
commit6a76108e97e58728da3fb3905098eb66938543cf (patch)
tree13373282607397013e3556db26f7783c2b003d2d
parente046bb89faca19596d35a8c285527b26c3a92e28 (diff)
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
-rw-r--r--net/freerdp/Makefile8
-rw-r--r--net/freerdp/files/mntent_compat.c4
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);
}