Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
Date: Sat, 01 Apr 2017 22:25:32
Message-Id: 1491085477.eee0146ce47e305d2310f5139612b388c7be0e72.sping@gentoo
1 commit: eee0146ce47e305d2310f5139612b388c7be0e72
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 1 22:22:44 2017 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 1 22:24:37 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eee0146c
7
8 media-libs/gegl: 0.3.14
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 media-libs/gegl/Manifest | 1 +
13 .../files/gegl-0.3.14-implicit-declaration.patch | 37 +++++
14 media-libs/gegl/gegl-0.3.14.ebuild | 180 +++++++++++++++++++++
15 3 files changed, 218 insertions(+)
16
17 diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
18 index e2e4991034c..f0a938a4c56 100644
19 --- a/media-libs/gegl/Manifest
20 +++ b/media-libs/gegl/Manifest
21 @@ -2,5 +2,6 @@ DIST gegl-0.2.0.tar.bz2 7502040 SHA256 df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a
22 DIST gegl-0.3.0.tar.bz2 5463571 SHA256 f0fec8f2e7b8835979d3cf4e38b05d41bb79f68dc80cf899a846484da693bbf7 SHA512 ff758df4689b0fa8f5e16ebcea32a7fe77bccfef70efc20d10669ce5139a70ec3533e78227fd4798812b31ac1ca5081b9d1d701a7449bf75356f879ece5fadd6 WHIRLPOOL 4827d6e40025c36d4ef869b5856f4def1e93cc195757f430cfd2980742ce6b37c79833283d17ec51e93b569a144548aaf7021854b9bcdb241b90049b1321a99b
23 DIST gegl-0.3.10.tar.bz2 5905157 SHA256 26b4d6d0a8edb358ca2fbc097f9f97eec9d74e0ffe42f89fa1aff201728023d9 SHA512 54df7e0cb26be2f2664eb9373fc2e1dff809df505007c95e72c896f3e2829e2159df7b9701c31b4dc20953a9476de69d603e8d5c1c42078284edfa6cf05dccd7 WHIRLPOOL c307bcb65287489c98e3cae50a57c6215e29eeef315b7d581c3c5239c8156ddd69b30edd83e35549d4c6b840e6ed15a778a5145f939a7a2e20a70d6b64551439
24 DIST gegl-0.3.12.tar.bz2 6037107 SHA256 62eb08d7dd6ac046953a0bf606a71f9d14c9016ffef4ef7273b07b598f14bec7 SHA512 a8c9d1d21b042d2c848a540f69f58c2224c6617e21a6e25b47eb885a0388242195569a81101242041eba2b7c486dbbc47f516fae8d7ab35f4d67ab5f5c2b0fe4 WHIRLPOOL 2f7846f80238d525cf160ad07b5dc96d52f081a35a5ac2455c1c7eab65cd09d9acb048ed361ec99a033f16562ac505943e845a5f4e7e1f363840f7721fd99a93
25 +DIST gegl-0.3.14.tar.bz2 5985306 SHA256 09f5e2e6899697641d4660e3e274aed696f5bacc96ba389ac77674ee1156590a SHA512 8d03bb15433777af3baae20bb987587cef2ae80315116e7e8a3197278c3ca2ff2814aa533ebe2ad4c2cca58a618a8a24b0b6faff0d0ce1194e3d31cfe85beaf9 WHIRLPOOL 1be1914cae5760bb2b35fc495c409cb927783f303cff393f0cdc43a875b42b380829cec9c8907d19c1f78cb57bed5d639759f09bb434c48436d1bc59750ab33d
26 DIST gegl-0.3.4.tar.bz2 5328192 SHA256 846290a790854d1e6b7c17a2d6f82ad7cb14c72e240bd3b81b98cc0ceddbc3ec SHA512 7fe14c1534d61cfc253bce54cc707f93882ad96302068fe672e6cdcb613430e835ee5d39a5398537f845a6d101eed6fd3d1ff7e4204d51bc9ab5a59c9e09d2ec WHIRLPOOL 046af673b5a21a050555fabf5e52532b5de7af289922991f0c15cc39a09d32302a6a98483bd4ff2cee3a37356d0cf0e267c87f524f3b6678eb61fcaab6d6735c
27 DIST gegl-0.3.8.tar.bz2 5876259 SHA256 06ca9e67a59da026eb941b9d323269d7c19a922f1e478acdd3791a0eef8b229b SHA512 13207e7ab4723be1e31bdba5e30e5725e93c1adc61bad1413502128730391dbe7eb35419d243c8d0a1d8794341a58188790adacbb10d2a8e68db861c18d21bfb WHIRLPOOL 97e3521e2c95e2b370c8a6ac2724b57212ebfbbf3c1eeccc3cfaa4de6b993c56b32ead9e5baa23dcbcb8272f7ec29ce7a2acc3afcc5fcc062d0adc72899293b8
28
29 diff --git a/media-libs/gegl/files/gegl-0.3.14-implicit-declaration.patch b/media-libs/gegl/files/gegl-0.3.14-implicit-declaration.patch
30 new file mode 100644
31 index 00000000000..0a7943aebc1
32 --- /dev/null
33 +++ b/media-libs/gegl/files/gegl-0.3.14-implicit-declaration.patch
34 @@ -0,0 +1,37 @@
35 +From 72905e2865b4f352da7caa8f722b1db77c07a173 Mon Sep 17 00:00:00 2001
36 +From: Sebastian Pipping <sebastian@×××××××.org>
37 +Date: Sun, 2 Apr 2017 00:13:54 +0200
38 +Subject: [PATCH] Apply upstream fixes for implicit function declaration
39 + warnings
40 +
41 +Source commits:
42 +https://git.gnome.org/browse/gegl/commit/tests/simple/test-buffer-sharing.c?id=7cb72e3a9ade11a506e252623bead17635de2047
43 +https://git.gnome.org/browse/gegl/commit/tests/simple/test-buffer-sharing.c?id=52f01ba49e2246df24a504084863b12794682d37
44 +---
45 + tests/simple/test-buffer-sharing.c | 3 +++
46 + 1 file changed, 3 insertions(+)
47 +
48 +diff --git a/tests/simple/test-buffer-sharing.c b/tests/simple/test-buffer-sharing.c
49 +index 94eccda..a52bfa8 100644
50 +--- a/tests/simple/test-buffer-sharing.c
51 ++++ b/tests/simple/test-buffer-sharing.c
52 +@@ -16,6 +16,7 @@
53 + */
54 +
55 + #include <gegl.h>
56 ++#include <glib/gstdio.h>
57 +
58 + // in order of progression
59 + typedef enum _TestState {
60 +@@ -164,6 +165,8 @@ on_timeout(gpointer user_data) {
61 + return FALSE;
62 + }
63 +
64 ++#include <unistd.h>
65 ++
66 + static void
67 + test_init(TestData *data) {
68 +
69 +--
70 +2.12.2
71 +
72
73 diff --git a/media-libs/gegl/gegl-0.3.14.ebuild b/media-libs/gegl/gegl-0.3.14.ebuild
74 new file mode 100644
75 index 00000000000..f9b15ae02a4
76 --- /dev/null
77 +++ b/media-libs/gegl/gegl-0.3.14.ebuild
78 @@ -0,0 +1,180 @@
79 +# Copyright 1999-2017 Gentoo Foundation
80 +# Distributed under the terms of the GNU General Public License v2
81 +
82 +EAPI=6
83 +PYTHON_COMPAT=( python2_7 )
84 +
85 +# vala and introspection support is broken, bug #468208
86 +VALA_USE_DEPEND=vapigen
87 +
88 +inherit versionator gnome2-utils eutils autotools python-any-r1 vala
89 +
90 +if [[ ${PV} == *9999* ]]; then
91 + inherit autotools git-r3
92 + EGIT_REPO_URI="git://git.gnome.org/gegl"
93 + SRC_URI=""
94 +else
95 + SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
96 + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
97 +fi
98 +
99 +DESCRIPTION="A graph based image processing framework"
100 +HOMEPAGE="http://www.gegl.org/"
101 +
102 +LICENSE="|| ( GPL-3 LGPL-3 )"
103 +SLOT="0.3"
104 +
105 +IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
106 +REQUIRED_USE="
107 + svg? ( cairo )
108 + vala? ( introspection )
109 +"
110 +
111 +# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
112 +# so there is no chance to support libav right now (Gentoo bug #567638)
113 +# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
114 +RDEPEND="
115 + >=dev-libs/glib-2.36:2
116 + dev-libs/json-glib
117 + >=media-libs/babl-0.1.24
118 + sys-libs/zlib
119 + >=x11-libs/gdk-pixbuf-2.32:2
120 + x11-libs/pango
121 +
122 + cairo? ( x11-libs/cairo )
123 + ffmpeg? (
124 + >=media-video/ffmpeg-2.8:0=
125 + )
126 + introspection? ( >=dev-libs/gobject-introspection-1.32:= )
127 + virtual/jpeg:0=
128 + jpeg2k? ( >=media-libs/jasper-1.900.1:= )
129 + lcms? ( >=media-libs/lcms-2.2:2 )
130 + lensfun? ( >=media-libs/lensfun-0.2.5 )
131 + openexr? ( media-libs/openexr:= )
132 + media-libs/libpng:0=
133 + raw? ( >=media-libs/libraw-0.15.4:0= )
134 + sdl? ( media-libs/libsdl )
135 + svg? ( >=gnome-base/librsvg-2.14:2 )
136 + tiff? ( >=media-libs/tiff-4:0 )
137 + umfpack? ( sci-libs/umfpack )
138 + v4l? ( >=media-libs/libv4l-1.0.1 )
139 + webp? ( media-libs/libwebp )
140 +"
141 +DEPEND="${RDEPEND}
142 + >=dev-util/gtk-doc-am-1
143 + >=dev-util/intltool-0.40.1
144 + dev-lang/perl
145 + virtual/pkgconfig
146 + >=sys-devel/libtool-2.2
147 + test? ( introspection? (
148 + $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
149 + vala? ( $(vala_depend) )
150 +"
151 +
152 +pkg_setup() {
153 + use test && use introspection && python-any-r1_pkg_setup
154 +}
155 +
156 +src_prepare() {
157 + default
158 +
159 + # FIXME: the following should be proper patch sent to upstream
160 + # fix OSX loadable module filename extension
161 + sed -i -e 's/\.dylib/.bundle/' configure.ac || die
162 + # don't require Apple's OpenCL on versions of OSX that don't have it
163 + if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
164 + sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
165 + fi
166 +
167 + #epatch "${FILESDIR}"/${P}-g_log_domain.patch
168 +
169 + # commit 7c78497b : tests that use gegl.png are broken on non-amd64
170 + sed -e '/clones.xml/d' \
171 + -e '/composite-transform.xml/d' \
172 + -i tests/compositions/Makefile.am || die
173 +
174 + epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
175 + epatch "${FILESDIR}"/${P}-implicit-declaration.patch
176 +
177 + eautoreconf
178 +
179 + gnome2_environment_reset
180 +
181 + use vala && vala_src_prepare
182 +}
183 +
184 +src_configure() {
185 + # never enable altering of CFLAGS via profile option
186 + # libspiro: not in portage main tree
187 + # disable documentation as the generating is bit automagic
188 + # if anyone wants to work on it just create bug with patch
189 +
190 + # Also please note that:
191 + #
192 + # - Some auto-detections are not patched away since the docs are
193 + # not built (--disable-docs, lack of --enable-gtk-doc) and these
194 + # tools affect re-generation of docs, only
195 + # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
196 + #
197 + # - Parameter --with-exiv2 compiles a noinst-app only, no use
198 + #
199 + # - Parameter --disable-workshop disables any use of Lua, effectivly
200 + #
201 + # - v4l support does not work with our media-libs/libv4l-0.8.9,
202 + # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
203 + #
204 + # - There are two checks for dot, one controllable by --with(out)-graphviz
205 + # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
206 + #
207 + # - mrg is not in tree and gexiv2 support only has effect when mrg support
208 + # is enabled
209 + #
210 + # So that's why USE="exif graphviz lua v4l" got resolved. More at:
211 + # https://bugs.gentoo.org/show_bug.cgi?id=451136
212 + #
213 + econf \
214 + --disable-docs \
215 + --disable-profile \
216 + --disable-silent-rules \
217 + --disable-workshop \
218 + --program-suffix=-${SLOT} \
219 + --with-gdk-pixbuf \
220 + --with-pango \
221 + --without-libspiro \
222 + $(use_enable cpu_flags_x86_mmx mmx) \
223 + $(use_enable cpu_flags_x86_sse sse) \
224 + $(use_enable debug) \
225 + $(use_with cairo) \
226 + $(use_with cairo pangocairo) \
227 + --without-exiv2 \
228 + $(use_with ffmpeg libavformat) \
229 + --without-gexiv2 \
230 + --without-graphviz \
231 + $(use_with jpeg2k jasper) \
232 + $(use_with lcms) \
233 + $(use_with lensfun) \
234 + --without-lua \
235 + --without-mrg \
236 + $(use_with openexr) \
237 + $(use_with raw libraw) \
238 + $(use_with sdl) \
239 + $(use_with svg librsvg) \
240 + $(use_with tiff libtiff) \
241 + $(use_with umfpack) \
242 + $(use_with v4l libv4l) \
243 + $(use_with v4l libv4l2) \
244 + $(use_enable introspection) \
245 + $(use_with vala) \
246 + $(use_with webp)
247 +}
248 +
249 +src_compile() {
250 + default
251 +
252 + [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
253 +}
254 +
255 +src_install() {
256 + default
257 + prune_libtool_files --all
258 +}