Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SHLIB_MAJOR to match xorg and fix linking against libxcb-sync which

Browse Source 
broke kwin for me.
This commit is contained in:
skrll 2014-10-01 09:30:58 +00:00
parent 219ff8454f
commit 899022eaca
6 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
distrib/sets/lists/xbase/shl.mi
View File

@ -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

8
distrib/sets/lists/xdebug/shl.mi
View File

@ -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

5
external/mit/xorg/lib/libxcb/libxcb/Makefile vendored
View File

@ -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 \

5
external/mit/xorg/lib/libxcb/randr/Makefile vendored
View File

@ -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"

6
external/mit/xorg/lib/libxcb/sync/Makefile vendored
View File

@ -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"

6
external/mit/xorg/lib/libxcb/xcb.mk vendored
View File

@ -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