Module Name: src
Committed By: mrg
Date: Sat Nov 12 02:03:09 UTC 2022
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/libpciaccess: Makefile shlib_version
Log Message:
updates for libpciaccess 0.17.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libpciaccess/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libpciaccess/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.99 src/distrib/sets/lists/xbase/shl.mi:1.100
--- src/distrib/sets/lists/xbase/shl.mi:1.99 Thu Jul 14 07:41:49 2022
+++ src/distrib/sets/lists/xbase/shl.mi Sat Nov 12 02:03:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.99 2022/07/14 07:41:49 mrg Exp $
+# $NetBSD: shl.mi,v 1.100 2022/11/12 02:03:08 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -199,7 +199,7 @@
./usr/X11R7/lib/liblbxutil.so.2.0 xbase-obsolete obsolete
./usr/X11R7/lib/libpciaccess.so xbase-libpciaccess-lib xorg,compatx11file
./usr/X11R7/lib/libpciaccess.so.0 xbase-libpciaccess-lib xorg,compatx11file
-./usr/X11R7/lib/libpciaccess.so.0.3 xbase-libpciaccess-lib xorg,compatx11file
+./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
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.65 src/distrib/sets/lists/xdebug/shl.mi:1.66
--- src/distrib/sets/lists/xdebug/shl.mi:1.65 Thu Jul 14 07:41:49 2022
+++ src/distrib/sets/lists/xdebug/shl.mi Sat Nov 12 02:03:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.65 2022/07/14 07:41:49 mrg Exp $
+# $NetBSD: shl.mi,v 1.66 2022/11/12 02:03:08 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
@@ -66,7 +66,7 @@
./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug xdebug-libgbm-debug xorg,debug,compatx11file
./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.3.debug xdebug-libpciaccess-debug xorg,debug,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/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
Index: src/external/mit/xorg/lib/libpciaccess/Makefile
diff -u src/external/mit/xorg/lib/libpciaccess/Makefile:1.10 src/external/mit/xorg/lib/libpciaccess/Makefile:1.11
--- src/external/mit/xorg/lib/libpciaccess/Makefile:1.10 Fri Jan 14 19:44:04 2022
+++ src/external/mit/xorg/lib/libpciaccess/Makefile Sat Nov 12 02:03:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/01/14 19:44:04 macallan Exp $
+# $NetBSD: Makefile,v 1.11 2022/11/12 02:03:08 mrg Exp $
.include <bsd.own.mk>
@@ -27,6 +27,8 @@ INCS= pciaccess.h
INCSDIR=${X11INCDIR}
PKGDIST= ${LIB}
+PKGCONFIG_SED_FLAGS= \
+ -e "s,@PCIACCESS_LIBS@,-lpci -lz," \
LIBDPLIBS+= pci ${NETBSDSRCDIR}/lib/libpci \
z ${NETBSDSRCDIR}/lib/libz
Index: src/external/mit/xorg/lib/libpciaccess/shlib_version
diff -u src/external/mit/xorg/lib/libpciaccess/shlib_version:1.4 src/external/mit/xorg/lib/libpciaccess/shlib_version:1.5
--- src/external/mit/xorg/lib/libpciaccess/shlib_version:1.4 Sat Jun 1 09:08:01 2013
+++ src/external/mit/xorg/lib/libpciaccess/shlib_version Sat Nov 12 02:03:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.4 2013/06/01 09:08:01 mrg Exp $
+# $NetBSD: shlib_version,v 1.5 2022/11/12 02:03:08 mrg Exp $
#
major=0
-minor=3
+minor=4