[src/netbsd-10]: src/external/mit/xorg/lib/pixman Pull up following revision(...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/df72d0fd2751
branches:  netbsd-10
changeset: 372674:df72d0fd2751
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Dec 19 12:06:56 2022 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #5):

        external/mit/xorg/lib/pixman/Makefile.cflags: revision 1.2
        external/mit/xorg/lib/pixman/Makefile: revision 1.42

handle pixman revert.

diffstat:

 external/mit/xorg/lib/pixman/Makefile        |  13 +++++++------
 external/mit/xorg/lib/pixman/Makefile.cflags |   4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r caa13d71670d -r df72d0fd2751 external/mit/xorg/lib/pixman/Makefile
--- a/external/mit/xorg/lib/pixman/Makefile     Mon Dec 19 11:44:29 2022 +0000
+++ b/external/mit/xorg/lib/pixman/Makefile     Mon Dec 19 12:06:56 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.41 2022/11/13 09:36:37 mrg Exp $
+#      $NetBSD: Makefile,v 1.41.2.1 2022/12/19 12:06:56 martin Exp $
 
 NOLINT=        1       # defined
 
@@ -88,12 +88,13 @@
 .endif
 
 .if !empty(MACHINE_ARCH:Maarch64*)
+# XXX not yet; new pixman bad on arm64.
 # ARM64 NEON
-SRCS+=         pixman-arm-neon.c                       \
-               pixman-arma64-neon-asm.S                \
-               pixman-arma64-neon-asm-bilinear.S
-CPPFLAGS+=     -DUSE_ARM_A64_NEON
-
+#SRCS+=                pixman-arm-neon.c                       \
+#              pixman-arma64-neon-asm.S                \
+#              pixman-arma64-neon-asm-bilinear.S
+#CPPFLAGS+=    -DUSE_ARM_A64_NEON
+#
 # XXX: not sure if needed?
 #AFLAGS+=      ${${ACTIVE_CC} == "clang" :? -fno-integrated-as :}
 .endif
diff -r caa13d71670d -r df72d0fd2751 external/mit/xorg/lib/pixman/Makefile.cflags
--- a/external/mit/xorg/lib/pixman/Makefile.cflags      Mon Dec 19 11:44:29 2022 +0000
+++ b/external/mit/xorg/lib/pixman/Makefile.cflags      Mon Dec 19 12:06:56 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.cflags,v 1.1 2022/11/13 09:36:37 mrg Exp $
+#      $NetBSD: Makefile.cflags,v 1.1.2.1 2022/12/19 12:06:56 martin Exp $
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 . if ${MACHINE_ARCH} == "i386"
@@ -18,7 +18,7 @@
 .endif
 
 .if !empty(MACHINE_ARCH:Maarch64*)
-CPPFLAGS+=     -DUSE_ARM_A64_NEON
+#CPPFLAGS+=    -DUSE_ARM_A64_NEON
 .endif
 
 .if !empty(MACHINE_ARCH:Mmips*64el) && empty(COPTS:M-march=*)