Module Name: src
Committed By: mrg
Date: Fri May 31 09:14:19 UTC 2013
Modified Files:
src/external/mit/xorg/bin/bitmap: Makefile
src/external/mit/xorg/bin/xrandr: Makefile
src/external/mit/xorg/bin/xsetroot: Makefile
src/external/mit/xorg/bin/xstdcmap: Makefile
src/external/mit/xorg/bin/xwininfo: Makefile
src/external/mit/xorg/include/xcb-proto: Makefile
src/external/mit/xorg/lib/libXrandr: Makefile shlib_version
src/external/mit/xorg/lib/libxcb: xcb.mk
Log Message:
define HAVE_MKSTEMP and HAVE_LRINT for bitmap.
define PACKAGE_STRING/VERSION correctly for xrandr, xsetroot and xstdcmap.
define ICONV_CONST for xwininfo.
install new xcb-proto files.
build new Xrandr sources.
bump version on libxcb and libXrandr.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/bitmap/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xrandr/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xsetroot/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xstdcmap/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xwininfo/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/include/xcb-proto/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXrandr/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXrandr/shlib_version
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libxcb/xcb.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/bitmap/Makefile
diff -u src/external/mit/xorg/bin/bitmap/Makefile:1.3 src/external/mit/xorg/bin/bitmap/Makefile:1.4
--- src/external/mit/xorg/bin/bitmap/Makefile:1.3 Thu Aug 11 23:15:35 2011
+++ src/external/mit/xorg/bin/bitmap/Makefile Fri May 31 09:14:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:35 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/31 09:14:18 mrg Exp $
.include <bsd.own.mk>
@@ -12,6 +12,8 @@ FILES= Dashes Down Excl FlipHoriz FlipVe
RotateRight Stipple Term Up
FILESDIR=${X11INCDIR}/X11/bitmaps
+CPPFLAGS+= -DHAVE_MKSTEMP -DHAVE_LRINT
+
LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
Index: src/external/mit/xorg/bin/xrandr/Makefile
diff -u src/external/mit/xorg/bin/xrandr/Makefile:1.5 src/external/mit/xorg/bin/xrandr/Makefile:1.6
--- src/external/mit/xorg/bin/xrandr/Makefile:1.5 Thu Aug 11 23:15:36 2011
+++ src/external/mit/xorg/bin/xrandr/Makefile Fri May 31 09:14:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:36 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2013/05/31 09:14:18 mrg Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@ PROG= xrandr
LDADD+= -lXrandr -lXrender -lXext -lX11 -lm
DPADD+= ${LIBXRANDR} ${LIBXRENDER} ${LIBXEXT} ${LIBX11} ${LIBM}
-CPPFLAGS+= -DVERSION=\"1.3.1\"
+CPPFLAGS+= -DVERSION=\"1.4.0\"
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xsetroot/Makefile
diff -u src/external/mit/xorg/bin/xsetroot/Makefile:1.3 src/external/mit/xorg/bin/xsetroot/Makefile:1.4
--- src/external/mit/xorg/bin/xsetroot/Makefile:1.3 Fri May 31 08:02:00 2013
+++ src/external/mit/xorg/bin/xsetroot/Makefile Fri May 31 09:14:18 2013
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 08:02:00 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/31 09:14:18 mrg Exp $
.include <bsd.own.mk>
PROG= xsetroot
+CPPFLAGS+= -DPACKAGE_STRING="\"xsetroot 1.1.1\""
+
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11 -lXcursor
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBXCURSOR}
Index: src/external/mit/xorg/bin/xstdcmap/Makefile
diff -u src/external/mit/xorg/bin/xstdcmap/Makefile:1.2 src/external/mit/xorg/bin/xstdcmap/Makefile:1.3
--- src/external/mit/xorg/bin/xstdcmap/Makefile:1.2 Fri May 31 08:02:00 2013
+++ src/external/mit/xorg/bin/xstdcmap/Makefile Fri May 31 09:14:18 2013
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 08:02:00 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 09:14:18 mrg Exp $
.include <bsd.own.mk>
PROG= xstdcmap
+CPPFLAGS+= -DPACKAGE_STRING="\"xstdcmap 1.0.3\""
+
LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
Index: src/external/mit/xorg/bin/xwininfo/Makefile
diff -u src/external/mit/xorg/bin/xwininfo/Makefile:1.5 src/external/mit/xorg/bin/xwininfo/Makefile:1.6
--- src/external/mit/xorg/bin/xwininfo/Makefile:1.5 Thu Aug 11 23:15:36 2011
+++ src/external/mit/xorg/bin/xwininfo/Makefile Fri May 31 09:14:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:36 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2013/05/31 09:14:18 mrg Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@ PROG= xwininfo
SRCS= xwininfo.c clientwin.c dsimple.c
XWININFODIR= ${X11SRCDIR.${PROG}}
-CPPFLAGS+=-I${XWININFODIR} -I${XWININFODIR}/../include
+CPPFLAGS+=-I${XWININFODIR} -I${XWININFODIR}/../include -DICONV_CONST=const
.PATH: ${XWININFODIR} ${XWININFODIR}/man
Index: src/external/mit/xorg/include/xcb-proto/Makefile
diff -u src/external/mit/xorg/include/xcb-proto/Makefile:1.1 src/external/mit/xorg/include/xcb-proto/Makefile:1.2
--- src/external/mit/xorg/include/xcb-proto/Makefile:1.1 Sat Jul 17 23:44:29 2010
+++ src/external/mit/xorg/include/xcb-proto/Makefile Fri May 31 09:14:19 2013
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2010/07/17 23:44:29 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/05/31 09:14:19 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 \
- glx.xml randr.xml record.xml render.xml res.xml \
+ ge.xml glx.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 xfixes.xml xinerama.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 \
xv.xml xvmc.xml
FILESDIR=${X11SHAREDIR}/xcb
Index: src/external/mit/xorg/lib/libXrandr/Makefile
diff -u src/external/mit/xorg/lib/libXrandr/Makefile:1.3 src/external/mit/xorg/lib/libXrandr/Makefile:1.4
--- src/external/mit/xorg/lib/libXrandr/Makefile:1.3 Thu Aug 11 23:15:39 2011
+++ src/external/mit/xorg/lib/libXrandr/Makefile Fri May 31 09:14:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/31 09:14:19 mrg Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ LIB= Xrandr
.PATH: ${X11SRCDIR.${LIB}}/man
SRCS= Xrandr.c XrrConfig.c XrrCrtc.c XrrMode.c XrrOutput.c \
- XrrProperty.c XrrScreen.c
+ XrrProperty.c XrrScreen.c XrrProvider.c XrrProviderProperty.c
INCS= Xrandr.h
INCSDIR=${X11INCDIR}/X11/extensions
Index: src/external/mit/xorg/lib/libXrandr/shlib_version
diff -u src/external/mit/xorg/lib/libXrandr/shlib_version:1.2 src/external/mit/xorg/lib/libXrandr/shlib_version:1.3
--- src/external/mit/xorg/lib/libXrandr/shlib_version:1.2 Sun Jan 11 03:10:12 2009
+++ src/external/mit/xorg/lib/libXrandr/shlib_version Fri May 31 09:14:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.2 2009/01/11 03:10:12 christos Exp $
+# $NetBSD: shlib_version,v 1.3 2013/05/31 09:14:19 mrg Exp $
#
major=3
-minor=0
+minor=1
Index: src/external/mit/xorg/lib/libxcb/xcb.mk
diff -u src/external/mit/xorg/lib/libxcb/xcb.mk:1.1 src/external/mit/xorg/lib/libxcb/xcb.mk:1.2
--- src/external/mit/xorg/lib/libxcb/xcb.mk:1.1 Sat Jul 17 23:43:27 2010
+++ src/external/mit/xorg/lib/libxcb/xcb.mk Fri May 31 09:14:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: xcb.mk,v 1.1 2010/07/17 23:43:27 mrg Exp $
+# $NetBSD: xcb.mk,v 1.2 2013/05/31 09:14:19 mrg Exp $
# define XCBEXT to something before including this
@@ -15,10 +15,10 @@ LIBDPLIBS=\
Xdmcp ${.CURDIR}/../../libXdmcp
SHLIB_MAJOR= 0
-SHLIB_MINOR= 0
+SHLIB_MINOR= 1
PKGCONFIG= xcb-${XCBEXT}
-PKGCONFIG_VERSION.${PKGCONFIG}= 1.6
+PKGCONFIG_VERSION.${PKGCONFIG}= 1.9
.include <bsd.x11.mk>
.include <bsd.lib.mk>
