From nobody Mon Mar 28 09:04:30 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 191981A3DD81; Mon, 28 Mar 2022 09:04:31 +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 4KRmwb0Cxdz4q6B; Mon, 28 Mar 2022 09:04:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648458271; 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=j28kayfGSM2E1qIf0mJLwk5BPqbabNIs84PTTVeYCfY=; b=hctOqighgZaHwIorgtpW3UE+o8kSfnDYRc5pLCCsXjNUMi/cseXNdGYTG1Xke8obYgJ+Ey A2dMMdaB9bo0cWNUQUnuvcKGFlm/otCaScx3nPcdMfI7pybD8M/m/ezwzsFV+IZuqTnUiu UGClH1a1zBDrmqyWkJM6GXBgSv552pDtjNyU3EjWpF+6oxXITmSAKkbD3IG6K0gxfR+aGl IblLGMicrX0qBgOWrhDZEu0elEw5HAR4S4a38/m3eJOPb/LBmp5b3GTvQXAA2xU4WHbchV E6URsg/6r1iDLFmjiUZ0jxPliCtSjLwQkDlPB64bGI9KGRlV16+2rFtYPATckg== 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 DBC4F26BD7; Mon, 28 Mar 2022 09:04:30 +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 22S94UWB074270; Mon, 28 Mar 2022 09:04:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22S94Umr074269; Mon, 28 Mar 2022 09:04:30 GMT (envelope-from git) Date: Mon, 28 Mar 2022 09:04:30 GMT Message-Id: <202203280904.22S94Umr074269@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 7ebf05a43c71 - main - devel/efl: Simplify EMF option group handling. 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/main X-Git-Reftype: branch X-Git-Commit: 7ebf05a43c714fed2dfa4e47222775ec66af4e44 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648458271; 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=j28kayfGSM2E1qIf0mJLwk5BPqbabNIs84PTTVeYCfY=; b=m3rrZoRscz79jPu2Awr179wIcXsn/74ttl3Mk6ASNqM7Sw8X3wvGj4tKbiPWSCfqK7hi7N P3A02lGF4BAR+3wuWZQYauqFMbrALv6hpo/7dpIZNy+RvPr41z6YWv9wZHkQ2tnGOGRhp7 VjXSRL2BgjgPOoHIBwoeDc9mxTl8xpqGKzZ6Z55D8Xar/6GoBKwmhoxhM4QCTKIrz/ALC3 wvI3neMcwk4gvWf+NxwZ99fCIk7ytuE4PlkMEm3m3L2C5/b7fFABoK70Nlw+gru644Zvi7 53AmSCJp0QzIZVALvseO8iyE74PmmtjpaZMVZoePKzk1UE/QlI62RANfchgLdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648458271; a=rsa-sha256; cv=none; b=d/xlVWC/5bbs8VulK2pAa5Ne1ghaWk2WWQfp/+k8cG8mX4RPldGLmu26ZZzqpJFDVpSOrY 9yXqdozhHXJlrIrNS30UsYyBaPYGIzJmAhl2NrnvqQTeXP8wLGmubhGnkDCc16xCHj7aoO 3JMr5+uooI5qJtvp5E3DQA831O0aNBcZEmwOtm0cSdGoQUPBpeiFcNIKszOZvSupBa1KUk XzoY4EI9Uf68M/lhINovCL605tRQiFe0ndrsATlDmrwIuCL+9Y5N2DKJ3rmEJM6rldz8Rh COkDOCiA7e9vC4hrVnADsxH0CZJy9gbFEYBuB2KDMptGWKiJ+VNqfsOEBfangA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7ebf05a43c714fed2dfa4e47222775ec66af4e44 commit 7ebf05a43c714fed2dfa4e47222775ec66af4e44 Author: Gleb Popov AuthorDate: 2022-03-28 09:03:22 +0000 Commit: Gleb Popov CommitDate: 2022-03-28 09:04:25 +0000 devel/efl: Simplify EMF option group handling. --- devel/efl/Makefile | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/devel/efl/Makefile b/devel/efl/Makefile index b72262b8ca6c..75cb663dfc9f 100644 --- a/devel/efl/Makefile +++ b/devel/efl/Makefile @@ -132,8 +132,12 @@ IBUS_LIB_DEPENDS= libibus-1.0.so:textproc/ibus IBUS_USES= gnome IBUS_USE= GNOME=glib20 IBUS_MESON_TRUE= glib +IBUS_VARS_OFF= ibus_disabler=ibus SCIM_LIB_DEPENDS= libscim-1.0.so:textproc/scim +SCIM_VARS_OFF= scim_disabler=scim + +XIM_VARS_OFF= xim_disabler=xim OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg @@ -187,32 +191,9 @@ SDL_MESON_TRUE= sdl .include -ECORE-IMF-LOADERS-DISABLER-BASE= -Decore-imf-loaders-disabler= -ECORE-IMF-LOADERS-DISABLER:= ${ECORE-IMF-LOADERS-DISABLER-BASE} - -.if empty(PORT_OPTIONS:MIBUS) -ECORE-IMF-LOADERS-DISABLER:= "${ECORE-IMF-LOADERS-DISABLER-BASE}ibus" -.endif - -.if empty(PORT_OPTIONS:MSCIM) -.if ${ECORE-IMF-LOADERS-DISABLER} != ${ECORE-IMF-LOADERS-DISABLER-BASE} -ECORE-IMF-LOADERS-DISABLER-BASE:=${ECORE-IMF-LOADERS-DISABLER} -ECORE-IMF-LOADERS-DISABLER:= "${ECORE-IMF-LOADERS-DISABLER-BASE},scim" -.else -ECORE-IMF-LOADERS-DISABLER:= "${ECORE-IMF-LOADERS-DISABLER-BASE}scim" -.endif -.endif - -.if empty(PORT_OPTIONS:MXIM) -.if ${ECORE-IMF-LOADERS-DISABLER} != ${ECORE-IMF-LOADERS-DISABLER-BASE} -ECORE-IMF-LOADERS-DISABLER-BASE:=${ECORE-IMF-LOADERS-DISABLER} -ECORE-IMF-LOADERS-DISABLER:= "${ECORE-IMF-LOADERS-DISABLER-BASE},xim" -.else -ECORE-IMF-LOADERS-DISABLER:= "${ECORE-IMF-LOADERS-DISABLER-BASE}xim" -.endif -.endif +IMF_DISABLERS= ${IBUS_DISABLER} ${SCIM_DISABLER} ${XIM_DISABLER} -MESON_ARGS+= ${ECORE-IMF-LOADERS-DISABLER} +MESON_ARGS+= -Decore-imf-loaders-disabler="${IMF_DISABLERS:ts,}" EVAS-LOADERS-DISABLER-BASE= -Devas-loaders-disabler= EVAS-LOADERS-DISABLER:= ${EVAS-LOADERS-DISABLER-BASE}