| 1 |
commit: f77b1be67b97101d6efdb430dc14cd2e1f780287 |
| 2 |
Author: Joonas Niilola <juippis <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jan 11 04:57:59 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 4 01:12:04 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f77b1be6 |
| 7 |
|
| 8 |
dev-libs/efl: fix GL handling in ebuilds |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/673460 |
| 11 |
Closes: https://bugs.gentoo.org/673702 |
| 12 |
Closes: https://bugs.gentoo.org/673588 |
| 13 |
Package-Manager: Portage[mgorny]-2.3.51.1 |
| 14 |
Signed-off-by: Joonas Niilola <juippis <AT> gmail.com> |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/10696 |
| 16 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 17 |
|
| 18 |
.../{efl-1.21.1-r3.ebuild => efl-1.20.7-r3.ebuild} | 94 +++++++++++++--------- |
| 19 |
dev-libs/efl/efl-1.21.1-r3.ebuild | 24 +++--- |
| 20 |
dev-libs/efl/metadata.xml | 1 + |
| 21 |
3 files changed, 69 insertions(+), 50 deletions(-) |
| 22 |
|
| 23 |
diff --git a/dev-libs/efl/efl-1.21.1-r3.ebuild b/dev-libs/efl/efl-1.20.7-r3.ebuild |
| 24 |
similarity index 71% |
| 25 |
copy from dev-libs/efl/efl-1.21.1-r3.ebuild |
| 26 |
copy to dev-libs/efl/efl-1.20.7-r3.ebuild |
| 27 |
index a2bedffdb45..eb9d5b8d1fa 100644 |
| 28 |
--- a/dev-libs/efl/efl-1.21.1-r3.ebuild |
| 29 |
+++ b/dev-libs/efl/efl-1.20.7-r3.ebuild |
| 30 |
@@ -6,41 +6,37 @@ EAPI=6 |
| 31 |
inherit gnome2-utils pax-utils xdg-utils |
| 32 |
|
| 33 |
DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" |
| 34 |
-HOMEPAGE="https://www.enlightenment.org" |
| 35 |
+HOMEPAGE="https://www.enlightenment.org/" |
| 36 |
SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz" |
| 37 |
|
| 38 |
LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" |
| 39 |
SLOT="0" |
| 40 |
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" |
| 41 |
-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" |
| 42 |
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 43 |
+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" |
| 44 |
|
| 45 |
REQUIRED_USE=" |
| 46 |
- ?? ( opengl egl ) |
| 47 |
- ?? ( opengl gles ) |
| 48 |
- egl? ( gles ) |
| 49 |
+ ?? ( gles2 opengl ) |
| 50 |
fbcon? ( !tslib ) |
| 51 |
- gles? ( |
| 52 |
- || ( X wayland ) |
| 53 |
+ gles2? ( |
| 54 |
+ || ( wayland X ) |
| 55 |
!sdl |
| 56 |
- egl |
| 57 |
) |
| 58 |
ibus? ( glib ) |
| 59 |
opengl? ( X ) |
| 60 |
pulseaudio? ( sound ) |
| 61 |
sdl? ( opengl ) |
| 62 |
- vnc? ( X fbcon ) |
| 63 |
- wayland? ( egl gles !opengl ) |
| 64 |
+ vnc? ( fbcon X ) |
| 65 |
+ wayland? ( gles2 !opengl ) |
| 66 |
xim? ( X ) |
| 67 |
- xpresent? ( X ) |
| 68 |
" |
| 69 |
|
| 70 |
-RDEPEND=" |
| 71 |
- net-misc/curl |
| 72 |
+COMMON_DEPEND=" |
| 73 |
media-libs/libpng:0= |
| 74 |
sys-apps/dbus |
| 75 |
sys-apps/util-linux |
| 76 |
sys-libs/zlib:= |
| 77 |
virtual/jpeg:0= |
| 78 |
+ avahi? ( net-dns/avahi ) |
| 79 |
connman? ( net-misc/connman ) |
| 80 |
drm? ( |
| 81 |
dev-libs/libinput |
| 82 |
@@ -48,12 +44,11 @@ RDEPEND=" |
| 83 |
x11-libs/libdrm |
| 84 |
x11-libs/libxkbcommon |
| 85 |
) |
| 86 |
- egl? ( media-libs/mesa[egl] ) |
| 87 |
fontconfig? ( media-libs/fontconfig ) |
| 88 |
fribidi? ( dev-libs/fribidi ) |
| 89 |
gif? ( media-libs/giflib:= ) |
| 90 |
- gles? ( media-libs/mesa[gles2] ) |
| 91 |
glib? ( dev-libs/glib:2 ) |
| 92 |
+ gles2? ( media-libs/mesa[egl,gles2] ) |
| 93 |
gstreamer? ( |
| 94 |
media-libs/gstreamer:1.0 |
| 95 |
media-libs/gst-plugins-base:1.0 |
| 96 |
@@ -61,13 +56,14 @@ RDEPEND=" |
| 97 |
harfbuzz? ( media-libs/harfbuzz ) |
| 98 |
hyphen? ( dev-libs/hyphen ) |
| 99 |
ibus? ( app-i18n/ibus ) |
| 100 |
- jpeg2k? ( media-libs/openjpeg:= ) |
| 101 |
+ jpeg2k? ( media-libs/openjpeg:0= ) |
| 102 |
libuv? ( dev-libs/libuv ) |
| 103 |
luajit? ( dev-lang/luajit:= ) |
| 104 |
!luajit? ( dev-lang/lua:* ) |
| 105 |
nls? ( sys-devel/gettext ) |
| 106 |
pdf? ( app-text/poppler:=[cxx] ) |
| 107 |
physics? ( sci-physics/bullet:= ) |
| 108 |
+ pixman? ( x11-libs/pixman ) |
| 109 |
postscript? ( app-text/libspectre ) |
| 110 |
pulseaudio? ( media-sound/pulseaudio ) |
| 111 |
raw? ( media-libs/libraw:= ) |
| 112 |
@@ -88,13 +84,12 @@ RDEPEND=" |
| 113 |
gnome-base/librsvg |
| 114 |
x11-libs/cairo |
| 115 |
) |
| 116 |
- system-lz4? ( app-arch/lz4 ) |
| 117 |
systemd? ( sys-apps/systemd ) |
| 118 |
tiff? ( media-libs/tiff:0= ) |
| 119 |
tslib? ( x11-libs/tslib:= ) |
| 120 |
unwind? ( sys-libs/libunwind ) |
| 121 |
valgrind? ( dev-util/valgrind ) |
| 122 |
- vlc? ( media-video/vlc ) |
| 123 |
+ vlc? ( >=media-video/vlc-3.0.0 ) |
| 124 |
vnc? ( net-libs/libvncserver ) |
| 125 |
wayland? ( |
| 126 |
dev-libs/wayland |
| 127 |
@@ -115,35 +110,47 @@ RDEPEND=" |
| 128 |
x11-libs/libXrender |
| 129 |
x11-libs/libXtst |
| 130 |
x11-libs/libXScrnSaver |
| 131 |
- gles? ( |
| 132 |
+ opengl? ( |
| 133 |
x11-libs/libX11 |
| 134 |
x11-libs/libXrender |
| 135 |
virtual/opengl |
| 136 |
) |
| 137 |
- opengl? ( |
| 138 |
+ gles2? ( |
| 139 |
x11-libs/libX11 |
| 140 |
x11-libs/libXrender |
| 141 |
virtual/opengl |
| 142 |
+ xpresent? ( x11-libs/libXpresent ) |
| 143 |
) |
| 144 |
) |
| 145 |
xine? ( media-libs/xine-lib ) |
| 146 |
xpm? ( x11-libs/libXpm ) |
| 147 |
- xpresent? ( x11-libs/libXpresent ) |
| 148 |
- zeroconf? ( net-dns/avahi ) |
| 149 |
" |
| 150 |
|
| 151 |
DEPEND=" |
| 152 |
- ${RDEPEND} |
| 153 |
+ ${COMMON_DEPEND} |
| 154 |
virtual/pkgconfig |
| 155 |
+ doc? ( app-doc/doxygen ) |
| 156 |
" |
| 157 |
|
| 158 |
-PATCHES=( |
| 159 |
- "${FILESDIR}/${P}-fix_evas_preload_segfault.patch" |
| 160 |
-) |
| 161 |
+RDEPEND=" |
| 162 |
+ ${COMMON_DEPEND} |
| 163 |
+ !media-libs/elementary |
| 164 |
+ !media-plugins/emotion_generic_players |
| 165 |
+ !media-plugins/evas_generic_loaders |
| 166 |
+" |
| 167 |
|
| 168 |
src_prepare() { |
| 169 |
default |
| 170 |
|
| 171 |
+ # Remove sleep command that forces user to read warnings about their configuration. |
| 172 |
+ # Back out gnu make hack that causes regen of Makefiles. |
| 173 |
+ # Delete var setting that causes the build to abort. |
| 174 |
+ sed -i \ |
| 175 |
+ -e '/sleep 10/d' \ |
| 176 |
+ -e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \ |
| 177 |
+ -e '/BARF_OK=/s:=.*:=:' \ |
| 178 |
+ configure || die "Sedding configure file failed in src_prepare." |
| 179 |
+ |
| 180 |
# Upstream still doesnt offer a configure flag. #611108 |
| 181 |
if ! use unwind ; then |
| 182 |
sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \ |
| 183 |
@@ -155,39 +162,41 @@ src_prepare() { |
| 184 |
|
| 185 |
src_configure() { |
| 186 |
local myconf=( |
| 187 |
+ --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 |
| 188 |
--enable-cserve |
| 189 |
--enable-image-loader-generic |
| 190 |
--enable-image-loader-jpeg |
| 191 |
--enable-image-loader-png |
| 192 |
- --enable-libeeze |
| 193 |
--enable-libmount |
| 194 |
- --enable-xinput22 |
| 195 |
+ --enable-xinput2 |
| 196 |
|
| 197 |
- --disable-doc |
| 198 |
--disable-eglfs |
| 199 |
--disable-gesture |
| 200 |
--disable-gstreamer |
| 201 |
--disable-image-loader-tgv |
| 202 |
--disable-tizen |
| 203 |
- --disable-wayland-ivi-shell |
| 204 |
+ --disable-xinput22 |
| 205 |
|
| 206 |
+ $(use_enable avahi) |
| 207 |
$(use_enable bmp image-loader-bmp) |
| 208 |
$(use_enable bmp image-loader-wbmp) |
| 209 |
$(use_enable dds image-loader-dds) |
| 210 |
$(use_enable drm) |
| 211 |
$(use_enable drm elput) |
| 212 |
+ $(use_enable doc) |
| 213 |
$(use_enable eet image-loader-eet) |
| 214 |
- $(use_enable egl) |
| 215 |
$(use_enable examples always-build-examples) |
| 216 |
$(use_enable fbcon fb) |
| 217 |
$(use_enable fontconfig) |
| 218 |
$(use_enable fribidi) |
| 219 |
$(use_enable gif image-loader-gif) |
| 220 |
+ $(use_enable gles2 egl) |
| 221 |
$(use_enable gstreamer gstreamer1) |
| 222 |
$(use_enable harfbuzz) |
| 223 |
$(use_enable hyphen) |
| 224 |
$(use_enable ico image-loader-ico) |
| 225 |
$(use_enable ibus) |
| 226 |
+ $(use_enable ivi wayland-ivi-shell) |
| 227 |
$(use_enable jpeg2k image-loader-jp2k) |
| 228 |
$(use_enable libuv) |
| 229 |
$(use_enable !luajit lua-old) |
| 230 |
@@ -195,6 +204,13 @@ src_configure() { |
| 231 |
$(use_enable nls) |
| 232 |
$(use_enable pdf poppler) |
| 233 |
$(use_enable physics) |
| 234 |
+ $(use_enable pixman) |
| 235 |
+ $(use_enable pixman pixman-font) |
| 236 |
+ $(use_enable pixman pixman-rect) |
| 237 |
+ $(use_enable pixman pixman-line) |
| 238 |
+ $(use_enable pixman pixman-poly) |
| 239 |
+ $(use_enable pixman pixman-image) |
| 240 |
+ $(use_enable pixman pixman-image-scale-sample) |
| 241 |
$(use_enable postscript spectre) |
| 242 |
$(use_enable ppm image-loader-pmaps) |
| 243 |
$(use_enable psd image-loader-psd) |
| 244 |
@@ -205,7 +221,6 @@ src_configure() { |
| 245 |
$(use_enable sound audio) |
| 246 |
$(use_enable static-libs static) |
| 247 |
$(use_enable svg librsvg) |
| 248 |
- $(use_enable system-lz4 liblz4) |
| 249 |
$(use_enable systemd) |
| 250 |
$(use_enable tga image-loader-tga) |
| 251 |
$(use_enable tiff image-loader-tiff) |
| 252 |
@@ -220,8 +235,6 @@ src_configure() { |
| 253 |
$(use_enable xim) |
| 254 |
$(use_enable xine) |
| 255 |
$(use_enable xpm image-loader-xpm) |
| 256 |
- $(use_enable xpresent) |
| 257 |
- $(use_enable zeroconf avahi) |
| 258 |
|
| 259 |
--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none)) |
| 260 |
--with-glib=$(usex glib) |
| 261 |
@@ -234,10 +247,11 @@ src_configure() { |
| 262 |
) |
| 263 |
|
| 264 |
use drm && use wayland && myconf+=( --enable-gl-drm ) |
| 265 |
+ use X && use xpresent && myconf+=( --enable-xpresent ) |
| 266 |
|
| 267 |
if use opengl ; then |
| 268 |
myconf+=( --with-opengl=full ) |
| 269 |
- elif use egl ; then |
| 270 |
+ elif use gles2 ; then |
| 271 |
myconf+=( --with-opengl=es ) |
| 272 |
elif use drm && use wayland ; then |
| 273 |
myconf+=( --with-opengl=es ) |
| 274 |
@@ -259,9 +273,17 @@ src_compile() { |
| 275 |
fi |
| 276 |
|
| 277 |
V=1 emake || die "Compiling EFL failed." |
| 278 |
+ |
| 279 |
+ if use doc ; then |
| 280 |
+ V=1 emake -j1 doc || die "Compiling docs for EFL failed." |
| 281 |
+ fi |
| 282 |
} |
| 283 |
|
| 284 |
src_install() { |
| 285 |
+ if use doc ; then |
| 286 |
+ local HTML_DOCS=( doc/. ) |
| 287 |
+ fi |
| 288 |
+ |
| 289 |
einstalldocs |
| 290 |
|
| 291 |
V=1 emake install DESTDIR="${D}" || die "Installing EFL files failed." |
| 292 |
|
| 293 |
diff --git a/dev-libs/efl/efl-1.21.1-r3.ebuild b/dev-libs/efl/efl-1.21.1-r3.ebuild |
| 294 |
index a2bedffdb45..5d7865140e8 100644 |
| 295 |
--- a/dev-libs/efl/efl-1.21.1-r3.ebuild |
| 296 |
+++ b/dev-libs/efl/efl-1.21.1-r3.ebuild |
| 297 |
@@ -12,24 +12,21 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz" |
| 298 |
LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" |
| 299 |
SLOT="0" |
| 300 |
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" |
| 301 |
-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" |
| 302 |
+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" |
| 303 |
|
| 304 |
REQUIRED_USE=" |
| 305 |
- ?? ( opengl egl ) |
| 306 |
- ?? ( opengl gles ) |
| 307 |
- egl? ( gles ) |
| 308 |
+ ?? ( gles2 opengl ) |
| 309 |
fbcon? ( !tslib ) |
| 310 |
- gles? ( |
| 311 |
- || ( X wayland ) |
| 312 |
+ gles2? ( |
| 313 |
+ || ( wayland X ) |
| 314 |
!sdl |
| 315 |
- egl |
| 316 |
) |
| 317 |
ibus? ( glib ) |
| 318 |
opengl? ( X ) |
| 319 |
pulseaudio? ( sound ) |
| 320 |
sdl? ( opengl ) |
| 321 |
- vnc? ( X fbcon ) |
| 322 |
- wayland? ( egl gles !opengl ) |
| 323 |
+ vnc? ( fbcon X ) |
| 324 |
+ wayland? ( gles2 !opengl ) |
| 325 |
xim? ( X ) |
| 326 |
xpresent? ( X ) |
| 327 |
" |
| 328 |
@@ -48,11 +45,10 @@ RDEPEND=" |
| 329 |
x11-libs/libdrm |
| 330 |
x11-libs/libxkbcommon |
| 331 |
) |
| 332 |
- egl? ( media-libs/mesa[egl] ) |
| 333 |
fontconfig? ( media-libs/fontconfig ) |
| 334 |
fribidi? ( dev-libs/fribidi ) |
| 335 |
gif? ( media-libs/giflib:= ) |
| 336 |
- gles? ( media-libs/mesa[gles2] ) |
| 337 |
+ gles2? ( media-libs/mesa[egl,gles2] ) |
| 338 |
glib? ( dev-libs/glib:2 ) |
| 339 |
gstreamer? ( |
| 340 |
media-libs/gstreamer:1.0 |
| 341 |
@@ -115,7 +111,7 @@ RDEPEND=" |
| 342 |
x11-libs/libXrender |
| 343 |
x11-libs/libXtst |
| 344 |
x11-libs/libXScrnSaver |
| 345 |
- gles? ( |
| 346 |
+ gles2? ( |
| 347 |
x11-libs/libX11 |
| 348 |
x11-libs/libXrender |
| 349 |
virtual/opengl |
| 350 |
@@ -177,12 +173,12 @@ src_configure() { |
| 351 |
$(use_enable drm) |
| 352 |
$(use_enable drm elput) |
| 353 |
$(use_enable eet image-loader-eet) |
| 354 |
- $(use_enable egl) |
| 355 |
$(use_enable examples always-build-examples) |
| 356 |
$(use_enable fbcon fb) |
| 357 |
$(use_enable fontconfig) |
| 358 |
$(use_enable fribidi) |
| 359 |
$(use_enable gif image-loader-gif) |
| 360 |
+ $(use_enable gles2 egl) |
| 361 |
$(use_enable gstreamer gstreamer1) |
| 362 |
$(use_enable harfbuzz) |
| 363 |
$(use_enable hyphen) |
| 364 |
@@ -237,7 +233,7 @@ src_configure() { |
| 365 |
|
| 366 |
if use opengl ; then |
| 367 |
myconf+=( --with-opengl=full ) |
| 368 |
- elif use egl ; then |
| 369 |
+ elif use gles2 ; then |
| 370 |
myconf+=( --with-opengl=es ) |
| 371 |
elif use drm && use wayland ; then |
| 372 |
myconf+=( --with-opengl=es ) |
| 373 |
|
| 374 |
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml |
| 375 |
index 9a89497c2f4..04c533dba69 100644 |
| 376 |
--- a/dev-libs/efl/metadata.xml |
| 377 |
+++ b/dev-libs/efl/metadata.xml |
| 378 |
@@ -16,6 +16,7 @@ |
| 379 |
<flag name="egl">Enable EGL rendering</flag> |
| 380 |
<flag name="fribidi">Enable bidirectional text support</flag> |
| 381 |
<flag name="gles">Enable the OpenGL ES GL implementation</flag> |
| 382 |
+ <flag name="gles2">Enable the OpenGL ES GL implementation</flag> |
| 383 |
<flag name="glib">Enable <pkg>dev-libs/glib</pkg> support</flag> |
| 384 |
<flag name="harfbuzz">Enable complex text shaping and layout support</flag> |
| 385 |
<flag name="hyphen">Enable text hyphenation support</flag> |
Archives