commit: 32578b4efcf9161fef1b2267cc1fc2d31aa52a7e Author: Joonas Niilola <juippis <AT> gmail <DOT> com> AuthorDate: Wed Dec 5 07:16:15 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Dec 5 08:35:31 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32578b4e
dev-libs/efl: revbump 1.21.1 to fix evas-preload segfault - thanks to tbartdev <AT> gmx-topmail.de for the patch - upstream bug: https://phab.enlightenment.org/T7354 Closes: https://bugs.gentoo.org/671876 Package-Manager: Portage[mgorny]-2.3.51.1 Signed-off-by: Joonas Niilola <juippis <AT> gmail.com> Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-libs/efl/efl-1.21.1-r1.ebuild | 279 +++++++++++++++++++++ .../efl-1.21.1-fix_evas_preload_segfault.patch | 10 + 2 files changed, 289 insertions(+) diff --git a/dev-libs/efl/efl-1.21.1-r1.ebuild b/dev-libs/efl/efl-1.21.1-r1.ebuild new file mode 100644 index 00000000000..c6e1fed2916 --- /dev/null +++ b/dev-libs/efl/efl-1.21.1-r1.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome2-utils pax-utils xdg-utils + +DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" +HOMEPAGE="https://www.enlightenment.org"; +SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"; + +LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="avahi +bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm" + +REQUIRED_USE=" + ?? ( opengl egl ) + ?? ( opengl gles ) + fbcon? ( !tslib ) + gles? ( + || ( X wayland ) + !sdl + egl + ) + ibus? ( glib ) + opengl? ( X ) + pulseaudio? ( sound ) + sdl? ( opengl ) + vnc? ( X fbcon ) + wayland? ( egl gles !opengl ) + xim? ( X ) + xpresent? ( X ) +" + +RDEPEND=" + net-misc/curl + media-libs/libpng:0= + sys-apps/dbus + sys-apps/util-linux + sys-libs/zlib:= + virtual/jpeg:0= + avahi? ( net-dns/avahi ) + connman? ( net-misc/connman ) + drm? ( + dev-libs/libinput + media-libs/mesa[gbm] + x11-libs/libdrm + x11-libs/libxkbcommon + ) + egl? ( media-libs/mesa[egl] ) + fontconfig? ( media-libs/fontconfig ) + fribidi? ( dev-libs/fribidi ) + gif? ( media-libs/giflib:= ) + gles? ( media-libs/mesa[gles2] ) + glib? ( dev-libs/glib:2 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + harfbuzz? ( media-libs/harfbuzz ) + hyphen? ( dev-libs/hyphen ) + ibus? ( app-i18n/ibus ) + jpeg2k? ( media-libs/openjpeg:0= ) + libuv? ( dev-libs/libuv ) + luajit? ( dev-lang/luajit:= ) + !luajit? ( dev-lang/lua:* ) + nls? ( sys-devel/gettext ) + pdf? ( app-text/poppler:=[cxx] ) + physics? ( sci-physics/bullet:= ) + postscript? ( app-text/libspectre ) + pulseaudio? ( media-sound/pulseaudio ) + raw? ( media-libs/libraw:= ) + scim? ( app-i18n/scim ) + sdl? ( + media-libs/libsdl2 + virtual/opengl + ) + sound? ( media-libs/libsndfile ) + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + ) + ) + svg? ( + gnome-base/librsvg + x11-libs/cairo + ) + system-lz4? ( app-arch/lz4 ) + systemd? ( sys-apps/systemd ) + tiff? ( media-libs/tiff:0= ) + tslib? ( x11-libs/tslib:= ) + unwind? ( sys-libs/libunwind ) + valgrind? ( dev-util/valgrind ) + vlc? ( media-video/vlc ) + vnc? ( net-libs/libvncserver ) + wayland? ( + dev-libs/wayland + media-libs/mesa[gles2,wayland] + x11-libs/libxkbcommon + ) + webp? ( media-libs/libwebp:= ) + X? ( + media-libs/freetype + x11-libs/libXcursor + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libXScrnSaver + gles? ( + x11-libs/libX11 + x11-libs/libXrender + virtual/opengl + ) + opengl? ( + x11-libs/libX11 + x11-libs/libXrender + virtual/opengl + ) + ) + xine? ( media-libs/xine-lib ) + xpm? ( x11-libs/libXpm ) + xpresent? ( x11-libs/libXpresent ) +" + +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${P}-fix_evas_preload_segfault.patch" +) + +src_prepare() { + default + + # Upstream still doesnt offer a configure flag. #611108 + if ! use unwind ; then + sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \ + configure || die "Sedding configure file with unwind fix failed." + fi + + xdg_environment_reset +} + +src_configure() { + local myconf=( + --enable-cserve + --enable-image-loader-generic + --enable-image-loader-jpeg + --enable-image-loader-png + --enable-libeeze + --enable-libmount + --enable-xinput22 + + --disable-doc + --disable-eglfs + --disable-gesture + --disable-gstreamer + --disable-image-loader-tgv + --disable-tizen + --disable-wayland-ivi-shell + + $(use_enable avahi) + $(use_enable bmp image-loader-bmp) + $(use_enable bmp image-loader-wbmp) + $(use_enable dds image-loader-dds) + $(use_enable drm) + $(use_enable drm elput) + $(use_enable eet image-loader-eet) + $(use_enable egl) + $(use_enable examples always-build-examples) + $(use_enable fbcon fb) + $(use_enable fontconfig) + $(use_enable fribidi) + $(use_enable gif image-loader-gif) + $(use_enable gstreamer gstreamer1) + $(use_enable harfbuzz) + $(use_enable hyphen) + $(use_enable ico image-loader-ico) + $(use_enable ibus) + $(use_enable jpeg2k image-loader-jp2k) + $(use_enable libuv) + $(use_enable !luajit lua-old) + $(use_enable neon) + $(use_enable nls) + $(use_enable pdf poppler) + $(use_enable physics) + $(use_enable postscript spectre) + $(use_enable ppm image-loader-pmaps) + $(use_enable psd image-loader-psd) + $(use_enable pulseaudio) + $(use_enable raw libraw) + $(use_enable scim) + $(use_enable sdl) + $(use_enable sound audio) + $(use_enable static-libs static) + $(use_enable svg librsvg) + $(use_enable system-lz4 liblz4) + $(use_enable systemd) + $(use_enable tga image-loader-tga) + $(use_enable tiff image-loader-tiff) + $(use_enable tslib) + $(use_enable v4l v4l2) + $(use_enable valgrind) + $(use_enable vlc libvlc) + $(use_enable vnc vnc-server) + $(use_enable wayland) + $(use_enable webp image-loader-webp) + $(use_enable xcf) + $(use_enable xim) + $(use_enable xine) + $(use_enable xpm image-loader-xpm) + $(use_enable xpresent) + + --with-crypto=$(usex gnutls gnutls $(usex ssl openssl none)) + --with-glib=$(usex glib) + --with-js=none + --with-net-control=$(usex connman connman none) + --with-profile=$(usex debug debug release) + --with-x11=$(usex X xlib none) + + $(use_with X x) + ) + + use drm && use wayland && myconf+=( --enable-gl-drm ) + + if use opengl ; then + myconf+=( --with-opengl=full ) + elif use egl ; then + myconf+=( --with-opengl=es ) + elif use drm && use wayland ; then + myconf+=( --with-opengl=es ) + else + myconf+=( --with-opengl=none ) + fi + + econf "${myconf[@]}" +} + +src_compile() { + if host-is-pax && use luajit ; then + # We need to build the lua code first so we can pax-mark it. #547076 + local target='_e_built_sources_target_gogogo_' + printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die + emake -C src "${target}" + emake -C src bin/elua/elua + pax-mark m src/bin/elua/.libs/elua + fi + + V=1 emake || die "Compiling EFL failed." +} + +src_install() { + einstalldocs + + V=1 emake install DESTDIR="${D}" || die "Installing EFL files failed." + + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update +} diff --git a/dev-libs/efl/files/efl-1.21.1-fix_evas_preload_segfault.patch b/dev-libs/efl/files/efl-1.21.1-fix_evas_preload_segfault.patch new file mode 100644 index 00000000000..8d42cbb0f25 --- /dev/null +++ b/dev-libs/efl/files/efl-1.21.1-fix_evas_preload_segfault.patch @@ -0,0 +1,10 @@ +--- a/src/lib/evas/cache/evas_cache_image.c 14:09:44.971119099 +0100 ++++ b/src/lib/evas/cache/evas_cache_image.c 14:10:21.521226043 +0100 +@@ -361,6 +361,7 @@ + cache = current->cache; + + if ((!current->flags.loaded) && ++ (current->info.loader) && + current->info.loader->threadable) + { + evas_module_task_register(evas_cache_image_cancelled, current);
