--- a/open-src/app/xrandr/Makefile Wed Jul 25 12:48:36 2007 -0700
+++ b/open-src/app/xrandr/Makefile Fri Jul 27 11:12:48 2007 -0700
@@ -2,7 +2,7 @@
#
# xrandr 1.x Makefile
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.1 06/10/02
+# @(#)Makefile 1.2 07/07/25
#
# Package name used in tarballs
APP_NAME=xrandr
# Version number (used in path names)
-APP_VERS=1.0.2
+APP_VERS=1.2.2
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXrandr/CrtcChange.patch Fri Jul 27 11:12:48 2007 -0700
@@ -0,0 +1,31 @@
+commit 126143add5349fc34488b23d54d1bdcc7e8847b9
+Author: Keith Packard <[email protected]>
+Date: Tue Jul 3 09:58:09 2007 -0700
+
+ CrtcChange event format conversion was using 'height' for 'width'.
+
+ CrtcChange events were getting the source 'height' value stored in the
+ 'width' target in both conversion directions.
+
+diff --git a/src/Xrandr.c b/src/Xrandr.c
+index f8bdf02..fdaa80d 100644
+--- a/src/Xrandr.c
++++ b/src/Xrandr.c
+@@ -116,7 +116,7 @@ static Bool XRRWireToEvent(Display *dpy,
+ aevent->rotation = awire->rotation;
+ aevent->x = awire->x;
+ aevent->y = awire->y;
+- aevent->width = awire->height;
++ aevent->width = awire->width;
+ aevent->height = awire->height;
+ return True;
+ }
+@@ -191,7 +191,7 @@ static Status XRREventToWire(Display *dp
+ awire->rotation = aevent->rotation;
+ awire->x = aevent->x;
+ awire->y = aevent->y;
+- awire->width = aevent->height;
++ awire->width = aevent->width;
+ awire->height = aevent->height;
+ return True;
+ }
--- a/open-src/lib/libXrandr/Makefile Wed Jul 25 12:48:36 2007 -0700
+++ b/open-src/lib/libXrandr/Makefile Fri Jul 27 11:12:48 2007 -0700
@@ -2,7 +2,7 @@
#
# Xrandr 1.x Makefile
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,17 +30,17 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.2 06/10/03
+# @(#)Makefile 1.4 07/07/27
#
# Package name used in tarballs
LIB_MODULE=libXrandr
# Version number (used in path names)
-LIB_VERS=1.1.1
+LIB_VERS=1.2.1
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES =
+SOURCE_PATCHES = CrtcChange.patch,-p1
# Library name
LIBNAME=Xrandr
@@ -57,4 +57,7 @@
# pkg-config files that need to have -R added
FIX_PC_FILES=xrandr.pc.in
+# Link with version mapfile
+LIB_ADD_LD_OPTIONS = -M $(PWD)/mapfile-vers
+
include ../Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXrandr/mapfile-vers Fri Jul 27 11:12:48 2007 -0700
@@ -0,0 +1,92 @@
+#
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+#
+# ident "@(#)mapfile-vers 1.1 07/07/27 SMI"
+#
+
+libXrandr_1.0 {
+ global:
+ XRRQueryExtension;
+ XRRQueryVersion;
+ XRRGetScreenInfo;
+ XRRFreeScreenConfigInfo;
+ XRRSetScreenConfig;
+ XRRConfigRotations;
+ XRRConfigTimes;
+ XRRConfigSizes;
+ XRRConfigCurrentConfiguration;
+ XRRRootToScreen;
+ XRRSelectInput;
+ XRRRotations;
+ XRRSizes;
+ XRRTimes;
+ local:
+ *;
+};
+
+libXrandr_1.1 {
+ global:
+ XRRSetScreenConfigAndRate;
+ XRRConfigRates;
+ XRRConfigCurrentRate;
+ XRRRates;
+} libXrandr_1.0;
+
+
+libXrandr_1.2 {
+ global:
+ XRRGetScreenSizeRange;
+ XRRSetScreenSize;
+ XRRGetScreenResources;
+ XRRFreeScreenResources;
+ XRRGetOutputInfo;
+ XRRFreeOutputInfo;
+ XRRListOutputProperties;
+ XRRQueryOutputProperty;
+ XRRConfigureOutputProperty;
+ XRRChangeOutputProperty;
+ XRRDeleteOutputProperty;
+ XRRGetOutputProperty;
+ XRRAllocModeInfo;
+ XRRCreateMode;
+ XRRDestroyMode;
+ XRRAddOutputMode;
+ XRRDeleteOutputMode;
+ XRRFreeModeInfo;
+ XRRGetCrtcInfo;
+ XRRFreeCrtcInfo;
+ XRRSetCrtcConfig;
+ XRRGetCrtcGammaSize;
+ XRRGetCrtcGamma;
+ XRRAllocGamma;
+ XRRSetCrtcGamma;
+ XRRFreeGamma;
+ XRRUpdateConfiguration;
+} libXrandr_1.1;
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/Randr/B32.patch Fri Jul 27 11:12:48 2007 -0700
@@ -0,0 +1,25 @@
+commit d1c5739ae19f7cc01a6a5603d3fae93e1f9ee3d1
+Author: Alan Coopersmith <[email protected]>
+Date: Mon Apr 9 14:31:10 2007 -0700
+
+ Delete duplicate B32's in xRRScreenChangeNotifyEvent
+
+ Caused compiler warnings:
+ "randrproto.h", line 567: warning: syntax error: empty member declaration
+ "randrproto.h", line 568: warning: syntax error: empty member declaration
+
+diff --git a/randrproto.h b/randrproto.h
+index abca369..cf7a022 100644
+--- a/randrproto.h
++++ b/randrproto.h
+@@ -564,8 +564,8 @@ typedef struct {
+ CARD8 type; /* always evBase + ScreenChangeNotify */
+ CARD8 rotation; /* new rotation */
+ CARD16 sequenceNumber B16;
+- Time timestamp B32; B32; /* time screen was changed */
+- Time configTimestamp B32; B32; /* time config data was changed */
++ Time timestamp B32; /* time screen was changed */
++ Time configTimestamp B32; /* time config data was changed */
+ Window root B32; /* root window */
+ Window window B32; /* window requesting notification */
+ SizeID sizeID B16; /* new size ID */
--- a/open-src/proto/Randr/Makefile Wed Jul 25 12:48:36 2007 -0700
+++ b/open-src/proto/Randr/Makefile Fri Jul 27 11:12:48 2007 -0700
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -28,17 +28,17 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.1 06/06/12
+# @(#)Makefile 1.2 07/07/25
#
# Package name used in tarballs
PROTO_NAME=randrproto
# Version number (used in path names)
-VERSION=1.1.2
+VERSION=1.2.1
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES=
+SOURCE_PATCHES= B32.patch,-p1
### Include common rulesets
include ../Makefile.inc