devel/efl: Update to 1.26.3

This commit is contained in:
Peter TKATCHENKO 2022-11-06 21:27:28 +03:00 committed by Gleb Popov
parent f95a79458e
commit f48874128b
3 changed files with 21 additions and 115 deletions

View File

@ -1,6 +1,5 @@
PORTNAME= efl
DISTVERSION= 1.26.2
PORTREVISION= 11
DISTVERSION= 1.26.3
CATEGORIES= devel enlightenment
MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/
DIST_SUBDIR= enlightenment
@ -107,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 \
@ -137,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
@ -146,19 +148,28 @@ 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
XCF_VARS_OFF= xcf_disabler=xcf
LUAJIT_USES= luajit
LUAJIT_MESON_ON= -Dlua-interpreter=luajit
@ -191,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}
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}
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
.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
@ -290,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

View File

@ -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

View File

@ -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