Module Name: src
Committed By: mrg
Date: Sat Nov 12 04:00:57 UTC 2022
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/pixman: Makefile shlib_version
Log Message:
updates for pixman 0.42.2.
this enables NEON for arm64. maybe firefox will be faster on pbp...
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/pixman/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/pixman/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.101 src/distrib/sets/lists/xbase/shl.mi:1.102
--- src/distrib/sets/lists/xbase/shl.mi:1.101 Sat Nov 12 02:20:15 2022
+++ src/distrib/sets/lists/xbase/shl.mi Sat Nov 12 04:00:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.101 2022/11/12 02:20:15 mrg Exp $
+# $NetBSD: shl.mi,v 1.102 2022/11/12 04:00:57 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -202,7 +202,7 @@
./usr/X11R7/lib/libpciaccess.so.0.4 xbase-libpciaccess-lib xorg,compatx11file
./usr/X11R7/lib/libpixman-1.so xbase-pixman-lib xorg,compatx11file
./usr/X11R7/lib/libpixman-1.so.2 xbase-pixman-lib xorg,compatx11file
-./usr/X11R7/lib/libpixman-1.so.2.2 xbase-pixman-lib xorg,compatx11file
+./usr/X11R7/lib/libpixman-1.so.2.3 xbase-pixman-lib xorg,compatx11file
./usr/X11R7/lib/libxcb-atom.so xbase-xcb-util-lib xorg,compatx11file
./usr/X11R7/lib/libxcb-atom.so.1 xbase-xcb-util-lib xorg,compatx11file
./usr/X11R7/lib/libxcb-atom.so.1.0 xbase-xcb-util-lib xorg,compatx11file
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.67 src/distrib/sets/lists/xdebug/shl.mi:1.68
--- src/distrib/sets/lists/xdebug/shl.mi:1.67 Sat Nov 12 02:20:15 2022
+++ src/distrib/sets/lists/xdebug/shl.mi Sat Nov 12 04:00:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.67 2022/11/12 02:20:15 mrg Exp $
+# $NetBSD: shl.mi,v 1.68 2022/11/12 04:00:57 mrg Exp $
./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg,debug,compatx11dir
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug obsolete obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug obsolete obsolete
@@ -67,7 +67,7 @@
./usr/libdata/debug/usr/X11R7/lib/libglapi.so.1.0.debug xdebug-libglapi-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug xdebug-obsolete xorg,obsolete,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.4.debug xdebug-libpciaccess-debug xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug xdebug-pixman-debug xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.3.debug xdebug-pixman-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libxcb-atom.so.1.0.debug xdebug-xcb-util-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libxcb-aux.so.0.0.debug xdebug-xcb-util-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libxcb-composite.so.0.1.debug xdebug-libxcb-debug xorg,debug,compatx11file
Index: src/external/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.38 src/external/mit/xorg/lib/pixman/Makefile:1.39
--- src/external/mit/xorg/lib/pixman/Makefile:1.38 Mon Apr 26 21:32:49 2021
+++ src/external/mit/xorg/lib/pixman/Makefile Sat Nov 12 04:00:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2021/04/26 21:32:49 christos Exp $
+# $NetBSD: Makefile,v 1.39 2022/11/12 04:00:57 mrg Exp $
NOLINT= 1 # defined
@@ -90,6 +90,17 @@ AFLAGS+= ${${ACTIVE_CC} == "clang" :? -f
#CPPFLAGS+= -DUSE_ARM_IWMMXT
.endif
+.if !empty(MACHINE_ARCH:Maarch64*)
+# ARM64 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
+
.if !empty(MACHINE_ARCH:Mmips*64el) && empty(COPTS:M-march=*)
# Loongson MMI
SRCS+= pixman-mmx.c
Index: src/external/mit/xorg/lib/pixman/shlib_version
diff -u src/external/mit/xorg/lib/pixman/shlib_version:1.6 src/external/mit/xorg/lib/pixman/shlib_version:1.7
--- src/external/mit/xorg/lib/pixman/shlib_version:1.6 Wed Jun 5 09:04:16 2013
+++ src/external/mit/xorg/lib/pixman/shlib_version Sat Nov 12 04:00:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.6 2013/06/05 09:04:16 mrg Exp $
+# $NetBSD: shlib_version,v 1.7 2022/11/12 04:00:57 mrg Exp $
#
major=2
-minor=2
+minor=3
