From nobody Mon Apr 29 13:30:36 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 4VSkjS3Pt0z5JKjg; Mon, 29 Apr 2024 13:30:36 +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 4VSkjS2q8Zz475p; Mon, 29 Apr 2024 13:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714397436; 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=KLz/4KN3BpJC59fmMcQAk7Jzw1J+nf7R4LaOeNNG3sY=; b=NPLyuLnFptCMAhvLPVdrCZ5+kbmUjRiAqHSPcK5EeWPYKdopwN/2nW9cBBf/aKdjBMuc+g PMI2q43X85EBLwo0ZCLP0lieVfCaL+Oc4LdTAEmk4vOomV/2CNUIOJgY29spOrFjAxs0kQ HtU8tFd13g1PPRE6NyIngPqXXsk6TDXCExP6dDg4k42nVYbJCMyEa/V6L4gEtgpZ1RqyN8 L7xdi0rlReCBVdJ2186lFQMZMKIy0uh9W2KaUfLBpi6rwKvj9xnx83T2FBh7csFCxzcGAv Tv8OCQkhmvuz42XiaSVPzXSD+zkNUcQGBUoJRJueBW09RR8zSJrJkOv0SrE6Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714397436; a=rsa-sha256; cv=none; b=wGldzShQDd3bJSKP02K4qFC+mTxTTx0Zt2iBm4C8vwd2pffYkcE+XGopeG5D2kK1y6I7b7 Pp7ZdIlSUt17GBcZPAtDSq5oecp3VZS7DT0Qq5Flol4vOuyMZrbwy31l3/p6Q67oMk0Klb vS38hxAa1vUz2jYN1HY3PZOfnj7Qb+LPlIFAUO/g6ReZpCmlrqpWUr7W9epRgX1dq8DD/K IaXvUiXV+lqIFQr8x1NXYLpReEuDCsXyeUNZx761Fl35iLch50QErwW4LaN3ZQDLjXdwnX NPPdOyUJ12f5bA9oMbcbPyZfa44w+epwKoN4Zaqk5IlojGYzA9F2TCSbwsr5Gg== 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=1714397436; 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=KLz/4KN3BpJC59fmMcQAk7Jzw1J+nf7R4LaOeNNG3sY=; b=iVOFugzIfmZmIap0sipZGHSEgt3EVGy2KnxOMis10UxwJkuHMfjLyH+yHKOlfTMm70Gjg8 xxEw2NJHg0fwzsLRcM6SBjzyQidHxMW9ab4oUMXI1d3RNxvtG0k+2PR5iMFj7SrfNYJtPl k41vb7fdcTMSrpU7h9tgZlIvSIN32y+I/bYrx5Q8dPTXYuLx/VLatSVV7JsHEEnTiR2Wgr VknlCjq8c9SK5VUz7OH1Q3EzBXWZ6iBJCH0v75nW9XiyUdHy2XnnITbgQVAkukwQkj+cIt oU6M8plPXTrpf2TFsaSr1Vg4ekV1igWN27Z5L1J9J4Qr+PilHJX5IDfUHO5Xaw== 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 4VSkjS2R30z19CL; Mon, 29 Apr 2024 13:30:36 +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 43TDUaKF069300; Mon, 29 Apr 2024 13:30:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TDUa1w069297; Mon, 29 Apr 2024 13:30:36 GMT (envelope-from git) Date: Mon, 29 Apr 2024 13:30:36 GMT Message-Id: <202404291330.43TDUa1w069297@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: 0bcd20b238ac - main - graphics/glfw: fix build with EXAMPLES enabled and PREEDIT disabled 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: 0bcd20b238ac35ec0db95a496b8c9ce7b6015b4e Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=0bcd20b238ac35ec0db95a496b8c9ce7b6015b4e commit 0bcd20b238ac35ec0db95a496b8c9ce7b6015b4e Author: Vladimir Druzenko AuthorDate: 2024-04-29 13:12:16 +0000 Commit: Vladimir Druzenko CommitDate: 2024-04-29 13:29:50 +0000 graphics/glfw: fix build with EXAMPLES enabled and PREEDIT disabled Both options are non-default. MFH: 2024Q2 --- Mk/Uses/mysql.mk | 4 ++-- graphics/glfw/Makefile | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk index cf5840131744..2a5edc80bb3c 100644 --- a/Mk/Uses/mysql.mk +++ b/Mk/Uses/mysql.mk @@ -5,8 +5,8 @@ # # version If no version is given (by the maintainer via the port), try to # find the currently installed version. Fall back to default if -# necessary (MySQL-8.0 = 80, look at bsd.default-versions.mk for -# possible values). +# necessary (MariaDB-10.11 = 10.11m, look at bsd.default-versions.mk +# for possible values). # client Depends on the libmysqlclient library (default) # server Depend on the server at run/build time. If none of these is # set, depends on the client. diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile index 8b33dd90eda3..3b2e330c99ac 100644 --- a/graphics/glfw/Makefile +++ b/graphics/glfw/Makefile @@ -65,6 +65,7 @@ X11_CMAKE_BOOL= GLFW_BUILD_X11 .if ${PORT_OPTIONS:MEXAMPLES} && ${PORT_OPTIONS:MPREEDIT} LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig +TESTS_FILES= input_text .endif do-install-DOCS-on: @@ -83,8 +84,9 @@ do-install-EXAMPLES-on: ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/tests && ${INSTALL_PROGRAM} \ allocator clipboard cursor empty events gamma glfwinfo icon \ - iconify input_text inputlag joysticks monitors msaa reopen \ + iconify inputlag joysticks monitors msaa reopen \ tearing threads timeout title triangle-vulkan window \ + ${TESTS_FILES} \ ${STAGEDIR}${EXAMPLESDIR}/tests .include