From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4FBAB138334 for ; Mon, 4 Feb 2019 01:14:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D56E7E0AEF; Mon, 4 Feb 2019 01:14:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A426DE0AEF for ; Mon, 4 Feb 2019 01:14:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5163233BEAE for ; Mon, 4 Feb 2019 01:14:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58F59520 for ; Mon, 4 Feb 2019 01:14:14 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1549242724.f77b1be67b97101d6efdb430dc14cd2e1f780287.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/efl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/efl/efl-1.20.7-r3.ebuild dev-libs/efl/efl-1.21.1-r3.ebuild dev-libs/efl/metadata.xml X-VCS-Directories: dev-libs/efl/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f77b1be67b97101d6efdb430dc14cd2e1f780287 X-VCS-Branch: master Date: Mon, 4 Feb 2019 01:14:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6052b05d-e239-48b4-9fb1-7e9cd2a33a66 X-Archives-Hash: 34b06e28c9db2d4665a60997ccf77305 commit: f77b1be67b97101d6efdb430dc14cd2e1f780287 Author: Joonas Niilola gmail com> AuthorDate: Fri Jan 11 04:57:59 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 4 01:12:04 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f77b1be6 dev-libs/efl: fix GL handling in ebuilds Bug: https://bugs.gentoo.org/673460 Closes: https://bugs.gentoo.org/673702 Closes: https://bugs.gentoo.org/673588 Package-Manager: Portage[mgorny]-2.3.51.1 Signed-off-by: Joonas Niilola gmail.com> Closes: https://github.com/gentoo/gentoo/pull/10696 Signed-off-by: Andreas Sturmlechner gentoo.org> .../{efl-1.21.1-r3.ebuild => efl-1.20.7-r3.ebuild} | 94 +++++++++++++--------- dev-libs/efl/efl-1.21.1-r3.ebuild | 24 +++--- dev-libs/efl/metadata.xml | 1 + 3 files changed, 69 insertions(+), 50 deletions(-) diff --git a/dev-libs/efl/efl-1.21.1-r3.ebuild b/dev-libs/efl/efl-1.20.7-r3.ebuild similarity index 71% copy from dev-libs/efl/efl-1.21.1-r3.ebuild copy to dev-libs/efl/efl-1.20.7-r3.ebuild index a2bedffdb45..eb9d5b8d1fa 100644 --- a/dev-libs/efl/efl-1.21.1-r3.ebuild +++ b/dev-libs/efl/efl-1.20.7-r3.ebuild @@ -6,41 +6,37 @@ EAPI=6 inherit gnome2-utils pax-utils xdg-utils DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" -HOMEPAGE="https://www.enlightenment.org" +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="+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 xpm xpresent zeroconf" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="avahi +bmp dds connman debug doc drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent" REQUIRED_USE=" - ?? ( opengl egl ) - ?? ( opengl gles ) - egl? ( gles ) + ?? ( gles2 opengl ) fbcon? ( !tslib ) - gles? ( - || ( X wayland ) + gles2? ( + || ( wayland X ) !sdl - egl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) - vnc? ( X fbcon ) - wayland? ( egl gles !opengl ) + vnc? ( fbcon X ) + wayland? ( gles2 !opengl ) xim? ( X ) - xpresent? ( X ) " -RDEPEND=" - net-misc/curl +COMMON_DEPEND=" 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 @@ -48,12 +44,11 @@ RDEPEND=" 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 ) + gles2? ( media-libs/mesa[egl,gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 @@ -61,13 +56,14 @@ RDEPEND=" harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) - jpeg2k? ( media-libs/openjpeg:= ) + 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:= ) + pixman? ( x11-libs/pixman ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) @@ -88,13 +84,12 @@ RDEPEND=" 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 ) + vlc? ( >=media-video/vlc-3.0.0 ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland @@ -115,35 +110,47 @@ RDEPEND=" x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver - gles? ( + opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) - opengl? ( + gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl + xpresent? ( x11-libs/libXpresent ) ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) - xpresent? ( x11-libs/libXpresent ) - zeroconf? ( net-dns/avahi ) " DEPEND=" - ${RDEPEND} + ${COMMON_DEPEND} virtual/pkgconfig + doc? ( app-doc/doxygen ) " -PATCHES=( - "${FILESDIR}/${P}-fix_evas_preload_segfault.patch" -) +RDEPEND=" + ${COMMON_DEPEND} + !media-libs/elementary + !media-plugins/emotion_generic_players + !media-plugins/evas_generic_loaders +" src_prepare() { default + # Remove sleep command that forces user to read warnings about their configuration. + # Back out gnu make hack that causes regen of Makefiles. + # Delete var setting that causes the build to abort. + sed -i \ + -e '/sleep 10/d' \ + -e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \ + -e '/BARF_OK=/s:=.*:=:' \ + configure || die "Sedding configure file failed in src_prepare." + # Upstream still doesnt offer a configure flag. #611108 if ! use unwind ; then sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \ @@ -155,39 +162,41 @@ src_prepare() { src_configure() { local myconf=( + --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb --enable-cserve --enable-image-loader-generic --enable-image-loader-jpeg --enable-image-loader-png - --enable-libeeze --enable-libmount - --enable-xinput22 + --enable-xinput2 - --disable-doc --disable-eglfs --disable-gesture --disable-gstreamer --disable-image-loader-tgv --disable-tizen - --disable-wayland-ivi-shell + --disable-xinput22 + $(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 doc) $(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 gles2 egl) $(use_enable gstreamer gstreamer1) $(use_enable harfbuzz) $(use_enable hyphen) $(use_enable ico image-loader-ico) $(use_enable ibus) + $(use_enable ivi wayland-ivi-shell) $(use_enable jpeg2k image-loader-jp2k) $(use_enable libuv) $(use_enable !luajit lua-old) @@ -195,6 +204,13 @@ src_configure() { $(use_enable nls) $(use_enable pdf poppler) $(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 postscript spectre) $(use_enable ppm image-loader-pmaps) $(use_enable psd image-loader-psd) @@ -205,7 +221,6 @@ src_configure() { $(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) @@ -220,8 +235,6 @@ src_configure() { $(use_enable xim) $(use_enable xine) $(use_enable xpm image-loader-xpm) - $(use_enable xpresent) - $(use_enable zeroconf avahi) --with-crypto=$(usex gnutls gnutls $(usex ssl openssl none)) --with-glib=$(usex glib) @@ -234,10 +247,11 @@ src_configure() { ) use drm && use wayland && myconf+=( --enable-gl-drm ) + use X && use xpresent && myconf+=( --enable-xpresent ) if use opengl ; then myconf+=( --with-opengl=full ) - elif use egl ; then + elif use gles2 ; then myconf+=( --with-opengl=es ) elif use drm && use wayland ; then myconf+=( --with-opengl=es ) @@ -259,9 +273,17 @@ src_compile() { fi V=1 emake || die "Compiling EFL failed." + + if use doc ; then + V=1 emake -j1 doc || die "Compiling docs for EFL failed." + fi } src_install() { + if use doc ; then + local HTML_DOCS=( doc/. ) + fi + einstalldocs V=1 emake install DESTDIR="${D}" || die "Installing EFL files failed." diff --git a/dev-libs/efl/efl-1.21.1-r3.ebuild b/dev-libs/efl/efl-1.21.1-r3.ebuild index a2bedffdb45..5d7865140e8 100644 --- a/dev-libs/efl/efl-1.21.1-r3.ebuild +++ b/dev-libs/efl/efl-1.21.1-r3.ebuild @@ -12,24 +12,21 @@ 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="+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 xpm xpresent zeroconf" +IUSE="+bmp dds connman debug drm +eet examples fbcon +fontconfig fribidi gif gles2 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 xpm xpresent zeroconf" REQUIRED_USE=" - ?? ( opengl egl ) - ?? ( opengl gles ) - egl? ( gles ) + ?? ( gles2 opengl ) fbcon? ( !tslib ) - gles? ( - || ( X wayland ) + gles2? ( + || ( wayland X ) !sdl - egl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) - vnc? ( X fbcon ) - wayland? ( egl gles !opengl ) + vnc? ( fbcon X ) + wayland? ( gles2 !opengl ) xim? ( X ) xpresent? ( X ) " @@ -48,11 +45,10 @@ RDEPEND=" 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] ) + gles2? ( media-libs/mesa[egl,gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 @@ -115,7 +111,7 @@ RDEPEND=" x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver - gles? ( + gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl @@ -177,12 +173,12 @@ src_configure() { $(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 gles2 egl) $(use_enable gstreamer gstreamer1) $(use_enable harfbuzz) $(use_enable hyphen) @@ -237,7 +233,7 @@ src_configure() { if use opengl ; then myconf+=( --with-opengl=full ) - elif use egl ; then + elif use gles2 ; then myconf+=( --with-opengl=es ) elif use drm && use wayland ; then myconf+=( --with-opengl=es ) diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml index 9a89497c2f4..04c533dba69 100644 --- a/dev-libs/efl/metadata.xml +++ b/dev-libs/efl/metadata.xml @@ -16,6 +16,7 @@ Enable EGL rendering Enable bidirectional text support Enable the OpenGL ES GL implementation + Enable the OpenGL ES GL implementation Enable dev-libs/glib support Enable complex text shaping and layout support Enable text hyphenation support