From cf3547bd7782ae5acedec47879282ec7129e8011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 2 Oct 2020 20:07:03 -0300 Subject: [PATCH] pixman: update to 0.40.0. Update links, simplify musl patch. --- .../musl-static__thread-scanline_buffer.patch | 23 ++----------------- srcpkgs/pixman/template | 8 +++---- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/srcpkgs/pixman/patches/musl-static__thread-scanline_buffer.patch b/srcpkgs/pixman/patches/musl-static__thread-scanline_buffer.patch index 0b9339dbea0..ab158a12000 100644 --- a/srcpkgs/pixman/patches/musl-static__thread-scanline_buffer.patch +++ b/srcpkgs/pixman/patches/musl-static__thread-scanline_buffer.patch @@ -9,27 +9,8 @@ general_composite_rect() which allocates a large buffer { 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; ++ static __thread uint8_t stack_scanline_buffer[3 * SCANLINE_BUFFER_LENGTH]; + uint8_t *scanline_buffer = (uint8_t *) stack_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); - } - diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template index eb4a6da3b03..ad6082b356a 100644 --- a/srcpkgs/pixman/template +++ b/srcpkgs/pixman/template @@ -1,6 +1,6 @@ # Template file for 'pixman' pkgname=pixman -version=0.38.4 +version=0.40.0 revision=1 build_style=gnu-configure configure_args="--disable-gtk" # do not require gtk+! @@ -8,9 +8,9 @@ hostmakedepends="pkg-config perl" short_desc="Library of low-level pixel manipulation routines" maintainer="Orphaned " license="MIT" -homepage="https://wiki.freedesktop.org/xorg/" -distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2" -checksum=84abb7fa2541af24d9c3b34bf75d6ac60cc94ac4410061bbb295b66a29221550 +homepage="http://pixman.org/" +distfiles="https://www.cairographics.org/releases/${pkgname}-${version}.tar.gz" +checksum=6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc pre_configure() { case "$XBPS_TARGET_MACHINE" in