jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4136 from pullmoll/pixman

Browse source 
pixman: try to fix musl stack size issue
This commit is contained in:
Jürgen Buchmüller 2016-05-05 19:44:48 +02:00
commit 6c9c6ffa72
2 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
srcpkgs/pixman/patches/musl-static__thread-scanline_buffer.patch Normal file
View file

@ -0,0 +1,35 @@
Reduce the stack footprint of pixman's function
general_composite_rect() which allocates a large buffer
`stack_scanline_buffer`. Make it `static __thread` instead.
--- pixman/pixman-general.c 2015-12-27 21:37:37.000000000 +0100
+++ pixman/pixman-general.c 2016-05-05 12:24:47.346661080 +0200
@@ -128,8 +128,8 @@
pixman_composite_info_t *info)
{
PIXMAN_COMPOSITE_ARGS (info);
- uint8_t stack_scanline_buffer[3 * SCANLINE_BUFFER_LENGTH];
- uint8_t *scanline_buffer = (uint8_t *) stack_scanline_buffer;
+ static __thread uint8_t static_scanline_buffer[3 * SCANLINE_BUFFER_LENGTH];
+ uint8_t *scanline_buffer = (uint8_t *) static_scanline_buffer;
uint8_t *src_buffer, *mask_buffer, *dest_buffer;
pixman_iter_t src_iter, mask_iter, dest_iter;
pixman_combine_32_func_t compose;
@@ -158,7 +158,7 @@
if (width <= 0 || _pixman_multiply_overflows_int (width, Bpp * 3))
return;
- if (width * Bpp * 3 > sizeof (stack_scanline_buffer) - 15 * 3)
+ if (width * Bpp * 3 > sizeof (static_scanline_buffer) - 15 * 3)
{
scanline_buffer = pixman_malloc_ab_plus_c (width, Bpp * 3, 15 * 3);
@@ -232,7 +232,7 @@
if (dest_iter.fini)
dest_iter.fini (&dest_iter);
- if (scanline_buffer != (uint8_t *) stack_scanline_buffer)
+ if (scanline_buffer != (uint8_t *) static_scanline_buffer)
free (scanline_buffer);
}

2
srcpkgs/pixman/template
View file

@ -1,7 +1,7 @@
# Template build file for 'pixman'.
pkgname=pixman
version=0.34.0
revision=1
revision=2
build_style=gnu-configure
configure_args="--disable-gtk" # do not require gtk+!
hostmakedepends="pkg-config perl"