From nobody Mon Nov 07 07:50:28 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 4N5Ngm51pNz4hH5M; Mon, 7 Nov 2022 07:50:28 +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 4N5Ngm4W9jz3bpX; Mon, 7 Nov 2022 07:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667807428; 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=L4xpquTSMorLUKPPTllANl6PltJIeSxUxnoUR15lpFU=; b=L1RL1Fkvob3ZGt1J9JC9W2zQDC70LzAwTdbC+nxbQ3sZB5dHyvpQmcQNYGeaO6/yvds7zu J02dPCiNMetkrblxSrix1/qYF76z9VLYigSoyiJRZGOhsQ7TB6nwtHYF1P5YumHAXBh6dX lMEqpxGklbVJhCPTAQsN/oQ17KD2dlUDhQUFAP3KsJf/+/riQhHiiPLz8Ekdj1ynK2olkW N9/wKN2OS1DCibSwaotoKFD9j1sWCatcZUUTEuS3e2Z2X8n4wezRYyITKxP3k9iiPOvC0C j+W3nKXlrldoNJjX1BOcpXFlaKCNYizhW5Ew04GhfJJwxM/9z1SJRySRqt1v1Q== 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 4N5Ngm3ZGjztLG; Mon, 7 Nov 2022 07:50:28 +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 2A77oS8m089776; Mon, 7 Nov 2022 07:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A77oSlb089775; Mon, 7 Nov 2022 07:50:28 GMT (envelope-from git) Date: Mon, 7 Nov 2022 07:50:28 GMT Message-Id: <202211070750.2A77oSlb089775@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: fd1e4070ba8c - 2022Q4 - devel/efl: Update to 1.26.3 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: fd1e4070ba8c425ebc29e9d5728b294ed0994489 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667807428; 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=L4xpquTSMorLUKPPTllANl6PltJIeSxUxnoUR15lpFU=; b=rSbah/N2o7gfQlVMPoVmfqLA2CadoR0UCSMy+VKRWk96GWqxwbptw5HpLx8Kyfh7ewMlm/ KGdzAO2P4NDaRro9EqZNKpLrC2p7ZeKPCKPRq7WVbYggUcfv2QLBsVu43EEMgajt+Btr/Q IRFLuFlAtxMiuvU2+SUPGbQcMQ9Jonma9R/GQzcMaJI8UT+7sporF/AEerAsFYBLE5VTf4 lOYsmes3u8DBmZ3yXM2ZUYQgKa8c09Gbg8MJGUcs8glaFFuwYL0HzIJWY0vUvhxgSjjRvC x7s1GvwwG1e+XQ3XL4PjPK2fFr4Qv4RCCtK094seoUbFVz6p/ZFtaz931+flow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667807428; a=rsa-sha256; cv=none; b=S0LzjFmPwjD5m1m6LULOiV7fRugnaDDvTLe/Fr4FW5Ry+Bq1QMv26U5sq3kkam68qPdPie bU1cZoj6yQrXPby9FZmiDiekgCG2KfKtdD3yJ4FWbMfdL6RN52OfXyeii69iTcm1g9dWza vutJ06GS2MVxVAc/ptqoYoo9o80FHpikv1ZqZG29pUZTQe85HY1++hZpBi/YVBuf9pcR/O XTH4rfbvYKoG7bmmTrf4acKyM0AmDYWMA4waWZwYlS4PHazxioYVjDA+8CM8FW6Ja8KpDJ De/MO1Wd+C7aqxt2qwdt2tGUcEKtKBEF2zSjbP4zeuKmKBtu8Xm/QTul+4PzcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd1e4070ba8c425ebc29e9d5728b294ed0994489 commit fd1e4070ba8c425ebc29e9d5728b294ed0994489 Author: Peter TKATCHENKO AuthorDate: 2022-11-06 18:27:28 +0000 Commit: Gleb Popov CommitDate: 2022-11-07 07:50:05 +0000 devel/efl: Update to 1.26.3 (cherry picked from commit f48874128b6b0e5199c94391de50ab731a6cfe58) --- devel/efl/Makefile | 140 ++++------------------ devel/efl/distinfo | 6 +- devel/efl/files/patch-src_lib_ecore_ecore__main.c | 11 -- 3 files changed, 25 insertions(+), 132 deletions(-) diff --git a/devel/efl/Makefile b/devel/efl/Makefile index c21150df935e..f33afca5f671 100644 --- a/devel/efl/Makefile +++ b/devel/efl/Makefile @@ -1,6 +1,5 @@ PORTNAME= efl -DISTVERSION= 1.26.2 -PORTREVISION= 8 +DISTVERSION= 1.26.3 CATEGORIES= devel enlightenment MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/ DIST_SUBDIR= enlightenment @@ -52,15 +51,9 @@ OPTIONS_GROUP_WAYLAND= WAYLAND OPTIONS_SINGLE= CRYPTO ENGINE LUAL OPTIONS_SINGLE_CRYPTO= OPENSSL GNUTLS OPTIONS_SINGLE_ENGINE= OPENGL OPENGLES NONE -OPTIONS_SINGLE_LUAL= LUAJIT LUAJIT_OR LUALANG +OPTIONS_SINGLE_LUAL= LUAJIT 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 @@ -76,7 +69,6 @@ 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 @@ -114,6 +106,8 @@ VNC_MESON_TRUE= vnc-server VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver LUA_IMPLIES= ELUA +LUA_VARS= lua_binding=lua +CXX_VARS= cxx_binding=cxx WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.7:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ @@ -144,6 +138,7 @@ SCIM_VARS_OFF= scim_disabler=scim XIM_VARS_OFF= xim_disabler=xim OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg +OPENJPEG_VARS_OFF= openjpeg_disabler=jp2k GNUTLS_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgnutls.so:security/gnutls @@ -153,33 +148,36 @@ GNUTLS_CFLAGS= -I${LOCALBASE}/include/gnutls/ GNUTLS_BROKEN= GNUTLS option is broken by the upstream bug: https://phab.enlightenment.org/T8807 PDF_LIB_DEPENDS= libpoppler.so:graphics/poppler +PDF_VARS_OFF= pdf_disabler=pdf PS_LIB_DEPENDS= libspectre.so:print/libspectre +PS_VARS_OFF= ps_disabler=ps RAW_LIB_DEPENDS= libraw.so:graphics/libraw +RAW_VARS_OFF= raw_disabler=raw SVG_USES= gnome SVG_USE= GNOME=cairo GNOME=librsvg2 +SVG_VARS_OFF= svg_disabler=rsvg AVIF_LIB_DEPENDS= libavif.so:graphics/libavif +AVIF_VARS_OFF= avif_disabler=avif HEIF_LIB_DEPENDS= libheif.so:graphics/libheif +HEIF_VARS_OFF= heif_disabler=heif WEBP_LIB_DEPENDS= libwebp.so:graphics/webp +WEBP_VARS_OFF= webp_disabler=webp -LUAJIT_BUILD_DEPENDS= luajit:lang/luajit -LUAJIT_RUN_DEPENDS= luajit:lang/luajit -LUAJIT_MESON_ON= -Dlua-interpreter=luajit -LUAJIT_PREVENTS= LUALANG LUAJIT_OR +XCF_VARS_OFF= xcf_disabler=xcf -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 +LUAJIT_USES= luajit +LUAJIT_MESON_ON= -Dlua-interpreter=luajit +LUAJIT_PREVENTS= LUALANG LUALANG_USES= lua:51,build,run LUALANG_MESON_ON= -Dlua-interpreter=lua -LUALANG_PREVENTS= LUAJIT LUAJIT_OR +LUALANG_PREVENTS= LUAJIT OPENGL_USES= gl OPENGL_USE= GL=gl @@ -204,94 +202,10 @@ IMF_DISABLERS= ${IBUS_DISABLER} ${SCIM_DISABLER} ${XIM_DISABLER} MESON_ARGS+= -Decore-imf-loaders-disabler="${IMF_DISABLERS:ts,}" -EVAS-LOADERS-DISABLER-BASE= -Devas-loaders-disabler= -EVAS-LOADERS-DISABLER:= ${EVAS-LOADERS-DISABLER-BASE} - -EVAS-LOADERS-DISABLER-BASE:= ${EVAS-LOADERS-DISABLER} -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE}json" - -.if empty(PORT_OPTIONS:MOPENJPEG) -.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE} -EVAS-LOADERS-DISABLER-BASE:= ${EVAS-LOADERS-DISABLER} -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE},jp2k" -.else -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE}jp2k" -.endif -.endif - -.if empty(PORT_OPTIONS:MPDF) -.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE} -EVAS-LOADERS-DISABLER-BASE:= ${EVAS-LOADERS-DISABLER} -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE},pdf" -.else -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE}pdf" -.endif -.endif +JSON_DISABLER=json +EVAS_DISABLERS= ${JSON_DISABLER} ${OPENJPEG_DISABLER} ${PDF_DISABLER} ${PS_DISABLER} ${RAW_DISABLER} ${SVG_DISABLER} ${AVIF_DISABLER} ${HEIF_DISABLER} ${WEBP_DISABLER} ${XCF_DISABLER} -.if empty(PORT_OPTIONS:MPS) -.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE} -EVAS-LOADERS-DISABLER-BASE:= ${EVAS-LOADERS-DISABLER} -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE},ps" -.else -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE}ps" -.endif -.endif - -.if empty(PORT_OPTIONS:MRAW) -.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE} -EVAS-LOADERS-DISABLER-BASE:= ${EVAS-LOADERS-DISABLER} -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE},raw" -.else -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE}raw" -.endif -.endif - -.if empty(PORT_OPTIONS:MSVG) -.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE} -EVAS-LOADERS-DISABLER-BASE:= ${EVAS-LOADERS-DISABLER} -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE},rsvg" -.else -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE}rsvg" -.endif -.endif - -.if empty(PORT_OPTIONS:MWEBP) -.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE} -EVAS-LOADERS-DISABLER-BASE:= ${EVAS-LOADERS-DISABLER} -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE},webp" -.else -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE}webp" -.endif -.endif - -.if empty(PORT_OPTIONS:MXCF) -.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE} -EVAS-LOADERS-DISABLER-BASE:= ${EVAS-LOADERS-DISABLER} -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE},xcf" -.else -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE}xcf" -.endif -.endif - -.if empty(PORT_OPTIONS:MAVIF) -.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE} -EVAS-LOADERS-DISABLER-BASE:= ${EVAS-LOADERS-DISABLER} -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE},avif" -.else -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE}avif" -.endif -.endif - -.if empty(PORT_OPTIONS:MHEIF) -.if ${EVAS-LOADERS-DISABLER} != ${EVAS-LOADERS-DISABLER-BASE} -EVAS-LOADERS-DISABLER-BASE:= ${EVAS-LOADERS-DISABLER} -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE},heif" -.else -EVAS-LOADERS-DISABLER:= "${EVAS-LOADERS-DISABLER-BASE}heif" -.endif -.endif - -MESON_ARGS+= ${EVAS-LOADERS-DISABLER} +MESON_ARGS+= -Devas-loaders-disabler="${EVAS_DISABLERS:ts,}" # Work-around build failure, which is caused by subtle problem in lld and -as-needed flag .if ${ARCH} == i386 @@ -303,19 +217,9 @@ BUILD_DEPENDS+= as:devel/binutils CFLAGS+= -no-integrated-as .endif -.if ${PORT_OPTIONS:MLUA} && ${PORT_OPTIONS:MCXX} -EFL_BINDINGS= -Dbindings=lua,cxx -.else -.if ${PORT_OPTIONS:MLUA} -EFL_BINDINGS= -Dbindings=lua -.else -.if ${PORT_OPTIONS:MCXX} -EFL_BINDINGS= -Dbindings=cxx -.endif -.endif -.endif +EFL_BINDINGS= ${LUA_BINDING} ${CXX_BINDING} -MESON_ARGS+= ${EFL_BINDINGS} +MESON_ARGS+= -Dbindings="${EFL_BINDINGS:ts,}" .if ${PORT_OPTIONS:MOPENGLES} && ${PORT_OPTIONS:MWAYLAND} LIB_DEPENDS+= libwayland-egl.so:graphics/wayland diff --git a/devel/efl/distinfo b/devel/efl/distinfo index 9eb76ddd7d65..766c194cd172 100644 --- a/devel/efl/distinfo +++ b/devel/efl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646771607 -SHA256 (enlightenment/efl-1.26.2.tar.xz) = 2979cfbc728a1a1f72ad86c2467d861ed91e664d3f17ef03190fb5c5f405301c -SIZE (enlightenment/efl-1.26.2.tar.xz) = 168537016 +TIMESTAMP = 1667499156 +SHA256 (enlightenment/efl-1.26.3.tar.xz) = d9f83aa0fd9334f44deeb4e4952dc0e5144683afac786feebce6030951617d15 +SIZE (enlightenment/efl-1.26.3.tar.xz) = 168540684 diff --git a/devel/efl/files/patch-src_lib_ecore_ecore__main.c b/devel/efl/files/patch-src_lib_ecore_ecore__main.c deleted file mode 100644 index 301bef323e48..000000000000 --- a/devel/efl/files/patch-src_lib_ecore_ecore__main.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/ecore/ecore_main.c.orig 2020-10-08 08:41:34 UTC -+++ src/lib/ecore/ecore_main.c -@@ -4,6 +4,8 @@ - - #define EINA_SLSTR_INTERNAL - -+#define FD_SETSIZE 8192 -+ - #ifdef _WIN32 - # ifndef USER_TIMER_MINIMUM - # define USER_TIMER_MINIMUM 0x0a