From nobody Wed Apr 02 07:32:35 2025 X-Original-To: dev-commits-ports-branches@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 4ZSGmM2GRWz5rsLc; Wed, 02 Apr 2025 07:32:35 +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 4ZSGmM133qz468X; Wed, 02 Apr 2025 07:32:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743579155; 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=oMrjBDHGjppfX/XorK4xViNaCLFCEoDGBOKSCJasQoU=; b=WqIfm8ZFam4qpZHtpNxxcViaDquTeohpJAEB2RLSrex3lQ/Ev9aVCdxayKwaQl1+/H0kRA WmZFRAa4K5ho5B38HeSNuvqE3z9c8/Tj0Ce0ujELBFjWk4868YGVBdv7IAVrJXN9ebKC7K OY5M+4VSUjYH8X7/Zw/g6fjmaI4MFSEiahAf8bTU2cICEeZY2MgoDUJq2620V0IpI7yiqg mdaW2CyE/OjKjTmzq8BdpZL9Bw4fMoGcZ+hn8tjcssWpfcA761SeqJGEE0ndJC5MeFXD+V FYX2TemYa+q0bmtaZ7U4Fx5I8uXZABuEJWvPCqsB/SO2IHvrFfGKTUJokJQltg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743579155; a=rsa-sha256; cv=none; b=q+AST+VXua7Cms6MmNc+xDa8v3IrSD28nxRCK+FUE9ykYIN7tTppQR7XSbFdh3vQ3+DvQz 7Mr7raFq4teqvVUIDC6bZDG7nDCrcWTpJvrYncQYK0jfnzasJxYgkTEysNiWIkLvUhwi2e XSMq1CI3ZDUBd45nS22pocZhaDlwt8+DQY89tfjkDs6pyMgbBcbZahV4OoVr4WGj7AkdJm INZhc40yhkcY3Zb7/FVjPjZYjmEvH36Ua/LpR1m0OR8qLaLAnm9oMk9mAnP33eO8QDNl/S jkLOHhSV40jVtIe1IyWIygQ4FX34a+jmUF6KGSw2eooeBN9+7LEln90+M4hUOw== 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=1743579155; 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=oMrjBDHGjppfX/XorK4xViNaCLFCEoDGBOKSCJasQoU=; b=FxzpeGJkQsHSiIMT5GgJ8tkOpNeDxLnbbiZk1Ik6aO7YIJZtWw50u7U4owlWyd/6vlHMbO FS2WCRMNIAPSQGyiMAwXIGbhpL2HhKwlOGxTWBQTvkGjyqVutca8gv0KpmkT5C9VmSe7Sb s7psXYgrFdTQInSf9yKxeeQa2uMEeFN4xIOrn9KLWuTw4HT5v7HTeQtChhlVf2UZAUMt5X 9d2tClS2a2uDzYPyJqJVri+N5X0KqOEBtjf9dkt6Tgk6I7q21Nkbq1fr9uX6KPq2QtHr89 W8ZD4Rb6bDMJfK2rFejK1bMyPNkS3x9iSgK6kSsRQ9Qh1yeTFK4HRbKSmJTU1w== 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 4ZSGmM0f4zz1688; Wed, 02 Apr 2025 07:32:35 +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 5327WZrv001376; Wed, 2 Apr 2025 07:32:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5327WZ8D001373; Wed, 2 Apr 2025 07:32:35 GMT (envelope-from git) Date: Wed, 2 Apr 2025 07:32:35 GMT Message-Id: <202504020732.5327WZ8D001373@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Koichiro Iwao Subject: git: 9787f71de921 - 2025Q2 - x11-drivers/xorgxrdp-devel: Fix build with pkg 2.1.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2025Q2 X-Git-Reftype: branch X-Git-Commit: 9787f71de921f5960126f721a66a1f8c21741077 Auto-Submitted: auto-generated The branch 2025Q2 has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=9787f71de921f5960126f721a66a1f8c21741077 commit 9787f71de921f5960126f721a66a1f8c21741077 Author: Koichiro Iwao AuthorDate: 2025-04-02 07:26:00 +0000 Commit: Koichiro Iwao CommitDate: 2025-04-02 07:31:51 +0000 x11-drivers/xorgxrdp-devel: 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 (cherry picked from commit cfb71f4ea6c6825b49f28e7f0401a5bc2e0fe0a0) --- x11-drivers/xorgxrdp-devel/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/x11-drivers/xorgxrdp-devel/Makefile b/x11-drivers/xorgxrdp-devel/Makefile index 4e5f88bac5e0..604a9728db50 100644 --- a/x11-drivers/xorgxrdp-devel/Makefile +++ b/x11-drivers/xorgxrdp-devel/Makefile @@ -16,32 +16,35 @@ 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= xorgproto xorg-server USE_GITHUB= yes GH_ACCOUNT= neutrinolabs GH_TAGNAME= 9698ba0 GH_TUPLE= neutrinolabs:xrdp:4c8c773:xrdp GNU_CONFIGURE= yes +CONFIGURE_ENV= XRDP_CFLAGS=-I${WRKSRC_xrdp}/common INSTALL_TARGET= install-strip -CONFIGURE_ENV= XRDP_CFLAGS=-I${WRKSRC_xrdp}/common CONFLICTS= xorgxrdp 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_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|'