From nobody Mon Apr 27 13:22:13 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 4g443n56xdz6b5X6 for ; Mon, 27 Apr 2026 13:22:13 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g443n10WHz4PsP for ; Mon, 27 Apr 2026 13:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777296133; 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=hC2PgoyEN8+AxJT+2mj+c4syGbRgoga0y57ehiocFT8=; b=CGeRm4rb+4YliCDkeUDPoHgQfeol+rzCPOQ3FezLF+OyfKpVgqbCNWnY9Moes66SRx4Vxt 1sN/oW03nj7Cz+2XP9pYqlO7R/gzgLg1+s3i2G44aUfXuSaLzbV6dHpgadMQLlwiULfCs4 QcEsYe5eDsGmjSi8JQKW2dNWrEAwtKqv6Bt9GCfEKrHIx3se8p5NozWE3VVv+mlVQE4yu/ 4v4gL83DK7RdDPqZCwlPA7CSIV26VD8SzGKCWxAgFM6DH99w4PF2zqiczzatBKiYZvz8n5 1I0NZN0u5iFfi3p4++9myZIXMRxBJRg3b/mU891zXLcIcl6CfYIPxadsMD2nnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777296133; a=rsa-sha256; cv=none; b=HMwFg3RJMThQ3XRpUWcmiu4rkfM7tdaG9KupanzsJTEE5A31aJDnqnaYmoB30cTPcwsnjg yh35yfYjaTk9dmUJ/eT0E3IDHd6awRnVR4ItU3kPv9K1WOgBEZGtULqXNFynnunUWr4VE1 b08l0hMcJ49GBxm9S92VQ1fAchIm82zn8Rb4B2iKGHxVfAL0K/CVDbeWV9FkCuzVWhj4F0 23Tq5/temW4mnHdP34jNg+Rk0nfzUHTY2zaIM8XS2XdkFada6QJVWxrvdFt+zxttnnP0II BmksIGaNG1pbuXT//3GM3tu+poaD8rasbaqFoE5SpRqok0bfglud40l+bSXWdg== 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=1777296133; 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=hC2PgoyEN8+AxJT+2mj+c4syGbRgoga0y57ehiocFT8=; b=i5dgMsDSYTpHlZI+itg24k620cV2qZAT2JG3BrROFuu6i/zxLI+3+gsJSV5ZZdF5+6sCrv xXsaTFpBHOAZI2YLRse3ufPVwYNn44cLShGXip1COtDA7dGXtP/DcwzxeII9Ul8nRG/2w3 6b/eRcoA9P8TUEsP/bY/CqU3UeBMgyAMRLfsh+ay25N8vV2Lo8lXsRu0S+M2hDZeSZvhQe eKOaqRjsAn8ZDFpSgvKR4iuX0srl7B8uCA3sZVZMVzGHfGHPPIzzVqLeb9aClAL2YxgSbA +fi2T7unWhtk7yheToqBX2vnkK6MO5+1uxVOxdUVt/ODgoWmeAhkiRNyx6OwSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g443n0bxjz185Y for ; Mon, 27 Apr 2026 13:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32cb7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Apr 2026 13:22:13 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Koichiro Iwao Subject: git: 14867172ebb2 - main - x11-drivers/xorgxrdp-devel: 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: 14867172ebb2133f7835417da48adcd48c15da7c Auto-Submitted: auto-generated Date: Mon, 27 Apr 2026 13:22:13 +0000 Message-Id: <69ef6305.32cb7.58be1372@gitrepo.freebsd.org> The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=14867172ebb2133f7835417da48adcd48c15da7c commit 14867172ebb2133f7835417da48adcd48c15da7c Author: Koichiro Iwao AuthorDate: 2026-04-27 12:54:38 +0000 Commit: Koichiro Iwao 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.so