Module Name: src Committed By: skrll Date: Wed Oct 1 09:30:58 UTC 2014
Modified Files: src/distrib/sets/lists/xbase: shl.mi src/distrib/sets/lists/xdebug: shl.mi src/external/mit/xorg/lib/libxcb: xcb.mk src/external/mit/xorg/lib/libxcb/libxcb: Makefile src/external/mit/xorg/lib/libxcb/randr: Makefile src/external/mit/xorg/lib/libxcb/sync: Makefile Log Message: Fix SHLIB_MAJOR to match xorg and fix linking against libxcb-sync which broke kwin for me. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libxcb/xcb.mk cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libxcb/libxcb/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libxcb/randr/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libxcb/sync/Makefile 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.55 src/distrib/sets/lists/xbase/shl.mi:1.56 --- src/distrib/sets/lists/xbase/shl.mi:1.55 Thu Mar 20 09:05:28 2014 +++ src/distrib/sets/lists/xbase/shl.mi Wed Oct 1 09:30:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.55 2014/03/20 09:05:28 mrg Exp $ +# $NetBSD: shl.mi,v 1.56 2014/10/01 09:30:58 skrll Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -376,8 +376,8 @@ ./usr/X11R7/lib/libxcb-property.so.1 -unknown- xorg ./usr/X11R7/lib/libxcb-property.so.1.0 -unknown- xorg ./usr/X11R7/lib/libxcb-randr.so -unknown- xorg -./usr/X11R7/lib/libxcb-randr.so.0 -unknown- xorg -./usr/X11R7/lib/libxcb-randr.so.0.1 -unknown- xorg +./usr/X11R7/lib/libxcb-randr.so.1 -unknown- xorg +./usr/X11R7/lib/libxcb-randr.so.1.0 -unknown- xorg ./usr/X11R7/lib/libxcb-record.so -unknown- xorg ./usr/X11R7/lib/libxcb-record.so.0 -unknown- xorg ./usr/X11R7/lib/libxcb-record.so.0.1 -unknown- xorg @@ -403,8 +403,8 @@ ./usr/X11R7/lib/libxcb-shm.so.0 -unknown- xorg ./usr/X11R7/lib/libxcb-shm.so.0.1 -unknown- xorg ./usr/X11R7/lib/libxcb-sync.so -unknown- xorg -./usr/X11R7/lib/libxcb-sync.so.0 -unknown- xorg -./usr/X11R7/lib/libxcb-sync.so.0.1 -unknown- xorg +./usr/X11R7/lib/libxcb-sync.so.1 -unknown- xorg +./usr/X11R7/lib/libxcb-sync.so.1.0 -unknown- xorg ./usr/X11R7/lib/libxcb-xevie.so -unknown- xorg ./usr/X11R7/lib/libxcb-xevie.so.0 -unknown- xorg ./usr/X11R7/lib/libxcb-xevie.so.0.1 -unknown- xorg @@ -430,8 +430,8 @@ ./usr/X11R7/lib/libxcb-xvmc.so.0 -unknown- xorg ./usr/X11R7/lib/libxcb-xvmc.so.0.1 -unknown- xorg ./usr/X11R7/lib/libxcb.so -unknown- xorg -./usr/X11R7/lib/libxcb.so.1 -unknown- xorg -./usr/X11R7/lib/libxcb.so.1.1 -unknown- xorg +./usr/X11R7/lib/libxcb.so.2 -unknown- xorg +./usr/X11R7/lib/libxcb.so.2.0 -unknown- xorg ./usr/X11R7/lib/libxkbfile.so -unknown- xorg ./usr/X11R7/lib/libxkbfile.so.2 -unknown- xorg ./usr/X11R7/lib/libxkbfile.so.2.0 -unknown- xorg Index: src/distrib/sets/lists/xdebug/shl.mi diff -u src/distrib/sets/lists/xdebug/shl.mi:1.14 src/distrib/sets/lists/xdebug/shl.mi:1.15 --- src/distrib/sets/lists/xdebug/shl.mi:1.14 Thu Mar 20 15:20:44 2014 +++ src/distrib/sets/lists/xdebug/shl.mi Wed Oct 1 09:30:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.14 2014/03/20 15:20:44 riastradh Exp $ +# $NetBSD: shl.mi,v 1.15 2014/10/01 09:30:58 skrll Exp $ ./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug ./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug ./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug @@ -122,7 +122,7 @@ ./usr/libdata/debug/usr/X11R7/lib/libxcb-keysyms.so.1.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libxcb-present.so.0.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libxcb-property.so.1.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/libxcb-randr.so.0.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/libxcb-randr.so.1.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libxcb-record.so.0.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libxcb-render-util.so.0.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libxcb-render.so.0.1.debug -unknown- xorg,debug @@ -131,7 +131,7 @@ ./usr/libdata/debug/usr/X11R7/lib/libxcb-screensaver.so.0.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libxcb-shape.so.0.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libxcb-shm.so.0.1.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/libxcb-sync.so.0.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/libxcb-sync.so.1.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libxcb-xevie.so.0.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libxcb-xf86dri.so.0.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libxcb-xfixes.so.0.1.debug -unknown- xorg,debug @@ -140,7 +140,7 @@ ./usr/libdata/debug/usr/X11R7/lib/libxcb-xtest.so.0.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libxcb-xv.so.0.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libxcb-xvmc.so.0.1.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/libxcb.so.1.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/libxcb.so.2.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libxkbfile.so.2.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libxkbui.so.2.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- xorg,debug Index: src/external/mit/xorg/lib/libxcb/xcb.mk diff -u src/external/mit/xorg/lib/libxcb/xcb.mk:1.2 src/external/mit/xorg/lib/libxcb/xcb.mk:1.3 --- src/external/mit/xorg/lib/libxcb/xcb.mk:1.2 Fri May 31 09:14:19 2013 +++ src/external/mit/xorg/lib/libxcb/xcb.mk Wed Oct 1 09:30:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: xcb.mk,v 1.2 2013/05/31 09:14:19 mrg Exp $ +# $NetBSD: xcb.mk,v 1.3 2014/10/01 09:30:58 skrll Exp $ # define XCBEXT to something before including this @@ -14,8 +14,8 @@ LIBDPLIBS=\ Xau ${.CURDIR}/../../libXau \ Xdmcp ${.CURDIR}/../../libXdmcp -SHLIB_MAJOR= 0 -SHLIB_MINOR= 1 +SHLIB_MAJOR?= 0 +SHLIB_MINOR?= 1 PKGCONFIG= xcb-${XCBEXT} PKGCONFIG_VERSION.${PKGCONFIG}= 1.9 Index: src/external/mit/xorg/lib/libxcb/libxcb/Makefile diff -u src/external/mit/xorg/lib/libxcb/libxcb/Makefile:1.5 src/external/mit/xorg/lib/libxcb/libxcb/Makefile:1.6 --- src/external/mit/xorg/lib/libxcb/libxcb/Makefile:1.5 Thu Feb 24 08:15:13 2011 +++ src/external/mit/xorg/lib/libxcb/libxcb/Makefile Wed Oct 1 09:30:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2011/02/24 08:15:13 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2014/10/01 09:30:58 skrll Exp $ .include <bsd.own.mk> @@ -7,6 +7,9 @@ LIB= xcb .PATH: ${X11SRCDIR.${LIB}} .PATH: ${.CURDIR}/../files +SHLIB_MAJOR= 2 +SHLIB_MINOR= 0 + SRCS= xcb_auth.c \ xcb_conn.c \ xcb_ext.c \ Index: src/external/mit/xorg/lib/libxcb/randr/Makefile diff -u src/external/mit/xorg/lib/libxcb/randr/Makefile:1.1 src/external/mit/xorg/lib/libxcb/randr/Makefile:1.2 --- src/external/mit/xorg/lib/libxcb/randr/Makefile:1.1 Sat Jul 17 23:43:29 2010 +++ src/external/mit/xorg/lib/libxcb/randr/Makefile Wed Oct 1 09:30:58 2014 @@ -1,5 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2010/07/17 23:43:29 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2014/10/01 09:30:58 skrll Exp $ XCBEXT= randr +SHLIB_MAJOR= 1 +SHLIB_MINOR= 0 + .include "../xcb.mk" Index: src/external/mit/xorg/lib/libxcb/sync/Makefile diff -u src/external/mit/xorg/lib/libxcb/sync/Makefile:1.2 src/external/mit/xorg/lib/libxcb/sync/Makefile:1.3 --- src/external/mit/xorg/lib/libxcb/sync/Makefile:1.2 Mon Mar 17 07:25:35 2014 +++ src/external/mit/xorg/lib/libxcb/sync/Makefile Wed Oct 1 09:30:58 2014 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2014/03/17 07:25:35 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2014/10/01 09:30:58 skrll Exp $ XCBEXT= sync -.include "../xcb.mk" - SHLIB_MAJOR= 1 SHLIB_MINOR= 0 + +.include "../xcb.mk"