From nobody Wed Feb 4 00:12:51 2026 X-Original-To: dev-commits-ports-main@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 4f5LQq2xhtz6QxVP for ; Wed, 04 Feb 2026 00:12:51 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5LQq0l1Fz3Fxk for ; Wed, 04 Feb 2026 00:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770163971; 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=/verJ1EpBp/Inv5txWBFlXbwYzEUY51p8GMCTALsU6k=; b=RLyI0R5ZyFHmxLeEi1+vEYybfm64g+RnTnm6NjvhUQjTCHRmu97Vw+XfCeXexeY0EhPBp2 JuYjFiaw0i+/UAk9f4TT/Qgt07zaZL718Ieshe33CIZJmsQA+foEDT00xOT4mZzil+f8Ud WJoad6vfBy1NfLCTJtKrPZs2VKWbunHWVw1rA+wly0VBrzYz0AMhs8gpLq38OOrJB7OsQM C6l1ccxZTBReWdRVYz5bJJ23i0rolVLuOlPrzWj/Wb/zoV+FwTHQpqssP3WVUl36iu1ied eWK1Y6cOsF6ao9my/HW6k3vqdzrS5zqHyzow1kGGE7Of3x4S6IBQjRegXQTPwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770163971; a=rsa-sha256; cv=none; b=AwYsooBG0wngxJL5z7qcXrNqcSf3OSrcpWFrSdSgTxJh/YZ0e8yjM+jgDDeJbUiPHz63JF YBPc6fzxa1ki6uVDT4zDQX00PQ71jTm36aruRAywHSZ+iN5mj5GerCr8S/uPxM3jxBnRXq pvPZBargpROUey9r6ZGeJrhNXi5RKJSnJVk0zQ+MZyTubvb4tA64yMTOZPGkUwLHcGhrz8 I49M5epEw1+ZtrBpaB/mIY6FoWMwcmTOL3TuSDmrVgSuHFauPxWvQ20Vgr3g7wJg6OmZkl ec42dzs9uzRCmcWeEdStCQId4k8wlvemvG44lWtT3urxlAih1nYqUk41r1MJ+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770163971; 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=/verJ1EpBp/Inv5txWBFlXbwYzEUY51p8GMCTALsU6k=; b=sn5bmYnVyKmVytQKHJ6QdC5FdvSJQeD0hK5YkXVPEqdgrcmW0vMouolcbgLkjRYt/b/uX8 2DUZCREPbIWYgL62XVBF4rCSF/EItBf+zpeYHbOcqydre/rhv8+Ds/4RpXgo5KBEtF7oW+ SVtprPZbG4EZI7TG8+bl4I18vEOW7oROiZDZw3uICiaYlNgKRpxbSAvIxAT93sYx9ZHSHX JqNN/jYNGqFFHefrGlJZEspodYSWzT8ghyYW94LMtc0Q/oWd0/ZDK/2/jYcgl1DGzMzzFt GYR7CDCeIwC+weW9qOTy0yXRx2lBoAyZML9tEiAcvN/4iLGUildlRo9/jOQsyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5LQq0HnBzcHB for ; Wed, 04 Feb 2026 00:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21cc3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Feb 2026 00:12:51 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Koichiro Iwao Subject: git: d04570a49aa2 - main - x11-drivers/xorgxrdp: Add Xlibre support List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: meta X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d04570a49aa2f481e88000ec58a5e34900c62a63 Auto-Submitted: auto-generated Date: Wed, 04 Feb 2026 00:12:51 +0000 Message-Id: <69828f03.21cc3.459eb6@gitrepo.freebsd.org> The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=d04570a49aa2f481e88000ec58a5e34900c62a63 commit d04570a49aa2f481e88000ec58a5e34900c62a63 Author: Koichiro Iwao AuthorDate: 2026-02-03 23:34:52 +0000 Commit: Koichiro Iwao 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.so