From nobody Wed Apr 02 07:30:18 2025
X-Original-To: dev-commits-ports-all@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 4ZSGjk3pVlz5rcQW;
Wed, 02 Apr 2025 07:30:18 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4ZSGjk2ZCmz45XX;
Wed, 02 Apr 2025 07:30:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1743579018;
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=VZ7pH6uPTHS1Q6ypedVXkFXDyyMrCyFk4oK+5Vl4Ty4=;
b=ue0xwVR662ywrMlm+4+3XyPU99vpOFARC1rbz9f+IAe+pvjfttVvDD6k/Wxed5vGX+xWHK
owI3I8BTGe5YUrM8H8X58IE7l/j42aQ7MCC5HoeBDgrnPaisu9EmITZEJL8eXAWYu0esJM
bEODnwu+kaI0SAOZPHm7ZfD51iOzmbpDK5A3P8vEh4QANrrKn+3x1QVQqNEHBq65YyPbUT
WgHEO6/cYt7vwrhSP9tDsImlvtlf43M/wE5czHjdwV+w2kW6KvYCmff28CxGTzhvPrmBFT
CzY8wHqDKGDW0TE7Cz2cqApNFo+wdzM3nMnwlG0SgyE1mkuEPBLfU0rWM0du8w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743579018; a=rsa-sha256; cv=none;
b=jc2nFT9g/J9zmSigpYH1us8RgGjr2mxKs+fQ2dj1jH+0N4hjFosU1vfreHKpCP81uHNcxd
76i/h/H8/QLNoB5kaJkq7lruT/pkwRlflRiRgxra8WR0O3BGY2GiG5Ef9e5RX4Fr83U2Bn
UTUyOq/9w/sEuY0YGfhhHfmvUYkMSljtXiYfD6AzIXOXzzHVSMAa3YZ17E8wd0veZvOHqM
l1VeMwb9Ov1Hjw9vMdAvFBAfyKvdoPIKFVJhZDf7z6CrUquL1wvmoDGnP8mgfEAPJk0MJe
HtE1lJp9jXaS4AGrPbKZBmqUrmulGwzto1iyK2xb2OnG5EQ9ciyHR7Mg+BpTwA==
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=1743579018;
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=VZ7pH6uPTHS1Q6ypedVXkFXDyyMrCyFk4oK+5Vl4Ty4=;
b=Elfdw2tCWB5igu983YAWIenI7GVl8IOAPbM+yzDquLl+o63K1cuU5a0+h94L56qJm+JaCa
Uk1ucVZS4k1j7pJl8Gco1WDBd7Bc7SQn4K6CU4AAeTinc9gTZsRX7iPZkKtzY3zkae8kyM
dg0df7PK8lAthV6X154oMm9L6CZPyHhdsvvbWdP1nYgQRtGgQf1Yt4EzT+jDeQeP7xV/Ku
C7hQzJ4/gzZ/vy0YWkAoIcaH0LYQPgkrrglz0wt/nbSvlKLbcpogqImWavhHsidEwtCqMt
70PfC0uwzrvnh85qH060RnlGzMqiDvIcp+G/k3dck09P2kcEYhQM+j8fLUNYhw==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZSGjk1vWcz15kp;
Wed, 02 Apr 2025 07:30:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5327UIG1093354;
Wed, 2 Apr 2025 07:30:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5327UImP093346;
Wed, 2 Apr 2025 07:30:18 GMT
(envelope-from git)
Date: Wed, 2 Apr 2025 07:30:18 GMT
Message-Id: <202504020730.5327UImP093346@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Koichiro Iwao
Subject: git: 687b2f44b3ef - main - x11-drivers/xorgxrdp: Fix build
with pkg 2.1.0
List-Id: Commit messages for all branches of the ports repository
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help:
List-Post:
List-Subscribe:
List-Unsubscribe:
X-BeenThere: dev-commits-ports-all@freebsd.org
Sender: owner-dev-commits-ports-all@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: 687b2f44b3eff4d8d7579c78b48845a2ae69c99b
Auto-Submitted: auto-generated
The branch main has been updated by meta:
URL: https://cgit.FreeBSD.org/ports/commit/?id=687b2f44b3eff4d8d7579c78b48845a2ae69c99b
commit 687b2f44b3eff4d8d7579c78b48845a2ae69c99b
Author: Koichiro Iwao
AuthorDate: 2025-04-02 07:17:06 +0000
Commit: Koichiro Iwao
CommitDate: 2025-04-02 07:29:51 +0000
x11-drivers/xorgxrdp: Fix build with pkg 2.1.0
Fix suggested by bapt.
While here, reformat Makefile with portfmt, and pet portclippy.
PR: 285815
Reported by: Anton Saietskii
Sponsored by: Cybertrust Japan
---
x11-drivers/xorgxrdp/Makefile | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/x11-drivers/xorgxrdp/Makefile b/x11-drivers/xorgxrdp/Makefile
index 07e2d506d8be..22e8929cce3c 100644
--- a/x11-drivers/xorgxrdp/Makefile
+++ b/x11-drivers/xorgxrdp/Makefile
@@ -5,7 +5,8 @@ PORTREVISION= 0
CATEGORIES= x11-drivers
MASTER_SITES= https://github.com/neutrinolabs/${PORTNAME}/releases/download/v${DISTVERSION}/ \
https://github.com/neutrinolabs/xrdp/releases/download/v${XRDPVER}/:xrdp
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xrdp-${XRDPVER}${EXTRACT_SUFX}:xrdp
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ xrdp-${XRDPVER}${EXTRACT_SUFX}:xrdp
DIST_SUBDIR= xrdp
PATCH_SITES= https://github.com/neutrinolabs/${GH_PROJECT}/commit/
@@ -17,31 +18,34 @@ WWW= https://www.xrdp.org/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= xauth:x11/xauth
BUILD_DEPENDS= nasm:devel/nasm
+RUN_DEPENDS= xauth:x11/xauth
USES= autoreconf libtool:build localbase pkgconfig xorg
-USE_XORG= xorgproto xorg-server
USE_LDCONFIG= yes
+USE_XORG= xorg-server xorgproto
-XRDPVER= 0.10.3
+XRDPVER= 0.10.3
GNU_CONFIGURE= yes
+CONFIGURE_ENV= XRDP_CFLAGS=-I${WRKDIR}/xrdp-${XRDPVER}/common
INSTALL_TARGET= install-strip
-CONFIGURE_ENV= XRDP_CFLAGS=-I${WRKDIR}/xrdp-${XRDPVER}/common
CONFLICTS= xorgxrdp-devel
-OPTIONS_DEFINE= DEBUG DRI3
+OPTIONS_DEFINE= DEBUG DRI3
OPTIONS_DEFAULT= DRI3
-DRI3_DESC= DRI3/Glamor OpenGL Support
-DRI3_CONFIGURE_ENABLE= glamor
-DRI3_LIB_DEPENDS= libepoxy.so:graphics/libepoxy
+DRI3_DESC= DRI3/Glamor OpenGL Support
DRI3_BUILD_DEPENDS= ${LOCALBASE}/include/libdrm/drm.h:graphics/libdrm
+DRI3_LIB_DEPENDS= libepoxy.so:graphics/libepoxy
+DRI3_CONFIGURE_ENABLE= glamor
DRI3_CFLAGS= -I${LOCALBASE}/include/libdrm
DRI3_SUB_FILES= pkg-message
+# Bug 285815
+NO_SHLIB_REQUIRES_GLOB= libglamoregl.so
+
post-patch-DEBUG-on:
${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e 's|#define LOG_LEVEL [0-9]*|#define LOG_LEVEL 20|'