From nobody Sun Apr 28 14:05:04 2024 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 4VS7Wh2ys7z5JJh0; Sun, 28 Apr 2024 14:05:04 +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 4VS7Wh2Cdqz4kyl; Sun, 28 Apr 2024 14:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714313104; 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=Vtm/1D6w32W4CfTXhhlZgoXTLZaMMaAuucmCzEsjuAk=; b=mjX/17rgFQo50goNpACUnMW5vfTOCspgguKpB5IRl2JIBs43RmsaF9XMnnGqwcm5Gdh7A+ gqGmnBkSO2xjrUsT8npKtqCD5tpmRxLOVjrVtCYBIg/Xl8xWrvHpVxiVjUBAbIOuaYyikQ lh5H1fIh0QwjpvAdUebrcUbTr/HvVxRBlT05jabNJocWH9z9h3d9lbHKeH5p+GjC+BemwA q6LJsaSA6oWiPjqlujicFty+tqTLruPnF0iKYKOi33Ba+NxO3comH0nmPd3oYFS7NSN/3B b9vgvbGAagCnfN4eBch6JDEDu+AmXiR+zD61E77+ku1c1W9BDHCAPBDdwxyNcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714313104; a=rsa-sha256; cv=none; b=rly0v0EsAmhhsQuqpzyMaKZRZb2xwzwCJZf8W/gDm0t1METFXRR/jIgfFefG9FBW3mBxKo sC9SNa9Y9jC3cdIsZXWD/XzQlpPyeBmhzM2SsYTtMZpvHywZJ+UFCU1U9cs8souzZR7ZB8 QUl84xmAPiZbThFd+mdivuup4zEk1dBCS3Y3PzUzW0REeMyI8FJPCs+Fq0Zna65QtQqqYd /XHr/sPIP76+4wQykGLzMu/5Ey9cykHhi9EEfwzmyiO9OFlfibv795lhdRJV4k7YFkYWlw UN8ClFm/J1uSCoHEqFcHQycDni0ze3kzR64cFC4qvyqYFCv+uTK4RzqRPKo4BA== 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=1714313104; 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=Vtm/1D6w32W4CfTXhhlZgoXTLZaMMaAuucmCzEsjuAk=; b=fva8NdbM/zn9bGsPgaxeLAJyQkB5DkC2ZdHZieoAr1dba1sX2g7vszf/i6+YikJEZLMYDC e9q7nS+2o8KXZ5ElbhKNaZ7q9ZazDbBrXFEWGWFFbLLrtMl7WWnc5OUsn73nTmNeXHwkD+ zU3mrXsq6Z2smmRCDxkTVbNoivg3cxTBii4V5NPiEJ+dNGuOe2TL56pz8CuWIkd4fQlND6 BW3m/Ai7URZsaH9Z+8OAFb9RwD5GZU3/bfXM+EVf3xUql9HbLUvDLyNHPXStEp6YryQBMY wH70lCzyIDa+Kis+cexjcmTSuUY4VmrNx9WnNHZUC77qgxRvCqyxFC1SMbWmrQ== 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 4VS7Wh1pVczSHH; Sun, 28 Apr 2024 14:05:04 +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 43SE54Nd086913; Sun, 28 Apr 2024 14:05:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SE54nK086910; Sun, 28 Apr 2024 14:05:04 GMT (envelope-from git) Date: Sun, 28 Apr 2024 14:05:04 GMT Message-Id: <202404281405.43SE54nK086910@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: f4bd1ce2e80a - main - graphics/glfw: fix build with EXAMPLES and PREEDIT enabled 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4bd1ce2e80ab85cf0c19713f41a0a917a65789b Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4bd1ce2e80ab85cf0c19713f41a0a917a65789b commit f4bd1ce2e80ab85cf0c19713f41a0a917a65789b Author: Vladimir Druzenko AuthorDate: 2024-04-28 13:56:54 +0000 Commit: Vladimir Druzenko CommitDate: 2024-04-28 13:56:54 +0000 graphics/glfw: fix build with EXAMPLES and PREEDIT enabled Reported by: Alexander88207 (discord) Tested by: nxjoseph (discord) Approved by: eduardo (maintainer) --- 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