Gentoo Archives: gentoo-commits

From: Ralph Sennhauser <sera@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/sera:master commit in: dev-libs/efl/, dev-libs/efl/files/
Date: Fri, 31 Oct 2014 07:38:50
Message-Id: 1414740747.33a44837920fce568fdbdff836d2c3e278645c80.sera@gentoo
1 commit: 33a44837920fce568fdbdff836d2c3e278645c80
2 Author: Ralph Sennhauser <sera <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 31 07:32:27 2014 +0000
4 Commit: Ralph Sennhauser <sera <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 31 07:32:27 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=dev/sera.git;a=commit;h=33a44837
7
8 efl-1.12.0_beta1: Version bump
9
10 Package-Manager: portage-2.2.14
11 Manifest-Sign-Key: 3C5CF75A
12
13 ---
14 dev-libs/efl/Manifest | 15 +-
15 dev-libs/efl/efl-1.12.0_beta1.ebuild | 236 +++++++++++++++++++++++
16 dev-libs/efl/files/efl-1.12.0_beta1-tmpdir.patch | 40 ++++
17 3 files changed, 284 insertions(+), 7 deletions(-)
18
19 diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
20 index 6eaa34f..8227970 100644
21 --- a/dev-libs/efl/Manifest
22 +++ b/dev-libs/efl/Manifest
23 @@ -2,14 +2,15 @@
24 Hash: SHA256
25
26 DIST efl-1.11.4.tar.bz2 40949204 SHA256 c60ffa209d9e2ea90bbfe3e1ec77500034cb055b5a441dad67042cc39dfcaeec SHA512 d5df667e09acda2814bd6a265ad55d06ebae6cbf45ef3800ac60d0bc4c53e5126d5c359688f17ae0812195623f9c60dc06638d6037586aa74d0cf9ee03083d78 WHIRLPOOL 000448973a225f206c85356b87e006f898b2e3a325192d900b4b07486dcb4f62a98fba6c05dcfb02a868e886dd9678bd1910345aa87e3c5221cc9878cd2ebe0c
27 +DIST efl-1.12.0-beta1.tar.bz2 46425713 SHA256 fa5e13f97e2282404e9bcf3d1ca4dd72163b8627efc10017c1d703dbfd61bac5 SHA512 221ffdf7102bbd57850837420071159d4d85eb403cda4fdeb5dd94281188c5f4431b2c2bd8a82646060f80d6ec253c5b3155af9798aabb764a720098511b4cf7 WHIRLPOOL ffa8e28a0306097cae5c31b07d4d23948bd472bed5c247371696c05f06461d167f87782c18c96c17680d65d46dad07bf4b86c64af2765be9f4c6b03b6d7ec840
28 -----BEGIN PGP SIGNATURE-----
29 Version: GnuPG v2
30
31 -iQEcBAEBCAAGBQJURnNHAAoJELjwI6Q8XPdar68IAI2duWg1pEWI2hhyir/ARn8L
32 -/5HFhsTEQKv2y69kAfPOkUBRdOSXs+6JH+K7+jOWzzqT3Om+ndWFu3NVto3f8NQf
33 -CE+V9bAag6QTj3LHb+1/Kv4mBpZwXKehSahIqhv+wIs3eqMLw0kY+2sBgNM7xdF8
34 -rpSSorzQrJ6hWn7zwxHqeSbyHyWcj68llJUHnnOMDepbbrab+wOhTngRLnGu554q
35 -Kg4vRRbd+u3PjrOpDbtB1ESYFBF185/v1G9F4vgw2CQ3blKag3Ty4TU4Cnic8J6K
36 -vhoKosLLQkAa4DBoys+rinB6bN9kjtoNAZ9lvjzOh/iKhqaA1yRdeA/poavOEkY=
37 -=TpPy
38 +iQEcBAEBCAAGBQJUUzsLAAoJELjwI6Q8XPdarTYH/jTMIiFp+wY2Uks1/DAnicWr
39 +i5wL1VUCqJ66bgqR/QedfbMNCxYMAxI6EI0zrsJ7i/3ymHxoobPwyQVrMnu4tLjN
40 +PAIX35Ck5wAUALOla0HH+LOVJkOzt5d1VsHeAcap4PQjMZBFdaOErfF9njNFHiua
41 +vOMCtPUBQ2rPs+VxTQ/f7B/aP5ggNVZvAGgrMs/TkEhmsvNRrW4Q5LbdvDFkIzi3
42 +JA38+CLiqR3j0QbJ6AP3iZBFFF1jX6eQaAgNZSeOrbm/VPnFhnufJ4mkoIpR1OWc
43 +gnR9CqDrazXz3nIEbDAKOUljMKlkjNpxmg4TTW44SE2DlBEveYNfCsg2LtSoCUU=
44 +=n6Ww
45 -----END PGP SIGNATURE-----
46
47 diff --git a/dev-libs/efl/efl-1.12.0_beta1.ebuild b/dev-libs/efl/efl-1.12.0_beta1.ebuild
48 new file mode 100644
49 index 0000000..62dd791
50 --- /dev/null
51 +++ b/dev-libs/efl/efl-1.12.0_beta1.ebuild
52 @@ -0,0 +1,236 @@
53 +# Copyright 1999-2014 Gentoo Foundation
54 +# Distributed under the terms of the GNU General Public License v2
55 +# $Header: $
56 +
57 +EAPI="5"
58 +
59 +inherit eutils autotools
60 +
61 +RESTRICT="test"
62 +
63 +DESCRIPTION="Enlightenment Foundation Core Libraries"
64 +HOMEPAGE="http://www.enlightenment.org/"
65 +SRC_URI="http://download.enlightenment.org/rel/libs/${PN}/${P/_/-}.tar.bz2"
66 +
67 +LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
68 +SLOT="0"
69 +KEYWORDS="~amd64 ~x86"
70 +
71 +IUSE="+X avahi cxx-bindings debug doc drm egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz ibus jp2k nls +opengl ssl physics +png pulseaudio scim sdl static-libs systemd test tiff tslib v4l2 wayland webp xim xine xpm"
72 +
73 +COMMON_DEP="
74 + dev-lang/luajit:2
75 + sys-apps/dbus
76 + sys-libs/zlib
77 + virtual/jpeg
78 + virtual/udev
79 + X? (
80 + x11-libs/libX11
81 + x11-libs/libXScrnSaver
82 + x11-libs/libXcomposite
83 + x11-libs/libXcursor
84 + x11-libs/libXdamage
85 + x11-libs/libXext
86 + x11-libs/libXfixes
87 + x11-libs/libXinerama
88 + x11-libs/libXp
89 + x11-libs/libXrandr
90 + x11-libs/libXrender
91 + x11-libs/libXtst
92 + gles? (
93 + media-libs/mesa[egl,gles2]
94 + x11-libs/libXrender
95 + )
96 + opengl? (
97 + virtual/opengl
98 + x11-libs/libXrender
99 + )
100 + )
101 + avahi? ( net-dns/avahi )
102 + debug? ( dev-util/valgrind )
103 + fontconfig? ( media-libs/fontconfig )
104 + fribidi? ( dev-libs/fribidi )
105 + gif? ( media-libs/giflib )
106 + glib? ( dev-libs/glib )
107 + gnutls? ( net-libs/gnutls )
108 + !gnutls? ( ssl? ( dev-libs/openssl ) )
109 + gstreamer? (
110 + media-libs/gstreamer:1.0
111 + media-libs/gst-plugins-base:1.0
112 + )
113 + harfbuzz? ( media-libs/harfbuzz )
114 + ibus? ( app-i18n/ibus )
115 + jp2k? ( media-libs/openjpeg )
116 + nls? ( sys-devel/gettext )
117 + physics? ( sci-physics/bullet )
118 + png? ( media-libs/libpng:0= )
119 + pulseaudio? (
120 + media-sound/pulseaudio
121 + media-libs/libsndfile
122 + )
123 + scim? ( app-i18n/scim )
124 + sdl? (
125 + >=media-libs/libsdl2-2.0.0:0[opengl?,gles?]
126 + )
127 + systemd? ( sys-apps/systemd )
128 + tiff? ( media-libs/tiff:0 )
129 + tslib? ( x11-libs/tslib )
130 + wayland? (
131 + >=dev-libs/wayland-1.3.0:0
132 + >=x11-libs/libxkbcommon-0.3.1
133 + egl? ( media-libs/mesa[egl,gles2] )
134 + )
135 + webp? ( media-libs/libwebp )
136 + xine? ( >=media-libs/xine-lib-1.1.1 )
137 + xpm? ( x11-libs/libXpm )"
138 +RDEPEND="${COMMON_DEP}"
139 +DEPEND="${COMMON_DEP}
140 + !!dev-libs/ecore
141 + !!dev-libs/edbus
142 + !!dev-libs/eet
143 + !!dev-libs/eeze
144 + !!dev-libs/efreet
145 + !!dev-libs/eina
146 + !!dev-libs/eio
147 + !!dev-libs/embryo
148 + !!dev-libs/eobj
149 + !!dev-libs/ephysics
150 + !!media-libs/edje
151 + !!media-libs/emotion
152 + !!media-libs/ethumb
153 + !!media-libs/evas
154 + doc? ( app-doc/doxygen )
155 + test? ( dev-libs/check )"
156 +
157 +S="${WORKDIR}/${P/_/-}"
158 +
159 +src_prepare() {
160 + epatch "${FILESDIR}"/${P}-tmpdir.patch
161 + eautoreconf
162 +}
163 +
164 +src_configure() {
165 + local config=()
166 +
167 + # gnutls / openssl
168 + if use gnutls; then
169 + config+=( --with-crypto=gnutls )
170 + use ssl && \
171 + einfo "You enabled both USE=ssl and USE=gnutls, using gnutls"
172 + elif use ssl; then
173 + config+=( --with-crypto=openssl )
174 + else
175 + config+=( --with-crypto=none )
176 + fi
177 +
178 + # X
179 + config+=(
180 + $(use_with X x)
181 + $(use_with X x11 xlib)
182 + )
183 + if use opengl; then
184 + config+=( --with-opengl=full )
185 + use gles && \
186 + einfo "You enabled both USE=opengl and USE=gles, using opengl"
187 + elif use gles; then
188 + config+=( --with-opengl=es )
189 + if use sdl; then
190 + config+=( --with-opengl=none )
191 + ewarn "You enabled both USE=sdl and USE=gles which isn't currently supported."
192 + ewarn "Disabling gl for all backends."
193 + fi
194 + else
195 + config+=( --with-opengl=none )
196 + fi
197 +
198 + # wayland
199 + config+=(
200 + $(use_enable egl)
201 + $(use_enable wayland)
202 + )
203 +
204 + if use systemd; then
205 + config+=( $(use_enable drm) )
206 + else
207 + config+=( --disable-drm )
208 + use drm && \
209 + einfo "You cannot build DRM support without systemd support, disabling drm engine"
210 + fi
211 +
212 + config+=(
213 + $(use_enable avahi)
214 + $(use_enable cxx-bindings cxx-bindings)
215 + $(use_enable doc)
216 + $(use_enable fbcon fb)
217 + $(use_enable fontconfig)
218 + $(use_enable fribidi)
219 + $(use_enable gstreamer gstreamer1)
220 + $(use_enable harfbuzz)
221 + $(use_enable ibus)
222 + $(use_enable nls)
223 + $(use_enable physics)
224 + $(use_enable pulseaudio)
225 + $(use_enable pulseaudio audio)
226 + $(use_enable scim)
227 + $(use_enable sdl)
228 + $(use_enable static-libs static)
229 + $(use_enable systemd)
230 + $(use_enable tslib)
231 + $(use_enable v4l2)
232 + $(use_enable xim)
233 + $(use_enable xine)
234 +
235 + # image loders
236 + --enable-image-loader-bmp
237 + --enable-image-loader-eet
238 + --enable-image-loader-generic
239 + --enable-image-loader-ico
240 + --enable-image-loader-jpeg # required by ethumb
241 + --enable-image-loader-psd
242 + --enable-image-loader-pmaps
243 + --enable-image-loader-tga
244 + --enable-image-loader-wbmp
245 + $(use_enable gif image-loader-gif)
246 + $(use_enable jp2k image-loader-jp2k)
247 + $(use_enable png image-loader-png)
248 + $(use_enable tiff image-loader-tiff)
249 + $(use_enable webp image-loader-webp)
250 + $(use_enable xpm image-loader-xpm)
251 +
252 + --enable-cserve
253 + --enable-libmount
254 + --enable-threads
255 + --enable-xinput22
256 +
257 + --disable-gesture
258 + --disable-gstreamer # using gstreamer1
259 + --disable-lua-old
260 + --disable-multisense
261 + --disable-tizen
262 + --disable-xinput2
263 + --disable-xpresent
264 +
265 + # bug 501074
266 + --disable-pixman
267 + --disable-pixman-font
268 + --disable-pixman-rect
269 + --disable-pixman-line
270 + --disable-pixman-poly
271 + --disable-pixman-image
272 + --disable-pixman-image-scale-sample
273 +
274 + --with-profile=$(usex debug debug release)
275 + --with-glib=$(usex glib yes no)
276 + --with-tests=$(usex test regular none)
277 +
278 + --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba
279 + )
280 +
281 + econf "${config[@]}"
282 +}
283 +
284 +src_install() {
285 + MAKEOPTS+=" -j1"
286 + default
287 + prune_libtool_files
288 +}
289
290 diff --git a/dev-libs/efl/files/efl-1.12.0_beta1-tmpdir.patch b/dev-libs/efl/files/efl-1.12.0_beta1-tmpdir.patch
291 new file mode 100644
292 index 0000000..fc6e028
293 --- /dev/null
294 +++ b/dev-libs/efl/files/efl-1.12.0_beta1-tmpdir.patch
295 @@ -0,0 +1,40 @@
296 +From e105abc99e717b84723ab35258375e27f17f8e82 Mon Sep 17 00:00:00 2001
297 +From: Stefan Schmidt <s.schmidt@×××××××.com>
298 +Date: Wed, 29 Oct 2014 15:51:11 +0100
299 +Subject: eina_file: Give TMPDIR presedence over XDG_RUNTIME_DIR when defined
300 +
301 +XDG_RUNTIME_DIR gives us a nice securty benefit by only allowing the
302 +same user to read wand write files.
303 +
304 +In some configuration this is problematic though. If one looks at the
305 +bug report this fixes for example you can see that there are build
306 +scripts that use a special build user.
307 +
308 +The way this has always worked on unix is that you can define your
309 +own tempdir with TMPDIR. When I was making the original change towards
310 +XDG_RUNTIME_DIR I expected some trouble with it but it worked quite
311 +well so far.
312 +
313 +To avoid breaking scripts out there and maybe configurations we
314 +haven't tested yet give TMPDIR precedence over XDG_RUNTIME_DIR.
315 +
316 +Fixes T1766
317 +
318 +diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c
319 +index 2a2e3e4..5c2b87a 100644
320 +--- a/src/lib/eina/eina_file_common.c
321 ++++ b/src/lib/eina/eina_file_common.c
322 +@@ -908,8 +908,8 @@ eina_file_mkstemp(const char *templatename, Eina_Tmpstr **path)
323 + #if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
324 + if (getuid() == geteuid())
325 + #endif
326 +- tmpdir = getenv("XDG_RUNTIME_DIR");
327 +- if (!tmpdir) tmpdir = getenv("TMPDIR");
328 ++ tmpdir = getenv("TMPDIR");
329 ++ if (!tmpdir) tmpdir = getenv("XDG_RUNTIME_DIR");
330 + if (!tmpdir) tmpdir = "/tmp";
331 + #else
332 + tmpdir = (char *)evil_tmpdir_get();
333 +--
334 +cgit v0.10.1
335 +