From nobody Tue Nov 08 16:49:57 2022 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 4N6Dbn50tNz4YVvH; Tue, 8 Nov 2022 16:49:57 +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 4N6Dbn4JsZz40jq; Tue, 8 Nov 2022 16:49:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667926197; 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=x3iQbMpl1TBrwYHMxcwfSwj8ctFIvAl7DH8CXsLbMoo=; b=AItFO6UgKfs/zjiEiBT01KCw5YhV2fDQYiPRdU/IZ8WsWfb6d6bkODbwanRosaImWenNIt 8HqGwyqoI9a00D9BfmJYFbK67UDuyP8GSf83oKEQhDowitwSZCCdPzL89TEZfKxjioUY+1 1M6z7PeRrg2dL7cSKy5yacYJhulPqJzfE83oGkPRvmiNUA/E8GMHC/bTU/U+dUE/PnUFo/ vrxWXekfJ6R0n9ftjZg9eavSSxZsaQhKSmWxsKY9Us3XPqRJyJTwKomsLX78OSbgFR7S93 2i8IKNkNi+ZJqFCRV6q80H4LH6yp0dnOdsMCIITqJyE0ibOfp42kmogvATaPIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667926197; 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=x3iQbMpl1TBrwYHMxcwfSwj8ctFIvAl7DH8CXsLbMoo=; b=aTol79ugMC9p2EFl+9qU78x/YEkQf5H6nYz3rSFjU99TCDQsfPe1EGl8kPik1amfIhVbrQ Q3kskzLdCdPX1aYjjEcOh8G3AS4XNQageT3zyHaddsQDPvfbrH4s8HK6KuzauAvQY3slfo Ar/qChamEbRRmLz2uHwWOqqTQdg7uJCBwsyT4HVQWkLEq4swqkbLa55nNp4qThVXCaATmA lwma900pLPjiFtDNbN0bYM60yj8ZeVFuuOjrH0Team+nxPON2oWelQ6k+O/PA+d30wetRe jg2BRO3TEhNhrDTqOZeUhfeVupPOAFnAZ+elekQhTACXdkn2MMMaPvUF7k6EpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667926197; a=rsa-sha256; cv=none; b=hZVFS8FE3am4T3ZcGmclBkQJU1035KJ4t4rXEdaUmwYUOS5QG4zh8qA9hLBFRsvviT8j/E GhwakNMNH/iYYS+5EBlznBhjis0Wml9cqA+UzNWzcn8Qa1M9F3D3JOwMeDGp2OrOZ7z46b iDRQnwErGwYAmfF4DWjxOaBIIHOndLKJQp4UmLZjhsBLp1PA8Er84m6RxzHwxq0GFHiVSq A/iQoe4/SF0YIpfewdm8bdVc41YYmMQ8naWEFuM8hHbXSQGgxrVrNuDHmNulcl2CmwNPbQ b/Vd2/bcpEs2bTuFswqdOl/ZkWkmBVgMXYwgxx1Z+AxyBa7qyzC9n8n7RoYqZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N6Dbn38Bjzpvb; Tue, 8 Nov 2022 16:49:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A8GnvDN001108; Tue, 8 Nov 2022 16:49:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A8Gnv4e001107; Tue, 8 Nov 2022 16:49:57 GMT (envelope-from git) Date: Tue, 8 Nov 2022 16:49:57 GMT Message-Id: <202211081649.2A8Gnv4e001107@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Gleb Popov Subject: git: df559c24e85b - 2022Q4 - devel/efl: Revert "Use USES=luajit (defaults to luajit-devel)" 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: df559c24e85b5ca62f695bc314f4a40c1047e813 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=df559c24e85b5ca62f695bc314f4a40c1047e813 commit df559c24e85b5ca62f695bc314f4a40c1047e813 Author: Gleb Popov AuthorDate: 2022-11-08 11:14:33 +0000 Commit: Gleb Popov CommitDate: 2022-11-08 16:49:32 +0000 devel/efl: Revert "Use USES=luajit (defaults to luajit-devel)" This reverts commit 470f0bf1c3353bca73e516f4053a29886f48d0fb from main, which slipped into 2022Q4 when I cherry-picked an update for this port. Reported by: pkg-fallout --- devel/efl/Makefile | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/devel/efl/Makefile b/devel/efl/Makefile index 729b187c0f80..0949c711799d 100644 --- a/devel/efl/Makefile +++ b/devel/efl/Makefile @@ -48,9 +48,15 @@ OPTIONS_GROUP_WAYLAND= WAYLAND OPTIONS_SINGLE= CRYPTO ENGINE LUAL OPTIONS_SINGLE_CRYPTO= OPENSSL GNUTLS OPTIONS_SINGLE_ENGINE= OPENGL OPENGLES NONE -OPTIONS_SINGLE_LUAL= LUAJIT LUALANG +OPTIONS_SINGLE_LUAL= LUAJIT LUAJIT_OR LUALANG OPTIONS_DEFAULT= FRIBIDI HARFBUZZ PULSEAUDIO EXAMPLES GSTREAMER V4L SCIM XIM \ OPENSSL OPENJPEG PDF PS RAW SVG WEBP XCF OPENGLES LUAJIT CXX +OPTIONS_DEFAULT_aarch64= LUALANG +OPTIONS_DEFAULT_powerpc64= LUAJIT_OR +OPTIONS_DEFAULT_powerpc64le= LUAJIT_OR +OPTIONS_EXCLUDE_aarch64= LUAJIT LUAJIT_OR +OPTIONS_EXCLUDE_powerpc64= LUAJIT +OPTIONS_EXCLUDE_powerpc64le= LUAJIT OPTIONS_SUB= yes HARFBUZZ_DESC= OpenType text shaping engine @@ -66,6 +72,7 @@ XCF_DESC= Gimp image format support LUAL_DESC= LUA LUALANG_DESC= Use Lua LUAJIT_DESC= Use Luajit +LUAJIT_OR_DESC= Use Luajit from OpenResty fork (experimental) OPENGLES_DESC= 2D/3D rendering support via OpenGL ES NONE_DESC= No acceleration, software only LUA_DESC= Lua Bindings @@ -168,13 +175,19 @@ WEBP_VARS_OFF= webp_disabler=webp XCF_VARS_OFF= xcf_disabler=xcf -LUAJIT_USES= luajit +LUAJIT_BUILD_DEPENDS= luajit:lang/luajit +LUAJIT_RUN_DEPENDS= luajit:lang/luajit LUAJIT_MESON_ON= -Dlua-interpreter=luajit -LUAJIT_PREVENTS= LUALANG +LUAJIT_PREVENTS= LUALANG LUAJIT_OR + +LUAJIT_OR_BUILD_DEPENDS= luajit:lang/luajit-openresty +LUAJIT_OR_RUN_DEPENDS= luajit:lang/luajit-openresty +LUAJIT_OR_MESON_ON= -Dlua-interpreter=luajit +LUAJIT_OR_PREVENTS= LUALANG LUAJIT LUALANG_USES= lua:51,build,run LUALANG_MESON_ON= -Dlua-interpreter=lua -LUALANG_PREVENTS= LUAJIT +LUALANG_PREVENTS= LUAJIT LUAJIT_OR OPENGL_USES= gl OPENGL_USE= GL=gl