Module Name: src
Committed By: mrg
Date: Sun Mar 16 23:25:15 UTC 2014
Modified Files:
src/distrib/sets/lists/xbase: mi
src/distrib/sets/lists/xcomp: mi
src/etc/mtree: NetBSD.dist.Xorg
src/external/mit/xorg/include: Makefile
src/external/mit/xorg/include/xcb-proto: Makefile
src/external/mit/xorg/share/nls: Makefile
Added Files:
src/external/mit/xorg/include/dri3proto: Makefile
src/external/mit/xorg/include/presentproto: Makefile
src/external/mit/xorg/share/nls/km_KH.UTF-8: Makefile
src/external/mit/xorg/share/nls/ru_RU.UTF-8: Makefile
src/external/mit/xorg/share/nls/sr_CS.UTF-8: Makefile
Log Message:
updates for libX11 1.6.2, dri3proto and presentproto, and fix
the libXrender build.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.144 -r1.145 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.12 -r1.13 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/include/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/include/dri3proto/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/include/presentproto/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/include/xcb-proto/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/share/nls/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/share/nls/km_KH.UTF-8/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/share/nls/ru_RU.UTF-8/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/share/nls/sr_CS.UTF-8/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/mi
diff -u src/distrib/sets/lists/xbase/mi:1.119 src/distrib/sets/lists/xbase/mi:1.120
--- src/distrib/sets/lists/xbase/mi:1.119 Sun Aug 11 22:29:03 2013
+++ src/distrib/sets/lists/xbase/mi Sun Mar 16 23:25:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.119 2013/08/11 22:29:03 joerg Exp $
+# $NetBSD: mi,v 1.120 2014/03/16 23:25:15 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1715,6 +1715,10 @@
./usr/X11R7/lib/X11/locale/ja_JP.UTF-8/Compose -unknown- xorg
./usr/X11R7/lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS -unknown- xorg
./usr/X11R7/lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE -unknown- xorg
+./usr/X11R7/lib/X11/locale/km_KH.UTF-8 base-x11-root xorg
+./usr/X11R7/lib/X11/locale/km_KH.UTF-8/Compose -unknown- xorg
+./usr/X11R7/lib/X11/locale/km_KH.UTF-8/XI18N_OBJS -unknown- xorg
+./usr/X11R7/lib/X11/locale/km_KH.UTF-8/XLC_LOCALE -unknown- xorg
./usr/X11R7/lib/X11/locale/ko base-x11-root xorg
./usr/X11R7/lib/X11/locale/ko/Compose -unknown- xorg
./usr/X11R7/lib/X11/locale/ko/XI18N_OBJS -unknown- xorg
@@ -1763,6 +1767,14 @@
./usr/X11R7/lib/X11/locale/pt_BR.UTF-8/Compose -unknown- xorg
./usr/X11R7/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS -unknown- xorg
./usr/X11R7/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE -unknown- xorg
+./usr/X11R7/lib/X11/locale/ru_RU.UTF-8 base-x11-root xorg
+./usr/X11R7/lib/X11/locale/ru_RU.UTF-8/Compose -unknown- xorg
+./usr/X11R7/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS -unknown- xorg
+./usr/X11R7/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE -unknown- xorg
+./usr/X11R7/lib/X11/locale/sr_CS.UTF-8 base-x11-root xorg
+./usr/X11R7/lib/X11/locale/sr_CS.UTF-8/Compose -unknown- xorg
+./usr/X11R7/lib/X11/locale/sr_CS.UTF-8/XI18N_OBJS -unknown- xorg
+./usr/X11R7/lib/X11/locale/sr_CS.UTF-8/XLC_LOCALE -unknown- xorg
./usr/X11R7/lib/X11/locale/tatar-cyr base-x11-root xorg
./usr/X11R7/lib/X11/locale/tatar-cyr/Compose -unknown- xorg
./usr/X11R7/lib/X11/locale/tatar-cyr/XI18N_OBJS -unknown- xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.144 src/distrib/sets/lists/xcomp/mi:1.145
--- src/distrib/sets/lists/xcomp/mi:1.144 Sun Aug 11 22:29:03 2013
+++ src/distrib/sets/lists/xcomp/mi Sun Mar 16 23:25:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.144 2013/08/11 22:29:03 joerg Exp $
+# $NetBSD: mi,v 1.145 2014/03/16 23:25:15 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5518,6 +5518,7 @@
./usr/X11R7/include/X11/extensions/dpmsstr.h -unknown- obsolete
./usr/X11R7/include/X11/extensions/dri2proto.h -unknown- xorg
./usr/X11R7/include/X11/extensions/dri2tokens.h -unknown- xorg
+./usr/X11R7/include/X11/extensions/dri3proto.h -unknown- xorg
./usr/X11R7/include/X11/extensions/evieproto.h -unknown- xorg
./usr/X11R7/include/X11/extensions/extutil.h -unknown- xorg
./usr/X11R7/include/X11/extensions/fontcache.h -unknown- xorg
@@ -5543,6 +5544,9 @@
./usr/X11R7/include/X11/extensions/multibufst.h -unknown- obsolete
./usr/X11R7/include/X11/extensions/panoramiXext.h -unknown- xorg
./usr/X11R7/include/X11/extensions/panoramiXproto.h -unknown- xorg
+./usr/X11R7/include/X11/extensions/presentproto.h -unknown- xorg
+./usr/X11R7/include/X11/extensions/presenttokens.h -unknown- xorg
+./usr/X11R7/include/X11/extensions/presenttokens.h -unknown- xorg
./usr/X11R7/include/X11/extensions/randr.h -unknown- xorg
./usr/X11R7/include/X11/extensions/randrproto.h -unknown- xorg
./usr/X11R7/include/X11/extensions/record.h -unknown- xorg
@@ -6277,6 +6281,7 @@
./usr/X11R7/lib/pkgconfig/damageproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/dri.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/dri2proto.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/dri3proto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/evieproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/fixesproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/fontcacheproto.pc -unknown- xorg
@@ -6299,6 +6304,7 @@
./usr/X11R7/lib/pkgconfig/libfs.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/pciaccess.pc -unknown- xorg
./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/randrproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/recordproto.pc -unknown- xorg
@@ -9126,8 +9132,10 @@
./usr/X11R7/share/xcb/damage.xml -unknown- xorg
./usr/X11R7/share/xcb/dpms.xml -unknown- xorg
./usr/X11R7/share/xcb/dri2.xml -unknown- xorg
+./usr/X11R7/share/xcb/dri3.xml -unknown- xorg
./usr/X11R7/share/xcb/ge.xml -unknown- xorg
./usr/X11R7/share/xcb/glx.xml -unknown- xorg
+./usr/X11R7/share/xcb/present.xml -unknown- xorg
./usr/X11R7/share/xcb/randr.xml -unknown- xorg
./usr/X11R7/share/xcb/record.xml -unknown- xorg
./usr/X11R7/share/xcb/render.xml -unknown- xorg
Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.12 src/etc/mtree/NetBSD.dist.Xorg:1.13
--- src/etc/mtree/NetBSD.dist.Xorg:1.12 Mon Jun 10 05:09:34 2013
+++ src/etc/mtree/NetBSD.dist.Xorg Sun Mar 16 23:25:15 2014
@@ -1,5 +1,4 @@
-# $NetBSD: NetBSD.dist.Xorg,v 1.12 2013/06/10 05:09:34 mrg Exp $
-
+# $NetBSD: NetBSD.dist.Xorg,v 1.13 2014/03/16 23:25:15 mrg Exp $
./usr/X11R7
./usr/X11R7/bin
./usr/X11R7/include
@@ -7,7 +6,6 @@
./usr/X11R7/include/GL
./usr/X11R7/include/GL/internal
./usr/X11R7/include/X11
-./usr/X11R7/include/X11/dri
./usr/X11R7/include/X11/ICE
./usr/X11R7/include/X11/PM
./usr/X11R7/include/X11/SM
@@ -17,11 +15,10 @@
./usr/X11R7/include/X11/Xmu
./usr/X11R7/include/X11/Xtrans
./usr/X11R7/include/X11/bitmaps
+./usr/X11R7/include/X11/dri
./usr/X11R7/include/X11/extensions
./usr/X11R7/include/X11/fonts
./usr/X11R7/include/X11/pixmaps
-./usr/X11R7/include/libdrm
-./usr/X11R7/include/libkms
./usr/X11R7/include/fontconfig
./usr/X11R7/include/freetype2
./usr/X11R7/include/freetype2/freetype
@@ -29,6 +26,8 @@
./usr/X11R7/include/freetype2/freetype/config
./usr/X11R7/include/freetype2/freetype/internal
./usr/X11R7/include/freetype2/freetype/internal/services
+./usr/X11R7/include/libdrm
+./usr/X11R7/include/libkms
./usr/X11R7/include/pixman-1
./usr/X11R7/include/xcb
./usr/X11R7/include/xorg
@@ -81,6 +80,7 @@
./usr/X11R7/lib/X11/locale/ja.JIS
./usr/X11R7/lib/X11/locale/ja.SJIS
./usr/X11R7/lib/X11/locale/ja_JP.UTF-8
+./usr/X11R7/lib/X11/locale/km_KH.UTF-8
./usr/X11R7/lib/X11/locale/ko
./usr/X11R7/lib/X11/locale/ko_KR.UTF-8
./usr/X11R7/lib/X11/locale/koi8-c
@@ -94,6 +94,8 @@
./usr/X11R7/lib/X11/locale/mulelao-1
./usr/X11R7/lib/X11/locale/nokhchi-1
./usr/X11R7/lib/X11/locale/pt_BR.UTF-8
+./usr/X11R7/lib/X11/locale/ru_RU.UTF-8
+./usr/X11R7/lib/X11/locale/sr_CS.UTF-8
./usr/X11R7/lib/X11/locale/tatar-cyr
./usr/X11R7/lib/X11/locale/th_TH
./usr/X11R7/lib/X11/locale/th_TH.UTF-8
@@ -139,9 +141,9 @@
./usr/X11R7/lib/X11/xkb/types
./usr/X11R7/lib/modules
./usr/X11R7/lib/modules/dri
+./usr/X11R7/lib/modules/drivers
./usr/X11R7/lib/modules/extensions
./usr/X11R7/lib/modules/fonts
-./usr/X11R7/lib/modules/drivers
./usr/X11R7/lib/modules/input
./usr/X11R7/lib/pkgconfig
./usr/X11R7/lib/xorg
Index: src/external/mit/xorg/include/Makefile
diff -u src/external/mit/xorg/include/Makefile:1.4 src/external/mit/xorg/include/Makefile:1.5
--- src/external/mit/xorg/include/Makefile:1.4 Sun Jul 18 07:07:09 2010
+++ src/external/mit/xorg/include/Makefile Sun Mar 16 23:25:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/07/18 07:07:09 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2014/03/16 23:25:15 mrg Exp $
# *proto packages for xorg
@@ -6,8 +6,8 @@ SUBDIR= xproto fontsproto bigreqsproto k
fixesproto inputproto scrnsaverproto xextproto evieext xineramaproto \
resourceproto recordproto videoproto xf86dgaproto xf86miscproto \
compositeproto damageproto trapproto glproto randrproto fontcacheproto \
- xf86driproto xf86vidmodeproto renderproto dri2proto \
- xproxymanagementprotocol xbitmaps xcb-proto .WAIT \
+ xf86driproto xf86vidmodeproto renderproto dri2proto dri3proto \
+ presentproto xproxymanagementprotocol xbitmaps xcb-proto .WAIT \
xtrans
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/include/xcb-proto/Makefile
diff -u src/external/mit/xorg/include/xcb-proto/Makefile:1.2 src/external/mit/xorg/include/xcb-proto/Makefile:1.3
--- src/external/mit/xorg/include/xcb-proto/Makefile:1.2 Fri May 31 09:14:19 2013
+++ src/external/mit/xorg/include/xcb-proto/Makefile Sun Mar 16 23:25:15 2014
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 09:14:19 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/16 23:25:15 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xcb-proto} ${X11SRCDIR.xcb-proto}/src
-FILES= bigreq.xml composite.xml damage.xml dpms.xml dri2.xml \
- ge.xml glx.xml randr.xml record.xml render.xml res.xml \
- screensaver.xml shape.xml shm.xml sync.xml xc_misc.xml \
+FILES= bigreq.xml composite.xml damage.xml dpms.xml dri2.xml dri3.xml \
+ ge.xml glx.xml present.xml randr.xml record.xml render.xml \
+ res.xml screensaver.xml shape.xml shm.xml sync.xml xc_misc.xml \
xcb.xsd xevie.xml xf86dri.xml xf86vidmode.xml xfixes.xml \
xinerama.xml xkb.xml \
xinput.xml xprint.xml xproto.xml xselinux.xml xtest.xml \
Index: src/external/mit/xorg/share/nls/Makefile
diff -u src/external/mit/xorg/share/nls/Makefile:1.3 src/external/mit/xorg/share/nls/Makefile:1.4
--- src/external/mit/xorg/share/nls/Makefile:1.3 Thu May 30 23:42:19 2013
+++ src/external/mit/xorg/share/nls/Makefile Sun Mar 16 23:25:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/30 23:42:19 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/16 23:25:15 mrg Exp $
.include <bsd.own.mk>
@@ -13,10 +13,12 @@ SUBDIR= \
iso8859-7 iso8859-8 iso8859-9 iso8859-9e iso8859-10 iso8859-11 \
iso8859-13 iso8859-14 iso8859-15 \
ja ja.JIS ja.SJIS ja_JP.UTF-8 \
- ko ko_KR.UTF-8 koi8-c koi8-r koi8-u \
+ km_KH.UTF-8 ko ko_KR.UTF-8 koi8-c koi8-r koi8-u \
microsoft-cp1251 microsoft-cp1255 microsoft-cp1256 mulelao-1 \
nokhchi-1 \
pt_BR.UTF-8 \
+ ru_RU.UTF-8 \
+ sr_CS.UTF-8 \
tatar-cyr th_TH th_TH.UTF-8 tscii-0 \
vi_VN.tcvn vi_VN.viscii \
zh_CN zh_CN.UTF-8 zh_CN.gb18030 zh_CN.gbk zh_HK.UTF-8 \
@@ -59,6 +61,6 @@ realall: ${FILES}
build_subdirs:
.for _dir in ${SUBDIR}
mkdir ${.CURDIR}/${_dir}
- printf '# $$NetBSD: Makefile,v 1.3 2013/05/30 23:42:19 mrg Exp $$\n\nNLS_SUBDIR= ${_dir}\n\n.include "../Makefile.nls"\n' > ${.CURDIR}/${_dir}/Makefile
+ printf '# $$NetBSD: Makefile,v 1.4 2014/03/16 23:25:15 mrg Exp $$\n\nNLS_SUBDIR= ${_dir}\n\n.include "../Makefile.nls"\n' > ${.CURDIR}/${_dir}/Makefile
.endfor
Added files:
Index: src/external/mit/xorg/include/dri3proto/Makefile
diff -u /dev/null src/external/mit/xorg/include/dri3proto/Makefile:1.1
--- /dev/null Sun Mar 16 23:25:15 2014
+++ src/external/mit/xorg/include/dri3proto/Makefile Sun Mar 16 23:25:15 2014
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2014/03/16 23:25:15 mrg Exp $
+
+.include <bsd.own.mk>
+
+.PATH: ${X11SRCDIR.dri3proto}
+
+INCS= dri3proto.h
+INCSDIR=${X11INCDIR}/X11/extensions
+
+NOOBJ= # defined
+
+PKGCONFIG= dri3proto
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/include/presentproto/Makefile
diff -u /dev/null src/external/mit/xorg/include/presentproto/Makefile:1.1
--- /dev/null Sun Mar 16 23:25:16 2014
+++ src/external/mit/xorg/include/presentproto/Makefile Sun Mar 16 23:25:15 2014
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2014/03/16 23:25:15 mrg Exp $
+
+.include <bsd.own.mk>
+
+.PATH: ${X11SRCDIR.present}
+
+INCS= presentproto.h presenttokens.h
+INCSDIR=${X11INCDIR}/X11/extensions
+
+NOOBJ= # defined
+
+PKGCONFIG= presentproto
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/share/nls/km_KH.UTF-8/Makefile
diff -u /dev/null src/external/mit/xorg/share/nls/km_KH.UTF-8/Makefile:1.1
--- /dev/null Sun Mar 16 23:25:16 2014
+++ src/external/mit/xorg/share/nls/km_KH.UTF-8/Makefile Sun Mar 16 23:25:15 2014
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2014/03/16 23:25:15 mrg Exp $
+
+NLS_SUBDIR= km_KH.UTF-8
+
+.include "../Makefile.nls"
Index: src/external/mit/xorg/share/nls/ru_RU.UTF-8/Makefile
diff -u /dev/null src/external/mit/xorg/share/nls/ru_RU.UTF-8/Makefile:1.1
--- /dev/null Sun Mar 16 23:25:16 2014
+++ src/external/mit/xorg/share/nls/ru_RU.UTF-8/Makefile Sun Mar 16 23:25:15 2014
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2014/03/16 23:25:15 mrg Exp $
+
+NLS_SUBDIR= ru_RU.UTF-8
+
+.include "../Makefile.nls"
Index: src/external/mit/xorg/share/nls/sr_CS.UTF-8/Makefile
diff -u /dev/null src/external/mit/xorg/share/nls/sr_CS.UTF-8/Makefile:1.1
--- /dev/null Sun Mar 16 23:25:16 2014
+++ src/external/mit/xorg/share/nls/sr_CS.UTF-8/Makefile Sun Mar 16 23:25:15 2014
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2014/03/16 23:25:15 mrg Exp $
+
+NLS_SUBDIR= sr_CS.UTF-8
+
+.include "../Makefile.nls"
