Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/DirectFB/files/
Date: Sun, 13 Aug 2017 11:31:43
Message-Id: 1502623673.f3b072c33d4644cfd8390b2b02a0f5aae4931a9a.soap@gentoo
1 commit: f3b072c33d4644cfd8390b2b02a0f5aae4931a9a
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Aug 13 08:25:07 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 13 11:27:53 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b072c3
7
8 dev-libs/DirectFB: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/5399
11
12 .../DirectFB/files/DirectFB-1.1.1-pkgconfig.patch | 22 --
13 .../DirectFB/files/DirectFB-1.2.0-headers.patch | 16 --
14 .../DirectFB/files/DirectFB-1.2.7-CFLAGS.patch | 19 --
15 .../DirectFB/files/DirectFB-1.4.9-libpng-1.5.patch | 244 ---------------------
16 4 files changed, 301 deletions(-)
17
18 diff --git a/dev-libs/DirectFB/files/DirectFB-1.1.1-pkgconfig.patch b/dev-libs/DirectFB/files/DirectFB-1.1.1-pkgconfig.patch
19 deleted file mode 100644
20 index 01a119ec7ae..00000000000
21 --- a/dev-libs/DirectFB/files/DirectFB-1.1.1-pkgconfig.patch
22 +++ /dev/null
23 @@ -1,22 +0,0 @@
24 -http://bugs.gentoo.org/200661
25 -
26 ---- DirectFB/directfb-config.in
27 -+++ DirectFB/directfb-config.in
28 -@@ -306,7 +306,7 @@
29 - libs="$libs -ldirectfb -lfusion -ldirect @THREADLIB@"
30 -
31 - if test -n "$echo_static"; then
32 -- libs="$libs @DYNLIB@ @ZLIB_LIBS@"
33 -+ libs="$libs @DYNLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@"
34 - fi
35 - fi
36 -
37 ---- DirectFB/directfb.pc.in
38 -+++ DirectFB/directfb.pc.in
39 -@@ -8,5 +8,5 @@
40 - Version: @VERSION@
41 - Requires: fusion direct
42 - Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@
43 --Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@
44 -+Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@
45 - Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
46
47 diff --git a/dev-libs/DirectFB/files/DirectFB-1.2.0-headers.patch b/dev-libs/DirectFB/files/DirectFB-1.2.0-headers.patch
48 deleted file mode 100644
49 index dc2e6d33be2..00000000000
50 --- a/dev-libs/DirectFB/files/DirectFB-1.2.0-headers.patch
51 +++ /dev/null
52 @@ -1,16 +0,0 @@
53 -Don't rely on the kernel to tell us what the cpu target is ... we'll just
54 -use the default values all the time instead.
55 -
56 -http://bugs.gentoo.org/152614
57 -
58 ---- lib/direct/ppcasm_memcpy_cachable.S
59 -+++ lib/direct/ppcasm_memcpy_cachable.S
60 -@@ -34,8 +34,6 @@
61 -
62 - #define __ASSEMBLY__
63 -
64 --#include <linux/config.h>
65 --
66 - #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
67 - #define L1_CACHE_LINE_SIZE 16
68 - #define LG_L1_CACHE_LINE_SIZE 4
69
70 diff --git a/dev-libs/DirectFB/files/DirectFB-1.2.7-CFLAGS.patch b/dev-libs/DirectFB/files/DirectFB-1.2.7-CFLAGS.patch
71 deleted file mode 100644
72 index 92e3ed8bdda..00000000000
73 --- a/dev-libs/DirectFB/files/DirectFB-1.2.7-CFLAGS.patch
74 +++ /dev/null
75 @@ -1,19 +0,0 @@
76 ---- DirectFB-1.2.7/configure
77 -+++ DirectFB-1.2.7/configure
78 -@@ -22953,8 +22953,6 @@
79 - CFLAGS=
80 - fi
81 -
82 --CFLAGS="-O3 -ffast-math -pipe $CFLAGS"
83 --
84 - DFB_INTERNAL_CFLAGS="-D_GNU_SOURCE $DFB_INTERNAL_CFLAGS"
85 -
86 - # Check whether --enable-extra-warnings was given.
87 -@@ -23622,7 +23620,6 @@
88 - fi
89 -
90 - if test "$enable_debug" = "yes"; then
91 -- CFLAGS="$CFLAGS -g3 -fno-inline -Wno-inline"
92 - DIRECT_BUILD_DEBUG=1
93 - else
94 - DIRECT_BUILD_DEBUG=0
95
96 diff --git a/dev-libs/DirectFB/files/DirectFB-1.4.9-libpng-1.5.patch b/dev-libs/DirectFB/files/DirectFB-1.4.9-libpng-1.5.patch
97 deleted file mode 100644
98 index e428afbaf7c..00000000000
99 --- a/dev-libs/DirectFB/files/DirectFB-1.4.9-libpng-1.5.patch
100 +++ /dev/null
101 @@ -1,244 +0,0 @@
102 -From 83180b25e90721e717bf37c5332c22713508786e Mon Sep 17 00:00:00 2001
103 -From: Mike Frysinger <vapier@g.o>
104 -Date: Sun, 20 Feb 2011 19:18:19 -0500
105 -Subject: [PATCH] png: add support for libpng 1.5.x
106 -
107 -Signed-off-by: Mike Frysinger <vapier@g.o>
108 ----
109 - .../idirectfbimageprovider_png.c | 56 ++++++++++++-------
110 - 1 files changed, 35 insertions(+), 21 deletions(-)
111 -
112 -diff --git a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
113 -index 6d65ea3..7d82c5c 100644
114 ---- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
115 -+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
116 -@@ -207,7 +207,7 @@ Construct( IDirectFBImageProvider *thiz,
117 - if (!data->png_ptr)
118 - goto error;
119 -
120 -- if (setjmp( data->png_ptr->jmpbuf )) {
121 -+ if (setjmp( png_jmpbuf( data->png_ptr ))) {
122 - D_ERROR( "ImageProvider/PNG: Error reading header!\n" );
123 - goto error;
124 - }
125 -@@ -292,7 +292,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
126 - rect = dst_data->area.wanted;
127 - }
128 -
129 -- if (setjmp( data->png_ptr->jmpbuf )) {
130 -+ if (setjmp( png_jmpbuf( data->png_ptr ))) {
131 - D_ERROR( "ImageProvider/PNG: Error during decoding!\n" );
132 -
133 - if (data->stage < STAGE_IMAGE)
134 -@@ -327,6 +327,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
135 - }
136 - else {
137 - CoreSurfaceBufferLock lock;
138 -+ png_byte bit_depth = png_get_bit_depth( data->png_ptr, data->info_ptr );
139 -
140 - ret = dfb_surface_lock_buffer( dst_surface, CSBR_BACK, CSAID_CPU, CSAF_WRITE, &lock );
141 - if (ret)
142 -@@ -334,7 +335,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
143 -
144 - switch (data->color_type) {
145 - case PNG_COLOR_TYPE_PALETTE:
146 -- if (dst_surface->config.format == DSPF_LUT8 && data->info_ptr->bit_depth == 8) {
147 -+ if (dst_surface->config.format == DSPF_LUT8 && bit_depth == 8) {
148 - /*
149 - * Special indexed PNG to LUT8 loading.
150 - */
151 -@@ -377,7 +378,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
152 - }
153 - else {
154 - if (data->color_type == PNG_COLOR_TYPE_GRAY) {
155 -- int num = 1 << data->info_ptr->bit_depth;
156 -+ int num = 1 << bit_depth;
157 -
158 - for (x=0; x<num; x++) {
159 - int value = x * 255 / (num - 1);
160 -@@ -386,7 +387,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
161 - }
162 - }
163 -
164 -- switch (data->info_ptr->bit_depth) {
165 -+ switch (bit_depth) {
166 - case 8:
167 - for (y=0; y<data->height; y++) {
168 - u8 *S = data->image + data->pitch * y;
169 -@@ -441,7 +442,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
170 -
171 - default:
172 - D_ERROR( "ImageProvider/PNG: Unsupported indexed bit depth %d!\n",
173 -- data->info_ptr->bit_depth );
174 -+ bit_depth );
175 - }
176 -
177 - dfb_scale_linear_32( image_argb, data->width, data->height,
178 -@@ -594,16 +595,26 @@ png_info_callback( png_structp png_read_ptr,
179 - NULL, NULL, NULL );
180 -
181 - if (png_get_valid( data->png_ptr, data->info_ptr, PNG_INFO_tRNS )) {
182 -+ png_bytep trans;
183 -+ png_color_16p trans_color;
184 -+ int num_trans;
185 -+
186 -+ png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
187 -+
188 - data->color_keyed = true;
189 -
190 - /* generate color key based on palette... */
191 - if (data->color_type == PNG_COLOR_TYPE_PALETTE) {
192 - u32 key;
193 -- png_colorp palette = data->info_ptr->palette;
194 -- png_bytep trans = data->info_ptr->trans_alpha;
195 -- int num_colors = MIN( MAXCOLORMAPSIZE,
196 -- data->info_ptr->num_palette );
197 -- u8 cmap[3][num_colors];
198 -+ png_colorp palette;
199 -+ int num_colors;
200 -+ u8 *cmap[3];
201 -+
202 -+ png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
203 -+ num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
204 -+ cmap[0] = alloca (num_colors);
205 -+ cmap[1] = alloca (num_colors);
206 -+ cmap[2] = alloca (num_colors);
207 -
208 - for (i=0; i<num_colors; i++) {
209 - cmap[0][i] = palette[i].red;
210 -@@ -613,7 +624,7 @@ png_info_callback( png_structp png_read_ptr,
211 -
212 - key = FindColorKey( num_colors, &cmap[0][0] );
213 -
214 -- for (i=0; i<data->info_ptr->num_trans; i++) {
215 -+ for (i=0; i<num_trans; i++) {
216 - if (!trans[i]) {
217 - palette[i].red = (key & 0xff0000) >> 16;
218 - palette[i].green = (key & 0x00ff00) >> 8;
219 -@@ -625,20 +636,23 @@ png_info_callback( png_structp png_read_ptr,
220 - }
221 - else {
222 - /* ...or based on trans rgb value */
223 -- png_color_16p trans = &data->info_ptr->trans_color;
224 --
225 -- data->color_key = (((trans->red & 0xff00) << 8) |
226 -- ((trans->green & 0xff00)) |
227 -- ((trans->blue & 0xff00) >> 8));
228 -+ data->color_key = (((trans_color->red & 0xff00) << 8) |
229 -+ ((trans_color->green & 0xff00)) |
230 -+ ((trans_color->blue & 0xff00) >> 8));
231 - }
232 - }
233 -
234 - switch (data->color_type) {
235 - case PNG_COLOR_TYPE_PALETTE: {
236 -- png_colorp palette = data->info_ptr->palette;
237 -- png_bytep trans = data->info_ptr->trans_alpha;
238 -- int num_trans = data->info_ptr->num_trans;
239 -- int num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette );
240 -+ png_colorp palette;
241 -+ png_bytep trans;
242 -+ png_color_16p trans_color;
243 -+ int num_trans;
244 -+ int num_colors;
245 -+
246 -+ png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
247 -+ num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
248 -+ png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
249 -
250 - for (i=0; i<num_colors; i++) {
251 - data->colors[i].a = (i < num_trans) ? trans[i] : 0xff;
252 ---
253 -1.7.4.1
254 -
255 -From 7a2a36fada3ecdd7f48fcfd782a552598477a8f5 Mon Sep 17 00:00:00 2001
256 -From: Mike Frysinger <vapier@g.o>
257 -Date: Sun, 20 Feb 2011 19:38:50 -0500
258 -Subject: [PATCH] tools: add support for libpng 1.5.x
259 -
260 -Signed-off-by: Mike Frysinger <vapier@g.o>
261 ----
262 - tools/directfb-csource.c | 20 +++++++++++++-------
263 - tools/mkdfiff.c | 2 +-
264 - tools/mkdgifft.cpp | 2 +-
265 - 3 files changed, 15 insertions(+), 9 deletions(-)
266 -
267 -diff --git a/tools/directfb-csource.c b/tools/directfb-csource.c
268 -index 8f2cbf0..487ea3c 100644
269 ---- a/tools/directfb-csource.c
270 -+++ b/tools/directfb-csource.c
271 -@@ -338,7 +338,7 @@ static DFBResult load_image (const char *filename,
272 - if (!png_ptr)
273 - goto cleanup;
274 -
275 -- if (setjmp (png_ptr->jmpbuf)) {
276 -+ if (setjmp (png_jmpbuf (png_ptr))) {
277 - if (desc->preallocated[0].data) {
278 - free (desc->preallocated[0].data);
279 - desc->preallocated[0].data = NULL;
280 -@@ -405,17 +405,22 @@ static DFBResult load_image (const char *filename,
281 - }
282 -
283 - switch (src_format) {
284 -- case DSPF_LUT8:
285 -- if (info_ptr->num_palette) {
286 -+ case DSPF_LUT8: {
287 -+ png_colorp png_palette;
288 -+ int num_palette;
289 -+
290 -+ png_get_PLTE( png_ptr, info_ptr, &png_palette, &num_palette );
291 -+
292 -+ if (num_palette) {
293 - png_byte *alpha;
294 - int i, num;
295 -
296 -- *palette_size = MIN (info_ptr->num_palette, 256);
297 -+ *palette_size = MIN (num_palette, 256);
298 - for (i = 0; i < *palette_size; i++) {
299 - palette[i].a = 0xFF;
300 -- palette[i].r = info_ptr->palette[i].red;
301 -- palette[i].g = info_ptr->palette[i].green;
302 -- palette[i].b = info_ptr->palette[i].blue;
303 -+ palette[i].r = png_palette[i].red;
304 -+ palette[i].g = png_palette[i].green;
305 -+ palette[i].b = png_palette[i].blue;
306 - }
307 - if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) {
308 - png_get_tRNS (png_ptr, info_ptr, &alpha, &num, NULL);
309 -@@ -424,6 +429,7 @@ static DFBResult load_image (const char *filename,
310 - }
311 - }
312 - break;
313 -+ }
314 - case DSPF_RGB32:
315 - png_set_filler (png_ptr, 0xFF,
316 - #ifdef WORDS_BIGENDIAN
317 -diff --git a/tools/mkdfiff.c b/tools/mkdfiff.c
318 -index 68a3b4f..edb58a7 100644
319 ---- a/tools/mkdfiff.c
320 -+++ b/tools/mkdfiff.c
321 -@@ -97,7 +97,7 @@ load_image (const char *filename,
322 - if (!png_ptr)
323 - goto cleanup;
324 -
325 -- if (setjmp (png_ptr->jmpbuf)) {
326 -+ if (setjmp (png_jmpbuf (png_ptr))) {
327 - if (desc->preallocated[0].data) {
328 - free (desc->preallocated[0].data);
329 - desc->preallocated[0].data = NULL;
330 -diff --git a/tools/mkdgifft.cpp b/tools/mkdgifft.cpp
331 -index 96e4220..d4b6bf4 100644
332 ---- a/tools/mkdgifft.cpp
333 -+++ b/tools/mkdgifft.cpp
334 -@@ -595,7 +595,7 @@ load_image (const char *filename,
335 - if (!png_ptr)
336 - goto cleanup;
337 -
338 -- if (setjmp (png_ptr->jmpbuf)) {
339 -+ if (setjmp (png_jmpbuf (png_ptr))) {
340 - if (desc->preallocated[0].data) {
341 - free (desc->preallocated[0].data);
342 - desc->preallocated[0].data = NULL;
343 ---
344 -1.7.4.1
345 -
Report Message
Find on MARC Find on Google Groups