Tue Oct 18 12:53:10 2022 UTC ()
pixman: add upstream merge request URL

Thanks, he@!


(wiz)
diff -r1.69 -r1.70 pkgsrc/x11/pixman/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/pixman/patches/patch-pixman_pixman-vmx.c
cvs diff -r1.69 -r1.70 pkgsrc/x11/pixman/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/pixman/distinfo 2022/10/18 11:14:18 1.69
+++ pkgsrc/x11/pixman/distinfo 2022/10/18 12:53:09 1.70
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.69 2022/10/18 11:14:18 wiz Exp $ 1$NetBSD: distinfo,v 1.70 2022/10/18 12:53:09 wiz Exp $
2 2
3BLAKE2s (pixman-0.42.0.tar.xz) = 9846ec6a902afa54328b18a9a58cbdf7ad066aa69cbbfddb145b1475c6ad8899 3BLAKE2s (pixman-0.42.0.tar.xz) = 9846ec6a902afa54328b18a9a58cbdf7ad066aa69cbbfddb145b1475c6ad8899
4SHA512 (pixman-0.42.0.tar.xz) = 43d43d1aef9b8a6167098ab68ce2cfd8c0429c4825d40a4fb468b5b51dc1a2035f8bd1b70413e4ecd77deb469b5d558f42171b423e348d5ddd8604c466ffc7d9 4SHA512 (pixman-0.42.0.tar.xz) = 43d43d1aef9b8a6167098ab68ce2cfd8c0429c4825d40a4fb468b5b51dc1a2035f8bd1b70413e4ecd77deb469b5d558f42171b423e348d5ddd8604c466ffc7d9
5Size (pixman-0.42.0.tar.xz) = 652780 bytes 5Size (pixman-0.42.0.tar.xz) = 652780 bytes
6SHA1 (patch-Makefile.in) = 244969af69e43472d43d8cd1556abacf9ec679e0 6SHA1 (patch-Makefile.in) = 244969af69e43472d43d8cd1556abacf9ec679e0
7SHA1 (patch-configure) = 909bf50acfd69700b26bd55a47f93fd77b49226c 7SHA1 (patch-configure) = 909bf50acfd69700b26bd55a47f93fd77b49226c
8SHA1 (patch-pixman_pixman-vmx.c) = d96dad41d94bf8dfb956afda00a5a175a9c1f6fc 8SHA1 (patch-pixman_pixman-vmx.c) = 993dde53047d20102d17d10420940cf2210a2049
cvs diff -r1.1 -r1.2 pkgsrc/x11/pixman/patches/patch-pixman_pixman-vmx.c (expand / switch to unified diff)

--- pkgsrc/x11/pixman/patches/patch-pixman_pixman-vmx.c 2016/04/21 21:39:36 1.1
+++ pkgsrc/x11/pixman/patches/patch-pixman_pixman-vmx.c 2022/10/18 12:53:10 1.2
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: patch-pixman_pixman-vmx.c,v 1.1 2016/04/21 21:39:36 he Exp $ 1$NetBSD: patch-pixman_pixman-vmx.c,v 1.2 2022/10/18 12:53:10 wiz Exp $
2 2
3Add a fix so that this builds on NetBSD/powerpc. Otherwise we get 3Add a fix so that this builds on NetBSD/powerpc. Otherwise we get
4pixman-vmx.c:2936:5: error: subscripted value is neither array nor pointer 4pixman-vmx.c:2936:5: error: subscripted value is neither array nor pointer
 5https://gitlab.freedesktop.org/pixman/pixman/-/merge_requests/64/
5 6
6--- pixman/pixman-vmx.c.orig 2016-01-04 09:13:54.000000000 +0000 7--- pixman/pixman-vmx.c.orig 2016-01-04 09:13:54.000000000 +0000
7+++ pixman/pixman-vmx.c 8+++ pixman/pixman-vmx.c
8@@ -2913,32 +2913,29 @@ scaled_nearest_scanline_vmx_8888_8888_OV 9@@ -2913,32 +2913,29 @@ scaled_nearest_scanline_vmx_8888_8888_OV
9  10
10 while (w >= 4) 11 while (w >= 4)
11 { 12 {
12- vector unsigned int tmp; 13- vector unsigned int tmp;
13- uint32_t tmp1, tmp2, tmp3, tmp4; 14- uint32_t tmp1, tmp2, tmp3, tmp4;
14+ union { 15+ union {
15+ vector unsigned int tmp; 16+ vector unsigned int tmp;
16+ uint32_t tmp1[4]; 17+ uint32_t tmp1[4];
17+ } u; 18+ } u;