Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] pixman: update to 0.40.0.
@ 2020-10-02 23:09 ericonr
  2020-10-02 23:14 ` [PR PATCH] [Updated] " ericonr
                   ` (17 more replies)
  0 siblings, 18 replies; 19+ messages in thread
From: ericonr @ 2020-10-02 23:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 542 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages pixman
https://github.com/void-linux/void-packages/pull/25301

pixman: update to 0.40.0.
Update links, simplify musl patch.

---

I'm not sure I understand the musl patch. The main thing with musl is that thread stack size is small, so putting the array in thread storage seems worse than leaving it in the main stack.

A patch file from https://github.com/void-linux/void-packages/pull/25301.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pixman-25301.patch --]
[-- Type: text/x-diff, Size: 3092 bytes --]

From 05f4029206a71b7d9055cdb0d0cf0e9fe8f3f270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 | 21 +------------------
 srcpkgs/pixman/template                       | 10 +++++----
 2 files changed, 7 insertions(+), 24 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..8984221f62f 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;
+     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..d49267112b1 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,14 +8,16 @@ hostmakedepends="pkg-config perl"
 short_desc="Library of low-level pixel manipulation routines"
 maintainer="Orphaned <orphan@voidlinux.org>"
 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
 		arm*) configure_args+=" --disable-arm-iwmmxt --disable-arm-iwmmxt2";;
 	esac
+
+	vsed -e 's/stack_scanline_buffer/static_scanline_buffer/g' -i pixman/pixman-general.c
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 19+ messages in thread
end of thread, other threads:[~2020-11-06 14:00 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-02 23:09 [PR PATCH] pixman: update to 0.40.0 ericonr
2020-10-02 23:14 ` [PR PATCH] [Updated] " ericonr
2020-10-02 23:41 ` ericonr
2020-10-09  5:00 ` [PR PATCH] [Updated] " ericonr
2020-10-09  5:01 ` ericonr
2020-10-13 22:00 ` ericonr
2020-10-13 22:20 ` ifreund
2020-10-13 22:20 ` ifreund
2020-10-13 22:22 ` ericonr
2020-10-13 22:42 ` ericonr
2020-10-14 20:23 ` [PR PATCH] [Updated] " ericonr
2020-10-14 20:41 ` ericonr
2020-10-14 21:27 ` ericonr
2020-10-14 21:43 ` ericonr
2020-10-14 21:47 ` ericonr
2020-10-14 22:03 ` ericonr
2020-10-20  5:50 ` ericonr
2020-11-06 13:52 ` ericonr
2020-11-06 14:00 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).