tommy 14/03/08 16:49:26 Modified: efl-1.8.5.ebuild ChangeLog Added: efl-1.8.6.ebuild Log: Version bump, require disabled sdl for gles for bug 496256 (Portage version: 2.2.6-r1/cvs/Linux x86_64, signed Manifest commit with key 0x35899067)
Revision Changes Path 1.4 dev-libs/efl/efl-1.8.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/efl/efl-1.8.5.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/efl/efl-1.8.5.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/efl/efl-1.8.5.ebuild?r1=1.3&r2=1.4 Index: efl-1.8.5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.8.5.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- efl-1.8.5.ebuild 6 Mar 2014 01:04:33 -0000 1.3 +++ efl-1.8.5.ebuild 8 Mar 2014 16:49:26 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.8.5.ebuild,v 1.3 2014/03/06 01:04:33 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.8.5.ebuild,v 1.4 2014/03/08 16:49:26 tommy Exp $ EAPI="5" @@ -28,9 +28,9 @@ pulseaudio? ( audio ) opengl? ( || ( X xcb sdl wayland ) ) gles? ( || ( X xcb sdl wayland ) ) + gles? ( !sdl ) gles? ( egl ) xcb? ( pixman ) - sdl? ( || ( opengl gles ) ) wayland? ( egl !opengl gles ) xim? ( || ( X xcb ) ) " 1.7 dev-libs/efl/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/efl/ChangeLog?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/efl/ChangeLog?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/efl/ChangeLog?r1=1.6&r2=1.7 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/efl/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ChangeLog 6 Mar 2014 01:04:33 -0000 1.6 +++ ChangeLog 8 Mar 2014 16:49:26 -0000 1.7 @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/efl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/ChangeLog,v 1.6 2014/03/06 01:04:33 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/ChangeLog,v 1.7 2014/03/08 16:49:26 tommy Exp $ + +*efl-1.8.6 (08 Mar 2014) + + 08 Mar 2014; Thomas Sachau (Tommy[D]) <[email protected]> +efl-1.8.6.ebuild, + efl-1.8.5.ebuild: + Version bump, require disabled sdl for gles for bug 496256 06 Mar 2014; Rick Farina <[email protected]> efl-1.8.5.ebuild, efl-1.9.0.ebuild: 1.1 dev-libs/efl/efl-1.8.6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/efl/efl-1.8.6.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/efl/efl-1.8.6.ebuild?rev=1.1&content-type=text/plain Index: efl-1.8.6.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.8.6.ebuild,v 1.1 2014/03/08 16:49:26 tommy Exp $ EAPI="5" MY_P=${P/_/-} if [[ "${PV}" == "9999" ]] ; then EGIT_SUB_PROJECT="core" EGIT_URI_APPEND="${PN}" else SRC_URI="http://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.bz2"; EKEY_STATE="snap" fi inherit enlightenment DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" KEYWORDS="~amd64 ~arm ~x86" IUSE="audio +bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl systemd tga tiff tslib v4l2 wayland webp X xcb xim xine xpm" REQUIRED_USE=" X? ( !xcb ) pulseaudio? ( audio ) opengl? ( || ( X xcb sdl wayland ) ) gles? ( || ( X xcb wayland ) ) gles? ( !sdl ) gles? ( egl ) xcb? ( pixman ) wayland? ( egl !opengl gles ) xim? ( || ( X xcb ) ) " RDEPEND=" audio? ( media-libs/libsndfile ) debug? ( dev-util/valgrind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) glib? ( dev-libs/glib ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* =media-plugins/gst-plugins-ffmpeg-0.10* ) harfbuzz? ( media-libs/harfbuzz ) ibus? ( app-i18n/ibus ) jp2k? ( media-libs/openjpeg ) jpeg? ( virtual/jpeg ) physics? ( sci-physics/bullet ) pixman? ( x11-libs/pixman ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl virtual/opengl ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff ) tslib? ( x11-libs/tslib ) wayland? ( >=dev-libs/wayland-1.3.0 >=x11-libs/libxkbcommon-0.3.1 media-libs/mesa[gles2,wayland] ) webp? ( media-libs/libwebp ) X? ( x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXp x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xcb? ( x11-libs/libxcb opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl x11-libs/xcb-util-renderutil ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl x11-libs/xcb-util-renderutil ) ) xine? ( >=media-libs/xine-lib-1.1.1 ) xpm? ( x11-libs/libXpm ) dev-lang/lua sys-apps/dbus >=sys-apps/util-linux-2.20.0 sys-libs/zlib !dev-libs/ecore !dev-libs/edbus !dev-libs/eet !dev-libs/eeze !dev-libs/efreet !dev-libs/eina !dev-libs/eio !dev-libs/embryo !dev-libs/eobj !dev-libs/ephysics !media-libs/edje !media-libs/emotion !media-libs/ethumb !media-libs/evas " #soft blockers added above for binpkg users #hard blocks are needed for building CORE_EFL_CONFLICTS=" !!dev-libs/ecore !!dev-libs/edbus !!dev-libs/eet !!dev-libs/eeze !!dev-libs/efreet !!dev-libs/eina !!dev-libs/eio !!dev-libs/embryo !!dev-libs/eobj !!dev-libs/ephysics !!media-libs/edje !!media-libs/emotion !!media-libs/ethumb !!media-libs/evas " DEPEND=" ${CORE_EFL_CONFLICTS} ${RDEPEND} doc? ( app-doc/doxygen ) " S=${WORKDIR}/${MY_P} src_configure() { use ssl && use gnutls && { einfo "You enabled both USEssl and USE=gnutls, but only one can be used" einfo "gnutls has been selected for you" } use opengl && use gles && { einfo "You enabled both USE=opengl and USE=gles, but only one can be used" einfo "opengl has been selected for you" } local profile="release" use debug && profile="debug" local crypto="none" use gnutls && crypto="gnutls" use ssl && crypto="openssl" local x11="none" local enable_graphics="" use X && x11="xlib" use xcb && x11="xcb" local MY_ECONF ( use X || use xcb ) && MY_ECONF+=" --with-x" local opengl="none" use gles && opengl="es" use opengl && opengl="full" local glib="no" use glib && glib="yes" MY_ECONF+=" --with-profile=${profile} --with-crypto=${crypto} --with-x11=${x11} --with-opengl=${opengl} --with-glib=${glib} $(use_enable audio) $(use_enable bmp image-loader-bmp) $(use_enable bmp image-loader-wbmp) $(use_enable drm) $(use_enable doc) $(use_enable eet image-loader-eet) $(use_enable egl) $(use_enable fbcon fb) $(use_enable fontconfig) $(use_enable fribidi) $(use_enable gif image-loader-gif) $(use_enable gstreamer) $(use_enable harfbuzz) $(use_enable ico image-loader-ico) $(use_enable ibus) $(use_enable jp2k image-loader-jp2k) $(use_enable jpeg image-loader-jpeg) $(use_enable nls) $(use_enable physics) $(use_enable pixman) $(use_enable pixman pixman-font) $(use_enable pixman pixman-rect) $(use_enable pixman pixman-line) $(use_enable pixman pixman-poly) $(use_enable pixman pixman-image) $(use_enable pixman pixman-image-scale-sample) $(use_enable png image-loader-png) $(use_enable ppm image-loader-pmaps) $(use_enable psd image-loader-psd) $(use_enable pulseaudio) $(use_enable scim) $(use_enable sdl) $(use_enable systemd) $(use_enable tga image-loader-tga) $(use_enable tiff image-loader-tiff) $(use_enable tslib) $(use_enable v4l2) $(use_enable wayland) $(use_enable webp image-loader-webp) $(use_enable xim) $(use_enable xine) $(use_enable xpm image-loader-xpm) --enable-cserve --enable-image-loader-generic --disable-tizen --disable-gesture --enable-xinput2 --disable-xinput22 --disable-multisense --enable-libmount " enlightenment_src_configure } src_compile() { ewarn "If the following compile phase fails with a message including" ewarn "lib/edje/.libs/libedje.so: undefined reference to 'eet_mmap'" ewarn "then most likely the @preserved-rebuild feature of portage" ewarn "preserved the 1.7 libraries, which cause the build failure." ewarn "As a workaround, either remove those libs manually or" ewarn "uninstall all packages still using those old libs with" ewarn "emerge -aC @preserved-rebuild" enlightenment_src_compile } src_install() { MAKEOPTS+=" -j1" enlightenment_src_install }
