wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-08 16:13:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pixman: update to 0.40.0, adopt.

Browse source 
- Update links, use linker flag for stack size instead of patch.
- Move to meson build style.
This commit is contained in:
Érico Rolim 2020-10-02 20:07:03 -03:00 • committed by Érico Nogueira Rolim
parent 13a8669033
commit c84a3608ee
2 changed files with 18 additions and 49 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
View file

@ -1,35 +0,0 @@
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);
}

32
srcpkgs/pixman/template
View file

@ -1,25 +1,30 @@
# Template file for 'pixman' # Template file for 'pixman'
pkgname=pixman pkgname=pixman
version=0.38.4 version=0.40.0
revision=1 revision=1
build_style=gnu-configure build_style=meson
configure_args="--disable-gtk" # do not require gtk+! # gtk is only necessary for demos, disabled to avoid dependency loop
configure_args="-Dgtk=disabled -Dgnu-inline-asm=enabled -Diwmmxt=disabled"
hostmakedepends="pkg-config perl" hostmakedepends="pkg-config perl"
checkdepends="libpng-devel libgomp-devel"
short_desc="Library of low-level pixel manipulation routines" short_desc="Library of low-level pixel manipulation routines"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT" license="MIT"
homepage="https://wiki.freedesktop.org/xorg/" homepage="http://pixman.org/"
distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2" distfiles="https://www.cairographics.org/releases/${pkgname}-${version}.tar.gz"
checksum=84abb7fa2541af24d9c3b34bf75d6ac60cc94ac4410061bbb295b66a29221550 checksum=6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc
pre_configure() { # set stacksize for musl: https://gitlab.gnome.org/GNOME/librsvg/-/issues/595
case "$XBPS_TARGET_MACHINE" in LDFLAGS="-Wl,-z,stack-size=2097152"
arm*) configure_args+=" --disable-arm-iwmmxt --disable-arm-iwmmxt2";;
esac if [ "$XBPS_CHECK_PKGS" ]; then
} # libpng and openmp are used only for testing; the make-blue-noise.c file isn't built
# https://gitlab.freedesktop.org/pixman/pixman/-/blob/9b49f4e08751885289333fed652bf5e0f45976b4/pixman/dither/make-blue-noise.c
configure_args+=" -Dlibpng=enabled -Dopenmp=enabled"
fi
post_install() { post_install() {
vlicense COPYING vlicense COPYING LICENSE
} }
pixman-devel_package() { pixman-devel_package() {
@ -28,7 +33,6 @@ pixman-devel_package() {
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
vmove "usr/lib/*.so" vmove "usr/lib/*.so"
} }
} }