Date: Wed, 04 Feb 2026 00:12:51 +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: d04570a49aa2 - main - x11-drivers/xorgxrdp: Add Xlibre support Message-ID: <69828f03.21cc3.459eb6@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=d04570a49aa2f481e88000ec58a5e34900c62a63 commit d04570a49aa2f481e88000ec58a5e34900c62a63 Author: Koichiro Iwao <meta@FreeBSD.org> AuthorDate: 2026-02-03 23:34:52 +0000 Commit: Koichiro Iwao <meta@FreeBSD.org> CommitDate: 2026-02-03 23:42:25 +0000 x11-drivers/xorgxrdp: Add Xlibre support PR: 291595 --- x11-drivers/xorgxrdp/Makefile | 32 +++++++++++++++++++++++++++++--- x11-drivers/xorgxrdp/distinfo | 10 +++++++++- x11-drivers/xorgxrdp/pkg-plist | 16 ++++++++-------- 3 files changed, 46 insertions(+), 12 deletions(-) diff --git a/x11-drivers/xorgxrdp/Makefile b/x11-drivers/xorgxrdp/Makefile index 424a5068c1c5..16ddaecc65a8 100644 --- a/x11-drivers/xorgxrdp/Makefile +++ b/x11-drivers/xorgxrdp/Makefile @@ -9,7 +9,12 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ xrdp-${XRDPVER}${EXTRACT_SUFX}:xrdp DIST_SUBDIR= xrdp -PATCH_SITES= https://github.com/neutrinolabs/${GH_PROJECT}/commit/ +PATCH_SITES= https://github.com/neutrinolabs/${PORTNAME}/commit/:commit \ + https://github.com/neutrinolabs/${PORTNAME}/pull/:pull +PATCHFILES+= f5a07e9.patch:-p1:commit +PATCHFILES+= e1c82b4.patch:-p1:commit +PATCHFILES+= 1c93081.patch:-p1:commit +PATCHFILES+= 58e6a64.patch:-p1:commit MAINTAINER= meta@FreeBSD.org COMMENT= X.Org driver enabling use through an RDP session with xrdp @@ -21,11 +26,30 @@ 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= xorg-server xorgproto +USE_XORG= xorgproto + +.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 XRDPVER= 0.10.5 +# xorg: /usr/local/lib/xorg/modules +# xlibre: /usr/local/lib/xorg/modules/xlibre-25 +# This works but != should be avoided +#_XMODDIR!= pkgconf --variable moduledir xorg-server | sed -e "s|^${LOCALBASE}/||" GNU_CONFIGURE= yes CONFIGURE_ENV= XRDP_CFLAGS=-I${WRKDIR}/xrdp-${XRDPVER}/common @@ -33,6 +57,8 @@ INSTALL_TARGET= install-strip CONFLICTS= xorgxrdp-devel +PLIST_SUB+= XMODDIR=${_XMODDIR} + OPTIONS_DEFINE= DEBUG DRI3 OPTIONS_DEFAULT= DRI3 diff --git a/x11-drivers/xorgxrdp/distinfo b/x11-drivers/xorgxrdp/distinfo index 5858791069ac..d53c0cdcd914 100644 --- a/x11-drivers/xorgxrdp/distinfo +++ b/x11-drivers/xorgxrdp/distinfo @@ -1,5 +1,13 @@ -TIMESTAMP = 1769741676 +TIMESTAMP = 1769996124 SHA256 (xrdp/xorgxrdp-0.10.5.tar.gz) = a5d03435f0ef48bf3d5010e63d9264f2334e7063cba3ecd8d4c0a15616a4f712 SIZE (xrdp/xorgxrdp-0.10.5.tar.gz) = 521964 SHA256 (xrdp/xrdp-0.10.5.tar.gz) = 9abc96d164de4b1c40e2f3f537d0593d052a640cf3388978c133715ea69fb123 SIZE (xrdp/xrdp-0.10.5.tar.gz) = 2489216 +SHA256 (xrdp/f5a07e9.patch) = 7d925e388ea1c95e251cf99acb3c0819de312e30297bd8751f740f6708f167d3 +SIZE (xrdp/f5a07e9.patch) = 1200 +SHA256 (xrdp/e1c82b4.patch) = 978d3b9231a6d596d154c57b7400cfc4ea5587d9e995689672dba4a880dbef63 +SIZE (xrdp/e1c82b4.patch) = 1144 +SHA256 (xrdp/1c93081.patch) = 6f1579261b52ddc53fbf3a6974ea5cb32e0102c5abe134d4c7575d6df564a609 +SIZE (xrdp/1c93081.patch) = 745 +SHA256 (xrdp/58e6a64.patch) = bcbe7d6a862ee297ffd3ca380628f15fe1072ffff5e9a54efe0613cf142b4c9c +SIZE (xrdp/58e6a64.patch) = 687 diff --git a/x11-drivers/xorgxrdp/pkg-plist b/x11-drivers/xorgxrdp/pkg-plist index 8170631330d8..fd0e244f6f33 100644 --- a/x11-drivers/xorgxrdp/pkg-plist +++ b/x11-drivers/xorgxrdp/pkg-plist @@ -1,10 +1,10 @@ @dir /etc/X11/xrdp /etc/X11/xrdp/xorg.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?69828f03.21cc3.459eb6>