Skip to content

Commit

Permalink
net/freerdp: use GNOME helper for cairo, make NEON default option for…
Browse files Browse the repository at this point in the history
… armv7

And remove unnessecary tabs in files/mntent_compat.c

Approved by:	arrowd (mentor, implicit)
MFH:		2024Q1

(cherry picked from commit 6a76108)
  • Loading branch information
VVD committed Jan 8, 2024
1 parent 10579b0 commit 1719e29
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
8 changes: 5 additions & 3 deletions net/freerdp/Makefile
Original file line number Diff line number Diff line change
@@ -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}/
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions net/freerdp/files/mntent_compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}
Expand Down

0 comments on commit 1719e29

Please sign in to comment.