From nobody Mon Apr 29 13:32:18 2024 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 4VSklQ2Wt8z5JLPF; Mon, 29 Apr 2024 13:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSklQ24vrz47jT; Mon, 29 Apr 2024 13:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714397538; 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=sQvAIbAzyi2fdfnn/uAmZzRx0OQPV7u10jlosribCEU=; b=N9zNiGOGjsbueAW/D9d08QAy1EvEq3OkaoX+x9OVROkxm7tYFX2h4LXItjTBTSpgoWjPRJ XFjWvgN32sKTU/jhvPXnZwYKcYp6j6bnMSaHSifD/S0Q4QBuzGL3on5gtObPAQ5FlO4jz7 XLBLCRjAaxFp8XNiXyvg7siGVo3nIHEy0hxOp2kT2vrYF8WPxDRb+rFrcFlONEpXOuxZd2 aGdF29QD8kADyROZIPk0PVVI6XiN/AIrqtBN558YO18zrrOE8cCFATIQOL1rVrfPub2dSa 1ypK3O53CdG6hU5kaJXXRX0qSnUCIpS/4cYeJhUP//EtKXeT8oV5/INls8yAxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714397538; a=rsa-sha256; cv=none; b=SzFJshlq6uN6/95yNI9eHmJblydJPDc4WUhPiOuKvuighx3CtqvWMO6uhajtrglxlfueYP ePrVaWyYjV4gVmAyC5uUydyMgKlbgCiHSelCp6bqLwzXrDRfZZPFUT8wXlOcM3WfaTjiCx +DrkLUKBlu+B26zOTgo2AHVKIKi7CUzIl0l2hh9srp9j0PP+puXE0sGj6Tye4ftYN5CrZK 0K1Qe3iks1sKLqlnePJbyjHRvlfe1S1kQtS6DoX9azDvvnlyuO6kihoJNGxzyKMKoW/w6N ctVduFCcPMWmTaNbv4F0Olark4x9ZgEpXobirnV4Y2MjEDYxGoBzWFf1a6F1yw== 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=1714397538; 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=sQvAIbAzyi2fdfnn/uAmZzRx0OQPV7u10jlosribCEU=; b=SX8OUz+heHURBRFWvRkXb4Q5cwjTDDtwYZzSHzlFMnv8SNrtcm0sg7M61bNUlhKrPf+Xga YvNHkV4ehsUPfVK65pXYx4kAWvdpr1ITAk/8rtnKMKfjQJ25UeQbDwOA87c/+/an2xnQLi 3RTZ2C+BuF8M/Dqfb/96869lQu3Fq8dzH5et+3VDlaXc2od7hufoVDHfkyLE0a6by6PFsX g+XkfQ7PtJSKT7jOhpohDXPLwd1KoX4iPeknjpBWvpIKbUpu+QDnEE2hR7DQb3SeiCFCax 8bSpvsZlSk98ulgLT/RN3E9AXjG1P+CD3eVTWT0e6LY8X52lKuHx1F21OetvsA== 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 4VSklQ1hnkz19Cy; Mon, 29 Apr 2024 13:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43TDWI0Q075443; Mon, 29 Apr 2024 13:32:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TDWILU075440; Mon, 29 Apr 2024 13:32:18 GMT (envelope-from git) Date: Mon, 29 Apr 2024 13:32:18 GMT Message-Id: <202404291332.43TDWILU075440@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 7868dab103d5 - 2024Q2 - graphics/glfw: fix build with EXAMPLES and PREEDIT enabled 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 7868dab103d546bab76462dd37759020125c1400 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7868dab103d546bab76462dd37759020125c1400 commit 7868dab103d546bab76462dd37759020125c1400 Author: Vladimir Druzenko AuthorDate: 2024-04-28 13:56:54 +0000 Commit: Vladimir Druzenko CommitDate: 2024-04-29 13:31:31 +0000 graphics/glfw: fix build with EXAMPLES and PREEDIT enabled Reported by: Alexander88207 (discord) Tested by: nxjoseph (discord) Approved by: eduardo (maintainer) (cherry picked from commit f4bd1ce2e80ab85cf0c19713f41a0a917a65789b) --- graphics/glfw/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile index 39b600a824c8..d6a45b65f78c 100644 --- a/graphics/glfw/Makefile +++ b/graphics/glfw/Makefile @@ -10,7 +10,7 @@ WWW= https://www.glfw.org/ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE.md -USES= cmake:insource localbase zip +USES= cmake:insource localbase:ldflags zip USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS @@ -61,6 +61,12 @@ X11_USES= xorg X11_USE= XORG=x11,xcursor,xi,xinerama,xrandr,xxf86vm X11_CMAKE_BOOL= GLFW_BUILD_X11 +.include + +.if ${PORT_OPTIONS:MEXAMPLES} && ${PORT_OPTIONS:MPREEDIT} +LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig +.endif + do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/docs/html/search ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} @@ -77,8 +83,8 @@ do-install-EXAMPLES-on: ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/tests && ${INSTALL_PROGRAM} \ allocator clipboard cursor empty events gamma glfwinfo icon \ - iconify inputlag joysticks monitors msaa reopen tearing threads \ - timeout title triangle-vulkan window \ + iconify input_text inputlag joysticks monitors msaa reopen \ + tearing threads timeout title triangle-vulkan window \ ${STAGEDIR}${EXAMPLESDIR}/tests .include