CVS commit: pkgsrc/x11/pixman

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Oct 20 09:35:15 UTC 2022

Modified Files:
        pkgsrc/x11/pixman: distinfo
        pkgsrc/x11/pixman/patches: patch-pixman_pixman-vmx.c

Log Message:
pixman: Fix patch.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/x11/pixman/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/pixman/patches/patch-pixman_pixman-vmx.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/pixman/distinfo
diff -u pkgsrc/x11/pixman/distinfo:1.71 pkgsrc/x11/pixman/distinfo:1.72
--- pkgsrc/x11/pixman/distinfo:1.71     Wed Oct 19 17:14:32 2022
+++ pkgsrc/x11/pixman/distinfo  Thu Oct 20 09:35:15 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.71 2022/10/19 17:14:32 he Exp $
+$NetBSD: distinfo,v 1.72 2022/10/20 09:35:15 jperkin Exp $
 
 BLAKE2s (pixman-0.42.0.tar.xz) = 9846ec6a902afa54328b18a9a58cbdf7ad066aa69cbbfddb145b1475c6ad8899
 SHA512 (pixman-0.42.0.tar.xz) = 43d43d1aef9b8a6167098ab68ce2cfd8c0429c4825d40a4fb468b5b51dc1a2035f8bd1b70413e4ecd77deb469b5d558f42171b423e348d5ddd8604c466ffc7d9
 Size (pixman-0.42.0.tar.xz) = 652780 bytes
 SHA1 (patch-Makefile.in) = 244969af69e43472d43d8cd1556abacf9ec679e0
 SHA1 (patch-configure) = 909bf50acfd69700b26bd55a47f93fd77b49226c
-SHA1 (patch-pixman_pixman-vmx.c) = 1139e520dbc7ea4066ab5f0b4d98345c87a37267
+SHA1 (patch-pixman_pixman-vmx.c) = 26ee87f2d1ffabf89fc1e2ed6cd50abbb2fc86cd

Index: pkgsrc/x11/pixman/patches/patch-pixman_pixman-vmx.c
diff -u pkgsrc/x11/pixman/patches/patch-pixman_pixman-vmx.c:1.3 pkgsrc/x11/pixman/patches/patch-pixman_pixman-vmx.c:1.4
--- pkgsrc/x11/pixman/patches/patch-pixman_pixman-vmx.c:1.3     Wed Oct 19 17:14:32 2022
+++ pkgsrc/x11/pixman/patches/patch-pixman_pixman-vmx.c Thu Oct 20 09:35:15 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-pixman_pixman-vmx.c,v 1.3 2022/10/19 17:14:32 he Exp $
+$NetBSD: patch-pixman_pixman-vmx.c,v 1.4 2022/10/20 09:35:15 jperkin Exp $
 
 Add a fix so that this builds on NetBSD/powerpc.  Otherwise we get
 pixman-vmx.c:2936:5: error: subscripted value is neither array nor pointer
@@ -7,9 +7,8 @@ vector registers from single 32-bit ints
 
 https://gitlab.freedesktop.org/pixman/pixman/-/merge_requests/64/
 
---- pixman/pixman-vmx.c.orig   2016-01-04 09:13:54.000000000 +0000
+--- pixman/pixman-vmx.c.orig   2021-03-01 13:49:17.000000000 +0000
 +++ pixman/pixman-vmx.c
-@@ -2913,32 +2913,29 @@ scaled_nearest_scanline_vmx_8888_8888_OV
 @@ -292,7 +292,9 @@ create_mask_1x32_128 (const uint32_t *sr
  static force_inline vector unsigned int
  create_mask_32_128 (uint32_t mask)