Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src merge libxcb 1.10 and libpthread-stubs build.
details: https://anonhg.NetBSD.org/src/rev/044ba0c873bb
branches: trunk
changeset: 327789:044ba0c873bb
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Mar 17 07:25:34 2014 +0000
description:
merge libxcb 1.10 and libpthread-stubs build.
update the libxcb generated files.
diffstat:
distrib/sets/lists/xbase/shl.mi | 11 +-
distrib/sets/lists/xcomp/mi | 14 +-
distrib/sets/lists/xcomp/shl.mi | 6 +-
distrib/sets/lists/xdebug/mi | 5 +-
distrib/sets/lists/xdebug/shl.mi | 5 +-
external/mit/xorg/lib/Makefile | 4 +-
external/mit/xorg/lib/libpthread-stubs/Makefile | 15 +
external/mit/xorg/lib/libxcb/Makefile | 5 +-
external/mit/xorg/lib/libxcb/dri3/Makefile | 5 +
external/mit/xorg/lib/libxcb/files/Makefile | 6 +-
external/mit/xorg/lib/libxcb/files/Makefile.xmlsrcs | 4 +-
external/mit/xorg/lib/libxcb/files/composite.h | 6 +-
external/mit/xorg/lib/libxcb/files/config.h | 12 +-
external/mit/xorg/lib/libxcb/files/damage.h | 8 +-
external/mit/xorg/lib/libxcb/files/dpms.h | 8 +-
external/mit/xorg/lib/libxcb/files/dri2.c | 12 +-
external/mit/xorg/lib/libxcb/files/dri2.h | 26 +-
external/mit/xorg/lib/libxcb/files/dri3.c | 684 +
external/mit/xorg/lib/libxcb/files/dri3.h | 752 +
external/mit/xorg/lib/libxcb/files/glx.c | 272 +-
external/mit/xorg/lib/libxcb/files/glx.h | 22 +-
external/mit/xorg/lib/libxcb/files/present.c | 715 +
external/mit/xorg/lib/libxcb/files/present.h | 844 +
external/mit/xorg/lib/libxcb/files/randr.c | 1965 +++-
external/mit/xorg/lib/libxcb/files/randr.h | 1667 ++-
external/mit/xorg/lib/libxcb/files/record.c | 24 +-
external/mit/xorg/lib/libxcb/files/render.c | 96 +-
external/mit/xorg/lib/libxcb/files/render.h | 134 +-
external/mit/xorg/lib/libxcb/files/res.c | 730 +-
external/mit/xorg/lib/libxcb/files/res.h | 688 +-
external/mit/xorg/lib/libxcb/files/screensaver.c | 4 +-
external/mit/xorg/lib/libxcb/files/screensaver.h | 21 +-
external/mit/xorg/lib/libxcb/files/shape.c | 8 +-
external/mit/xorg/lib/libxcb/files/shape.h | 16 +-
external/mit/xorg/lib/libxcb/files/shm.c | 214 +
external/mit/xorg/lib/libxcb/files/shm.h | 220 +-
external/mit/xorg/lib/libxcb/files/sync.c | 580 +-
external/mit/xorg/lib/libxcb/files/sync.h | 198 +-
external/mit/xorg/lib/libxcb/files/xc_misc.c | 4 +-
external/mit/xorg/lib/libxcb/files/xcb.h | 45 +-
external/mit/xorg/lib/libxcb/files/xcb_conn.c | 43 +-
external/mit/xorg/lib/libxcb/files/xcb_in.c | 306 +-
external/mit/xorg/lib/libxcb/files/xcb_list.c | 2 +-
external/mit/xorg/lib/libxcb/files/xcb_out.c | 20 +-
external/mit/xorg/lib/libxcb/files/xcb_util.c | 4 +
external/mit/xorg/lib/libxcb/files/xcbext.h | 6 +-
external/mit/xorg/lib/libxcb/files/xcbint.h | 17 +
external/mit/xorg/lib/libxcb/files/xevie.h | 4 +-
external/mit/xorg/lib/libxcb/files/xf86dri.c | 16 +-
external/mit/xorg/lib/libxcb/files/xfixes.c | 307 +-
external/mit/xorg/lib/libxcb/files/xfixes.h | 252 +-
external/mit/xorg/lib/libxcb/files/xinerama.c | 4 +-
external/mit/xorg/lib/libxcb/files/xinput.c | 10091 ++++++++++++++++-
external/mit/xorg/lib/libxcb/files/xinput.h | 8650 +++++++++++++-
external/mit/xorg/lib/libxcb/files/xkb.c | 8292 +------------
external/mit/xorg/lib/libxcb/files/xkb.h | 4216 +------
external/mit/xorg/lib/libxcb/files/xprint.c | 40 +-
external/mit/xorg/lib/libxcb/files/xproto.c | 256 +-
external/mit/xorg/lib/libxcb/files/xproto.h | 152 +-
external/mit/xorg/lib/libxcb/files/xselinux.c | 92 +-
external/mit/xorg/lib/libxcb/files/xtest.h | 2 +-
external/mit/xorg/lib/libxcb/files/xv.c | 40 +-
external/mit/xorg/lib/libxcb/files/xv.h | 34 +-
external/mit/xorg/lib/libxcb/files/xvmc.c | 20 +-
external/mit/xorg/lib/libxcb/present/Makefile | 5 +
external/mit/xorg/lib/libxcb/sync/Makefile | 5 +-
external/mit/xorg/lib/libxcb/xinput/Makefile | 6 +-
external/mit/xorg/lib/libxcb/xkb/Makefile | 8 +
68 files changed, 29790 insertions(+), 13155 deletions(-)
diffs (truncated from 49730 to 300 lines):
diff -r 78b5cb14ca2a -r 044ba0c873bb distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi Mon Mar 17 07:11:40 2014 +0000
+++ b/distrib/sets/lists/xbase/shl.mi Mon Mar 17 07:25:34 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.53 2013/08/11 22:29:03 joerg Exp $
+# $NetBSD: shl.mi,v 1.54 2014/03/17 07:25:34 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -351,6 +351,9 @@
./usr/X11R7/lib/libxcb-dri2.so -unknown- xorg
./usr/X11R7/lib/libxcb-dri2.so.0 -unknown- xorg
./usr/X11R7/lib/libxcb-dri2.so.0.1 -unknown- xorg
+./usr/X11R7/lib/libxcb-dri3.so -unknown- xorg
+./usr/X11R7/lib/libxcb-dri3.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-dri3.so.0.1 -unknown- xorg
./usr/X11R7/lib/libxcb-event.so -unknown- xorg
./usr/X11R7/lib/libxcb-event.so.1 -unknown- xorg
./usr/X11R7/lib/libxcb-event.so.1.0 -unknown- xorg
@@ -366,6 +369,9 @@
./usr/X11R7/lib/libxcb-keysyms.so -unknown- xorg
./usr/X11R7/lib/libxcb-keysyms.so.1 -unknown- xorg
./usr/X11R7/lib/libxcb-keysyms.so.1.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-present.so -unknown- xorg
+./usr/X11R7/lib/libxcb-present.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-present.so.0.1 -unknown- xorg
./usr/X11R7/lib/libxcb-property.so -unknown- xorg
./usr/X11R7/lib/libxcb-property.so.1 -unknown- xorg
./usr/X11R7/lib/libxcb-property.so.1.0 -unknown- xorg
@@ -411,6 +417,9 @@
./usr/X11R7/lib/libxcb-xinerama.so -unknown- xorg
./usr/X11R7/lib/libxcb-xinerama.so.0 -unknown- xorg
./usr/X11R7/lib/libxcb-xinerama.so.0.1 -unknown- xorg
+./usr/X11R7/lib/libxcb-xkb.so -unknown- xorg
+./usr/X11R7/lib/libxcb-xkb.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-xkb.so.0.1 -unknown- xorg
./usr/X11R7/lib/libxcb-xtest.so -unknown- xorg
./usr/X11R7/lib/libxcb-xtest.so.0 -unknown- xorg
./usr/X11R7/lib/libxcb-xtest.so.0.1 -unknown- xorg
diff -r 78b5cb14ca2a -r 044ba0c873bb distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi Mon Mar 17 07:11:40 2014 +0000
+++ b/distrib/sets/lists/xcomp/mi Mon Mar 17 07:25:34 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.146 2014/03/17 01:09:07 mrg Exp $
+# $NetBSD: mi,v 1.147 2014/03/17 07:25:34 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6210,6 +6210,8 @@
./usr/X11R7/lib/libpciaccess_p.a -unknown- profile,xorg
./usr/X11R7/lib/libpixman-1.a -unknown- xorg
./usr/X11R7/lib/libpixman-1_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libpthread-stubs.a -unknown- xorg
+./usr/X11R7/lib/libpthread-stubs_p.a -unknown- profile,xorg
./usr/X11R7/lib/libre.a -unknown- xorg
./usr/X11R7/lib/libre_p.a -unknown- profile,xorg
./usr/X11R7/lib/libxcb-atom.a -unknown- xorg
@@ -6224,6 +6226,8 @@
./usr/X11R7/lib/libxcb-dpms_p.a -unknown- profile,xorg
./usr/X11R7/lib/libxcb-dri2.a -unknown- xorg
./usr/X11R7/lib/libxcb-dri2_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-dri3.a -unknown- xorg
+./usr/X11R7/lib/libxcb-dri3_p.a -unknown- profile,xorg
./usr/X11R7/lib/libxcb-event.a -unknown- xorg
./usr/X11R7/lib/libxcb-event_p.a -unknown- profile,xorg
./usr/X11R7/lib/libxcb-glx.a -unknown- xorg
@@ -6234,6 +6238,8 @@
./usr/X11R7/lib/libxcb-image_p.a -unknown- profile,xorg
./usr/X11R7/lib/libxcb-keysyms.a -unknown- xorg
./usr/X11R7/lib/libxcb-keysyms_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-present.a -unknown- xorg
+./usr/X11R7/lib/libxcb-present_p.a -unknown- profile,xorg
./usr/X11R7/lib/libxcb-property.a -unknown- xorg
./usr/X11R7/lib/libxcb-property_p.a -unknown- profile,xorg
./usr/X11R7/lib/libxcb-randr.a -unknown- xorg
@@ -6264,6 +6270,8 @@
./usr/X11R7/lib/libxcb-xfixes_p.a -unknown- profile,xorg
./usr/X11R7/lib/libxcb-xinerama.a -unknown- xorg
./usr/X11R7/lib/libxcb-xinerama_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-xkb.a -unknown- xorg
+./usr/X11R7/lib/libxcb-xkb_p.a -unknown- profile,xorg
./usr/X11R7/lib/libxcb-xtest.a -unknown- xorg
./usr/X11R7/lib/libxcb-xtest_p.a -unknown- profile,xorg
./usr/X11R7/lib/libxcb-xv.a -unknown- xorg
@@ -6306,6 +6314,7 @@
./usr/X11R7/lib/pkgconfig/pixman-1.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/presentproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/printproto.pc -obsolete- obsolete
+./usr/X11R7/lib/pkgconfig/pthread-stubs.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/randrproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/recordproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/renderproto.pc -unknown- xorg
@@ -6327,11 +6336,13 @@
./usr/X11R7/lib/pkgconfig/xcb-damage.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcb-dpms.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcb-dri2.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-dri3.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcb-event.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcb-glx.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcb-icccm.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcb-image.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcb-keysyms.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-present.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcb-property.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcb-proto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcb-randr.pc -unknown- xorg
@@ -6348,6 +6359,7 @@
./usr/X11R7/lib/pkgconfig/xcb-xf86dri.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcb-xfixes.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcb-xinerama.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-xkb.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcb-xtest.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcb-xv.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcb-xvmc.pc -unknown- xorg
diff -r 78b5cb14ca2a -r 044ba0c873bb distrib/sets/lists/xcomp/shl.mi
--- a/distrib/sets/lists/xcomp/shl.mi Mon Mar 17 07:11:40 2014 +0000
+++ b/distrib/sets/lists/xcomp/shl.mi Mon Mar 17 07:25:34 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.36 2014/01/02 16:46:40 tho Exp $
+# $NetBSD: shl.mi,v 1.37 2014/03/17 07:25:34 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -104,6 +104,7 @@
./usr/X11R7/lib/libmp_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libpciaccess_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libpixman-1_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libpthread-stubs_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libre_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-atom_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-aux_pic.a -unknown- xorg,picinstall
@@ -111,11 +112,13 @@
./usr/X11R7/lib/libxcb-damage_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-dpms_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-dri2_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libxcb-dri3_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-event_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-glx_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-icccm_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-image_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-keysyms_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libxcb-present_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-property_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-randr_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-record_pic.a -unknown- xorg,picinstall
@@ -131,6 +134,7 @@
./usr/X11R7/lib/libxcb-xf86dri_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-xfixes_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-xinerama_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libxcb-xkb_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-xtest_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-xv_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libxcb-xvmc_pic.a -unknown- xorg,picinstall
diff -r 78b5cb14ca2a -r 044ba0c873bb distrib/sets/lists/xdebug/mi
--- a/distrib/sets/lists/xdebug/mi Mon Mar 17 07:11:40 2014 +0000
+++ b/distrib/sets/lists/xdebug/mi Mon Mar 17 07:25:34 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.6 2013/08/11 22:29:03 joerg Exp $
+# $NetBSD: mi,v 1.7 2014/03/17 07:25:34 mrg Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/X11R6/lib/libFS_g.a -unknown- debuglib,x11
./usr/X11R6/lib/libGLU_g.a -unknown- debuglib,x11
@@ -112,11 +112,13 @@
./usr/X11R7/lib/libxcb-damage_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxcb-dpms_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxcb-dri2_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-dri3_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxcb-event_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxcb-glx_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxcb-icccm_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxcb-image_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxcb-keysyms_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-present_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxcb-property_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxcb-randr_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxcb-record_g.a -unknown- debuglib,xorg
@@ -132,6 +134,7 @@
./usr/X11R7/lib/libxcb-xf86dri_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxcb-xfixes_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxcb-xinerama_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-xkb_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxcb-xtest_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxcb-xv_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxcb-xvmc_g.a -unknown- debuglib,xorg
diff -r 78b5cb14ca2a -r 044ba0c873bb distrib/sets/lists/xdebug/shl.mi
--- a/distrib/sets/lists/xdebug/shl.mi Mon Mar 17 07:11:40 2014 +0000
+++ b/distrib/sets/lists/xdebug/shl.mi Mon Mar 17 07:25:34 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.12 2013/08/11 22:29:03 joerg Exp $
+# $NetBSD: shl.mi,v 1.13 2014/03/17 07:25:34 mrg 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
@@ -114,11 +114,13 @@
./usr/libdata/debug/usr/X11R7/lib/libxcb-damage.so.0.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libxcb-dpms.so.0.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libxcb-dri2.so.0.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libxcb-dri3.so.0.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libxcb-event.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libxcb-glx.so.0.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libxcb-icccm.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libxcb-image.so.0.0.debug -unknown- xorg,debug
./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-record.so.0.1.debug -unknown- xorg,debug
@@ -134,6 +136,7 @@
./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
./usr/libdata/debug/usr/X11R7/lib/libxcb-xinerama.so.0.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xkb.so.0.1.debug -unknown- xorg,debug
./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
diff -r 78b5cb14ca2a -r 044ba0c873bb external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile Mon Mar 17 07:11:40 2014 +0000
+++ b/external/mit/xorg/lib/Makefile Mon Mar 17 07:25:34 2014 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2013/06/05 02:51:49 mrg Exp $
+# $NetBSD: Makefile,v 1.28 2014/03/17 07:25:34 mrg Exp $
# build libraries for xorg
SUBDIR= libfontenc freetype libFS libICE libOSMesa \
- libXau libXdmcp libdrm libpciaccess .WAIT
+ libXau libXdmcp libdrm libpciaccess libpthread-stubs .WAIT
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR+=libdrm_intel
.endif
diff -r 78b5cb14ca2a -r 044ba0c873bb external/mit/xorg/lib/libpthread-stubs/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libpthread-stubs/Makefile Mon Mar 17 07:25:34 2014 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2014/03/17 07:25:34 mrg Exp $
+
+.include <bsd.own.mk>
+
+LIB= pthread-stubs
+.PATH: ${X11SRCDIR.${LIB}}
+
+SRCS= stubs.c
+
+CPPFLAGS+= ${X11FLAGS.THREADLIB} -I${X11SRCDIR.${LIB}}/../include
+
+PKGDIST= ${LIB}
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
diff -r 78b5cb14ca2a -r 044ba0c873bb external/mit/xorg/lib/libxcb/Makefile
--- a/external/mit/xorg/lib/libxcb/Makefile Mon Mar 17 07:11:40 2014 +0000
+++ b/external/mit/xorg/lib/libxcb/Makefile Mon Mar 17 07:25:34 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/07/17 23:43:27 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/17 07:25:34 mrg Exp $
SUBDIR= libxcb .WAIT
@@ -7,7 +7,9 @@
damage \
dpms \
dri2 \
+ dri3 \
glx \
+ present \
randr \
record \
render \
@@ -20,6 +22,7 @@
xf86dri \
xfixes \
xinerama \
+ xkb \
xtest \
xv \
xvmc \
diff -r 78b5cb14ca2a -r 044ba0c873bb external/mit/xorg/lib/libxcb/dri3/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libxcb/dri3/Makefile Mon Mar 17 07:25:34 2014 +0000
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2014/03/17 07:25:34 mrg Exp $
+
+XCBEXT= dri3
+
+.include "../xcb.mk"
diff -r 78b5cb14ca2a -r 044ba0c873bb external/mit/xorg/lib/libxcb/files/Makefile
--- a/external/mit/xorg/lib/libxcb/files/Makefile Mon Mar 17 07:11:40 2014 +0000
+++ b/external/mit/xorg/lib/libxcb/files/Makefile Mon Mar 17 07:25:34 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/07/17 23:43:28 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/17 07:25:34 mrg Exp $
# This makefile is used to generate the libxcb xml/python generated files.
# For now it is broken, and these files were copied from a normal libxcb
@@ -7,8 +7,8 @@
.include <bsd.own.mk>
.include "Makefile.xmlsrcs"
-PYTHON?= /usr/pkg/bin/python2.6
-PYTHONLIB?= /usr/pkg/lib/python2.6
Home |
Main Index |
Thread Index |
Old Index