1 |
commit: 8dd04ea06b8a9c71730e98b1dbfea62c40a0af77 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 12 14:07:42 2018 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 12 14:07:42 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=8dd04ea0 |
7 |
|
8 |
x11-libs/agg: Remove |
9 |
|
10 |
* Unmaintained, version in the main tree |
11 |
is more up to date. |
12 |
|
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
x11-libs/agg/agg-2.5-r3.ebuild | 56 ------ |
16 |
...on-terminating-loop-conditions-when-len-1.patch | 81 --------- |
17 |
...ion-by-aborting-if-the-co-ordinates-are-t.patch | 40 ----- |
18 |
...ates-from-previous-vertex-if-last-command.patch | 30 ---- |
19 |
...izer_outline_aa-ignore-close_polygon-when.patch | 138 --------------- |
20 |
.../files/2.5/0005-Remove-VC-6-workaround.patch | 52 ------ |
21 |
...-Implement-grain-merge-blending-mode-GIMP.patch | 85 --------- |
22 |
...mplement-grain-extract-blending-mode-GIMP.patch | 85 --------- |
23 |
...tiplication-and-division-operators-as-con.patch | 36 ---- |
24 |
...0009-Add-a-static-identity-transformation.patch | 37 ---- |
25 |
.../2.5/0010-Add-renderer_scanline_aa_alpha.patch | 193 --------------------- |
26 |
...Avoid-division-by-zero-in-color-burn-mode.patch | 58 ------- |
27 |
...12-Avoid-pixel-artifacts-when-compositing.patch | 26 --- |
28 |
...conv-classes-to-allow-access-to-the-origi.patch | 93 ---------- |
29 |
...tial-zero-division-resulting-in-nan-in-ag.patch | 30 ---- |
30 |
...t-value-in-the-gamma-table-is-always-zero.patch | 24 --- |
31 |
x11-libs/agg/files/agg-2.4-depends.patch | 48 ----- |
32 |
x11-libs/agg/files/agg-2.5-autotools.patch | 11 -- |
33 |
x11-libs/agg/files/agg-2.5-pkgconfig.patch | 10 -- |
34 |
x11-libs/agg/files/agg-2.5-sdl-automagic.patch | 26 --- |
35 |
x11-libs/agg/files/agg-2.5-sdl-m4.patch | 186 -------------------- |
36 |
x11-libs/agg/metadata.xml | 17 -- |
37 |
22 files changed, 1362 deletions(-) |
38 |
|
39 |
diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild |
40 |
deleted file mode 100644 |
41 |
index e3b31660e..000000000 |
42 |
--- a/x11-libs/agg/agg-2.5-r3.ebuild |
43 |
+++ /dev/null |
44 |
@@ -1,56 +0,0 @@ |
45 |
-# Copyright 1999-2016 Gentoo Foundation |
46 |
-# Distributed under the terms of the GNU General Public License v2 |
47 |
- |
48 |
-EAPI=6 |
49 |
- |
50 |
-inherit autotools |
51 |
- |
52 |
-DESCRIPTION="High quality rendering engine library for C++" |
53 |
-HOMEPAGE="http://antigrain.com/" |
54 |
-SRC_URI="http://antigrain.com/${P}.tar.gz" |
55 |
- |
56 |
-LICENSE="GPL-2 gpc? ( free-noncomm )" |
57 |
-SLOT="0" |
58 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
59 |
-IUSE="+gpc sdl static-libs +truetype +X" |
60 |
- |
61 |
-# preffer X with enabled xcb, really |
62 |
-RDEPEND=" |
63 |
- sdl? ( >=media-libs/libsdl-1.2.0[X?] ) |
64 |
- X? ( >=x11-libs/libX11-1.3.99.901 ) |
65 |
- truetype? ( media-libs/freetype:2 ) |
66 |
-" |
67 |
-DEPEND="${RDEPEND} |
68 |
- virtual/pkgconfig |
69 |
-" |
70 |
- |
71 |
-DOCS=( readme authors ChangeLog news ) |
72 |
- |
73 |
-# patches taken from fedora |
74 |
-PATCHES=( |
75 |
- "${FILESDIR}"/agg-2.4-depends.patch |
76 |
- "${FILESDIR}"/${P}-pkgconfig.patch |
77 |
- "${FILESDIR}"/${P}-autotools.patch |
78 |
- "${FILESDIR}"/${P}-sdl-m4.patch |
79 |
- "${FILESDIR}"/${P}-sdl-automagic.patch |
80 |
- "${FILESDIR}"/${PV} |
81 |
-) |
82 |
- |
83 |
-src_prepare() { |
84 |
- default |
85 |
- mv configure.{in,ac} || die |
86 |
- AT_M4DIR="." eautoreconf |
87 |
-} |
88 |
- |
89 |
-src_configure() { |
90 |
- local myeconfargs=( |
91 |
- --disable-ctrl |
92 |
- --disable-examples |
93 |
- --disable-dependency-tracking |
94 |
- $(use_enable gpc) |
95 |
- $(use_enable sdl) |
96 |
- $(use_enable truetype freetype) |
97 |
- $(use_with X x) |
98 |
- ) |
99 |
- econf ${myeconfargs[@]} |
100 |
-} |
101 |
|
102 |
diff --git a/x11-libs/agg/files/2.5/0001-Fix-non-terminating-loop-conditions-when-len-1.patch b/x11-libs/agg/files/2.5/0001-Fix-non-terminating-loop-conditions-when-len-1.patch |
103 |
deleted file mode 100644 |
104 |
index eaf0467fb..000000000 |
105 |
--- a/x11-libs/agg/files/2.5/0001-Fix-non-terminating-loop-conditions-when-len-1.patch |
106 |
+++ /dev/null |
107 |
@@ -1,81 +0,0 @@ |
108 |
-From efd33aad5e69f36ab343b1f28839a55db4538104 Mon Sep 17 00:00:00 2001 |
109 |
-From: Tom Hughes <tom@×××××××.nu> |
110 |
-Date: Sun, 19 May 2013 10:55:37 +0100 |
111 |
-Subject: [PATCH 01/15] Fix non-terminating loop conditions when len=1 |
112 |
- |
113 |
-- while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len) |
114 |
-+ while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len) |
115 |
- { |
116 |
- sx = (lp.x1 + sx) >> 1; |
117 |
- sy = (lp.y1 + sy) >> 1; |
118 |
- } |
119 |
---- |
120 |
- include/agg_renderer_outline_aa.h | 8 ++++---- |
121 |
- include/agg_renderer_outline_image.h | 4 ++-- |
122 |
- 2 files changed, 6 insertions(+), 6 deletions(-) |
123 |
- |
124 |
-diff --git a/include/agg_renderer_outline_aa.h b/include/agg_renderer_outline_aa.h |
125 |
-index ce25a2e..cb2aa00 100644 |
126 |
---- a/include/agg_renderer_outline_aa.h |
127 |
-+++ b/include/agg_renderer_outline_aa.h |
128 |
-@@ -1659,7 +1659,7 @@ namespace agg |
129 |
- } |
130 |
- else |
131 |
- { |
132 |
-- while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len) |
133 |
-+ while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len) |
134 |
- { |
135 |
- sx = (lp.x1 + sx) >> 1; |
136 |
- sy = (lp.y1 + sy) >> 1; |
137 |
-@@ -1726,7 +1726,7 @@ namespace agg |
138 |
- } |
139 |
- else |
140 |
- { |
141 |
-- while(abs(ex - lp.x2) + abs(ey - lp.y2) > lp2.len) |
142 |
-+ while(abs(ex - lp.x2) + abs(ey - lp.y2) > 1 + lp2.len) |
143 |
- { |
144 |
- ex = (lp.x2 + ex) >> 1; |
145 |
- ey = (lp.y2 + ey) >> 1; |
146 |
-@@ -1798,7 +1798,7 @@ namespace agg |
147 |
- } |
148 |
- else |
149 |
- { |
150 |
-- while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len) |
151 |
-+ while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len) |
152 |
- { |
153 |
- sx = (lp.x1 + sx) >> 1; |
154 |
- sy = (lp.y1 + sy) >> 1; |
155 |
-@@ -1811,7 +1811,7 @@ namespace agg |
156 |
- } |
157 |
- else |
158 |
- { |
159 |
-- while(abs(ex - lp.x2) + abs(ey - lp.y2) > lp2.len) |
160 |
-+ while(abs(ex - lp.x2) + abs(ey - lp.y2) > 1 + lp2.len) |
161 |
- { |
162 |
- ex = (lp.x2 + ex) >> 1; |
163 |
- ey = (lp.y2 + ey) >> 1; |
164 |
-diff --git a/include/agg_renderer_outline_image.h b/include/agg_renderer_outline_image.h |
165 |
-index fbfac10..66d2b9a 100644 |
166 |
---- a/include/agg_renderer_outline_image.h |
167 |
-+++ b/include/agg_renderer_outline_image.h |
168 |
-@@ -969,7 +969,7 @@ namespace agg |
169 |
- } |
170 |
- else |
171 |
- { |
172 |
-- while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len) |
173 |
-+ while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len) |
174 |
- { |
175 |
- sx = (lp.x1 + sx) >> 1; |
176 |
- sy = (lp.y1 + sy) >> 1; |
177 |
-@@ -982,7 +982,7 @@ namespace agg |
178 |
- } |
179 |
- else |
180 |
- { |
181 |
-- while(abs(ex - lp.x2) + abs(ey - lp.y2) > lp2.len) |
182 |
-+ while(abs(ex - lp.x2) + abs(ey - lp.y2) > 1 + lp2.len) |
183 |
- { |
184 |
- ex = (lp.x2 + ex) >> 1; |
185 |
- ey = (lp.y2 + ey) >> 1; |
186 |
--- |
187 |
-1.8.1.4 |
188 |
- |
189 |
|
190 |
diff --git a/x11-libs/agg/files/2.5/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch b/x11-libs/agg/files/2.5/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch |
191 |
deleted file mode 100644 |
192 |
index 4fe74341e..000000000 |
193 |
--- a/x11-libs/agg/files/2.5/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch |
194 |
+++ /dev/null |
195 |
@@ -1,40 +0,0 @@ |
196 |
-From e269fe9b62af6fe314cebe0ee7a6d6d1a4a84d1c Mon Sep 17 00:00:00 2001 |
197 |
-From: Tom Hughes <tom@×××××××.nu> |
198 |
-Date: Sun, 19 May 2013 11:03:26 +0100 |
199 |
-Subject: [PATCH 02/15] Cure recursion by aborting if the co-ordinates are to |
200 |
- big to handle |
201 |
- |
202 |
---- |
203 |
- include/agg_rasterizer_cells_aa.h | 9 ++++++++- |
204 |
- 1 file changed, 8 insertions(+), 1 deletion(-) |
205 |
- |
206 |
-diff --git a/include/agg_rasterizer_cells_aa.h b/include/agg_rasterizer_cells_aa.h |
207 |
-index d3bb138..3a616d9 100644 |
208 |
---- a/include/agg_rasterizer_cells_aa.h |
209 |
-+++ b/include/agg_rasterizer_cells_aa.h |
210 |
-@@ -40,7 +40,8 @@ |
211 |
- #define AGG_RASTERIZER_CELLS_AA_INCLUDED |
212 |
- |
213 |
- #include <string.h> |
214 |
--#include <math.h> |
215 |
-+#include <cstdlib> |
216 |
-+#include <limits> |
217 |
- #include "agg_math.h" |
218 |
- #include "agg_array.h" |
219 |
- |
220 |
-@@ -333,6 +334,12 @@ namespace agg |
221 |
- { |
222 |
- int cx = (x1 + x2) >> 1; |
223 |
- int cy = (y1 + y2) >> 1; |
224 |
-+ |
225 |
-+ // Bail if values are so large they are likely to wrap |
226 |
-+ if ((std::abs(x1) >= std::numeric_limits<int>::max()/2) || (std::abs(y1) >= std::numeric_limits<int>::max()/2) || |
227 |
-+ (std::abs(x2) >= std::numeric_limits<int>::max()/2) || (std::abs(y2) >= std::numeric_limits<int>::max()/2)) |
228 |
-+ return; |
229 |
-+ |
230 |
- line(x1, y1, cx, cy); |
231 |
- line(cx, cy, x2, y2); |
232 |
- } |
233 |
--- |
234 |
-1.8.1.4 |
235 |
- |
236 |
|
237 |
diff --git a/x11-libs/agg/files/2.5/0003-Get-coordinates-from-previous-vertex-if-last-command.patch b/x11-libs/agg/files/2.5/0003-Get-coordinates-from-previous-vertex-if-last-command.patch |
238 |
deleted file mode 100644 |
239 |
index b12684d18..000000000 |
240 |
--- a/x11-libs/agg/files/2.5/0003-Get-coordinates-from-previous-vertex-if-last-command.patch |
241 |
+++ /dev/null |
242 |
@@ -1,30 +0,0 @@ |
243 |
-From 032d5342430f4c5dfbc34a2817d67386a14fd51b Mon Sep 17 00:00:00 2001 |
244 |
-From: Tom Hughes <tom@×××××××.nu> |
245 |
-Date: Sun, 19 May 2013 11:40:49 +0100 |
246 |
-Subject: [PATCH 03/15] Get coordinates from previous vertex if last command is |
247 |
- path_cmd_end_poly |
248 |
- |
249 |
---- |
250 |
- include/agg_path_storage.h | 6 ++++++ |
251 |
- 1 file changed, 6 insertions(+) |
252 |
- |
253 |
-diff --git a/include/agg_path_storage.h b/include/agg_path_storage.h |
254 |
-index 7be7393..8922fc8 100644 |
255 |
---- a/include/agg_path_storage.h |
256 |
-+++ b/include/agg_path_storage.h |
257 |
-@@ -878,6 +878,12 @@ namespace agg |
258 |
- *x += x2; |
259 |
- *y += y2; |
260 |
- } |
261 |
-+ else if (!is_stop(m_vertices.last_command()) && |
262 |
-+ is_vertex(m_vertices.prev_vertex(&x2, &y2))) |
263 |
-+ { |
264 |
-+ *x += x2; |
265 |
-+ *y += y2; |
266 |
-+ } |
267 |
- } |
268 |
- } |
269 |
- |
270 |
--- |
271 |
-1.8.1.4 |
272 |
- |
273 |
|
274 |
diff --git a/x11-libs/agg/files/2.5/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch b/x11-libs/agg/files/2.5/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch |
275 |
deleted file mode 100644 |
276 |
index 0cecaf794..000000000 |
277 |
--- a/x11-libs/agg/files/2.5/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch |
278 |
+++ /dev/null |
279 |
@@ -1,138 +0,0 @@ |
280 |
-From b9c4b1c72b4ad6b24c37f402d3eec39ef393b0eb Mon Sep 17 00:00:00 2001 |
281 |
-From: Tom Hughes <tom@×××××××.nu> |
282 |
-Date: Sun, 19 May 2013 14:17:43 +0100 |
283 |
-Subject: [PATCH 04/15] Make rasterizer_outline_aa ignore close_polygon when |
284 |
- vertex count < 3 |
285 |
- |
286 |
---- |
287 |
- include/agg_rasterizer_outline_aa.h | 107 ++++++++++++++++++------------------ |
288 |
- 1 file changed, 52 insertions(+), 55 deletions(-) |
289 |
- |
290 |
-diff --git a/include/agg_rasterizer_outline_aa.h b/include/agg_rasterizer_outline_aa.h |
291 |
-index 4d6dd57..24301d5 100644 |
292 |
---- a/include/agg_rasterizer_outline_aa.h |
293 |
-+++ b/include/agg_rasterizer_outline_aa.h |
294 |
-@@ -333,68 +333,65 @@ namespace agg |
295 |
- int y2; |
296 |
- int lprev; |
297 |
- |
298 |
-- if(close_polygon) |
299 |
-+ if(close_polygon && (m_src_vertices.size() >= 3)) |
300 |
- { |
301 |
-- if(m_src_vertices.size() >= 3) |
302 |
-+ dv.idx = 2; |
303 |
-+ |
304 |
-+ v = &m_src_vertices[m_src_vertices.size() - 1]; |
305 |
-+ x1 = v->x; |
306 |
-+ y1 = v->y; |
307 |
-+ lprev = v->len; |
308 |
-+ |
309 |
-+ v = &m_src_vertices[0]; |
310 |
-+ x2 = v->x; |
311 |
-+ y2 = v->y; |
312 |
-+ dv.lcurr = v->len; |
313 |
-+ line_parameters prev(x1, y1, x2, y2, lprev); |
314 |
-+ |
315 |
-+ v = &m_src_vertices[1]; |
316 |
-+ dv.x1 = v->x; |
317 |
-+ dv.y1 = v->y; |
318 |
-+ dv.lnext = v->len; |
319 |
-+ dv.curr = line_parameters(x2, y2, dv.x1, dv.y1, dv.lcurr); |
320 |
-+ |
321 |
-+ v = &m_src_vertices[dv.idx]; |
322 |
-+ dv.x2 = v->x; |
323 |
-+ dv.y2 = v->y; |
324 |
-+ dv.next = line_parameters(dv.x1, dv.y1, dv.x2, dv.y2, dv.lnext); |
325 |
-+ |
326 |
-+ dv.xb1 = 0; |
327 |
-+ dv.yb1 = 0; |
328 |
-+ dv.xb2 = 0; |
329 |
-+ dv.yb2 = 0; |
330 |
-+ |
331 |
-+ switch(m_line_join) |
332 |
- { |
333 |
-- dv.idx = 2; |
334 |
-- |
335 |
-- v = &m_src_vertices[m_src_vertices.size() - 1]; |
336 |
-- x1 = v->x; |
337 |
-- y1 = v->y; |
338 |
-- lprev = v->len; |
339 |
-- |
340 |
-- v = &m_src_vertices[0]; |
341 |
-- x2 = v->x; |
342 |
-- y2 = v->y; |
343 |
-- dv.lcurr = v->len; |
344 |
-- line_parameters prev(x1, y1, x2, y2, lprev); |
345 |
-- |
346 |
-- v = &m_src_vertices[1]; |
347 |
-- dv.x1 = v->x; |
348 |
-- dv.y1 = v->y; |
349 |
-- dv.lnext = v->len; |
350 |
-- dv.curr = line_parameters(x2, y2, dv.x1, dv.y1, dv.lcurr); |
351 |
-- |
352 |
-- v = &m_src_vertices[dv.idx]; |
353 |
-- dv.x2 = v->x; |
354 |
-- dv.y2 = v->y; |
355 |
-- dv.next = line_parameters(dv.x1, dv.y1, dv.x2, dv.y2, dv.lnext); |
356 |
-- |
357 |
-- dv.xb1 = 0; |
358 |
-- dv.yb1 = 0; |
359 |
-- dv.xb2 = 0; |
360 |
-- dv.yb2 = 0; |
361 |
-- |
362 |
-- switch(m_line_join) |
363 |
-- { |
364 |
-- case outline_no_join: |
365 |
-- dv.flags = 3; |
366 |
-- break; |
367 |
-+ case outline_no_join: |
368 |
-+ dv.flags = 3; |
369 |
-+ break; |
370 |
- |
371 |
-- case outline_miter_join: |
372 |
-- case outline_round_join: |
373 |
-- dv.flags = |
374 |
-- (prev.diagonal_quadrant() == dv.curr.diagonal_quadrant()) | |
375 |
-- ((dv.curr.diagonal_quadrant() == dv.next.diagonal_quadrant()) << 1); |
376 |
-- break; |
377 |
-+ case outline_miter_join: |
378 |
-+ case outline_round_join: |
379 |
-+ dv.flags = |
380 |
-+ (prev.diagonal_quadrant() == dv.curr.diagonal_quadrant()) | |
381 |
-+ ((dv.curr.diagonal_quadrant() == dv.next.diagonal_quadrant()) << 1); |
382 |
-+ break; |
383 |
- |
384 |
-- case outline_miter_accurate_join: |
385 |
-- dv.flags = 0; |
386 |
-- break; |
387 |
-- } |
388 |
-+ case outline_miter_accurate_join: |
389 |
-+ dv.flags = 0; |
390 |
-+ break; |
391 |
-+ } |
392 |
- |
393 |
-- if((dv.flags & 1) == 0 && m_line_join != outline_round_join) |
394 |
-- { |
395 |
-- bisectrix(prev, dv.curr, &dv.xb1, &dv.yb1); |
396 |
-- } |
397 |
-+ if((dv.flags & 1) == 0 && m_line_join != outline_round_join) |
398 |
-+ { |
399 |
-+ bisectrix(prev, dv.curr, &dv.xb1, &dv.yb1); |
400 |
-+ } |
401 |
- |
402 |
-- if((dv.flags & 2) == 0 && m_line_join != outline_round_join) |
403 |
-- { |
404 |
-- bisectrix(dv.curr, dv.next, &dv.xb2, &dv.yb2); |
405 |
-- } |
406 |
-- draw(dv, 0, m_src_vertices.size()); |
407 |
-+ if((dv.flags & 2) == 0 && m_line_join != outline_round_join) |
408 |
-+ { |
409 |
-+ bisectrix(dv.curr, dv.next, &dv.xb2, &dv.yb2); |
410 |
- } |
411 |
-+ draw(dv, 0, m_src_vertices.size()); |
412 |
- } |
413 |
- else |
414 |
- { |
415 |
--- |
416 |
-1.8.1.4 |
417 |
- |
418 |
|
419 |
diff --git a/x11-libs/agg/files/2.5/0005-Remove-VC-6-workaround.patch b/x11-libs/agg/files/2.5/0005-Remove-VC-6-workaround.patch |
420 |
deleted file mode 100644 |
421 |
index f38f7c40d..000000000 |
422 |
--- a/x11-libs/agg/files/2.5/0005-Remove-VC-6-workaround.patch |
423 |
+++ /dev/null |
424 |
@@ -1,52 +0,0 @@ |
425 |
-From b8c43fb0ba13af0cc2b1050f48f81d76d2fdf0c7 Mon Sep 17 00:00:00 2001 |
426 |
-From: Tom Hughes <tom@×××××××.nu> |
427 |
-Date: Sun, 19 May 2013 15:04:05 +0100 |
428 |
-Subject: [PATCH 05/15] Remove VC++ 6 workaround |
429 |
- |
430 |
---- |
431 |
- include/agg_renderer_scanline.h | 29 +---------------------------- |
432 |
- 1 file changed, 1 insertion(+), 28 deletions(-) |
433 |
- |
434 |
-diff --git a/include/agg_renderer_scanline.h b/include/agg_renderer_scanline.h |
435 |
-index c3bb6f0..c27ca60 100644 |
436 |
---- a/include/agg_renderer_scanline.h |
437 |
-+++ b/include/agg_renderer_scanline.h |
438 |
-@@ -79,34 +79,7 @@ namespace agg |
439 |
- sl.reset(ras.min_x(), ras.max_x()); |
440 |
- while(ras.sweep_scanline(sl)) |
441 |
- { |
442 |
-- //render_scanline_aa_solid(sl, ren, ren_color); |
443 |
-- |
444 |
-- // This code is equivalent to the above call (copy/paste). |
445 |
-- // It's just a "manual" optimization for old compilers, |
446 |
-- // like Microsoft Visual C++ v6.0 |
447 |
-- //------------------------------- |
448 |
-- int y = sl.y(); |
449 |
-- unsigned num_spans = sl.num_spans(); |
450 |
-- typename Scanline::const_iterator span = sl.begin(); |
451 |
-- |
452 |
-- for(;;) |
453 |
-- { |
454 |
-- int x = span->x; |
455 |
-- if(span->len > 0) |
456 |
-- { |
457 |
-- ren.blend_solid_hspan(x, y, (unsigned)span->len, |
458 |
-- ren_color, |
459 |
-- span->covers); |
460 |
-- } |
461 |
-- else |
462 |
-- { |
463 |
-- ren.blend_hline(x, y, (unsigned)(x - span->len - 1), |
464 |
-- ren_color, |
465 |
-- *(span->covers)); |
466 |
-- } |
467 |
-- if(--num_spans == 0) break; |
468 |
-- ++span; |
469 |
-- } |
470 |
-+ render_scanline_aa_solid(sl, ren, ren_color); |
471 |
- } |
472 |
- } |
473 |
- } |
474 |
--- |
475 |
-1.8.1.4 |
476 |
- |
477 |
|
478 |
diff --git a/x11-libs/agg/files/2.5/0006-Implement-grain-merge-blending-mode-GIMP.patch b/x11-libs/agg/files/2.5/0006-Implement-grain-merge-blending-mode-GIMP.patch |
479 |
deleted file mode 100644 |
480 |
index f1e465b4d..000000000 |
481 |
--- a/x11-libs/agg/files/2.5/0006-Implement-grain-merge-blending-mode-GIMP.patch |
482 |
+++ /dev/null |
483 |
@@ -1,85 +0,0 @@ |
484 |
-From 9422570f4e099a834fc43619f7b2a7eb6b442e25 Mon Sep 17 00:00:00 2001 |
485 |
-From: Tom Hughes <tom@×××××××.nu> |
486 |
-Date: Sun, 19 May 2013 15:31:01 +0100 |
487 |
-Subject: [PATCH 06/15] Implement grain-merge blending mode (GIMP) |
488 |
- |
489 |
---- |
490 |
- include/agg_pixfmt_rgba.h | 42 ++++++++++++++++++++++++++++++++++++++++-- |
491 |
- 1 file changed, 40 insertions(+), 2 deletions(-) |
492 |
- |
493 |
-diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h |
494 |
-index 79d10dc..f576ce4 100644 |
495 |
---- a/include/agg_pixfmt_rgba.h |
496 |
-+++ b/include/agg_pixfmt_rgba.h |
497 |
-@@ -1401,9 +1401,46 @@ namespace agg |
498 |
- } |
499 |
- }; |
500 |
- |
501 |
-+ //================================================comp_op_rgba_grain_merge |
502 |
-+ template <typename ColorT, typename Order> struct comp_op_rgba_grain_merge |
503 |
-+ { |
504 |
-+ typedef ColorT color_type; |
505 |
-+ typedef Order order_type; |
506 |
-+ typedef typename color_type::value_type value_type; |
507 |
-+ typedef typename color_type::calc_type calc_type; |
508 |
-+ typedef typename color_type::long_type long_type; |
509 |
-+ enum base_scale_e |
510 |
-+ { |
511 |
-+ base_shift = color_type::base_shift, |
512 |
-+ base_mask = color_type::base_mask |
513 |
-+ }; |
514 |
- |
515 |
-+ // E = I + M - 128 |
516 |
-+ static AGG_INLINE void blend_pix(value_type* p, |
517 |
-+ unsigned sr, unsigned sg, unsigned sb, |
518 |
-+ unsigned sa, unsigned cover) |
519 |
-+ { |
520 |
- |
521 |
-- |
522 |
-+ if(cover < 255) |
523 |
-+ { |
524 |
-+ sr = (sr * cover + 255) >> 8; |
525 |
-+ sg = (sg * cover + 255) >> 8; |
526 |
-+ sb = (sb * cover + 255) >> 8; |
527 |
-+ sa = (sa * cover + 255) >> 8; |
528 |
-+ } |
529 |
-+ if(sa) |
530 |
-+ { |
531 |
-+ calc_type da = p[Order::A]; |
532 |
-+ int dr = sr + p[Order::R] - 128; |
533 |
-+ int dg = sg + p[Order::G] - 128; |
534 |
-+ int db = sb + p[Order::B] - 128; |
535 |
-+ p[Order::R] = (value_type)(dr < 0 ? 0 : (dr > 255 ? 255 : dr)); |
536 |
-+ p[Order::G] = (value_type)(dg < 0 ? 0 : (dg > 255 ? 255 : dg)); |
537 |
-+ p[Order::B] = (value_type)(db < 0 ? 0 : (db > 255 ? 255 : db)); |
538 |
-+ p[Order::A] = (value_type)(sa + da - ((sa * da + base_mask) >> base_shift)); |
539 |
-+ } |
540 |
-+ } |
541 |
-+ }; |
542 |
- |
543 |
- //======================================================comp_op_table_rgba |
544 |
- template<class ColorT, class Order> struct comp_op_table_rgba |
545 |
-@@ -1451,6 +1488,7 @@ namespace agg |
546 |
- comp_op_rgba_contrast <ColorT,Order>::blend_pix, |
547 |
- comp_op_rgba_invert <ColorT,Order>::blend_pix, |
548 |
- comp_op_rgba_invert_rgb <ColorT,Order>::blend_pix, |
549 |
-+ comp_op_rgba_grain_merge<ColorT,Order>::blend_pix, |
550 |
- 0 |
551 |
- }; |
552 |
- |
553 |
-@@ -1486,6 +1524,7 @@ namespace agg |
554 |
- comp_op_contrast, //----comp_op_contrast |
555 |
- comp_op_invert, //----comp_op_invert |
556 |
- comp_op_invert_rgb, //----comp_op_invert_rgb |
557 |
-+ comp_op_grain_merge, //----comp_op_grain_merge |
558 |
- |
559 |
- end_of_comp_op_e |
560 |
- }; |
561 |
-@@ -2908,4 +2947,3 @@ namespace agg |
562 |
- } |
563 |
- |
564 |
- #endif |
565 |
-- |
566 |
--- |
567 |
-1.8.1.4 |
568 |
- |
569 |
|
570 |
diff --git a/x11-libs/agg/files/2.5/0007-Implement-grain-extract-blending-mode-GIMP.patch b/x11-libs/agg/files/2.5/0007-Implement-grain-extract-blending-mode-GIMP.patch |
571 |
deleted file mode 100644 |
572 |
index cafb36eb0..000000000 |
573 |
--- a/x11-libs/agg/files/2.5/0007-Implement-grain-extract-blending-mode-GIMP.patch |
574 |
+++ /dev/null |
575 |
@@ -1,85 +0,0 @@ |
576 |
-From abd440342e166a90d08610bf5b31d2a8357eafbe Mon Sep 17 00:00:00 2001 |
577 |
-From: Tom Hughes <tom@×××××××.nu> |
578 |
-Date: Sun, 19 May 2013 15:43:18 +0100 |
579 |
-Subject: [PATCH 07/15] Implement grain-extract blending mode (GIMP) |
580 |
- |
581 |
---- |
582 |
- include/agg_pixfmt_rgba.h | 48 +++++++++++++++++++++++++++++++++++++++++++++++ |
583 |
- 1 file changed, 48 insertions(+) |
584 |
- |
585 |
-diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h |
586 |
-index f576ce4..42f0a05 100644 |
587 |
---- a/include/agg_pixfmt_rgba.h |
588 |
-+++ b/include/agg_pixfmt_rgba.h |
589 |
-@@ -1442,6 +1442,52 @@ namespace agg |
590 |
- } |
591 |
- }; |
592 |
- |
593 |
-+ //==============================================comp_op_rgba_grain_extract |
594 |
-+ template <typename ColorT, typename Order> struct comp_op_rgba_grain_extract |
595 |
-+ { |
596 |
-+ typedef ColorT color_type; |
597 |
-+ typedef Order order_type; |
598 |
-+ typedef typename color_type::value_type value_type; |
599 |
-+ typedef typename color_type::calc_type calc_type; |
600 |
-+ typedef typename color_type::long_type long_type; |
601 |
-+ enum base_scale_e |
602 |
-+ { |
603 |
-+ base_shift = color_type::base_shift, |
604 |
-+ base_mask = color_type::base_mask |
605 |
-+ }; |
606 |
-+ |
607 |
-+ // E = I - M + 128 |
608 |
-+ static AGG_INLINE void blend_pix(value_type* p, |
609 |
-+ unsigned sr, unsigned sg, unsigned sb, |
610 |
-+ unsigned sa, unsigned cover) |
611 |
-+ { |
612 |
-+ calc_type da = (p[Order::A] * sa + 255) >> 8; |
613 |
-+ |
614 |
-+ int dr = p[Order::R] - sr + 128; |
615 |
-+ int dg = p[Order::G] - sg + 128; |
616 |
-+ int db = p[Order::B] - sb + 128; |
617 |
-+ |
618 |
-+ dr = dr < 0 ? 0 : (dr > 255 ? 255 : dr); |
619 |
-+ dg = dg < 0 ? 0 : (dg > 255 ? 255 : dg); |
620 |
-+ db = db < 0 ? 0 : (db > 255 ? 255 : db); |
621 |
-+ |
622 |
-+ p[Order::A] = da; |
623 |
-+ |
624 |
-+ if(da < 255) |
625 |
-+ { |
626 |
-+ p[Order::R] = (dr * da + 255) >> 8; |
627 |
-+ p[Order::G] = (dg * da + 255) >> 8; |
628 |
-+ p[Order::B] = (db * da + 255) >> 8; |
629 |
-+ } |
630 |
-+ else |
631 |
-+ { |
632 |
-+ p[Order::R] = dr; |
633 |
-+ p[Order::G] = dg; |
634 |
-+ p[Order::B] = db; |
635 |
-+ } |
636 |
-+ } |
637 |
-+ }; |
638 |
-+ |
639 |
- //======================================================comp_op_table_rgba |
640 |
- template<class ColorT, class Order> struct comp_op_table_rgba |
641 |
- { |
642 |
-@@ -1489,6 +1535,7 @@ namespace agg |
643 |
- comp_op_rgba_invert <ColorT,Order>::blend_pix, |
644 |
- comp_op_rgba_invert_rgb <ColorT,Order>::blend_pix, |
645 |
- comp_op_rgba_grain_merge<ColorT,Order>::blend_pix, |
646 |
-+ comp_op_rgba_grain_extract<ColorT,Order>::blend_pix, |
647 |
- 0 |
648 |
- }; |
649 |
- |
650 |
-@@ -1525,6 +1572,7 @@ namespace agg |
651 |
- comp_op_invert, //----comp_op_invert |
652 |
- comp_op_invert_rgb, //----comp_op_invert_rgb |
653 |
- comp_op_grain_merge, //----comp_op_grain_merge |
654 |
-+ comp_op_grain_extract, //----comp_op_grain_extract |
655 |
- |
656 |
- end_of_comp_op_e |
657 |
- }; |
658 |
--- |
659 |
-1.8.1.4 |
660 |
- |
661 |
|
662 |
diff --git a/x11-libs/agg/files/2.5/0008-Declare-multiplication-and-division-operators-as-con.patch b/x11-libs/agg/files/2.5/0008-Declare-multiplication-and-division-operators-as-con.patch |
663 |
deleted file mode 100644 |
664 |
index 0ed92ee6c..000000000 |
665 |
--- a/x11-libs/agg/files/2.5/0008-Declare-multiplication-and-division-operators-as-con.patch |
666 |
+++ /dev/null |
667 |
@@ -1,36 +0,0 @@ |
668 |
-From 2688af280836b95908d3cfd6915510d55de673b8 Mon Sep 17 00:00:00 2001 |
669 |
-From: Tom Hughes <tom@×××××××.nu> |
670 |
-Date: Sun, 19 May 2013 16:15:01 +0100 |
671 |
-Subject: [PATCH 08/15] Declare multiplication and division operators as const |
672 |
- |
673 |
---- |
674 |
- include/agg_trans_affine.h | 8 ++++---- |
675 |
- 1 file changed, 4 insertions(+), 4 deletions(-) |
676 |
- |
677 |
-diff --git a/include/agg_trans_affine.h b/include/agg_trans_affine.h |
678 |
-index a662099..2f602a0 100644 |
679 |
---- a/include/agg_trans_affine.h |
680 |
-+++ b/include/agg_trans_affine.h |
681 |
-@@ -216,15 +216,15 @@ namespace agg |
682 |
- } |
683 |
- |
684 |
- // Multiply the matrix by another one and return |
685 |
-- // the result in a separete matrix. |
686 |
-- trans_affine operator * (const trans_affine& m) |
687 |
-+ // the result in a separate matrix. |
688 |
-+ trans_affine operator * (const trans_affine& m) const |
689 |
- { |
690 |
- return trans_affine(*this).multiply(m); |
691 |
- } |
692 |
- |
693 |
- // Multiply the matrix by inverse of another one |
694 |
-- // and return the result in a separete matrix. |
695 |
-- trans_affine operator / (const trans_affine& m) |
696 |
-+ // and return the result in a separate matrix. |
697 |
-+ trans_affine operator / (const trans_affine& m) const |
698 |
- { |
699 |
- return trans_affine(*this).multiply_inv(m); |
700 |
- } |
701 |
--- |
702 |
-1.8.1.4 |
703 |
- |
704 |
|
705 |
diff --git a/x11-libs/agg/files/2.5/0009-Add-a-static-identity-transformation.patch b/x11-libs/agg/files/2.5/0009-Add-a-static-identity-transformation.patch |
706 |
deleted file mode 100644 |
707 |
index 01555cb3a..000000000 |
708 |
--- a/x11-libs/agg/files/2.5/0009-Add-a-static-identity-transformation.patch |
709 |
+++ /dev/null |
710 |
@@ -1,37 +0,0 @@ |
711 |
-From be9ed90897bc43b4547a3a1f8046827caaf13b4c Mon Sep 17 00:00:00 2001 |
712 |
-From: Tom Hughes <tom@×××××××.nu> |
713 |
-Date: Sun, 19 May 2013 16:15:36 +0100 |
714 |
-Subject: [PATCH 09/15] Add a static identity transformation |
715 |
- |
716 |
---- |
717 |
- include/agg_trans_affine.h | 1 + |
718 |
- src/agg_trans_affine.cpp | 1 + |
719 |
- 2 files changed, 2 insertions(+) |
720 |
- |
721 |
-diff --git a/include/agg_trans_affine.h b/include/agg_trans_affine.h |
722 |
-index 2f602a0..67fe5ca 100644 |
723 |
---- a/include/agg_trans_affine.h |
724 |
-+++ b/include/agg_trans_affine.h |
725 |
-@@ -92,6 +92,7 @@ namespace agg |
726 |
- //---------------------------------------------------------------------- |
727 |
- struct trans_affine |
728 |
- { |
729 |
-+ static const trans_affine identity; |
730 |
- double sx, shy, shx, sy, tx, ty; |
731 |
- |
732 |
- //------------------------------------------ Construction |
733 |
-diff --git a/src/agg_trans_affine.cpp b/src/agg_trans_affine.cpp |
734 |
-index aca18c2..b3d9bc0 100644 |
735 |
---- a/src/agg_trans_affine.cpp |
736 |
-+++ b/src/agg_trans_affine.cpp |
737 |
-@@ -28,6 +28,7 @@ |
738 |
- |
739 |
- namespace agg |
740 |
- { |
741 |
-+ const trans_affine trans_affine::identity; |
742 |
- |
743 |
- //------------------------------------------------------------------------ |
744 |
- const trans_affine& trans_affine::parl_to_parl(const double* src, |
745 |
--- |
746 |
-1.8.1.4 |
747 |
- |
748 |
|
749 |
diff --git a/x11-libs/agg/files/2.5/0010-Add-renderer_scanline_aa_alpha.patch b/x11-libs/agg/files/2.5/0010-Add-renderer_scanline_aa_alpha.patch |
750 |
deleted file mode 100644 |
751 |
index b0be2583f..000000000 |
752 |
--- a/x11-libs/agg/files/2.5/0010-Add-renderer_scanline_aa_alpha.patch |
753 |
+++ /dev/null |
754 |
@@ -1,193 +0,0 @@ |
755 |
-From 749c8cd11e9e6f81e93ae5ce19258431722b6bdf Mon Sep 17 00:00:00 2001 |
756 |
-From: Tom Hughes <tom@×××××××.nu> |
757 |
-Date: Sun, 19 May 2013 16:43:25 +0100 |
758 |
-Subject: [PATCH 10/15] Add renderer_scanline_aa_alpha |
759 |
- |
760 |
---- |
761 |
- include/agg_pixfmt_rgba.h | 24 +++++++++++++- |
762 |
- include/agg_renderer_base.h | 28 ++++++++++++++++ |
763 |
- include/agg_renderer_scanline.h | 71 +++++++++++++++++++++++++++++++++++++++++ |
764 |
- 3 files changed, 122 insertions(+), 1 deletion(-) |
765 |
- |
766 |
-diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h |
767 |
-index 42f0a05..6c4bc37 100644 |
768 |
---- a/include/agg_pixfmt_rgba.h |
769 |
-+++ b/include/agg_pixfmt_rgba.h |
770 |
-@@ -2247,7 +2247,6 @@ namespace agg |
771 |
- } |
772 |
- |
773 |
- |
774 |
-- |
775 |
- //-------------------------------------------------------------------- |
776 |
- void blend_color_vspan(int x, int y, |
777 |
- unsigned len, |
778 |
-@@ -2751,6 +2750,29 @@ namespace agg |
779 |
- } |
780 |
- |
781 |
- //-------------------------------------------------------------------- |
782 |
-+ void blend_color_hspan_alpha(int x, int y, unsigned len, |
783 |
-+ const color_type* colors, |
784 |
-+ value_type alpha, |
785 |
-+ const int8u* covers, |
786 |
-+ int8u cover) |
787 |
-+ { |
788 |
-+ value_type* p = (value_type*)m_rbuf->row_ptr(x, y, len) + (x << 2); |
789 |
-+ do |
790 |
-+ { |
791 |
-+ blender_type::blend_pix(m_comp_op, |
792 |
-+ p, |
793 |
-+ (colors->r * alpha + 255) >> 8, |
794 |
-+ (colors->g * alpha + 255) >> 8, |
795 |
-+ (colors->b * alpha + 255) >> 8, |
796 |
-+ (colors->a * alpha + 255) >> 8, |
797 |
-+ covers ? *covers++ : cover); |
798 |
-+ p += 4; |
799 |
-+ ++colors; |
800 |
-+ } |
801 |
-+ while(--len); |
802 |
-+ } |
803 |
-+ |
804 |
-+ //-------------------------------------------------------------------- |
805 |
- void blend_color_vspan(int x, int y, unsigned len, |
806 |
- const color_type* colors, |
807 |
- const int8u* covers, |
808 |
-diff --git a/include/agg_renderer_base.h b/include/agg_renderer_base.h |
809 |
-index 1808944..25f07c3 100644 |
810 |
---- a/include/agg_renderer_base.h |
811 |
-+++ b/include/agg_renderer_base.h |
812 |
-@@ -37,6 +37,7 @@ namespace agg |
813 |
- public: |
814 |
- typedef PixelFormat pixfmt_type; |
815 |
- typedef typename pixfmt_type::color_type color_type; |
816 |
-+ typedef typename pixfmt_type::color_type::value_type value_type; |
817 |
- typedef typename pixfmt_type::row_data row_data; |
818 |
- |
819 |
- //-------------------------------------------------------------------- |
820 |
-@@ -383,6 +384,33 @@ namespace agg |
821 |
- } |
822 |
- |
823 |
- //-------------------------------------------------------------------- |
824 |
-+ void blend_color_hspan_alpha(int x, int y, int len, |
825 |
-+ const color_type* colors, |
826 |
-+ value_type alpha, |
827 |
-+ const cover_type* covers, |
828 |
-+ cover_type cover = agg::cover_full) |
829 |
-+ { |
830 |
-+ if(y > ymax()) return; |
831 |
-+ if(y < ymin()) return; |
832 |
-+ |
833 |
-+ if(x < xmin()) |
834 |
-+ { |
835 |
-+ int d = xmin() - x; |
836 |
-+ len -= d; |
837 |
-+ if(len <= 0) return; |
838 |
-+ if(covers) covers += d; |
839 |
-+ colors += d; |
840 |
-+ x = xmin(); |
841 |
-+ } |
842 |
-+ if(x + len > xmax()) |
843 |
-+ { |
844 |
-+ len = xmax() - x + 1; |
845 |
-+ if(len <= 0) return; |
846 |
-+ } |
847 |
-+ m_ren->blend_color_hspan_alpha(x, y, len, colors, alpha, covers, cover); |
848 |
-+ } |
849 |
-+ |
850 |
-+ //-------------------------------------------------------------------- |
851 |
- void blend_color_vspan(int x, int y, int len, |
852 |
- const color_type* colors, |
853 |
- const cover_type* covers, |
854 |
-diff --git a/include/agg_renderer_scanline.h b/include/agg_renderer_scanline.h |
855 |
-index c27ca60..4fcb557 100644 |
856 |
---- a/include/agg_renderer_scanline.h |
857 |
-+++ b/include/agg_renderer_scanline.h |
858 |
-@@ -156,6 +156,35 @@ namespace agg |
859 |
- } |
860 |
- } |
861 |
- |
862 |
-+ //================================================render_scanline_aa_alpha |
863 |
-+ template<class Scanline, class BaseRenderer, |
864 |
-+ class SpanAllocator, class SpanGenerator> |
865 |
-+ void render_scanline_aa_alpha(const Scanline& sl, BaseRenderer& ren, |
866 |
-+ SpanAllocator& alloc, SpanGenerator& span_gen, |
867 |
-+ unsigned alpha) |
868 |
-+ { |
869 |
-+ int y = sl.y(); |
870 |
-+ |
871 |
-+ unsigned num_spans = sl.num_spans(); |
872 |
-+ typename Scanline::const_iterator span = sl.begin(); |
873 |
-+ for(;;) |
874 |
-+ { |
875 |
-+ int x = span->x; |
876 |
-+ int len = span->len; |
877 |
-+ const typename Scanline::cover_type* covers = span->covers; |
878 |
-+ |
879 |
-+ if(len < 0) len = -len; |
880 |
-+ typename BaseRenderer::color_type* colors = alloc.allocate(len); |
881 |
-+ span_gen.generate(colors, x, y, len); |
882 |
-+ ren.blend_color_hspan_alpha(x, y, len, colors, alpha, |
883 |
-+ (span->len < 0) ? 0 : covers, *covers); |
884 |
-+ |
885 |
-+ if(--num_spans == 0) break; |
886 |
-+ ++span; |
887 |
-+ } |
888 |
-+ } |
889 |
-+ |
890 |
-+ |
891 |
- //=====================================================render_scanlines_aa |
892 |
- template<class Rasterizer, class Scanline, class BaseRenderer, |
893 |
- class SpanAllocator, class SpanGenerator> |
894 |
-@@ -216,8 +245,50 @@ namespace agg |
895 |
- }; |
896 |
- |
897 |
- |
898 |
-+ //==============================================renderer_scanline_aa_alpha |
899 |
-+ template<class BaseRenderer, class SpanAllocator, class SpanGenerator> |
900 |
-+ class renderer_scanline_aa_alpha |
901 |
-+ { |
902 |
-+ public: |
903 |
-+ typedef BaseRenderer base_ren_type; |
904 |
-+ typedef SpanAllocator alloc_type; |
905 |
-+ typedef SpanGenerator span_gen_type; |
906 |
- |
907 |
-+ //-------------------------------------------------------------------- |
908 |
-+ renderer_scanline_aa_alpha() : m_ren(0), m_alloc(0), m_span_gen(0), m_alpha(1.0) {} |
909 |
-+ renderer_scanline_aa_alpha(base_ren_type& ren, |
910 |
-+ alloc_type& alloc, |
911 |
-+ span_gen_type& span_gen, |
912 |
-+ unsigned alpha) : |
913 |
-+ m_ren(&ren), |
914 |
-+ m_alloc(&alloc), |
915 |
-+ m_span_gen(&span_gen), |
916 |
-+ m_alpha(alpha) |
917 |
-+ {} |
918 |
-+ void attach(base_ren_type& ren, |
919 |
-+ alloc_type& alloc, |
920 |
-+ span_gen_type& span_gen) |
921 |
-+ { |
922 |
-+ m_ren = &ren; |
923 |
-+ m_alloc = &alloc; |
924 |
-+ m_span_gen = &span_gen; |
925 |
-+ } |
926 |
- |
927 |
-+ //-------------------------------------------------------------------- |
928 |
-+ void prepare() { m_span_gen->prepare(); } |
929 |
-+ |
930 |
-+ //-------------------------------------------------------------------- |
931 |
-+ template<class Scanline> void render(const Scanline& sl) |
932 |
-+ { |
933 |
-+ render_scanline_aa_alpha(sl, *m_ren, *m_alloc, *m_span_gen, m_alpha); |
934 |
-+ } |
935 |
-+ |
936 |
-+ private: |
937 |
-+ base_ren_type* m_ren; |
938 |
-+ alloc_type* m_alloc; |
939 |
-+ span_gen_type* m_span_gen; |
940 |
-+ unsigned m_alpha; |
941 |
-+ }; |
942 |
- |
943 |
- |
944 |
- //===============================================render_scanline_bin_solid |
945 |
--- |
946 |
-1.8.1.4 |
947 |
- |
948 |
|
949 |
diff --git a/x11-libs/agg/files/2.5/0011-Avoid-division-by-zero-in-color-burn-mode.patch b/x11-libs/agg/files/2.5/0011-Avoid-division-by-zero-in-color-burn-mode.patch |
950 |
deleted file mode 100644 |
951 |
index 2a0d198fe..000000000 |
952 |
--- a/x11-libs/agg/files/2.5/0011-Avoid-division-by-zero-in-color-burn-mode.patch |
953 |
+++ /dev/null |
954 |
@@ -1,58 +0,0 @@ |
955 |
-From 0ec68d7f5695403eccac75025ba7f6f7ecf1814e Mon Sep 17 00:00:00 2001 |
956 |
-From: Tom Hughes <tom@×××××××.nu> |
957 |
-Date: Sun, 19 May 2013 16:49:08 +0100 |
958 |
-Subject: [PATCH 11/15] Avoid division by zero in color-burn mode |
959 |
- |
960 |
-FIXME: re-work using latest math from http://www.w3.org/TR/SVGCompositing/ |
961 |
---- |
962 |
- include/agg_pixfmt_rgba.h | 21 ++++++++++++++++++--- |
963 |
- 1 file changed, 18 insertions(+), 3 deletions(-) |
964 |
- |
965 |
-diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h |
966 |
-index 6c4bc37..5d6b511 100644 |
967 |
---- a/include/agg_pixfmt_rgba.h |
968 |
-+++ b/include/agg_pixfmt_rgba.h |
969 |
-@@ -1027,6 +1027,21 @@ namespace agg |
970 |
- // Dca' = Sa.(Sca.Da + Dca.Sa - Sa.Da)/Sca + Sca.(1 - Da) + Dca.(1 - Sa) |
971 |
- // |
972 |
- // Da' = Sa + Da - Sa.Da |
973 |
-+ |
974 |
-+ |
975 |
-+ // http://www.w3.org/TR/SVGCompositing/ |
976 |
-+ // if Sca == 0 and Dca == Da |
977 |
-+ // Dca' = Sa × Da + Sca × (1 - Da) + Dca × (1 - Sa) |
978 |
-+ // = Sa × Da + Dca × (1 - Sa) |
979 |
-+ // = Da = Dca |
980 |
-+ // otherwise if Sca == 0 |
981 |
-+ // Dca' = Sca × (1 - Da) + Dca × (1 - Sa) |
982 |
-+ // = Dca × (1 - Sa) |
983 |
-+ // otherwise if Sca > 0 |
984 |
-+ // Dca' = Sa × Da - Sa × Da × min(1, (1 - Dca/Da) × Sa/Sca) + Sca × (1 - Da) + Dca × (1 - Sa) |
985 |
-+ // = Sa × Da × (1 - min(1, (1 - Dca/Da) × Sa/Sca)) + Sca × (1 - Da) + Dca × (1 - Sa) |
986 |
-+ |
987 |
-+ // sa * da * (255 - std::min(255, (255 - p[0]/da)*(sa/(sc*sa)) + |
988 |
- static AGG_INLINE void blend_pix(value_type* p, |
989 |
- unsigned sr, unsigned sg, unsigned sb, |
990 |
- unsigned sa, unsigned cover) |
991 |
-@@ -1056,15 +1071,15 @@ namespace agg |
992 |
- |
993 |
- p[Order::R] = (value_type)(((srda + drsa <= sada) ? |
994 |
- sr * d1a + dr * s1a : |
995 |
-- sa * (srda + drsa - sada) / sr + sr * d1a + dr * s1a + base_mask) >> base_shift); |
996 |
-+ (sr > 0 ? sa * (srda + drsa - sada) / sr + sr * d1a + dr * s1a + base_mask : 0)) >> base_shift); |
997 |
- |
998 |
- p[Order::G] = (value_type)(((sgda + dgsa <= sada) ? |
999 |
- sg * d1a + dg * s1a : |
1000 |
-- sa * (sgda + dgsa - sada) / sg + sg * d1a + dg * s1a + base_mask) >> base_shift); |
1001 |
-+ (sg > 0 ? sa * (sgda + dgsa - sada) / sg + sg * d1a + dg * s1a + base_mask : 0)) >> base_shift); |
1002 |
- |
1003 |
- p[Order::B] = (value_type)(((sbda + dbsa <= sada) ? |
1004 |
- sb * d1a + db * s1a : |
1005 |
-- sa * (sbda + dbsa - sada) / sb + sb * d1a + db * s1a + base_mask) >> base_shift); |
1006 |
-+ (sb > 0 ? sa * (sbda + dbsa - sada) / sb + sb * d1a + db * s1a + base_mask : 0)) >> base_shift); |
1007 |
- |
1008 |
- p[Order::A] = (value_type)(sa + da - ((sa * da + base_mask) >> base_shift)); |
1009 |
- } |
1010 |
--- |
1011 |
-1.8.1.4 |
1012 |
- |
1013 |
|
1014 |
diff --git a/x11-libs/agg/files/2.5/0012-Avoid-pixel-artifacts-when-compositing.patch b/x11-libs/agg/files/2.5/0012-Avoid-pixel-artifacts-when-compositing.patch |
1015 |
deleted file mode 100644 |
1016 |
index b3e641e6f..000000000 |
1017 |
--- a/x11-libs/agg/files/2.5/0012-Avoid-pixel-artifacts-when-compositing.patch |
1018 |
+++ /dev/null |
1019 |
@@ -1,26 +0,0 @@ |
1020 |
-From bf0e0b71360cfbc690a29f4abe15d7b9b61b8479 Mon Sep 17 00:00:00 2001 |
1021 |
-From: Tom Hughes <tom@×××××××.nu> |
1022 |
-Date: Sat, 22 Jun 2013 12:11:54 +0100 |
1023 |
-Subject: [PATCH 12/15] Avoid pixel artifacts when compositing |
1024 |
- |
1025 |
-Change src_over alpha to avoid pixel artifacts by reordering computations. |
1026 |
---- |
1027 |
- include/agg_pixfmt_rgba.h | 2 +- |
1028 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
1029 |
- |
1030 |
-diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h |
1031 |
-index 5d6b511..bb255cd 100644 |
1032 |
---- a/include/agg_pixfmt_rgba.h |
1033 |
-+++ b/include/agg_pixfmt_rgba.h |
1034 |
-@@ -346,7 +346,7 @@ namespace agg |
1035 |
- p[Order::R] = (value_type)(sr + ((p[Order::R] * s1a + base_mask) >> base_shift)); |
1036 |
- p[Order::G] = (value_type)(sg + ((p[Order::G] * s1a + base_mask) >> base_shift)); |
1037 |
- p[Order::B] = (value_type)(sb + ((p[Order::B] * s1a + base_mask) >> base_shift)); |
1038 |
-- p[Order::A] = (value_type)(sa + p[Order::A] - ((sa * p[Order::A] + base_mask) >> base_shift)); |
1039 |
-+ p[Order::A] = (value_type)(sa + ((p[Order::A] * s1a + base_mask) >> base_shift)); |
1040 |
- } |
1041 |
- }; |
1042 |
- |
1043 |
--- |
1044 |
-1.8.1.4 |
1045 |
- |
1046 |
|
1047 |
diff --git a/x11-libs/agg/files/2.5/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch b/x11-libs/agg/files/2.5/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch |
1048 |
deleted file mode 100644 |
1049 |
index 9deb90473..000000000 |
1050 |
--- a/x11-libs/agg/files/2.5/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch |
1051 |
+++ /dev/null |
1052 |
@@ -1,93 +0,0 @@ |
1053 |
-From 6f1ab5f4b470bcf4e7e72aac6e2f7f6ee3e7b424 Mon Sep 17 00:00:00 2001 |
1054 |
-From: Tom Hughes <tom@×××××××.nu> |
1055 |
-Date: Sat, 22 Jun 2013 12:16:42 +0100 |
1056 |
-Subject: [PATCH 13/15] Modify agg conv classes to allow access to the original |
1057 |
- geometry type |
1058 |
- |
1059 |
---- |
1060 |
- include/agg_conv_adaptor_vcgen.h | 2 ++ |
1061 |
- include/agg_conv_adaptor_vpgen.h | 1 + |
1062 |
- include/agg_conv_clip_polygon.h | 1 + |
1063 |
- include/agg_conv_clip_polyline.h | 1 + |
1064 |
- include/agg_conv_smooth_poly1.h | 2 ++ |
1065 |
- 5 files changed, 7 insertions(+) |
1066 |
- |
1067 |
-diff --git a/include/agg_conv_adaptor_vcgen.h b/include/agg_conv_adaptor_vcgen.h |
1068 |
-index 7bd9b07..fef4579 100644 |
1069 |
---- a/include/agg_conv_adaptor_vcgen.h |
1070 |
-+++ b/include/agg_conv_adaptor_vcgen.h |
1071 |
-@@ -38,6 +38,7 @@ namespace agg |
1072 |
- |
1073 |
- void rewind(unsigned) {} |
1074 |
- unsigned vertex(double*, double*) { return path_cmd_stop; } |
1075 |
-+ unsigned type() const { return 0; } |
1076 |
- }; |
1077 |
- |
1078 |
- |
1079 |
-@@ -73,6 +74,7 @@ namespace agg |
1080 |
- } |
1081 |
- |
1082 |
- unsigned vertex(double* x, double* y); |
1083 |
-+ unsigned type() const { return m_source->type(); } |
1084 |
- |
1085 |
- private: |
1086 |
- // Prohibit copying |
1087 |
-diff --git a/include/agg_conv_adaptor_vpgen.h b/include/agg_conv_adaptor_vpgen.h |
1088 |
-index dca9415..a39102d 100644 |
1089 |
---- a/include/agg_conv_adaptor_vpgen.h |
1090 |
-+++ b/include/agg_conv_adaptor_vpgen.h |
1091 |
-@@ -42,6 +42,7 @@ namespace agg |
1092 |
- |
1093 |
- void rewind(unsigned path_id); |
1094 |
- unsigned vertex(double* x, double* y); |
1095 |
-+ unsigned type() const { return m_source->type(); } |
1096 |
- |
1097 |
- private: |
1098 |
- conv_adaptor_vpgen(const conv_adaptor_vpgen<VertexSource, VPGen>&); |
1099 |
-diff --git a/include/agg_conv_clip_polygon.h b/include/agg_conv_clip_polygon.h |
1100 |
-index 3c34590..e417a7d 100644 |
1101 |
---- a/include/agg_conv_clip_polygon.h |
1102 |
-+++ b/include/agg_conv_clip_polygon.h |
1103 |
-@@ -60,6 +60,7 @@ namespace agg |
1104 |
- double y1() const { return base_type::vpgen().y1(); } |
1105 |
- double x2() const { return base_type::vpgen().x2(); } |
1106 |
- double y2() const { return base_type::vpgen().y2(); } |
1107 |
-+ unsigned type() const { return base_type::type(); } |
1108 |
- |
1109 |
- private: |
1110 |
- conv_clip_polygon(const conv_clip_polygon<VertexSource>&); |
1111 |
-diff --git a/include/agg_conv_clip_polyline.h b/include/agg_conv_clip_polyline.h |
1112 |
-index d45067f..0de4b57 100644 |
1113 |
---- a/include/agg_conv_clip_polyline.h |
1114 |
-+++ b/include/agg_conv_clip_polyline.h |
1115 |
-@@ -60,6 +60,7 @@ namespace agg |
1116 |
- double y1() const { return base_type::vpgen().y1(); } |
1117 |
- double x2() const { return base_type::vpgen().x2(); } |
1118 |
- double y2() const { return base_type::vpgen().y2(); } |
1119 |
-+ unsigned type() const { return base_type::type(); } |
1120 |
- |
1121 |
- private: |
1122 |
- conv_clip_polyline(const conv_clip_polyline<VertexSource>&); |
1123 |
-diff --git a/include/agg_conv_smooth_poly1.h b/include/agg_conv_smooth_poly1.h |
1124 |
-index 15f7f8d..0956c4e 100644 |
1125 |
---- a/include/agg_conv_smooth_poly1.h |
1126 |
-+++ b/include/agg_conv_smooth_poly1.h |
1127 |
-@@ -48,6 +48,7 @@ namespace agg |
1128 |
- |
1129 |
- void smooth_value(double v) { base_type::generator().smooth_value(v); } |
1130 |
- double smooth_value() const { return base_type::generator().smooth_value(); } |
1131 |
-+ unsigned type() const { return base_type::type(); } |
1132 |
- |
1133 |
- private: |
1134 |
- conv_smooth_poly1(const conv_smooth_poly1<VertexSource>&); |
1135 |
-@@ -70,6 +71,7 @@ namespace agg |
1136 |
- |
1137 |
- void smooth_value(double v) { m_smooth.generator().smooth_value(v); } |
1138 |
- double smooth_value() const { return m_smooth.generator().smooth_value(); } |
1139 |
-+ unsigned type() const { return m_smooth.type(); } |
1140 |
- |
1141 |
- private: |
1142 |
- conv_smooth_poly1_curve(const conv_smooth_poly1_curve<VertexSource>&); |
1143 |
--- |
1144 |
-1.8.1.4 |
1145 |
- |
1146 |
|
1147 |
diff --git a/x11-libs/agg/files/2.5/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch b/x11-libs/agg/files/2.5/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch |
1148 |
deleted file mode 100644 |
1149 |
index 547b0d218..000000000 |
1150 |
--- a/x11-libs/agg/files/2.5/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch |
1151 |
+++ /dev/null |
1152 |
@@ -1,30 +0,0 @@ |
1153 |
-From 6433a64f4cd41e88499386b0b7c7ae05d30683b8 Mon Sep 17 00:00:00 2001 |
1154 |
-From: Tom Hughes <tom@×××××××.nu> |
1155 |
-Date: Sat, 22 Jun 2013 12:33:32 +0100 |
1156 |
-Subject: [PATCH 14/15] Avoid potential zero division resulting in nan in |
1157 |
- agg::gamma_linear |
1158 |
- |
1159 |
---- |
1160 |
- include/agg_gamma_functions.h | 6 +++++- |
1161 |
- 1 file changed, 5 insertions(+), 1 deletion(-) |
1162 |
- |
1163 |
-diff --git a/include/agg_gamma_functions.h b/include/agg_gamma_functions.h |
1164 |
-index fa38a45..beb0c04 100644 |
1165 |
---- a/include/agg_gamma_functions.h |
1166 |
-+++ b/include/agg_gamma_functions.h |
1167 |
-@@ -94,7 +94,11 @@ namespace agg |
1168 |
- { |
1169 |
- if(x < m_start) return 0.0; |
1170 |
- if(x > m_end) return 1.0; |
1171 |
-- return (x - m_start) / (m_end - m_start); |
1172 |
-+ double delta = m_end - m_start; |
1173 |
-+ // avoid nan from potential zero division |
1174 |
-+ // https://github.com/mapnik/mapnik/issues/761 |
1175 |
-+ if (delta <= 0.0) return 0.0; |
1176 |
-+ return (x - m_start) / delta; |
1177 |
- } |
1178 |
- |
1179 |
- private: |
1180 |
--- |
1181 |
-1.8.1.4 |
1182 |
- |
1183 |
|
1184 |
diff --git a/x11-libs/agg/files/2.5/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch b/x11-libs/agg/files/2.5/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch |
1185 |
deleted file mode 100644 |
1186 |
index 6214bd62e..000000000 |
1187 |
--- a/x11-libs/agg/files/2.5/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch |
1188 |
+++ /dev/null |
1189 |
@@ -1,24 +0,0 @@ |
1190 |
-From ca818d4dcd428c5560fc3c341fbaf427a7485e32 Mon Sep 17 00:00:00 2001 |
1191 |
-From: Tom Hughes <tom@×××××××.nu> |
1192 |
-Date: Sat, 22 Jun 2013 12:34:37 +0100 |
1193 |
-Subject: [PATCH 15/15] Ensure first value in the gamma table is always zero |
1194 |
- |
1195 |
---- |
1196 |
- include/agg_gamma_functions.h | 1 + |
1197 |
- 1 file changed, 1 insertion(+) |
1198 |
- |
1199 |
-diff --git a/include/agg_gamma_functions.h b/include/agg_gamma_functions.h |
1200 |
-index beb0c04..b8eda52 100644 |
1201 |
---- a/include/agg_gamma_functions.h |
1202 |
-+++ b/include/agg_gamma_functions.h |
1203 |
-@@ -49,6 +49,7 @@ namespace agg |
1204 |
- |
1205 |
- double operator() (double x) const |
1206 |
- { |
1207 |
-+ if (x == 0.0) return 0.0; |
1208 |
- return pow(x, m_gamma); |
1209 |
- } |
1210 |
- |
1211 |
--- |
1212 |
-1.8.1.4 |
1213 |
- |
1214 |
|
1215 |
diff --git a/x11-libs/agg/files/agg-2.4-depends.patch b/x11-libs/agg/files/agg-2.4-depends.patch |
1216 |
deleted file mode 100644 |
1217 |
index 9d4f6e309..000000000 |
1218 |
--- a/x11-libs/agg/files/agg-2.4-depends.patch |
1219 |
+++ /dev/null |
1220 |
@@ -1,48 +0,0 @@ |
1221 |
---- agg-2.4.orig/font_freetype/Makefile.am 2005-10-18 11:45:40.000000000 +0100 |
1222 |
-+++ agg-2.4/font_freetype/Makefile.am 2006-07-10 15:11:55.000000000 +0100 |
1223 |
-@@ -4,8 +4,9 @@ |
1224 |
- agginclude_HEADERS = agg_font_freetype.h |
1225 |
- lib_LTLIBRARIES = libaggfontfreetype.la |
1226 |
- |
1227 |
--libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@ |
1228 |
-+libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ |
1229 |
- libaggfontfreetype_la_SOURCES = agg_font_freetype.cpp |
1230 |
- libaggfontfreetype_la_CXXFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@ |
1231 |
-+libaggfontfreetype_la_LIBADD = ../src/libagg.la @FREETYPE_LIBS@ |
1232 |
- endif |
1233 |
- |
1234 |
---- agg-2.4.orig/src/platform/sdl/Makefile.am 2005-10-17 23:49:35.000000000 +0100 |
1235 |
-+++ agg-2.4/src/platform/sdl/Makefile.am 2006-07-10 15:11:55.000000000 +0100 |
1236 |
-@@ -5,6 +5,6 @@ |
1237 |
- libaggplatformsdl_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ |
1238 |
- libaggplatformsdl_la_SOURCES = agg_platform_support.cpp |
1239 |
- libaggplatformsdl_la_CXXFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@ |
1240 |
--libaggplatformsdl_la_LIBADD = @SDL_LIBS@ |
1241 |
-+libaggplatformsdl_la_LIBADD = ../../libagg.la @SDL_LIBS@ |
1242 |
- endif |
1243 |
- |
1244 |
---- agg-2.5.orig/configure.in 2006-10-09 05:06:36.000000000 +0100 |
1245 |
-+++ agg-2.5/configure.in 2007-01-07 14:07:39.000000000 +0000 |
1246 |
-@@ -122,7 +122,8 @@ |
1247 |
- fi |
1248 |
- AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes]) |
1249 |
- AC_SUBST(x_includes) |
1250 |
--AC_SUBST(x_libraries) |
1251 |
-+test -n "$x_libraries" && X_LDFLAGS="-L$x_libraries" |
1252 |
-+AC_SUBST(X_LDFLAGS) |
1253 |
- dnl ############################################### |
1254 |
- |
1255 |
- dnl Settung up library version |
1256 |
---- agg-2.5.orig/src/platform/X11/Makefile.am 2006-12-11 00:59:45.000000000 +0000 |
1257 |
-+++ agg-2.5/src/platform/X11/Makefile.am 2007-01-07 14:07:39.000000000 +0000 |
1258 |
-@@ -1,8 +1,8 @@ |
1259 |
- if ENABLE_X11 |
1260 |
- lib_LTLIBRARIES = libaggplatformX11.la |
1261 |
- |
1262 |
--libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ -L@x_libraries@ |
1263 |
-+libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @X_LDFLAGS@ |
1264 |
- libaggplatformX11_la_SOURCES = agg_platform_support.cpp |
1265 |
- libaggplatformX11_la_CXXFLAGS = -I$(top_srcdir)/include -I@x_includes@ |
1266 |
--libaggplatformX11_la_LIBADD = -lX11 |
1267 |
-+libaggplatformX11_la_LIBADD = ../../libagg.la -lX11 |
1268 |
- endif |
1269 |
|
1270 |
diff --git a/x11-libs/agg/files/agg-2.5-autotools.patch b/x11-libs/agg/files/agg-2.5-autotools.patch |
1271 |
deleted file mode 100644 |
1272 |
index 1272b65bb..000000000 |
1273 |
--- a/x11-libs/agg/files/agg-2.5-autotools.patch |
1274 |
+++ /dev/null |
1275 |
@@ -1,11 +0,0 @@ |
1276 |
---- a/configure.in 2013-02-22 09:30:00.000000000 -0600 |
1277 |
-+++ b/configure.in 2013-02-22 09:30:49.030777571 -0600 |
1278 |
-@@ -8,7 +8,7 @@ |
1279 |
- AC_PROG_CC |
1280 |
- AC_PROG_CXX |
1281 |
- AC_ISC_POSIX |
1282 |
--AM_C_PROTOTYPES |
1283 |
-+#AM_C_PROTOTYPES |
1284 |
- if test "x$U" != "x"; then |
1285 |
- AC_MSG_ERROR(Compiler not ANSI compliant) |
1286 |
- fi |
1287 |
|
1288 |
diff --git a/x11-libs/agg/files/agg-2.5-pkgconfig.patch b/x11-libs/agg/files/agg-2.5-pkgconfig.patch |
1289 |
deleted file mode 100644 |
1290 |
index a303bfb90..000000000 |
1291 |
--- a/x11-libs/agg/files/agg-2.5-pkgconfig.patch |
1292 |
+++ /dev/null |
1293 |
@@ -1,10 +0,0 @@ |
1294 |
---- agg-2.5/libagg.pc.in.orig 2007-01-07 13:58:28.000000000 +0000 |
1295 |
-+++ agg-2.5/libagg.pc.in 2007-01-07 14:02:40.000000000 +0000 |
1296 |
-@@ -6,5 +6,6 @@ |
1297 |
- Name: libagg |
1298 |
- Description: Anti Grain Geometry - A High Quality Rendering Engine for C++ |
1299 |
- Version: @VERSION@ |
1300 |
--Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg |
1301 |
-+Requires.private: freetype2 |
1302 |
-+Libs: -L${libdir} -lagg |
1303 |
- Cflags: -I${includedir} |
1304 |
|
1305 |
diff --git a/x11-libs/agg/files/agg-2.5-sdl-automagic.patch b/x11-libs/agg/files/agg-2.5-sdl-automagic.patch |
1306 |
deleted file mode 100644 |
1307 |
index 19daaea06..000000000 |
1308 |
--- a/x11-libs/agg/files/agg-2.5-sdl-automagic.patch |
1309 |
+++ /dev/null |
1310 |
@@ -1,26 +0,0 @@ |
1311 |
---- a/configure.in 2013-08-06 16:35:30.740061017 -0700 |
1312 |
-+++ b/configure.in 2013-08-06 16:40:47.511004499 -0700 |
1313 |
-@@ -95,10 +95,14 @@ |
1314 |
- |
1315 |
- dnl ######### Check for SDL: ##################### |
1316 |
- dnl the sdl script pollutes our global values: |
1317 |
-+AC_ARG_ENABLE(sdl, |
1318 |
-+ AC_HELP_STRING([--enable-sdl],[enable the sdl layer]) ) |
1319 |
-+ |
1320 |
-+sdl_enabled="no" |
1321 |
-+if test x"$enable_sdl" = x"yes"; then |
1322 |
- temp_LIBS="$LIBS" |
1323 |
- temp_CFLAGS="$CFLAGS" |
1324 |
- temp_CXXFLAGS="$CXXFLAGS" |
1325 |
--sdl_enabled="" |
1326 |
- SDL_VERSION=1.2.0 |
1327 |
- AM_PATH_SDL($SDL_VERSION, |
1328 |
- [sdl_enabled="yes"], |
1329 |
-@@ -111,6 +115,7 @@ |
1330 |
- dnl ### the sdl script already does that: |
1331 |
- dnl AC_SUBST(SDL_CFLAGS) |
1332 |
- dnl AC_SUBST(SDL_LIBS) |
1333 |
-+fi |
1334 |
- AM_CONDITIONAL(ENABLE_SDL,[test xyes = x$sdl_enabled -a xno != x$enable_platform -a x$win32_host != xyes]) |
1335 |
- dnl ############################################### |
1336 |
- |
1337 |
|
1338 |
diff --git a/x11-libs/agg/files/agg-2.5-sdl-m4.patch b/x11-libs/agg/files/agg-2.5-sdl-m4.patch |
1339 |
deleted file mode 100644 |
1340 |
index 2e2569f8b..000000000 |
1341 |
--- a/x11-libs/agg/files/agg-2.5-sdl-m4.patch |
1342 |
+++ /dev/null |
1343 |
@@ -1,186 +0,0 @@ |
1344 |
---- a/sdl.m4 1969-12-31 16:00:00.000000000 -0800 |
1345 |
-+++ b/sdl.m4 2008-01-24 07:50:20.000000000 -0800 |
1346 |
-@@ -0,0 +1,183 @@ |
1347 |
-+# Configure paths for SDL |
1348 |
-+# Sam Lantinga 9/21/99 |
1349 |
-+# stolen from Manish Singh |
1350 |
-+# stolen back from Frank Belew |
1351 |
-+# stolen from Manish Singh |
1352 |
-+# Shamelessly stolen from Owen Taylor |
1353 |
-+ |
1354 |
-+dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) |
1355 |
-+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS |
1356 |
-+dnl |
1357 |
-+AC_DEFUN([AM_PATH_SDL], |
1358 |
-+[dnl |
1359 |
-+dnl Get the cflags and libraries from the sdl-config script |
1360 |
-+dnl |
1361 |
-+AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], |
1362 |
-+ sdl_prefix="$withval", sdl_prefix="") |
1363 |
-+AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], |
1364 |
-+ sdl_exec_prefix="$withval", sdl_exec_prefix="") |
1365 |
-+AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], |
1366 |
-+ , enable_sdltest=yes) |
1367 |
-+ |
1368 |
-+ if test x$sdl_exec_prefix != x ; then |
1369 |
-+ sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" |
1370 |
-+ if test x${SDL_CONFIG+set} != xset ; then |
1371 |
-+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config |
1372 |
-+ fi |
1373 |
-+ fi |
1374 |
-+ if test x$sdl_prefix != x ; then |
1375 |
-+ sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" |
1376 |
-+ if test x${SDL_CONFIG+set} != xset ; then |
1377 |
-+ SDL_CONFIG=$sdl_prefix/bin/sdl-config |
1378 |
-+ fi |
1379 |
-+ fi |
1380 |
-+ |
1381 |
-+ as_save_PATH="$PATH" |
1382 |
-+ if test "x$prefix" != xNONE; then |
1383 |
-+ PATH="$prefix/bin:$prefix/usr/bin:$PATH" |
1384 |
-+ fi |
1385 |
-+ AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) |
1386 |
-+ PATH="$as_save_PATH" |
1387 |
-+ min_sdl_version=ifelse([$1], ,0.11.0,$1) |
1388 |
-+ AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) |
1389 |
-+ no_sdl="" |
1390 |
-+ if test "$SDL_CONFIG" = "no" ; then |
1391 |
-+ no_sdl=yes |
1392 |
-+ else |
1393 |
-+ SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` |
1394 |
-+ SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` |
1395 |
-+ |
1396 |
-+ sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ |
1397 |
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
1398 |
-+ sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \ |
1399 |
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` |
1400 |
-+ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ |
1401 |
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
1402 |
-+ if test "x$enable_sdltest" = "xyes" ; then |
1403 |
-+ ac_save_CFLAGS="$CFLAGS" |
1404 |
-+ ac_save_CXXFLAGS="$CXXFLAGS" |
1405 |
-+ ac_save_LIBS="$LIBS" |
1406 |
-+ CFLAGS="$CFLAGS $SDL_CFLAGS" |
1407 |
-+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" |
1408 |
-+ LIBS="$LIBS $SDL_LIBS" |
1409 |
-+dnl |
1410 |
-+dnl Now check if the installed SDL is sufficiently new. (Also sanity |
1411 |
-+dnl checks the results of sdl-config to some extent |
1412 |
-+dnl |
1413 |
-+ rm -f conf.sdltest |
1414 |
-+ AC_TRY_RUN([ |
1415 |
-+#include <stdio.h> |
1416 |
-+#include <stdlib.h> |
1417 |
-+#include <string.h> |
1418 |
-+#include "SDL.h" |
1419 |
-+ |
1420 |
-+char* |
1421 |
-+my_strdup (char *str) |
1422 |
-+{ |
1423 |
-+ char *new_str; |
1424 |
-+ |
1425 |
-+ if (str) |
1426 |
-+ { |
1427 |
-+ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); |
1428 |
-+ strcpy (new_str, str); |
1429 |
-+ } |
1430 |
-+ else |
1431 |
-+ new_str = NULL; |
1432 |
-+ |
1433 |
-+ return new_str; |
1434 |
-+} |
1435 |
-+ |
1436 |
-+int main (int argc, char *argv[]) |
1437 |
-+{ |
1438 |
-+ int major, minor, micro; |
1439 |
-+ char *tmp_version; |
1440 |
-+ |
1441 |
-+ /* This hangs on some systems (?) |
1442 |
-+ system ("touch conf.sdltest"); |
1443 |
-+ */ |
1444 |
-+ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } |
1445 |
-+ |
1446 |
-+ /* HP/UX 9 (%@#!) writes to sscanf strings */ |
1447 |
-+ tmp_version = my_strdup("$min_sdl_version"); |
1448 |
-+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { |
1449 |
-+ printf("%s, bad version string\n", "$min_sdl_version"); |
1450 |
-+ exit(1); |
1451 |
-+ } |
1452 |
-+ |
1453 |
-+ if (($sdl_major_version > major) || |
1454 |
-+ (($sdl_major_version == major) && ($sdl_minor_version > minor)) || |
1455 |
-+ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) |
1456 |
-+ { |
1457 |
-+ return 0; |
1458 |
-+ } |
1459 |
-+ else |
1460 |
-+ { |
1461 |
-+ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); |
1462 |
-+ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); |
1463 |
-+ printf("*** best to upgrade to the required version.\n"); |
1464 |
-+ printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); |
1465 |
-+ printf("*** to point to the correct copy of sdl-config, and remove the file\n"); |
1466 |
-+ printf("*** config.cache before re-running configure\n"); |
1467 |
-+ return 1; |
1468 |
-+ } |
1469 |
-+} |
1470 |
-+ |
1471 |
-+],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) |
1472 |
-+ CFLAGS="$ac_save_CFLAGS" |
1473 |
-+ CXXFLAGS="$ac_save_CXXFLAGS" |
1474 |
-+ LIBS="$ac_save_LIBS" |
1475 |
-+ fi |
1476 |
-+ fi |
1477 |
-+ if test "x$no_sdl" = x ; then |
1478 |
-+ AC_MSG_RESULT(yes) |
1479 |
-+ ifelse([$2], , :, [$2]) |
1480 |
-+ else |
1481 |
-+ AC_MSG_RESULT(no) |
1482 |
-+ if test "$SDL_CONFIG" = "no" ; then |
1483 |
-+ echo "*** The sdl-config script installed by SDL could not be found" |
1484 |
-+ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" |
1485 |
-+ echo "*** your path, or set the SDL_CONFIG environment variable to the" |
1486 |
-+ echo "*** full path to sdl-config." |
1487 |
-+ else |
1488 |
-+ if test -f conf.sdltest ; then |
1489 |
-+ : |
1490 |
-+ else |
1491 |
-+ echo "*** Could not run SDL test program, checking why..." |
1492 |
-+ CFLAGS="$CFLAGS $SDL_CFLAGS" |
1493 |
-+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" |
1494 |
-+ LIBS="$LIBS $SDL_LIBS" |
1495 |
-+ AC_TRY_LINK([ |
1496 |
-+#include <stdio.h> |
1497 |
-+#include "SDL.h" |
1498 |
-+ |
1499 |
-+int main(int argc, char *argv[]) |
1500 |
-+{ return 0; } |
1501 |
-+#undef main |
1502 |
-+#define main K_and_R_C_main |
1503 |
-+], [ return 0; ], |
1504 |
-+ [ echo "*** The test program compiled, but did not run. This usually means" |
1505 |
-+ echo "*** that the run-time linker is not finding SDL or finding the wrong" |
1506 |
-+ echo "*** version of SDL. If it is not finding SDL, you'll need to set your" |
1507 |
-+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" |
1508 |
-+ echo "*** to the installed location Also, make sure you have run ldconfig if that" |
1509 |
-+ echo "*** is required on your system" |
1510 |
-+ echo "***" |
1511 |
-+ echo "*** If you have an old version installed, it is best to remove it, although" |
1512 |
-+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], |
1513 |
-+ [ echo "*** The test program failed to compile or link. See the file config.log for the" |
1514 |
-+ echo "*** exact error that occured. This usually means SDL was incorrectly installed" |
1515 |
-+ echo "*** or that you have moved SDL since it was installed. In the latter case, you" |
1516 |
-+ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) |
1517 |
-+ CFLAGS="$ac_save_CFLAGS" |
1518 |
-+ CXXFLAGS="$ac_save_CXXFLAGS" |
1519 |
-+ LIBS="$ac_save_LIBS" |
1520 |
-+ fi |
1521 |
-+ fi |
1522 |
-+ SDL_CFLAGS="" |
1523 |
-+ SDL_LIBS="" |
1524 |
-+ ifelse([$3], , :, [$3]) |
1525 |
-+ fi |
1526 |
-+ AC_SUBST(SDL_CFLAGS) |
1527 |
-+ AC_SUBST(SDL_LIBS) |
1528 |
-+ rm -f conf.sdltest |
1529 |
-+]) |
1530 |
|
1531 |
diff --git a/x11-libs/agg/metadata.xml b/x11-libs/agg/metadata.xml |
1532 |
deleted file mode 100644 |
1533 |
index 26de58ba4..000000000 |
1534 |
--- a/x11-libs/agg/metadata.xml |
1535 |
+++ /dev/null |
1536 |
@@ -1,17 +0,0 @@ |
1537 |
-<?xml version="1.0" encoding="UTF-8"?> |
1538 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1539 |
-<pkgmetadata> |
1540 |
- <maintainer type="project"> |
1541 |
- <email>sci@g.o</email> |
1542 |
- <name>Gentoo Science Project</name> |
1543 |
- </maintainer> |
1544 |
- <longdescription> |
1545 |
-Anti-Grain Geometry (AGG) is a general purpose graphical toolkit |
1546 |
-written completely in standard and platform independent C++. It can be used |
1547 |
-in many areas of computer programming where high quality 2D graphics is an |
1548 |
-essential part of the project. |
1549 |
-</longdescription> |
1550 |
- <use> |
1551 |
- <flag name="gpc">Enable gpc polygon clipper library</flag> |
1552 |
- </use> |
1553 |
-</pkgmetadata> |