Date: Mon, 27 Apr 2026 13:22:13 +0000 From: Koichiro Iwao <meta@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 14867172ebb2 - main - x11-drivers/xorgxrdp-devel: Add Xlibre support Message-ID: <69ef6305.32cb7.58be1372@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=14867172ebb2133f7835417da48adcd48c15da7c commit 14867172ebb2133f7835417da48adcd48c15da7c Author: Koichiro Iwao <meta@FreeBSD.org> AuthorDate: 2026-04-27 12:54:38 +0000 Commit: Koichiro Iwao <meta@FreeBSD.org> CommitDate: 2026-04-27 13:21:23 +0000 x11-drivers/xorgxrdp-devel: Add Xlibre support PR: 291596 Obtained from: https://github.com/neutrinolabs/xorgxrdp/pull/406 --- x11-drivers/xorgxrdp-devel/Makefile | 27 +++++++++++++++++++++++---- x11-drivers/xorgxrdp-devel/distinfo | 4 +++- x11-drivers/xorgxrdp-devel/pkg-plist | 16 ++++++++-------- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/x11-drivers/xorgxrdp-devel/Makefile b/x11-drivers/xorgxrdp-devel/Makefile index 70d8f1e9f5ac..d49863fe6f1c 100644 --- a/x11-drivers/xorgxrdp-devel/Makefile +++ b/x11-drivers/xorgxrdp-devel/Makefile @@ -2,12 +2,13 @@ PORTNAME= xorgxrdp DISTVERSIONPREFIX= v DISTVERSION= 0.10.80.b20260203 # Be sure to bump PORTREVISION after xorg-server update to force rebuild -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers PKGNAMESUFFIX= -devel DIST_SUBDIR= xrdp -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/ +PATCHFILES= 406.patch:-p1 MAINTAINER= meta@FreeBSD.org COMMENT= X.Org driver enabling use through an RDP session with xrdp @@ -19,18 +20,36 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= nasm:devel/nasm RUN_DEPENDS= xauth:x11/xauth -USES= autoreconf libtool:build localbase pkgconfig xorg +FLAVORS= xorg xlibre +FLAVOR?= ${FLAVORS:[1]} + +USES= autoreconf libtool:build localbase pkgconfig USE_LDCONFIG= yes -USE_XORG= xorgproto xorg-server +USE_XORG= xorgproto USE_GITHUB= yes GH_ACCOUNT= neutrinolabs GH_TAGNAME= 7abffbf GH_TUPLE= neutrinolabs:xrdp:4d9dde8:xrdp + +.if ${FLAVOR} == xlibre +PKGNAMEPREFIX= xlibre- +USES+= xlibre +USE_XLIBRE+= xlibre-server +_XLIBRE_MAJOR_VER= 25 +_XMODDIR= lib/xorg/modules/xlibre-${_XLIBRE_MAJOR_VER} +.else +USE_XORG= xorg-server +USES+= xorg +_XMODDIR= lib/xorg/modules +.endif + GNU_CONFIGURE= yes CONFIGURE_ENV= XRDP_CFLAGS=-I${WRKSRC_xrdp}/common INSTALL_TARGET= install-strip +PLIST_SUB+= XMODDIR=${_XMODDIR} + CONFLICTS= xorgxrdp OPTIONS_DEFINE= DEBUG DRI3 diff --git a/x11-drivers/xorgxrdp-devel/distinfo b/x11-drivers/xorgxrdp-devel/distinfo index c5dcf2986bc9..30ee81cb9ad9 100644 --- a/x11-drivers/xorgxrdp-devel/distinfo +++ b/x11-drivers/xorgxrdp-devel/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1770193845 +TIMESTAMP = 1777275232 SHA256 (xrdp/neutrinolabs-xorgxrdp-v0.10.80.b20260203-7abffbf_GH0.tar.gz) = a8c169cb2339c6ef2d51434b577ea827710405278b244c5c820a7e8977e6afb4 SIZE (xrdp/neutrinolabs-xorgxrdp-v0.10.80.b20260203-7abffbf_GH0.tar.gz) = 134673 SHA256 (xrdp/neutrinolabs-xrdp-4d9dde8_GH0.tar.gz) = f5655834cfe46fe2511116e560c5c4cf4ea464103415ba26f16cf9ab9563d5fe SIZE (xrdp/neutrinolabs-xrdp-4d9dde8_GH0.tar.gz) = 1282002 +SHA256 (xrdp/406.patch) = be6a29b16265585ffb465fb8dc2b4275fde0f941b20e7437e9c409b654750858 +SIZE (xrdp/406.patch) = 4941 diff --git a/x11-drivers/xorgxrdp-devel/pkg-plist b/x11-drivers/xorgxrdp-devel/pkg-plist index 298519ee70b2..049ea3d956e2 100644 --- a/x11-drivers/xorgxrdp-devel/pkg-plist +++ b/x11-drivers/xorgxrdp-devel/pkg-plist @@ -1,11 +1,11 @@ @dir /etc/X11/xrdp /etc/X11/xrdp/xorg.conf /etc/X11/xrdp/xorg_nvidia.conf -lib/xorg/modules/drivers/xrdpdev_drv.a -lib/xorg/modules/drivers/xrdpdev_drv.so -lib/xorg/modules/input/xrdpkeyb_drv.a -lib/xorg/modules/input/xrdpkeyb_drv.so -lib/xorg/modules/input/xrdpmouse_drv.a -lib/xorg/modules/input/xrdpmouse_drv.so -lib/xorg/modules/libxorgxrdp.a -lib/xorg/modules/libxorgxrdp.so +%%XMODDIR%%/drivers/xrdpdev_drv.a +%%XMODDIR%%/drivers/xrdpdev_drv.so +%%XMODDIR%%/input/xrdpkeyb_drv.a +%%XMODDIR%%/input/xrdpkeyb_drv.so +%%XMODDIR%%/input/xrdpmouse_drv.a +%%XMODDIR%%/input/xrdpmouse_drv.so +%%XMODDIR%%/libxorgxrdp.a +%%XMODDIR%%/libxorgxrdp.sohome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69ef6305.32cb7.58be1372>