February 2009 - openSUSE Commits - openSUSE Mailing Lists

commit xorg-x11-libs for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package xorg-x11-libs for openSUSE:Factory checked in at Thu Feb 26 12:16:13 CET 2009. -------- --- xorg-x11-libs/xorg-x11-libs.changes 2009-02-13 07:04:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-libs/xorg-x11-libs.changes 2009-02-26 10:34:31.212311028 +0100 @@ -1,0 +2,23 @@ +Thu Feb 26 10:34:20 CET 2009 - sndirsch(a)suse.de + +- back to libXaw 1.0.4 + +------------------------------------------------------------------- +Thu Feb 26 04:22:21 CET 2009 - sndirsch(a)suse.de + +- xcb-util 0.3.3 + +------------------------------------------------------------------- +Thu Feb 26 03:58:29 CET 2009 - sndirsch(a)suse.de + +- libXi 1.2.1 +- libXrandr 1.2.99.4 + +------------------------------------------------------------------- +Thu Feb 26 03:19:09 CET 2009 - sndirsch(a)suse.de + +- libXfont 1.4.0 +- libXaw 1.0.5 +- libpciaccess 0.10.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libpciaccess-0.10.3.tar.bz2 libXfont-1.3.3.tar.bz2 libXi-1.1.3.tar.bz2 libXrandr-1.2.3.tar.bz2 libXrandr.diff xcb-util-0.2.1.tar.bz2 New: ---- libpciaccess-0.10.5.tar.bz2 libXfont-1.4.0.tar.bz2 libXi-1.2.1.tar.bz2 libXrandr-1.2.99.4.tar.bz2 xcb-util-0.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libs.spec ++++++ --- /var/tmp/diff_new_pack.re8094/_old 2009-02-26 12:14:45.000000000 +0100 +++ /var/tmp/diff_new_pack.re8094/_new 2009-02-26 12:14:45.000000000 +0100 @@ -32,7 +32,7 @@ # Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 12 +Release: 13 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -47,13 +47,13 @@ Source7: libXcursor-1.1.9.tar.bz2 Source8: libXdamage-1.1.1.tar.bz2 Source9: libXevie-1.0.2.tar.bz2 -Source10: libXfont-1.3.3.tar.bz2 +Source10: libXfont-1.4.0.tar.bz2 Source11: libXfontcache-1.0.4.tar.bz2 Source12: libXft-2.1.13.tar.bz2 -Source13: libXi-1.1.3.tar.bz2 +Source13: libXi-1.2.1.tar.bz2 Source14: libXinerama-1.0.3.tar.bz2 Source15: libXprintAppUtil-X11R7.0-1.0.1.tar.bz2 -Source16: libXrandr-1.2.3.tar.bz2 +Source16: libXrandr-1.2.99.4.tar.bz2 Source17: libXtst-1.0.3.tar.bz2 Source18: libXvMC-1.0.4.tar.bz2 Source19: libXxf86dga-1.0.2.tar.bz2 @@ -68,9 +68,8 @@ Source28: libXft1-X11R6.9-1.2.tar.bz2 Source29: libvnc-20070501.tar.bz2 Source30: libXcliplist-20070501.tar.bz2 -Source31: xcb-util-0.2.1.tar.bz2 -Source33: libpciaccess-0.10.3.tar.bz2 -Patch: libXrandr.diff +Source31: xcb-util-0.3.3.tar.bz2 +Source33: libpciaccess-0.10.5.tar.bz2 Patch2: libXft-2.1.7-lcd-filter-2.patch Patch3: p_xft_cjk.diff Patch5: libxkbui.diff @@ -219,9 +218,6 @@ %prep %setup -T -c %{name} for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done -pushd libXrandr-* -%patch -popd pushd libXft-*/src %if %suse_version > 1010 %patch2 -p1 @@ -324,6 +320,17 @@ /usr/%{_lib}/libpciaccess.so %changelog +* Thu Feb 26 2009 sndirsch(a)suse.de +- back to libXaw 1.0.4 +* Thu Feb 26 2009 sndirsch(a)suse.de +- xcb-util 0.3.3 +* Thu Feb 26 2009 sndirsch(a)suse.de +- libXi 1.2.1 +- libXrandr 1.2.99.4 +* Thu Feb 26 2009 sndirsch(a)suse.de +- libXfont 1.4.0 +- libXaw 1.0.5 +- libpciaccess 0.10.5 * Fri Feb 13 2009 sndirsch(a)suse.de - libpixman now in seperate source package (bnc #439019) * Wed Feb 11 2009 coolo(a)suse.de ++++++ libpciaccess-0.10.3.tar.bz2 -> libpciaccess-0.10.5.tar.bz2 ++++++ ++++ 6352 lines of diff (skipped) ++++++ libXfont-1.3.3.tar.bz2 -> libXfont-1.4.0.tar.bz2 ++++++ ++++ 95217 lines of diff (skipped) ++++++ libXi-1.1.3.tar.bz2 -> libXi-1.2.1.tar.bz2 ++++++ ++++ 29891 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.3/ChangeLog new/libXi-1.2.1/ChangeLog --- old/libXi-1.1.3/ChangeLog 2007-09-05 18:45:33.000000000 +0200 +++ new/libXi-1.2.1/ChangeLog 2009-02-26 00:26:02.000000000 +0100 @@ -1,3 +1,124 @@ +commit 69422ae36ede8fd5d7975c1e2b74c32906ad8535 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Feb 26 09:20:44 2009 +1000 + + libXi 1.2.1 + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit f63ea39a328ce0e5e6c980243e2ebea15634dc7d +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Feb 25 17:00:16 2009 +1000 + + XGetDeviceControl: size the libXi structs, not the wire structs (#20293) + + X.Org Bug 20293 <http://bugs.freedesktop.org/show_bug.cgi?id=20293> + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit cbdc33d903ec6f90a42ec3c31905eeaef9ecf0a2) + +commit 6e65cf0776019b2eec6be4a06fef7838562e94a8 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Feb 25 16:59:04 2009 +1000 + + XGetDeviceControl: Add a missing break leading to wrong length calculation. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit 78f64722c57ff5ec5d0ae35da0c8f151598e6d6b) + +commit 17df06d5aeceb4798caf487a1d57efe58fa7e3fa +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Mon Feb 2 20:34:34 2009 -0800 + + Add README with pointers to mailing list, bugzilla & git repos + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + (cherry picked from commit 6e1159a9059d762d6b5d24455237a088e839fe2c) + +commit f2f92b1df861c1f571edc89eddbb8d72a228e2a8 +Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br> +Date: Thu Jan 29 19:30:30 2009 -0200 + + Return NULL on error, and match LockDisplay with UnlockDisplay. + (cherry picked from commit ba2546a51d5f9087ec54fba7cae46ea1f210198a) + +commit 2d586065649304b2864afddee6f6225a4a61a0c9 +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Wed Dec 3 12:50:45 2008 +1000 + + libXi 1.2.0 + + Requires inputproto 1.5.0 or later. + +commit 305d356e43462834a2fdd2cf59d47b055c2416fd +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Mon Nov 17 11:50:06 2008 +1000 + + Add support for XI 1.5 device properties. + + This is a manual merge from master onto libXi 1.1.4. The branches have + diverged too much to make cherry-picking reasonable and readable. + + This patch includes the property support provided by the combination of the + following patches: + - 7d5bb99ffce3200f82420c5a5ebac3b445aac633 + - 0211e3e8277c590349903989f1676f6af4baa44b + - bfd2e08f3530091fbcd8c078f684e9aab9057df0 + - bec02767629ed795582ba3f645299d7036093511 + - f9a5371d43b2c6023745f766d0e8ceff2acdff60 + - e179b124aac13387c6f730197b8852c1f69eb9e3 + + Man pages are copied from the parsed docbook output from master. + +commit 45b73dc157f326785e1022f5476bfc1f9f514d6e +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Mon Nov 17 11:44:31 2008 +1000 + + Add XI_JOYSTICK to list of defined types. + (cherry picked from commit e5c529813b04327babc20e51ca56006210cb0c37) + + Conflicts: + + man/XI.xml + +commit 88e2bf75cc619bb1ddc51e5dc65ddb9d712f69f5 +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Mon Nov 17 11:35:59 2008 +1000 + + Bump to 1.1.99.2. + + 1.1.99.1 was used by master for a while. + +commit f0ecfd1952289f5ff33297e3358552365e047f09 +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Mon Nov 17 11:12:39 2008 +1000 + + libXi 1.1.4 + +commit 3e99cc281509c70c9240e71ae55cf4e62c6569ba +Author: Matthieu Herrb <matthieu.herrb(a)laas.fr> +Date: Sun Mar 9 08:30:32 2008 +0100 + + nuke RCS Ids + +commit 411340ccb7070e2e966a36f64f2fb3019ea0242a +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Nov 29 13:49:21 2007 -0800 + + Coverity #743/744: Returned without freeing storage bufp/savp + + If either bufp or savp failed to malloc, we returned without freeing the other. + +commit 5ac8f5dcfb2cf5f695c903179a5a95ac6bd4303e +Author: Peter Hutterer <peter(a)cs.unisa.edu.au> +Date: Tue Nov 27 10:47:56 2007 +1030 + + GetDeviceControl: calculate the length field correctly. + + Length field should indicate the length of the struct in bytes. Not the length + of the pointer to the struct... + (cherry picked from commit ddcc71df2a273a410cb5a933aef5501fa56d84cf) + commit 0239ef13d66113024066b7db8ade3942af563656 Author: Eric Anholt <eric(a)anholt.net> Date: Wed Sep 5 09:45:20 2007 -0700 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.3/configure.ac new/libXi-1.2.1/configure.ac --- old/libXi-1.1.3/configure.ac 2007-09-05 18:42:33.000000000 +0200 +++ new/libXi-1.2.1/configure.ac 2009-02-26 00:25:47.000000000 +0100 @@ -4,7 +4,7 @@ AC_PREREQ([2.57]) -AC_INIT(libXi, 1.1.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] libXi) +AC_INIT(libXi, 1.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] libXi) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE @@ -15,7 +15,7 @@ AC_PROG_LIBTOOL # Checks for pkg-config packages -PKG_CHECK_MODULES(XI, xproto x11 xextproto xext inputproto >= 1.4) +PKG_CHECK_MODULES(XI, xproto x11 xextproto xext inputproto >= 1.5) AC_SUBST(XI_CFLAGS) AC_SUBST(XI_LIBS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.3/man/Makefile.am new/libXi-1.2.1/man/Makefile.am --- old/libXi-1.1.3/man/Makefile.am 2007-09-05 18:41:58.000000000 +0200 +++ new/libXi-1.2.1/man/Makefile.am 2009-02-26 00:25:47.000000000 +0100 @@ -1,4 +1,3 @@ -# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # @@ -52,7 +51,9 @@ XSetDeviceButtonMapping.man \ XSetDeviceFocus.man \ XSetDeviceMode.man \ - XSetDeviceValuators.man + XSetDeviceValuators.man \ + XListDeviceProperties.man \ + XGetDeviceProperty.man BUILT_SOURCES = shadows.DONE @@ -90,7 +91,8 @@ $(XOpenDevice_shadows) \ $(XSetDeviceButtonMapping_shadows) \ $(XSetDeviceFocus_shadows) \ - $(XSelectExtensionEvent_shadows) + $(XSelectExtensionEvent_shadows) \ + $(XGetDeviceProperty_shadows) XGetDeviceControl_shadows = \ @@ -135,6 +137,10 @@ XSelectExtensionEvent_shadows = \ XGetSelectedExtensionEvents +XGetDeviceProperty_shadows = \ + XDeleteDeviceProperty \ + XChangeDeviceProperty + shadows.DONE: -rm -f $(all_shadows:=.@LIB_MAN_SUFFIX@) (for i in $(XGetDeviceControl_shadows:=.@LIB_MAN_SUFFIX@) ; do \ @@ -179,3 +185,6 @@ (for i in $(XSelectExtensionEvent_shadows:=.@LIB_MAN_SUFFIX@) ; do \ echo .so man$(LIB_MAN_DIR_SUFFIX)/XSelectExtensionEvent.$(LIB_MAN_SUFFIX) > $$i; \ done) + (for i in $(XGetDeviceProperty_shadows:=.@LIB_MAN_SUFFIX@) ; do \ + echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetDeviceProperty.$(LIB_MAN_SUFFIX) > $$i; \ + done) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.3/man/XGetDeviceProperty.man new/libXi-1.2.1/man/XGetDeviceProperty.man --- old/libXi-1.1.3/man/XGetDeviceProperty.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXi-1.2.1/man/XGetDeviceProperty.man 2009-02-26 00:25:47.000000000 +0100 @@ -0,0 +1,191 @@ +.\" Title: XGetDeviceProperty +.\" Author: Peter Hutterer +.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/> +.\" Date: <pubdate>July 9, 2008</pubdate> +.\" Manual: XINPUT FUNCTIONS +.\" Source: __xorgversion__ +.\" +.TH "XGETDEVICEPROPERTY" "__libmansuffix__" "<pubdate>July 9, 2008</pubdate>" "__xorgversion__" "XINPUT FUNCTIONS" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +XGetDeviceProperty, XChangeDeviceProperty, XDeleteDeviceProperty - Get, change or delete a device's property. +.SH "SYNTAX" +.sp +.ft B +.nf +#include <X11/extensions/XInput\.h> +.fi +.ft +.HP 23 +.BI "int XGetDeviceProperty(Display\ *" "display" ", XDevice\ *" "device" ", Atom\ " "property" ", long\ " "offset" ", long\ " "length" ", Bool\ " "delete" ", Bool\ " "pending" ", Atom\ " "req_type" ", Atom\ *" "actual_type_return" ", int\ *" "actual_format_return" ", unsigned\ long\ *" "nitems_return" ", unsigned\ long\ *" "bytes_after_return" ", unsigned\ char\ **" "prop_return" ");" +.HP 27 +.BI "void XChangeDeviceProperty(Display\ *" "display" ", XDevice\ *" "device" ", Atom\ " "property" ", Atom\ " "type" ", int\ " "format" ", int\ " "mode" ", const\ char\ *" "data" ", int\ " "nelements" ");" +.HP 27 +.BI "void XDeleteDeviceProperty(Display\ *" "display" ", XDevice\ *" "device" ", Atom\ " "property" ");" +.SH "ARGUMENTS" +.PP +.PP +\fIactual_type_return\fR +.RS 4 +Returns an atom identifier that defines the actual type of the property\. +.RE +.PP +\fIactual_format_return\fR +.RS 4 +Returns the actual format of the property\. +.RE +.PP +\fIbytes_after_return\fR +.RS 4 +Returns the number of bytes remaining to be read in the property if a partial read was performed\. +.RE +.PP +\fIdata\fR +.RS 4 +Specifies the property data\. +.RE +.PP +\fIdelete\fR +.RS 4 +Specifies a Boolean value that determines wether the property is deleted\. +.RE +.PP +\fIdisplay\fR +.RS 4 +Specifies the connection to the X server\. +.RE +.PP +\fIdevice\fR +.RS 4 +The device to grab\. +.RE +.PP +\fIformat\fR +.RS 4 +Specifies whether the data should be viewed as a list of 8\-bit, 16\-bit, or 32\-bit quantities\. Possible values are 8, 16, and 32\. This information allows the X server to correctly perform byte\-swap operations as necessary\. If the format is 16\-bit or 32\-bit, you must explicitly cast the data pointer to an (unsigned char*) in the call to +\fBXChangeDeviceProperty\fR\. +.RE +.PP +\fIlength\fR +.RS 4 +Specifies the length in 32\-bit multiplies of the data to be retrieved\. +.RE +.PP +\fImode\fR +.RS 4 +Specifies the mode of operation\. You can pass +\fBPropModeReplace\fR, +\fBPropModePrepend\fR, or +\fBPropModeAppend\fR\. +.RE +.PP +\fInelements\fR +.RS 4 +Specifies the number of elements in data\. +.RE +.PP +\fInitems_return\fR +.RS 4 +Returns the actual number of 8\-bit, 16\-bit, or 32\-bit items stored in the prop_return array\. +.RE +.PP +\fInum_values\fR +.RS 4 +Specifies the number of elements in the values list\. +.RE +.PP +\fIoffset\fR +.RS 4 +Specifies the offset in the specified property (in 32\-bit quantities) where the data is to be retrieved\. +.RE +.PP +\fIpending\fR +.RS 4 +Specifies whether to retrieve the pending state of the property or the current state\. +.RE +.PP +\fIproperty\fR +.RS 4 +Specifies the property to modify or query\. +.RE +.PP +\fIprop_return\fR +.RS 4 +Returns the data in the specified format\. If the returned format is 8, the returned data is represented as a char array\. If the returned format is 16, the returned data is represented as an array of short int type and should be cast to that type to obtain the elements\. If the returned format is 32, the property data will be stored as an array of longs (which in a 64\-bit application will be 64\-bit values that are padded in the upper 4 bytes)\. +.RE +.PP +\fIreq_type\fR +.RS 4 +Specifies the atom identifier associated with the property type or +\fBAnyPropertyType\fR\. +.RE +.SH "DESCRIPTION" +.PP +The +\fBXGetDeviceProperty\fR +function returns the actual type of the property; the actual format of the property; the number of 8\-bit, 16\-bit, or 32\-bit items transferred; the number of bytes remaining to be read in the property; and a pointer to the data actually returned\. For a detailed description of this function, see the man page to +\fBXGetWindowProperty\fR\. +.PP +The +\fBXChangeDeviceProperty\fR +function alters the property for the specified device and causes the server to generate a +\fBXPropertyNotifyEvent\fR +event on that device\. For a detailed description of this function, see the man page to +\fBXChangeProperty\fR\. +.PP +The +\fBXDeleteDeviceProperty\fR +function deletes the specified device property\. Note that a client cannot delete a property created by a driver or the server\. Attempting to do so will result in a +BadAtom +error\. +.PP + +\fBXGetDeviceProperty\fR +can generate a +BadAtom, +BadDevice +error\. +.PP + +\fBXChangeDeviceProperty\fR +can generate a +BadDevice, a +BadMatch, a +BadAtom, and a +BadValue +error\. +.PP + +\fBXDeleteDeviceProperty\fR +can generate a +BadDevice, and a +BadAtom +error\. +.SH "DIAGNOSIS" +.PP +.PP +BadAtom +.RS 4 +A value does not describe a valid named identifier or the client attempted to remove a driver\-allocated property\. +.RE +.PP +BadDevice +.RS 4 +An invalid device was specified\. The device does not exist\. +.RE +.SH "SEE ALSO" +.PP + +\fBXListDeviceProperties\fR, +\fBXQueryDeviceProperty\fR, +\fBXConfigureDeviceProperty\fR\. +.SH "AUTHOR" +.PP +\fBPeter Hutterer\fR +.sp -1n +.IP "" 4 +Specification and implementation\. + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.3/man/XListDeviceProperties.man new/libXi-1.2.1/man/XListDeviceProperties.man --- old/libXi-1.1.3/man/XListDeviceProperties.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXi-1.2.1/man/XListDeviceProperties.man 2009-02-26 00:25:47.000000000 +0100 @@ -0,0 +1,95 @@ +.\" Title: XListDeviceProperties +.\" Author: Peter Hutterer +.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/> +.\" Date: <pubdate>July 9, 2008</pubdate> +.\" Manual: XINPUT FUNCTIONS +.\" Source: __xorgversion__ +.\" +.TH "XLISTDEVICEPROPERTIE" "__libmansuffix__" "<pubdate>July 9, 2008</pubdate>" "__xorgversion__" "XINPUT FUNCTIONS" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +XListDeviceProperties - List a device's properties. +.SH "SYNTAX" +.sp +.ft B +.nf +#include <X11/extensions/XInput\.h> +.fi +.ft +.HP 28 +.BI "Atom* XListDeviceProperties(Display\ *" "display" ", XDevice\ *" "device" ", int\ *" "nprops_return" ");" +.SH "ARGUMENTS" +.PP +.PP +\fIdisplay\fR +.RS 4 +Specifies the connection to the X server\. +.RE +.PP +\fIdevice\fR +.RS 4 +The device to grab\. +.RE +.PP +\fInprops_return\fR +.RS 4 +Specifies the number of Atoms returned\. +.RE +.PP +\fInum_values\fR +.RS 4 +Specifies the number of elements in the values list\. +.RE +.PP +\fIproperty\fR +.RS 4 +Specifies the property to modify or query\. +.RE +.SH "DESCRIPTION" +.PP +The +\fBXListDeviceProperties\fR +function returns a list of the properties associated with the input device specified in +\fIdevice\fR\. Each device may have an arbitrary number of properties attached, some of which were created by the driver and/or server, others created by clients at runtime\. +.PP +The client is expected to free the list of properties using +\fBXFree\fR\. +.PP + +\fBXListDeviceProperties\fR +can generate a +BadDevice +error\. +.SH "DIAGNOSIS" +.PP +.PP +BadAtom +.RS 4 +A value does not describe a valid named identifier\. +.RE +.PP +BadWindow +.RS 4 +A value for a Window argument does not name a defined window\. +.RE +.PP +BadDevice +.RS 4 +An invalid device was specified\. The device does not exist\. +.RE +.SH "SEE ALSO" +.PP + +\fBXChangeDeviceProperty\fR, +\fBXGetDeviceProperty\fR, +\fBXDeleteDeviceProperty\fR\. +.SH "AUTHOR" +.PP +\fBPeter Hutterer\fR +.sp -1n +.IP "" 4 +Specification and implementation\. + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.3/man/XListInputDevices.man new/libXi-1.2.1/man/XListInputDevices.man --- old/libXi-1.1.3/man/XListInputDevices.man 2007-09-05 18:41:58.000000000 +0200 +++ new/libXi-1.2.1/man/XListInputDevices.man 2009-02-26 00:25:47.000000000 +0100 @@ -97,6 +97,7 @@ XI_EYETRACKER XI_CURSORKEYS XI_FOOTMOUSE +XI_JOYSTICK .DE .LP These names may be directly compared with the name field of the diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.3/README new/libXi-1.2.1/README --- old/libXi-1.1.3/README 2007-09-05 18:41:58.000000000 +0200 +++ new/libXi-1.2.1/README 2009-02-26 00:16:52.000000000 +0100 @@ -0,0 +1,25 @@ +libXi - library for the X Input Extension + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/lib/libXi + + http://cgit.freedesktop.org/xorg/lib/libXi + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.3/src/Makefile.am new/libXi-1.2.1/src/Makefile.am --- old/libXi-1.1.3/src/Makefile.am 2007-09-05 18:41:58.000000000 +0200 +++ new/libXi-1.2.1/src/Makefile.am 2009-02-26 00:25:47.000000000 +0100 @@ -6,15 +6,18 @@ XAllowDv.c \ XChgDCtl.c \ XChgFCtl.c \ + XChDProp.c \ XChgKbd.c \ XChgKMap.c \ XChgPnt.c \ XChgProp.c \ XCloseDev.c \ + XDelDProp.c \ XDevBell.c \ XExtToWire.c \ XGetBMap.c \ XGetDCtl.c \ + XGetDProp.c \ XGetFCtl.c \ XGetKMap.c \ XGetMMap.c \ @@ -27,6 +30,7 @@ XGtFocus.c \ XGtSelect.c \ XListDev.c \ + XListDProp.c \ XOpenDev.c \ XQueryDv.c \ XSelect.c \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.3/src/XChDProp.c new/libXi-1.2.1/src/XChDProp.c --- old/libXi-1.1.3/src/XChDProp.c 1970-01-01 01:00:00.000000000 +0100 +++ new/libXi-1.2.1/src/XChDProp.c 2009-02-14 01:36:17.000000000 +0100 @@ -0,0 +1,106 @@ +/************************************************************ + +Copyright 2008 Peter Hutterer + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +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. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the author shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the author. + +*/ + +/*********************************************************************** + * XChangeDeviceProperties - change an input device's properties. + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <X11/Xlibint.h> +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> +#include <X11/extensions/XInput.h> +#include <X11/extensions/extutil.h> +#include "XIint.h" + +void +XChangeDeviceProperty(Display* dpy, XDevice* dev, + Atom property, Atom type, + int format, int mode, + _Xconst unsigned char *data, int nelements) +{ + xChangeDevicePropertyReq *req; + int len; + + XExtDisplayInfo *info = XInput_find_display(dpy); + + LockDisplay(dpy); + if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1) + return; + + GetReq(ChangeDeviceProperty, req); + req->reqType = info->codes->major_opcode; + req->ReqType = X_ChangeDeviceProperty; + req->deviceid = dev->device_id; + req->property = property; + req->type = type; + req->mode = mode; + if (nelements < 0) { + req->nUnits = 0; + req->format = 0; /* ask for garbage, get garbage */ + } else { + req->nUnits = nelements; + req->format = format; + } + + switch (req->format) { + case 8: + len = ((long)nelements + 3) >> 2; + if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) { + SetReqLen(req, len, len); + Data (dpy, (char *)data, nelements); + } /* else force BadLength */ + break; + + case 16: + len = ((long)nelements + 1) >> 1; + if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) { + SetReqLen(req, len, len); + len = (long)nelements << 1; + Data16 (dpy, (short *) data, len); + } /* else force BadLength */ + break; + + case 32: + len = nelements; + if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) { + SetReqLen(req, len, len); + len = (long)nelements << 2; + Data32 (dpy, (long *) data, len); + } /* else force BadLength */ + break; + + default: + /* BadValue will be generated */ ; + } + + UnlockDisplay(dpy); + SyncHandle(); +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.3/src/XDelDProp.c new/libXi-1.2.1/src/XDelDProp.c --- old/libXi-1.1.3/src/XDelDProp.c 1970-01-01 01:00:00.000000000 +0100 +++ new/libXi-1.2.1/src/XDelDProp.c 2009-02-14 01:36:17.000000000 +0100 @@ -0,0 +1,64 @@ +/************************************************************ + +Copyright 2008 Peter Hutterer + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +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. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the author shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the author. + +*/ + +/*********************************************************************** + * XDeleteDeviceProperties - delete an input device's properties. + * + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <X11/Xlibint.h> +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> +#include <X11/extensions/XInput.h> +#include <X11/extensions/extutil.h> +#include "XIint.h" + +void +XDeleteDeviceProperty(Display* dpy, XDevice* dev, Atom property) +{ + xDeleteDevicePropertyReq *req; + + XExtDisplayInfo *info = XInput_find_display(dpy); + + LockDisplay(dpy); + if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1) + return; + + GetReq(DeleteDeviceProperty, req); + req->reqType = info->codes->major_opcode; + req->ReqType = X_DeleteDeviceProperty; + req->deviceid = dev->device_id; + req->property = property; + + UnlockDisplay(dpy); + SyncHandle(); + return; +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.3/src/XExtInt.c new/libXi-1.2.1/src/XExtInt.c --- old/libXi-1.1.3/src/XExtInt.c 2007-09-05 18:41:58.000000000 +0200 +++ new/libXi-1.2.1/src/XExtInt.c 2009-02-26 00:25:47.000000000 +0100 @@ -121,7 +121,9 @@ {XI_Present, XI_Add_XChangeDeviceControl_Major, XI_Add_XChangeDeviceControl_Minor}, {XI_Present, XI_Add_DevicePresenceNotify_Major, - XI_Add_DevicePresenceNotify_Minor} + XI_Add_DevicePresenceNotify_Minor}, + {XI_Present, XI_Add_DeviceProperties_Major, + XI_Add_DeviceProperties_Minor}, }; /*********************************************************************** @@ -697,6 +699,21 @@ } break; + case XI_DevicePropertyNotify: + + { + XDevicePropertyNotifyEvent* ev = (XDevicePropertyNotifyEvent*)re; + devicePropertyNotify *ev2 = (devicePropertyNotify*)event; + + *ev = *(XDevicePropertyNotifyEvent*)save; + ev->time = ev2->time; + ev->deviceid = ev2->deviceid; + ev->atom = ev2->atom; + ev->state = ev2->state; + return ENQUEUE_EVENT; + } + break; + default: printf("XInputWireToEvent: UNKNOWN WIRE EVENT! type=%d\n", type); break; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.3/src/XGetDCtl.c new/libXi-1.2.1/src/XGetDCtl.c --- old/libXi-1.1.3/src/XGetDCtl.c 2007-09-05 18:41:58.000000000 +0200 +++ new/libXi-1.2.1/src/XGetDCtl.c 2009-02-26 00:25:47.000000000 +0100 @@ -104,6 +104,12 @@ sav = d; _XRead(dpy, (char *)d, nbytes); + /* In theory, we should just be able to use d->length to get the size. + * Turns out that a number of X servers (up to and including server + * 1.4) sent the wrong length value down the wire. So to not break + * apps that run against older servers, we have to calculate the size + * manually. + */ switch (d->control) { case DEVICE_RESOLUTION: { @@ -116,17 +122,18 @@ } case DEVICE_ABS_CALIB: { - size += sizeof(xDeviceAbsCalibState); + size += sizeof(XDeviceAbsCalibState); break; } case DEVICE_ABS_AREA: { - size += sizeof(xDeviceAbsAreaState); + size += sizeof(XDeviceAbsAreaState); break; } case DEVICE_CORE: { - size += sizeof(xDeviceCoreState); + size += sizeof(XDeviceCoreState); + break; } default: size += d->length; @@ -170,7 +177,7 @@ XDeviceAbsCalibState *C = (XDeviceAbsCalibState *) Device; C->control = DEVICE_ABS_CALIB; - C->length = sizeof(C); + C->length = sizeof(XDeviceAbsCalibState); C->min_x = c->min_x; C->max_x = c->max_x; C->min_y = c->min_y; @@ -188,7 +195,7 @@ XDeviceAbsAreaState *A = (XDeviceAbsAreaState *) Device; A->control = DEVICE_ABS_AREA; - A->length = sizeof(A); + A->length = sizeof(XDeviceAbsAreaState); A->offset_x = a->offset_x; A->offset_y = a->offset_y; A->width = a->width; @@ -204,7 +211,7 @@ XDeviceCoreState *C = (XDeviceCoreState *) Device; C->control = DEVICE_CORE; - C->length = sizeof(C); + C->length = sizeof(XDeviceCoreState); C->status = c->status; C->iscore = c->iscore; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.3/src/XGetDProp.c new/libXi-1.2.1/src/XGetDProp.c --- old/libXi-1.1.3/src/XGetDProp.c 1970-01-01 01:00:00.000000000 +0100 +++ new/libXi-1.2.1/src/XGetDProp.c 2009-02-14 01:36:17.000000000 +0100 @@ -0,0 +1,139 @@ +/************************************************************ + +Copyright 2008 Peter Hutterer + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +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. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the author shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the author. + +*/ + +/*********************************************************************** + * XGetDeviceProperties - get an input device's properties. + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <X11/Xlibint.h> +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> +#include <X11/extensions/XInput.h> +#include <X11/extensions/extutil.h> +#include "XIint.h" + +int +XGetDeviceProperty(Display* dpy, XDevice* dev, + Atom property, long offset, long length, Bool delete, + Atom req_type, Atom *actual_type, int *actual_format, + unsigned long *nitems, unsigned long *bytes_after, + unsigned char **prop) +{ + xGetDevicePropertyReq *req; + xGetDevicePropertyReply rep; + long nbytes, rbytes; + + XExtDisplayInfo *info = XInput_find_display(dpy); + + LockDisplay(dpy); + if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1) + return 1; + + GetReq(GetDeviceProperty, req); + req->reqType = info->codes->major_opcode; + req->ReqType = X_GetDeviceProperty; + req->deviceid = dev->device_id; + req->property = property; + req->type = req_type; + req->longOffset = offset; + req->longLength = length; + req->delete = delete; + + if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) + { + UnlockDisplay (dpy); + SyncHandle (); + return 1; + } + + *prop = (unsigned char *) NULL; + + if (rep.propertyType != None) { + /* + * One extra byte is malloced than is needed to contain the property + * data, but this last byte is null terminated and convenient for + * returning string properties, so the client doesn't then have to + * recopy the string to make it null terminated. + */ + switch (rep.format) { + case 8: + nbytes = rep.nItems; + rbytes = rep.nItems + 1; + if (rbytes > 0 && + (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) + _XReadPad (dpy, (char *) *prop, nbytes); + break; + + case 16: + nbytes = rep.nItems << 1; + rbytes = rep.nItems * sizeof (short) + 1; + if (rbytes > 0 && + (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) + _XRead16Pad (dpy, (short *) *prop, nbytes); + break; + + case 32: + nbytes = rep.nItems << 2; + rbytes = rep.nItems * sizeof (long) + 1; + if (rbytes > 0 && + (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) + _XRead32 (dpy, (long *) *prop, nbytes); + break; + + default: + /* + * This part of the code should never be reached. If it is, + * the server sent back a property with an invalid format. + */ + nbytes = rep.length << 2; + _XEatData(dpy, (unsigned long) nbytes); + UnlockDisplay(dpy); + SyncHandle(); + return(BadImplementation); + } + if (! *prop) { + _XEatData(dpy, (unsigned long) nbytes); + UnlockDisplay(dpy); + SyncHandle(); + return(BadAlloc); + } + (*prop)[rbytes - 1] = '\0'; + } + + *actual_type = rep.propertyType; + *actual_format = rep.format; + *nitems = rep.nItems; + *bytes_after = rep.bytesAfter; + UnlockDisplay (dpy); + SyncHandle (); + + return Success; +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.3/src/XGMotion.c new/libXi-1.2.1/src/XGMotion.c --- old/libXi-1.1.3/src/XGMotion.c 2007-09-05 18:41:58.000000000 +0200 +++ new/libXi-1.2.1/src/XGMotion.c 2009-02-26 00:25:47.000000000 +0100 @@ -115,6 +115,8 @@ savp = readp = (int *)Xmalloc(size); bufp = (int *)Xmalloc(size2); if (!bufp || !savp) { + Xfree(bufp); + Xfree(savp); *nEvents = 0; _XEatData(dpy, (unsigned long)size); UnlockDisplay(dpy); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.3/src/XListDProp.c new/libXi-1.2.1/src/XListDProp.c --- old/libXi-1.1.3/src/XListDProp.c 1970-01-01 01:00:00.000000000 +0100 +++ new/libXi-1.2.1/src/XListDProp.c 2009-02-26 00:16:43.000000000 +0100 @@ -0,0 +1,82 @@ +/************************************************************ + +Copyright 2008 Peter Hutterer + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +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. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the author shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the author. + +*/ + +/*********************************************************************** + * XListDeviceProperties - List an input device's properties. + */ + + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <X11/Xlibint.h> +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> +#include <X11/extensions/XInput.h> +#include <X11/extensions/extutil.h> +#include "XIint.h" + +Atom* +XListDeviceProperties(Display* dpy, XDevice* dev, int *nprops_return) +{ + xListDevicePropertiesReq *req; + xListDevicePropertiesReply rep; + XExtDisplayInfo *info = XInput_find_display(dpy); + Atom *props = NULL; + + LockDisplay(dpy); + *nprops_return = 0; + if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1) + goto cleanup; + + GetReq(ListDeviceProperties, req); + req->reqType = info->codes->major_opcode; + req->ReqType = X_ListDeviceProperties; + req->deviceid = dev->device_id; + + if (!_XReply(dpy, (xReply*)&rep, 0, xFalse)) + goto cleanup; + + if (rep.nAtoms) { + props = (Atom*)Xmalloc(rep.nAtoms * sizeof(Atom)); + if (!props) + { + _XEatData(dpy, rep.nAtoms << 2); + goto cleanup; + } + + _XRead32(dpy, props, rep.nAtoms << 2); + } + + *nprops_return = rep.nAtoms; + +cleanup: + UnlockDisplay(dpy); + SyncHandle(); + return props; +} + ++++++ libXrandr-1.2.3.tar.bz2 -> libXrandr-1.2.99.4.tar.bz2 ++++++ ++++ 11407 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.2.3/ChangeLog new/libXrandr-1.2.99.4/ChangeLog --- old/libXrandr-1.2.3/ChangeLog 2008-07-02 21:28:33.000000000 +0200 +++ new/libXrandr-1.2.99.4/ChangeLog 2008-12-17 17:33:15.000000000 +0100 @@ -1,3 +1,125 @@ +commit e2f075ea3927f83fb7ee8b359ef951222e8f894b +Author: Adam Jackson <ajax(a)redhat.com> +Date: Wed Dec 17 11:29:05 2008 -0500 + + Define _XRRHasRates internally. + +commit 53bd07438d3671dca86df2bf3052f89ee8ce0891 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Wed Dec 17 11:27:19 2008 -0500 + + Be sure to return NULL when returning no properties. + +commit 7c1ccb19bd2545ccdf7099489e946e772a25649f +Author: Adam Jackson <ajax(a)redhat.com> +Date: Wed Dec 17 11:25:20 2008 -0500 + + Use RRCheckExtension in function returning a value. + +commit 2db939e82c29fa3ab868bac9d2b54de18419004b +Author: Adam Jackson <ajax(a)redhat.com> +Date: Wed Dec 17 11:24:33 2008 -0500 + + Fix type of GetReq() argument. + +commit c79e2aecab080d8f47b258ae3c4dd9394280ae2a +Author: Adam Jackson <ajax(a)redhat.com> +Date: Wed Dec 17 11:23:51 2008 -0500 + + Use RRSimpleCheckExtension in functions returning void + +commit dda80ea67e33d18f7cc869c6f828c444c8966704 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Fri Dec 12 13:04:57 2008 +0100 + + Bump to 1.2.99.3 + +commit 59c8812099f33d56b43044f999ffe5df16adf5ff +Author: Adam Jackson <ajax(a)redhat.com> +Date: Mon Dec 8 15:37:53 2008 -0500 + + Add [GS]etOutputPrimary + +commit 0f11922bdc0d4e3929df4dc967379ea0b48338b8 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Thu Dec 4 18:24:42 2008 +0100 + + Bump to 1.2.99.2. + + Note the .99 + +commit e788c1ed41e029e54470a2c79f1478c1be7bba92 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Thu Dec 4 15:51:07 2008 +0100 + + Nuke config-timestamp for panning. + +commit 1de7212d9a945403f13f4dc15a66ec115c3be44c +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Fri Nov 28 17:26:43 2008 +0100 + + Panning support + +commit 0dd24bd6ad3c437f320c5d8e922c479fb61b115f +Author: Julien Cristau <jcristau(a)debian.org> +Date: Mon Dec 1 21:19:35 2008 +0100 + + Bump to 1.2.91 + +commit 0fa7452220701ee44d8bafc57001e362afcedb0c +Author: Julien Cristau <jcristau(a)debian.org> +Date: Mon Dec 1 21:09:44 2008 +0100 + + RRNotify subevents have 'window' at different offsets, the sequel + + f176b2bda103f6f38aabab8207f47a02cc797659 fixed XRRWireToEvent, but + XRREventToWire had the same bug. + + Signed-off-by: Julien Cristau <jcristau(a)debian.org> + +commit 83e567f427f68dc4ae2de796a1184748bbe0238e +Merge: 908de8f... 00f2e30... +Author: Julien Cristau <jcristau(a)debian.org> +Date: Mon Dec 1 20:59:39 2008 +0100 + + Merge branch 'transform-proposal' of git.freedesktop.org:/git/xorg/lib/libXrandr + + Conflicts: + + src/Xrandr.c + +commit 00f2e30d0b8296668776d62a4c47f96bf95faa08 +Author: Julien Cristau <jcristau(a)debian.org> +Date: Fri Nov 28 16:16:22 2008 +0100 + + Set attr->pendingNparams in XRRGetCrtcTransform() + +commit 908de8fc7228ecc7b02825ebede5fb937f3abf1b +Author: Adam Jackson <ajax(a)redhat.com> +Date: Mon Nov 24 16:11:46 2008 -0500 + + Add GetScreenResourcesCurrent + +commit 377126fdaf1094354d54b1743f9d2bf1f2de1e0c +Author: Keith Packard <keithp(a)keithp.com> +Date: Fri Sep 12 20:18:21 2008 -0700 + + Set NparamsFilter in XRRGetCrtcTransform return value. + + Leaving this uninitialized isn't very helpful, and can cause segfaults. + +commit f176b2bda103f6f38aabab8207f47a02cc797659 +Author: Tomas Carnecky <tom(a)dbservice.com> +Date: Wed Aug 13 10:24:11 2008 -0400 + + RRNotify subevents have 'window' at different offsets. + +commit d631e453d62104b4a4afdcf0b34e6f3aefd62644 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Wed Aug 13 10:21:51 2008 -0400 + + Remove RCS tags. + commit bf476779616b24c6456339bc77896460f1a2545a Author: Adam Jackson <ajax(a)redhat.com> Date: Wed Jul 2 15:28:08 2008 -0400 @@ -30,6 +152,32 @@ It seems that they were never actually implemented. Also remove the corresponding manpage symlinks. +commit 7a21e7bc994c5fa7d3ab15ba7201667e134f1512 +Author: Keith Packard <keithp(a)keithp.com> +Date: Tue Mar 18 16:02:36 2008 -0700 + + Eliminate inverse matrix from randr transform protocol + + It is easier, and potentially more precise, to compute the inverse in the + server where everything can eventually be kept in floating point form. + +commit a6e5fa4ceb72795380496fcfe62c083866791dc1 +Author: Keith Packard <keithp(a)keithp.com> +Date: Sat Mar 15 00:33:30 2008 -0700 + + Support CRTC Transform filters + + XRRGetCrtcTransform now returns a giant struct containing all of the + transform and filter data. + + XRRSetCrtcTransform now accepts filter parameters. + +commit 2a5fb0e58ed6ee1ff1f0ff00b5bf5b2623991132 +Author: Keith Packard <keithp(a)keithp.com> +Date: Tue Mar 4 08:17:48 2008 -0800 + + Add support for new Transform requests. + commit dc0ce2e363dbdac560fc2a8c1296c5468d75f644 Author: Matthieu Herrb <matthieu.herrb(a)laas.fr> Date: Sun Mar 9 08:37:17 2008 +0100 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.2.3/configure.ac new/libXrandr-1.2.99.4/configure.ac --- old/libXrandr-1.2.3/configure.ac 2008-07-02 21:27:58.000000000 +0200 +++ new/libXrandr-1.2.99.4/configure.ac 2008-12-17 17:32:49.000000000 +0100 @@ -30,7 +30,7 @@ dnl digit in the version number to track changes which don't affect the dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n dnl -AC_INIT(libXrandr, 1.2.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] libXrandr) +AC_INIT(libXrandr, 1.2.99.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] libXrandr) AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.2.3/include/X11/extensions/Xrandr.h new/libXrandr-1.2.99.4/include/X11/extensions/Xrandr.h --- old/libXrandr-1.2.3/include/X11/extensions/Xrandr.h 2008-06-23 19:24:52.000000000 +0200 +++ new/libXrandr-1.2.99.4/include/X11/extensions/Xrandr.h 2008-12-10 17:21:14.000000000 +0100 @@ -2,6 +2,7 @@ * Copyright © 2000 Compaq Computer Corporation, Inc. * Copyright © 2002 Hewlett-Packard Company, Inc. * Copyright © 2006 Intel Corporation + * Copyright © 2008 Red Hat, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -29,6 +30,7 @@ #define _XRANDR_H_ #include <X11/extensions/randr.h> +#include <X11/extensions/Xrender.h> #include <X11/Xfuncproto.h> @@ -371,13 +373,83 @@ void XRRFreeGamma (XRRCrtcGamma *gamma); -/* +/* Version 1.3 additions */ + +XRRScreenResources * +XRRGetScreenResourcesCurrent (Display *dpy, Window window); + +void +XRRSetCrtcTransform (Display *dpy, + RRCrtc crtc, + XTransform *transform, + char *filter, + XFixed *params, + int nparams); + +typedef struct _XRRCrtcTransformAttributes { + XTransform pendingTransform; + char *pendingFilter; + int pendingNparams; + XFixed *pendingParams; + XTransform currentTransform; + char *currentFilter; + int currentNparams; + XFixed *currentParams; +} XRRCrtcTransformAttributes; + +/* + * Get current crtc transforms and filters. + * Pass *attributes to XFree to free + */ +Status +XRRGetCrtcTransform (Display *dpy, + RRCrtc crtc, + XRRCrtcTransformAttributes **attributes); + +/* * intended to take RRScreenChangeNotify, or * ConfigureNotify (on the root window) * returns 1 if it is an event type it understands, 0 if not */ int XRRUpdateConfiguration(XEvent *event); +typedef struct _XRRPanning { + Time timestamp; + unsigned int left; + unsigned int top; + unsigned int width; + unsigned int height; + unsigned int track_left; + unsigned int track_top; + unsigned int track_width; + unsigned int track_height; + int border_left; + int border_top; + int border_right; + int border_bottom; +} XRRPanning; + +XRRPanning * +XRRGetPanning (Display *dpy, XRRScreenResources *resources, RRCrtc crtc); + +void +XRRFreePanning (XRRPanning *panning); + +Status +XRRSetPanning (Display *dpy, + XRRScreenResources *resources, + RRCrtc crtc, + XRRPanning *panning); + +void +XRRSetOutputPrimary(Display *dpy, + Window window, + RROutput output); + +RROutput +XRRGetOutputPrimary(Display *dpy, + Window window); + _XFUNCPROTOEND #endif /* _XRANDR_H_ */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.2.3/src/Makefile.am new/libXrandr-1.2.99.4/src/Makefile.am --- old/libXrandr-1.2.3/src/Makefile.am 2008-05-12 23:31:27.000000000 +0200 +++ new/libXrandr-1.2.99.4/src/Makefile.am 2008-12-08 20:55:57.000000000 +0100 @@ -15,7 +15,7 @@ INCLUDES = -I$(top_srcdir)/include/X11/extensions -libXrandr_la_LDFLAGS = -version-number 2:1:0 -no-undefined +libXrandr_la_LDFLAGS = -version-number 2:2:0 -no-undefined libXrandrincludedir = $(includedir)/X11/extensions libXrandrinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xrandr.h diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.2.3/src/Xrandr.c new/libXrandr-1.2.99.4/src/Xrandr.c --- old/libXrandr-1.2.3/src/Xrandr.c 2008-06-23 19:25:06.000000000 +0200 +++ new/libXrandr-1.2.99.4/src/Xrandr.c 2008-12-08 20:55:57.000000000 +0100 @@ -1,6 +1,4 @@ /* - * $XFree86: xc/lib/Xrandr/Xrandr.c,v 1.13tsi Exp $ - * * Copyright © 2000 Compaq Computer Corporation, Inc. * Copyright © 2002 Hewlett Packard Company, Inc. * @@ -88,18 +86,16 @@ return True; } case RRNotify: { - XRRNotifyEvent *aevent = (XRRNotifyEvent *) event; - xRRCrtcChangeNotifyEvent *awire = (xRRCrtcChangeNotifyEvent *) wire; - aevent->type = awire->type & 0x7F; - aevent->serial = _XSetLastRequestRead(dpy, (xGenericReply *) wire); - aevent->send_event = (awire->type & 0x80) != 0; - aevent->display = dpy; - aevent->window = awire->window; - aevent->subtype = awire->subCode; - switch (aevent->subtype) { + switch (wire->u.u.detail) { case RRNotify_OutputChange: { XRROutputChangeNotifyEvent *aevent = (XRROutputChangeNotifyEvent *) event; xRROutputChangeNotifyEvent *awire = (xRROutputChangeNotifyEvent *) wire; + aevent->type = awire->type & 0x7F; + aevent->serial = _XSetLastRequestRead(dpy, (xGenericReply *) wire); + aevent->send_event = (awire->type & 0x80) != 0; + aevent->display = dpy; + aevent->window = awire->window; + aevent->subtype = awire->subCode; aevent->output = awire->output; aevent->crtc = awire->crtc; aevent->mode = awire->mode; @@ -111,6 +107,12 @@ case RRNotify_CrtcChange: { XRRCrtcChangeNotifyEvent *aevent = (XRRCrtcChangeNotifyEvent *) event; xRRCrtcChangeNotifyEvent *awire = (xRRCrtcChangeNotifyEvent *) wire; + aevent->type = awire->type & 0x7F; + aevent->serial = _XSetLastRequestRead(dpy, (xGenericReply *) wire); + aevent->send_event = (awire->type & 0x80) != 0; + aevent->display = dpy; + aevent->window = awire->window; + aevent->subtype = awire->subCode; aevent->crtc = awire->crtc; aevent->mode = awire->mode; aevent->rotation = awire->rotation; @@ -123,6 +125,12 @@ case RRNotify_OutputProperty: { XRROutputPropertyNotifyEvent *aevent = (XRROutputPropertyNotifyEvent *) event; xRROutputPropertyNotifyEvent *awire = (xRROutputPropertyNotifyEvent *) wire; + aevent->type = awire->type & 0x7F; + aevent->serial = _XSetLastRequestRead(dpy, (xGenericReply *) wire); + aevent->send_event = (awire->type & 0x80) != 0; + aevent->display = dpy; + aevent->window = awire->window; + aevent->subtype = awire->subCode; aevent->output = awire->output; aevent->property = awire->atom; aevent->timestamp = awire->timestamp; @@ -169,12 +177,12 @@ XRRNotifyEvent *aevent = (XRRNotifyEvent *) event; awire->type = aevent->type | (aevent->send_event ? 0x80 : 0); awire->sequenceNumber = aevent->serial & 0xFFFF; - awire->window = aevent->window; awire->subCode = aevent->subtype; switch (aevent->subtype) { case RRNotify_OutputChange: { xRROutputChangeNotifyEvent *awire = (xRROutputChangeNotifyEvent *) wire; XRROutputChangeNotifyEvent *aevent = (XRROutputChangeNotifyEvent *) event; + awire->window = aevent->window; awire->output = aevent->output; awire->crtc = aevent->crtc; awire->mode = aevent->mode; @@ -186,6 +194,7 @@ case RRNotify_CrtcChange: { xRRCrtcChangeNotifyEvent *awire = (xRRCrtcChangeNotifyEvent *) wire; XRRCrtcChangeNotifyEvent *aevent = (XRRCrtcChangeNotifyEvent *) event; + awire->window = aevent->window; awire->crtc = aevent->crtc; awire->mode = aevent->mode; awire->rotation = aevent->rotation; @@ -198,6 +207,7 @@ case RRNotify_OutputProperty: { xRROutputPropertyNotifyEvent *awire = (xRROutputPropertyNotifyEvent *) wire; XRROutputPropertyNotifyEvent *aevent = (XRROutputPropertyNotifyEvent *) event; + awire->window = aevent->window; awire->output = aevent->output; awire->atom = aevent->property; awire->timestamp = aevent->timestamp; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.2.3/src/Xrandrint.h new/libXrandr-1.2.99.4/src/Xrandrint.h --- old/libXrandr-1.2.3/src/Xrandrint.h 2008-05-12 23:31:27.000000000 +0200 +++ new/libXrandr-1.2.99.4/src/Xrandrint.h 2008-12-17 17:32:33.000000000 +0100 @@ -1,7 +1,4 @@ /* - * $XFree86: xc/lib/Xrandr/Xrandrint.h,v 1.2 2001/06/07 15:33:43 keithp Exp $ - * - * * Copyright © 2000, Compaq Computer Corporation, * Copyright © 2002, Hewlett Packard, Inc. * @@ -100,4 +97,7 @@ int len, XPointer data); +_X_HIDDEN Bool +_XRRHasRates (int major, int minor); + #endif /* _XRANDRINT_H_ */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.2.3/src/XrrCrtc.c new/libXrandr-1.2.99.4/src/XrrCrtc.c --- old/libXrandr-1.2.3/src/XrrCrtc.c 2008-05-12 23:31:27.000000000 +0200 +++ new/libXrandr-1.2.99.4/src/XrrCrtc.c 2008-12-08 20:55:57.000000000 +0100 @@ -270,3 +270,291 @@ { Xfree (crtc_gamma); } + +/* Version 1.3 additions */ + +static void +XTransform_from_xRenderTransform (XTransform *x, + xRenderTransform *render) +{ + x->matrix[0][0] = render->matrix11; + x->matrix[0][1] = render->matrix12; + x->matrix[0][2] = render->matrix13; + + x->matrix[1][0] = render->matrix21; + x->matrix[1][1] = render->matrix22; + x->matrix[1][2] = render->matrix23; + + x->matrix[2][0] = render->matrix31; + x->matrix[2][1] = render->matrix32; + x->matrix[2][2] = render->matrix33; +} + +static void +xRenderTransform_from_XTransform (xRenderTransform *render, + XTransform *x) +{ + render->matrix11 = x->matrix[0][0]; + render->matrix12 = x->matrix[0][1]; + render->matrix13 = x->matrix[0][2]; + + render->matrix21 = x->matrix[1][0]; + render->matrix22 = x->matrix[1][1]; + render->matrix23 = x->matrix[1][2]; + + render->matrix31 = x->matrix[2][0]; + render->matrix32 = x->matrix[2][1]; + render->matrix33 = x->matrix[2][2]; +} + +void +XRRSetCrtcTransform (Display *dpy, + RRCrtc crtc, + XTransform *transform, + char *filter, + XFixed *params, + int nparams) +{ + XExtDisplayInfo *info = XRRFindDisplay(dpy); + xRRSetCrtcTransformReq *req; + int nbytes = strlen (filter); + + RRSimpleCheckExtension (dpy, info); + + LockDisplay(dpy); + GetReq (RRSetCrtcTransform, req); + req->reqType = info->codes->major_opcode; + req->randrReqType = X_RRSetCrtcTransform; + req->crtc = crtc; + + xRenderTransform_from_XTransform (&req->transform, transform); + + req->nbytesFilter = nbytes; + req->length += ((nbytes + 3) >> 2) + nparams; + Data (dpy, filter, nbytes); + Data32 (dpy, params, nparams << 2); + + UnlockDisplay (dpy); + SyncHandle (); +} + +#define CrtcTransformExtra (SIZEOF(xRRGetCrtcTransformReply) - 32) + +static const xRenderTransform identity = { + 0x10000, 0, 0, + 0, 0x10000, 0, + 0, 0, 0x10000, +}; + +static Bool +_XRRHasTransform (int major, int minor) +{ + return major > 1 || (major == 1 && minor >= 3); +} + +Status +XRRGetCrtcTransform (Display *dpy, + RRCrtc crtc, + XRRCrtcTransformAttributes **attributes) +{ + XExtDisplayInfo *info = XRRFindDisplay(dpy); + XRandRInfo *xrri; + xRRGetCrtcTransformReply rep; + xRRGetCrtcTransformReq *req; + int major_version, minor_version; + XRRCrtcTransformAttributes *attr; + char *extra = NULL, *e; + int p; + + *attributes = NULL; + + RRCheckExtension (dpy, info, False); + + if (!XRRQueryVersion (dpy, &major_version, &minor_version) || + !_XRRHasTransform (major_version, minor_version)) + { + /* For pre-1.3 servers, just report identity matrices everywhere */ + rep.pendingTransform = identity; + rep.pendingNbytesFilter = 0; + rep.pendingNparamsFilter = 0; + rep.currentTransform = identity; + rep.currentNbytesFilter = 0; + rep.currentNparamsFilter = 0; + } + else + { + LockDisplay (dpy); + GetReq (RRGetCrtcTransform, req); + req->reqType = info->codes->major_opcode; + req->randrReqType = X_RRGetCrtcTransform; + req->crtc = crtc; + + if (!_XReply (dpy, (xReply *) &rep, CrtcTransformExtra >> 2, xFalse)) + { + rep.pendingTransform = identity; + rep.pendingNbytesFilter = 0; + rep.pendingNparamsFilter = 0; + rep.currentTransform = identity; + rep.currentNbytesFilter = 0; + rep.currentNparamsFilter = 0; + } + else + { + int extraBytes = rep.length * 4 - CrtcTransformExtra; + extra = Xmalloc (extraBytes); + if (!extra) { + _XEatData (dpy, extraBytes); + UnlockDisplay (dpy); + SyncHandle (); + return False; + } + _XRead (dpy, extra, extraBytes); + } + + UnlockDisplay (dpy); + SyncHandle (); + } + + attr = Xmalloc (sizeof (XRRCrtcTransformAttributes) + + rep.pendingNparamsFilter * sizeof (XFixed) + + rep.currentNparamsFilter * sizeof (XFixed) + + rep.pendingNbytesFilter + 1 + + rep.currentNbytesFilter + 1); + + if (!attr) { + XFree (extra); + return False; + } + XTransform_from_xRenderTransform (&attr->pendingTransform, &rep.pendingTransform); + XTransform_from_xRenderTransform (&attr->currentTransform, &rep.currentTransform); + + attr->pendingParams = (XFixed *) (attr + 1); + attr->currentParams = attr->pendingParams + rep.pendingNparamsFilter; + attr->pendingFilter = (char *) (attr->currentParams + rep.currentNparamsFilter); + attr->currentFilter = attr->pendingFilter + rep.pendingNbytesFilter + 1; + + e = extra; + + memcpy (attr->pendingFilter, e, rep.pendingNbytesFilter); + attr->pendingFilter[rep.pendingNbytesFilter] = '\0'; + e += (rep.pendingNbytesFilter + 3) & ~3; + for (p = 0; p < rep.pendingNparamsFilter; p++) { + INT32 f; + memcpy (&f, e, 4); + e += 4; + attr->pendingParams[p] = (XFixed) f; + } + attr->pendingNparams = rep.pendingNparamsFilter; + + memcpy (attr->currentFilter, e, rep.currentNbytesFilter); + attr->currentFilter[rep.currentNbytesFilter] = '\0'; + e += (rep.currentNbytesFilter + 3) & ~3; + for (p = 0; p < rep.currentNparamsFilter; p++) { + INT32 f; + memcpy (&f, e, 4); + e += 4; + attr->currentParams[p] = (XFixed) f; + } + attr->currentNparams = rep.currentNparamsFilter; + + if (extra) + XFree (extra); + *attributes = attr; + + return True; +} + +XRRPanning * +XRRGetPanning (Display *dpy, XRRScreenResources *resources, RRCrtc crtc) +{ + XExtDisplayInfo *info = XRRFindDisplay(dpy); + xRRGetPanningReply rep; + xRRGetPanningReq *req; + XRRPanning *xp; + + RRCheckExtension (dpy, info, 0); + + LockDisplay (dpy); + GetReq (RRGetPanning, req); + req->reqType = info->codes->major_opcode; + req->randrReqType = X_RRGetPanning; + req->crtc = crtc; + + if (!_XReply (dpy, (xReply *) &rep, 1, xFalse)) + { + UnlockDisplay (dpy); + SyncHandle (); + return NULL; + } + + if (! (xp = (XRRPanning *) Xmalloc(sizeof(XRRPanning))) ) { + _XEatData (dpy, sizeof(XRRPanning)); + UnlockDisplay (dpy); + SyncHandle (); + return NULL; + } + + xp->timestamp = rep.timestamp; + xp->left = rep.left; + xp->top = rep.top; + xp->width = rep.width; + xp->height = rep.height; + xp->track_left = rep.track_left; + xp->track_top = rep.track_top; + xp->track_width = rep.track_width; + xp->track_height = rep.track_height; + xp->border_left = rep.border_left; + xp->border_top = rep.border_top; + xp->border_right = rep.border_right; + xp->border_bottom = rep.border_bottom; + + UnlockDisplay (dpy); + SyncHandle (); + return (XRRPanning *) xp; +} + +void +XRRFreePanning (XRRPanning *panning) +{ + Xfree (panning); +} + +Status +XRRSetPanning (Display *dpy, + XRRScreenResources *resources, + RRCrtc crtc, + XRRPanning *panning) +{ + XExtDisplayInfo *info = XRRFindDisplay(dpy); + xRRSetPanningReply rep; + xRRSetPanningReq *req; + int i; + + RRCheckExtension (dpy, info, 0); + + LockDisplay(dpy); + GetReq (RRSetPanning, req); + req->reqType = info->codes->major_opcode; + req->randrReqType = X_RRSetPanning; + req->crtc = crtc; + req->timestamp = panning->timestamp; + req->left = panning->left; + req->top = panning->top; + req->width = panning->width; + req->height = panning->height; + req->track_left = panning->track_left; + req->track_top = panning->track_top; + req->track_width = panning->track_width; + req->track_height = panning->track_height; + req->border_left = panning->border_left; + req->border_top = panning->border_top; + req->border_right = panning->border_right; + req->border_bottom = panning->border_bottom; + + if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) + rep.status = RRSetConfigFailed; + UnlockDisplay (dpy); + SyncHandle (); + return rep.status; +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.2.3/src/XrrMode.c new/libXrandr-1.2.99.4/src/XrrMode.c --- old/libXrandr-1.2.3/src/XrrMode.c 2008-05-12 23:31:27.000000000 +0200 +++ new/libXrandr-1.2.99.4/src/XrrMode.c 2008-12-17 17:32:33.000000000 +0100 @@ -56,7 +56,7 @@ xRRCreateModeReply rep; long channelSize; - RRSimpleCheckExtension (dpy, info); + RRCheckExtension (dpy, info, None); LockDisplay(dpy); GetReq (RRCreateMode, req); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.2.3/src/XrrOutput.c new/libXrandr-1.2.99.4/src/XrrOutput.c --- old/libXrandr-1.2.3/src/XrrOutput.c 2008-05-12 23:31:27.000000000 +0200 +++ new/libXrandr-1.2.99.4/src/XrrOutput.c 2008-12-17 17:32:33.000000000 +0100 @@ -1,5 +1,6 @@ /* * Copyright © 2006 Keith Packard + * Copyright © 2008 Red Hat, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -129,3 +130,64 @@ { Xfree (outputInfo); } + +static Bool +_XRRHasOutputPrimary (int major, int minor) +{ + return major > 1 || (major == 1 && minor >= 3); +} + +void +XRRSetOutputPrimary(Display *dpy, Window window, RROutput output) +{ + XExtDisplayInfo *info = XRRFindDisplay(dpy); + xRRSetOutputPrimaryReq *req; + int i; + int major_version, minor_version; + + RRSimpleCheckExtension (dpy, info); + + if (!XRRQueryVersion (dpy, &major_version, &minor_version) || + !_XRRHasOutputPrimary (major_version, minor_version)) + return; + + LockDisplay(dpy); + GetReq (RRSetOutputPrimary, req); + req->reqType = info->codes->major_opcode; + req->randrReqType = X_RRSetOutputPrimary; + req->window = window; + req->output = output; + + UnlockDisplay (dpy); + SyncHandle (); +} + +RROutput +XRRGetOutputPrimary(Display *dpy, Window window) +{ + XExtDisplayInfo *info = XRRFindDisplay(dpy); + xRRGetOutputPrimaryReq *req; + xRRGetOutputPrimaryReply rep; + int i; + int major_version, minor_version; + + RRCheckExtension (dpy, info, 0); + + if (!XRRQueryVersion (dpy, &major_version, &minor_version) || + !_XRRHasOutputPrimary (major_version, minor_version)) + return None; + + LockDisplay(dpy); + GetReq (RRGetOutputPrimary, req); + req->reqType = info->codes->major_opcode; + req->randrReqType = X_RRGetOutputProperty; + req->window = window; + + if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) + rep.output = None; + + UnlockDisplay(dpy); + SyncHandle(); + + return rep.output; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.2.3/src/XrrProperty.c new/libXrandr-1.2.99.4/src/XrrProperty.c --- old/libXrandr-1.2.3/src/XrrProperty.c 2008-05-12 23:31:27.000000000 +0200 +++ new/libXrandr-1.2.99.4/src/XrrProperty.c 2008-12-17 17:32:33.000000000 +0100 @@ -41,7 +41,7 @@ int nbytes, nbytesRead, rbytes; int i; xRRQueryVersionReq *vreq; - Atom *props; + Atom *props = NULL; RRCheckExtension (dpy, info, 0); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.2.3/src/XrrScreen.c new/libXrandr-1.2.99.4/src/XrrScreen.c --- old/libXrandr-1.2.3/src/XrrScreen.c 2008-05-12 23:31:27.000000000 +0200 +++ new/libXrandr-1.2.99.4/src/XrrScreen.c 2008-12-08 20:55:57.000000000 +0100 @@ -32,8 +32,12 @@ #include <X11/extensions/Xrender.h> #include "Xrandrint.h" -XRRScreenResources * -XRRGetScreenResources (Display *dpy, Window window) +/* + * this is cheating on the knowledge that the two requests are identical + * but for the request number. + */ +static XRRScreenResources * +doGetScreenResources (Display *dpy, Window window, int poll) { XExtDisplayInfo *info = XRRFindDisplay(dpy); xRRGetScreenResourcesReply rep; @@ -75,7 +79,8 @@ GetReq (RRGetScreenResources, req); req->reqType = info->codes->major_opcode; - req->randrReqType = X_RRGetScreenResources; + req->randrReqType = poll ? X_RRGetScreenResources + : X_RRGetScreenResourcesCurrent; req->window = window; if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) @@ -187,6 +192,18 @@ return (XRRScreenResources *) xrsr; } +XRRScreenResources * +XRRGetScreenResources(Display *dpy, Window window) +{ + return doGetScreenResources(dpy, window, 1); +} + +XRRScreenResources * +XRRGetScreenResourcesCurrent(Display *dpy, Window window) +{ + return doGetScreenResources(dpy, window, 0); +} + void XRRFreeScreenResources (XRRScreenResources *resources) { ++++++ xcb-util-0.2.1.tar.bz2 -> xcb-util-0.3.3.tar.bz2 ++++++ ++++ 7112 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-proto-devel for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package xorg-x11-proto-devel for openSUSE:Factory checked in at Thu Feb 26 12:14:31 CET 2009. -------- --- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2009-02-26 03:07:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2009-02-26 05:39:53.656979008 +0100 @@ -1,0 +2,12 @@ +Thu Feb 26 05:39:36 CET 2009 - sndirsch(a)suse.de + +- back to xextproto 7.0.3 + +------------------------------------------------------------------- +Thu Feb 26 03:38:23 CET 2009 - sndirsch(a)suse.de + +- inputproto 1.5.0 +- xextproto 7.0.5 +- randrproto 1.2.99.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- inputproto-1.4.4.tar.bz2 randrproto-1.2.2.tar.bz2 New: ---- inputproto-1.5.0.tar.bz2 randrproto-1.2.99.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-proto-devel.spec ++++++ --- /var/tmp/diff_new_pack.bb6481/_old 2009-02-26 12:14:11.000000000 +0100 +++ /var/tmp/diff_new_pack.bb6481/_new 2009-02-26 12:14:11.000000000 +0100 @@ -21,7 +21,7 @@ Name: xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 4 +Release: 5 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/X11 @@ -35,10 +35,10 @@ Source6: fontcacheproto-X11R7.0-0.1.2.tar.bz2 Source7: fontsproto-X11R7.0-2.0.2.tar.bz2 Source8: glproto-1.4.9.tar.bz2 -Source9: inputproto-1.4.4.tar.bz2 +Source9: inputproto-1.5.0.tar.bz2 Source10: kbproto-1.0.3.tar.bz2 Source11: printproto-1.0.4.tar.bz2 -Source12: randrproto-1.2.2.tar.bz2 +Source12: randrproto-1.2.99.4.tar.bz2 Source13: recordproto-X11R7.0-1.13.2.tar.bz2 Source14: renderproto-0.9.3.tar.bz2 Source15: resourceproto-X11R7.0-1.0.2.tar.bz2 @@ -141,6 +141,12 @@ %changelog * Thu Feb 26 2009 sndirsch(a)suse.de +- back to xextproto 7.0.3 +* Thu Feb 26 2009 sndirsch(a)suse.de +- inputproto 1.5.0 +- xextproto 7.0.5 +- randrproto 1.2.99.4 +* Thu Feb 26 2009 sndirsch(a)suse.de - util-macros 1.2.1 - xproto 7.0.14 - applewmproto 1.1.1 ++++++ inputproto-1.4.4.tar.bz2 -> inputproto-1.5.0.tar.bz2 ++++++ ++++ 2724 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/inputproto-1.4.4/ChangeLog new/inputproto-1.5.0/ChangeLog --- old/inputproto-1.4.4/ChangeLog 2008-07-29 01:50:03.000000000 +0200 +++ new/inputproto-1.5.0/ChangeLog 2008-11-28 06:41:25.000000000 +0100 @@ -1,3 +1,98 @@ +commit d38e79ca3ddd6031ca4a335eb2faf99294a6731f +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Wed Nov 26 21:37:06 2008 +1000 + + inputproto 1.5.0 + +commit 5829370cafb112e488156e7ac1dd7902cfd1659a +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Mon Nov 17 10:58:31 2008 +1000 + + Remove Configure/QueryDeviceProperty. + (cherry picked from commit 18ef04f8a2026cca5d2d2b796ec2ea1c949bad36) + + Removing Configure/QueryDevice property from XInput.h as well. + Not cherry-picked as XInput.h is moved to libXi in master. + + Conflicts: + + XIproto.h + +commit 6a4aefa04bb95c05d223027cebbe83c4117829f0 +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Thu Sep 18 16:28:09 2008 +0930 + + Add XI_JOYSTICK type. + (cherry picked from commit c9454a8e84b2dce54bb346ff1aafb32e3c0ac5b9) + +commit 6af8447fab4a06d943398e6540e6b869d8a714ae +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Mon Nov 17 10:13:15 2008 +1000 + + Undef Atom after we're done so we don't pollute users of XIproto.h + (cherry picked from commit 36c8a6f3faf56a8f8ca31455812c9132b379b1b3) + + Conflicts: + + XIproto.h + +commit 72fb0941fff83f00fb039f865edcf5d25584757c +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Mon Nov 17 10:12:50 2008 +1000 + + Make sure Atoms are defined as CARD32. + (cherry picked from commit c919917e375aefaf473570c1b25b3c22231e858d) + + Conflicts: + + XIproto.h + +commit 6ee1ad8951ff811dc2618c9bd26cd42096ab2ecc +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Fri Aug 15 14:21:24 2008 +0930 + + Remove RCS tags, typo fix. + (cherry picked from commit c2d47b04c55cf72aef6c13a9e2cc4b41abfca673) + +commit d81ca85c4bcdcab208e4731a5d0f7d9bffbfab67 +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Fri Oct 31 17:53:39 2008 +1030 + + PropertyNotify, move deviceid back to last byte. + + This way, it can be type-cast to deviceKeyButtonPointer to extract the + deviceid, which is (aside from time) the only thing it has in common with + those anyway. + (cherry picked from commit f8064629496c6061bedb7a99b788fb9d3a170f11) + +commit e22b0ace88447a87c0b19d062a678880529b1b3b +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Mon Aug 25 11:34:47 2008 +0930 + + Add libXi's property interfaces. + + XInput.h was removed from inputproto, hence this commit is not a cherry-pick + but a copy of the changes to XInput.h in libXi. + +commit 0a87cb3aac72adbbb81c7ac7ac04551547bf8b56 +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Fri Aug 15 14:50:23 2008 +0930 + + Protect against C++ includes. + (cherry picked from commit fabe087cebb11c6a2600e57c6f7a52fda2efea29) + +commit e507aaaa74eeb02896843eb1815b614adf47a24a +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Mon Aug 25 10:19:37 2008 +0930 + + Back out Device Properties from XI 2, push into XI 1.5. + (cherry picked from commit 7c9620d8232e5c05115746055a832363a528ac2d) + + Conflicts: + + XI.h + XIproto.h + commit c109e2ddb9cab22f185a877ab7e48002d1087400 Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Tue Jul 29 09:10:09 2008 +0930 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/inputproto-1.4.4/configure.ac new/inputproto-1.5.0/configure.ac --- old/inputproto-1.4.4/configure.ac 2008-07-29 01:49:33.000000000 +0200 +++ new/inputproto-1.5.0/configure.ac 2008-11-26 12:37:16.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([InputProto], [1.4.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] +AC_INIT([InputProto], [1.5.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/inputproto-1.4.4/XI.h new/inputproto-1.5.0/XI.h --- old/inputproto-1.4.4/XI.h 2008-07-29 01:45:06.000000000 +0200 +++ new/inputproto-1.5.0/XI.h 2008-11-26 12:36:49.000000000 +0100 @@ -106,6 +106,12 @@ #define sz_xGetDeviceControlReply 32 #define sz_xChangeDeviceControlReq 8 #define sz_xChangeDeviceControlReply 32 +#define sz_xListDevicePropertiesReq 8 +#define sz_xListDevicePropertiesReply 32 +#define sz_xChangeDevicePropertyReq 20 +#define sz_xDeleteDevicePropertyReq 12 +#define sz_xGetDevicePropertyReq 24 +#define sz_xGetDevicePropertyReply 32 #define INAME "XInputExtension" @@ -127,6 +133,7 @@ #define XI_EYETRACKER "EYETRACKER" #define XI_CURSORKEYS "CURSORKEYS" #define XI_FOOTMOUSE "FOOTMOUSE" +#define XI_JOYSTICK "JOYSTICK" #define Dont_Check 0 #define XInput_Initial_Release 1 @@ -134,6 +141,7 @@ #define XInput_Add_XSetDeviceValuators 3 #define XInput_Add_XChangeDeviceControl 4 #define XInput_Add_DevicePresenceNotify 5 +#define XInput_Add_DeviceProperties 6 #define XI_Absent 0 #define XI_Present 1 @@ -153,6 +161,9 @@ #define XI_Add_DevicePresenceNotify_Major 1 #define XI_Add_DevicePresenceNotify_Minor 4 +#define XI_Add_DeviceProperties_Major 1 +#define XI_Add_DeviceProperties_Minor 5 + #define DEVICE_RESOLUTION 1 #define DEVICE_ABS_CALIB 2 #define DEVICE_CORE 3 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/inputproto-1.4.4/XInput.h new/inputproto-1.5.0/XInput.h --- old/inputproto-1.4.4/XInput.h 2008-07-29 01:43:38.000000000 +0200 +++ new/inputproto-1.5.0/XInput.h 2008-11-26 12:36:49.000000000 +0100 @@ -72,6 +72,10 @@ #define _deviceStateNotify 0 #define _deviceMappingNotify 1 #define _changeDeviceNotify 2 +/* Space of 3 between is necessary! Reserved for DeviceKeyStateNotify, + DeviceButtonStateNotify, DevicePresenceNotify (essentially unused). This + code has to be in sync with FixExtensionEvents() in xserver/Xi/extinit.c */ +#define _propertyNotify 6 #define FindTypeAndClass(d,type,_class,classid,offset) \ { int _i; XInputClassInfo *_ip; \ @@ -119,6 +123,9 @@ #define ChangeDeviceNotify(d,type,_class) \ FindTypeAndClass(d, type, _class, OtherClass, _changeDeviceNotify) +#define DevicePropertyNotify(d, type, _class) \ + FindTypeAndClass(d, type, _class, OtherClass, _propertyNotify) + #define DevicePointerMotionHint(d,type,_class) \ { _class = ((XDevice *) d)->device_id << 8 | _devicePointerMotionHint;} @@ -448,6 +455,22 @@ XID control; } XDevicePresenceNotifyEvent; +/* + * Notifies the client that a property on a device has changed value. The + * client is expected to query the server for updated value of the property. + */ +typedef struct { + int type; + unsigned long serial; /* # of last request processed by server */ + Bool send_event; /* true if this came from a SendEvent request */ + Display *display; /* Display the event was read from */ + Window window; /* unused */ + Time time; + XID deviceid; /* id of the device that changed */ + Atom atom; /* the property that changed */ + int state; /* PropertyNewValue or PropertyDeleted */ +} XDevicePropertyNotifyEvent; + /******************************************************************* * * Control structures for input devices that support input class @@ -1195,6 +1218,56 @@ XDeviceControl* /* control */ ); +typedef struct { + Bool pending; + Bool range; + Bool immutable; + Bool fromClient; + int num_values; + long *values; +} XIPropertyInfo; + +extern Atom* XListDeviceProperties( + Display* /* dpy */, + XDevice* /* dev */, + int* /* nprops_return */ +); + +extern void XChangeDeviceProperty( + Display* /* dpy */, + XDevice* /* dev */, + Atom /* property */, + Atom /* type */, + int /* format */, + int /* mode */, + _Xconst unsigned char * /*data */, + int /* nelements */ +); + +extern void +XDeleteDeviceProperty( + Display* /* dpy */, + XDevice* /* dev */, + Atom /* property */ +); + +extern Status +XGetDeviceProperty( + Display* /* dpy*/, + XDevice* /* dev*/, + Atom /* property*/, + long /* offset*/, + long /* length*/, + Bool /* delete*/, + Atom /* req_type*/, + Atom* /* actual_type*/, + int* /* actual_format*/, + unsigned long* /* nitems*/, + unsigned long* /* bytes_after*/, + unsigned char** /* prop*/ +); + + _XFUNCPROTOEND #endif /* _XINPUT_H_ */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/inputproto-1.4.4/XIproto.h new/inputproto-1.5.0/XIproto.h --- old/inputproto-1.4.4/XIproto.h 2008-07-29 01:45:06.000000000 +0200 +++ new/inputproto-1.5.0/XIproto.h 2008-11-26 12:36:49.000000000 +0100 @@ -1,5 +1,3 @@ -/* $Xorg: XIproto.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XIproto.h,v 1.4 2001/01/17 17:53:17 dawes Exp $ */ #ifndef _XIPROTO_H #define _XIPROTO_H @@ -57,6 +54,7 @@ #define Window CARD32 #define Time CARD32 #define KeyCode CARD8 +#define Atom CARD32 /********************************************************* * @@ -72,8 +70,9 @@ #define numInputClasses 7 -#define IEVENTS 16 +#define IEVENTS 17 #define IERRORS 5 +#define IREQUESTS 41 #define CLIENT_REQ 1 @@ -114,6 +113,8 @@ #define XI_DeviceKeystateNotify 13 #define XI_DeviceButtonstateNotify 14 #define XI_DevicePresenceNotify 15 +#define XI_DevicePropertyNotify 16 + /********************************************************* * @@ -156,6 +157,11 @@ #define X_SetDeviceValuators 33 #define X_GetDeviceControl 34 #define X_ChangeDeviceControl 35 +/* XI 1.5 */ +#define X_ListDeviceProperties 36 +#define X_ChangeDeviceProperty 37 +#define X_DeleteDeviceProperty 38 +#define X_GetDeviceProperty 39 /********************************************************* * @@ -1413,6 +1419,110 @@ CARD16 pad1 B16; } xDeviceEnableCtl; +/* XI 1.5 */ + +/********************************************************* + * + * ListDeviceProperties. + * + */ + +typedef struct { + CARD8 reqType; /* input extension major opcode */ + CARD8 ReqType; /* always X_ListDeviceProperties */ + CARD16 length B16; + CARD8 deviceid; + CARD8 pad0; + CARD16 pad1 B16; +} xListDevicePropertiesReq; + +typedef struct { + CARD8 repType; /* X_Reply */ + CARD8 RepType; /* always X_ListDeviceProperties */ + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD16 nAtoms B16; + CARD16 pad1 B16; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; + CARD32 pad6 B32; +} xListDevicePropertiesReply; + +/********************************************************* + * + * ChangeDeviceProperty. + * + */ + +typedef struct { + CARD8 reqType; /* input extension major opcode */ + CARD8 ReqType; /* always X_ChangeDeviceProperty */ + CARD16 length B16; + Atom property B32; + Atom type B32; + CARD8 deviceid; + CARD8 format; + CARD8 mode; + CARD8 pad; + CARD32 nUnits B32; +} xChangeDevicePropertyReq; + +/********************************************************* + * + * DeleteDeviceProperty. + * + */ + +typedef struct { + CARD8 reqType; /* input extension major opcode */ + CARD8 ReqType; /* always X_DeleteDeviceProperty */ + CARD16 length B16; + Atom property B32; + CARD8 deviceid; + CARD8 pad0; + CARD16 pad1 B16; +} xDeleteDevicePropertyReq; + +/********************************************************* + * + * GetDeviceProperty. + * + */ + +typedef struct { + CARD8 reqType; /* input extension major opcode */ + CARD8 ReqType; /* always X_GetDeviceProperty */ + CARD16 length B16; + Atom property B32; + Atom type B32; + CARD32 longOffset B32; + CARD32 longLength B32; + CARD8 deviceid; +#if defined(__cplusplus) || defined(c_plusplus) + BOOL c_delete; +#else + BOOL delete; +#endif + CARD16 pad; +} xGetDevicePropertyReq; + +typedef struct { + CARD8 repType; /* X_Reply */ + CARD8 RepType; /* always X_GetDeviceProperty */ + CARD16 sequenceNumber B16; + CARD32 length B32; + Atom propertyType B32; + CARD32 bytesAfter B32; + CARD32 nItems B32; + CARD8 format; + CARD8 deviceid; + CARD16 pad1 B16; + CARD32 pad2 B32; + CARD32 pad3 B32; +} xGetDevicePropertyReply; + /********************************************************** * * Input extension events. @@ -1610,8 +1720,33 @@ CARD32 pad06 B32; } devicePresenceNotify; +/********************************************************* + * DevicePropertyNotifyEvent + * + * Sent whenever a device's property changes. + * + */ + +typedef struct + { + BYTE type; + BYTE state; /* NewValue or Deleted */ + CARD16 sequenceNumber B16; + CARD32 time B32; + Atom atom B32; /* affected property */ + CARD32 pad0 B32; + CARD32 pad1 B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD16 pad5 B16; + CARD8 pad4; + CARD8 deviceid; /* id of device */ + } devicePropertyNotify; + + #undef Window #undef Time #undef KeyCode +#undef Atom #endif ++++++ randrproto-1.2.2.tar.bz2 -> randrproto-1.2.99.4.tar.bz2 ++++++ ++++ 4606 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/randrproto-1.2.2/autogen.sh new/randrproto-1.2.99.4/autogen.sh --- old/randrproto-1.2.2/autogen.sh 2008-06-23 20:50:35.000000000 +0200 +++ new/randrproto-1.2.99.4/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/randrproto-1.2.2/ChangeLog new/randrproto-1.2.99.4/ChangeLog --- old/randrproto-1.2.2/ChangeLog 2008-07-02 21:34:40.000000000 +0200 +++ new/randrproto-1.2.99.4/ChangeLog 2009-02-25 17:12:59.000000000 +0100 @@ -1,3 +1,185 @@ +commit 5cc58adb620d37694a9d57cd26c40b4cb2d1de68 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Wed Feb 25 17:08:45 2009 +0100 + + Bump to 1.2.99.4 + +commit 7bd01756e684bb841f32fa30832eb7980f92ac9c +Author: Adam Jackson <ajax(a)redhat.com> +Date: Tue Feb 17 13:58:19 2009 -0500 + + Zero reply from GetPanning means panning not supported. + + Don't throw BadRRCrtc for this case, that's just mean. + +commit 1c7e20d115bc470479f32afd703ca7966754c54f +Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br> +Date: Tue Jan 27 20:06:28 2009 -0200 + + Janitor: Correct make distcheck and dont distribute autogen.sh + +commit 1ff5e2cdfa2636317099a0917c9819ff4a81b025 +Author: Maarten Maathuis <madman2003(a)gmail.com> +Date: Tue Dec 16 23:35:49 2008 +0100 + + Fix typo in 83f3f29dd3ac5d3875b5edef5805d6adb6a02698. + +commit 83f3f29dd3ac5d3875b5edef5805d6adb6a02698 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Tue Dec 16 18:20:00 2008 +0100 + + Add standard property name defines. + +commit 6a480445e94c39df2bc9663e7590ab41cd17c465 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Tue Dec 16 18:13:48 2008 +0100 + + Should read "EDID", not "EdidData". + +commit 2aae5ec72ea285a051deaae98515587e1c77d7a5 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Tue Dec 16 18:09:08 2008 +0100 + + Add description of standard properties. + +commit 3fdbdc2b0a971db7497c6e03e215fd19ec400ce9 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Fri Dec 12 12:41:21 2008 +0100 + + Bump to 1.2.99.3 + +commit 0c1527d2e89a807e54c549e44798e2cf63fafca2 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Thu Dec 11 17:15:15 2008 +0100 + + Panning tracking areas describe full screen if set to 0. + +commit d904495a4cbd66850dc03d32f223aaaf8425f077 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Wed Dec 10 11:15:48 2008 -0500 + + Add [GS]etOutputPrimary + +commit 1334866b4aa025bce745140aa0f71f6493408ffa +Merge: ad65017... e719120... +Author: Keith Packard <keithp(a)keithp.com> +Date: Tue Dec 9 20:59:47 2008 -0800 + + Merge commit 'origin/master' + +commit e71912062f3985dd2f4d7b37e415b4a614b51d9b +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Mon Dec 8 14:40:07 2008 +0100 + + Add unicode art pictures for panning. + +commit 19a851fc85192906586138c5b17740ba28328eaa +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Thu Dec 4 15:45:23 2008 +0100 + + Bump to 1.2.99.2 + +commit fb1f243716282f442235323834fec50aab7fe2f7 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Thu Dec 4 15:44:12 2008 +0100 + + Nuke config-timestamp for panning. Specifying panning update on screen size change. + +commit 425468e9a29071823316bfc027bc80eb20acc61e +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Thu Dec 4 12:57:33 2008 +0100 + + Add panning to versioning information. + +commit 419a0f20746d9f3e8962ea3294568343d9877b2c +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Fri Nov 28 18:30:22 2008 +0100 + + Panning protocol bits description + +commit 6b5d4ce8943c1d39392a0536d426fe27a9161b04 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Fri Nov 28 18:29:19 2008 +0100 + + Panning protocol description + +commit abe956221670598a5fd0f77107a3471c2fcf84df +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Fri Nov 28 17:22:23 2008 +0100 + + Panning protocol extension + +commit 546906dbe29816adaa6a35277266d79fbe131d0c +Author: Adam Jackson <ajax(a)redhat.com> +Date: Wed Dec 3 13:36:00 2008 -0500 + + Indent CRTC transform docs to match the rest of the requests. + +commit 5d5e4cff8c69d36d10e682d59c9a9005a8b5ad18 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Wed Dec 3 12:02:18 2008 -0500 + + More doc for CRTC transforms + +commit ad6501790bbaff528cf247df24ddb7de27576a11 +Author: Keith Packard <keithp(a)keithp.com> +Date: Wed Nov 26 15:47:18 2008 -0800 + + Remove duplicate GetScreenResourcesCurrent declarations + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit 10bff0be50cf5cf314960bb85c472f1c63d37755 +Author: Keith Packard <keithp(a)keithp.com> +Date: Wed Nov 26 09:24:36 2008 -0800 + + Update to version 1.2.99.1 + +commit 6c17940a7960885695aa6033de58c3cd2bb6fb79 +Merge: c998b46... 8793429... +Author: Keith Packard <keithp(a)keithp.com> +Date: Mon Nov 24 16:22:11 2008 -0800 + + Merge branch 'transform-proposal' + + Conflicts: + + randr.h + randrproto.h + randrproto.txt + +commit 8793429f3d9d7cdf16be118ce05a68af6531568e +Author: Keith Packard <keithp(a)keithp.com> +Date: Mon Nov 24 16:01:55 2008 -0800 + + Describe projective transform additions in Introduction + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit c998b4658d735e5b2d7aa6983d732d40cc802823 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Mon Nov 24 16:29:58 2008 -0500 + + GSRC added in 1.3, not 1.2 + +commit 0d334c880396b9ef67ed899ad228cc693aad6a28 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Mon Nov 24 16:19:43 2008 -0500 + + Fix RRNumberRequests + +commit 2c0635eed5ae418ca278d99e044f583d54273097 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Mon Nov 24 15:54:09 2008 -0500 + + Add GetScreenResourcesCurrent + +commit 4a960ba3db3c3f8bdf3d519d263f910b6107b9ff +Author: Julien Cristau <jcristau(a)debian.org> +Date: Fri Jul 11 17:12:22 2008 +0200 + + spec: add missing list of clones to RRGetOutputInfo reply + commit 2be5a52d5f6bdd2aa70efcb06bd99a149c6db6ba Author: Adam Jackson <ajax(a)redhat.com> Date: Wed Jul 2 15:34:31 2008 -0400 @@ -12,6 +194,29 @@ Thanks for the upward compatibility, Bjarne. +commit 2d09f9cac379c74f492b528a8aa2ac3b5997d617 +Author: Keith Packard <keithp(a)keithp.com> +Date: Tue Mar 18 16:01:10 2008 -0700 + + Eliminate inverse matrix from randr transform protocol + + It is easier, and potentially more precise, to compute the inverse in the + server where everything can eventually be kept in floating point form. + +commit aa5cd18a9f84aa075ffa7f70e6591b70b093119f +Author: Keith Packard <keithp(a)keithp.com> +Date: Sat Mar 15 00:32:35 2008 -0700 + + Add filters to CRTC transforms. + + This allows scaling transforms to use bilinear filtering if desired. + +commit 329b2068c1505dbc2eef7cc245b02c3bbf9c67ff +Author: Keith Packard <keithp(a)keithp.com> +Date: Fri Feb 15 15:49:35 2008 -0800 + + Add Transform request proposal for 1.3 + commit 2df8499d24d15bfca3c928b681f64b6e8a05f0af Author: James Cloos <cloos(a)jhcloos.com> Date: Thu Dec 6 16:39:05 2007 -0500 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/randrproto-1.2.2/configure.ac new/randrproto-1.2.99.4/configure.ac --- old/randrproto-1.2.2/configure.ac 2008-07-02 21:34:24.000000000 +0200 +++ new/randrproto-1.2.99.4/configure.ac 2009-02-25 17:08:42.000000000 +0100 @@ -22,10 +22,14 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT([RandrProto], [1.2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] +AC_INIT([RandrProto], [1.2.99.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] AM_INIT_AUTOMAKE([foreign dist-bzip2]) +# Require xorg-macros: XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile randrproto.pc]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/randrproto-1.2.2/Makefile.am new/randrproto-1.2.99.4/Makefile.am --- old/randrproto-1.2.2/Makefile.am 2008-06-23 20:50:35.000000000 +0200 +++ new/randrproto-1.2.99.4/Makefile.am 2009-02-03 16:54:59.000000000 +0100 @@ -9,7 +9,7 @@ randrdocdir = $(datadir)/doc/$(PACKAGE) randrdoc_DATA = randrproto.txt -EXTRA_DIST = autogen.sh randrproto.pc.in $(randrdoc_DATA) +EXTRA_DIST = randrproto.pc.in $(randrdoc_DATA) EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -17,6 +17,6 @@ .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/randrproto-1.2.2/randr.h new/randrproto-1.2.99.4/randr.h --- old/randrproto-1.2.2/randr.h 2008-06-23 20:50:35.000000000 +0200 +++ new/randrproto-1.2.99.4/randr.h 2008-12-17 13:21:21.000000000 +0100 @@ -2,6 +2,7 @@ * Copyright © 2000 Compaq Computer Corporation * Copyright © 2002 Hewlett Packard Company * Copyright © 2006 Intel Corporation + * Copyright © 2008 Red Hat, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -39,11 +40,11 @@ #define RANDR_NAME "RANDR" #define RANDR_MAJOR 1 -#define RANDR_MINOR 2 +#define RANDR_MINOR 3 #define RRNumberErrors 3 #define RRNumberEvents 2 -#define RRNumberRequests 25 +#define RRNumberRequests 32 #define X_RRQueryVersion 0 /* we skip 1 to make old clients fail pretty immediately */ @@ -77,6 +78,20 @@ #define X_RRGetCrtcGamma 23 #define X_RRSetCrtcGamma 24 +/* V1.3 additions */ +#define X_RRGetScreenResourcesCurrent 25 +#define X_RRSetCrtcTransform 26 +#define X_RRGetCrtcTransform 27 +#define X_RRGetPanning 28 +#define X_RRSetPanning 29 +#define X_RRSetOutputPrimary 30 +#define X_RRGetOutputPrimary 31 + +#define RRTransformUnit (1L << 0) +#define RRTransformScaleUp (1L << 1) +#define RRTransformScaleDown (1L << 2) +#define RRTransformProjective (1L << 3) + /* Event selection bits */ #define RRScreenChangeNotifyMask (1L << 0) /* V1.2 additions */ @@ -136,6 +151,12 @@ /* Conventional RandR output properties */ -#define RR_PROPERTY_RANDR_EDID "RANDR_EDID" +#define RR_PROPERTY_RANDR_EDID "EDID" +#define RR_PROPERTY_SIGNAL_FORMAT "SignalFormat" +#define RR_PROPERTY_SIGNAL_PROPERTIES "SignalProperties" +#define RR_PROPERTY_CONNECTOR_TYPE "ConnectorType" +#define RR_PROPERTY_CONNECTOR_NUMBER "ConnectorNumber" +#define RR_PROPERTY_COMPATIBILITY_LIST "CompatibilityList" +#define RR_PROPERTY_CLONE_LIST "CloneList" #endif /* _RANDR_H_ */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/randrproto-1.2.2/randrproto.h new/randrproto-1.2.99.4/randrproto.h --- old/randrproto-1.2.2/randrproto.h 2008-06-23 20:51:58.000000000 +0200 +++ new/randrproto-1.2.99.4/randrproto.h 2008-12-11 14:35:45.000000000 +0100 @@ -2,6 +2,7 @@ * Copyright © 2000 Compaq Computer Corporation * Copyright © 2002 Hewlett-Packard Company * Copyright © 2006 Intel Corporation + * Copyright © 2008 Red Hat, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -31,6 +32,7 @@ #define _XRANDRP_H_ #include <X11/extensions/randr.h> +#include <X11/extensions/renderproto.h> #define Window CARD32 #define Drawable CARD32 @@ -562,6 +564,88 @@ #define sz_xRRSetCrtcGammaReq 12 /* + * Additions for V1.3 + */ + +typedef xRRGetScreenResourcesReq xRRGetScreenResourcesCurrentReq; + +#define sz_xRRGetScreenResourcesCurrentReq sz_xRRGetScreenResourcesReq + +typedef xRRGetScreenResourcesReply xRRGetScreenResourcesCurrentReply; +#define sz_xRRGetScreenResourcesCurrentReply sz_xRRGetScreenResourcesReply + +typedef struct { + CARD8 reqType; + CARD8 randrReqType; + CARD16 length B16; + RRCrtc crtc B32; + xRenderTransform transform; + CARD16 nbytesFilter; /* number of bytes in filter name */ + CARD16 pad B16; +} xRRSetCrtcTransformReq; + +#define sz_xRRSetCrtcTransformReq 48 + +typedef struct { + CARD8 reqType; + CARD8 randrReqType; + CARD16 length B16; + RRCrtc crtc B32; +} xRRGetCrtcTransformReq; + +#define sz_xRRGetCrtcTransformReq 8 + +typedef struct { + BYTE type; + CARD8 status; + CARD16 sequenceNumber B16; + CARD32 length B32; + xRenderTransform pendingTransform; + BYTE hasTransforms; + CARD8 pad0; + CARD16 pad1 B16; + xRenderTransform currentTransform; + CARD32 pad2 B32; + CARD16 pendingNbytesFilter B16; /* number of bytes in filter name */ + CARD16 pendingNparamsFilter B16; /* number of filter params */ + CARD16 currentNbytesFilter B16; /* number of bytes in filter name */ + CARD16 currentNparamsFilter B16; /* number of filter params */ +} xRRGetCrtcTransformReply; + +#define sz_xRRGetCrtcTransformReply 96 + +typedef struct { + CARD8 reqType; + CARD8 randrReqType; + CARD16 length B16; + Window window B32; + RROutput output B32; +} xRRSetOutputPrimaryReq; +#define sz_xRRSetOutputPrimaryReq 12 + +typedef struct { + CARD8 reqType; + CARD8 randrReqType; + CARD16 length B16; + Window window B32; +} xRRGetOutputPrimaryReq; +#define sz_xRRGetOutputPrimaryReq 8 + +typedef struct { + BYTE type; + CARD8 pad; + CARD16 sequenceNumber B16; + CARD32 length B32; + RROutput output B32; + CARD32 pad1 B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; +} xRRGetOutputPrimaryReply; +#define sz_xRRGetOutputPrimaryReply 32 + +/* * event */ typedef struct { @@ -602,8 +686,8 @@ CARD8 type; /* always evBase + RRNotify */ CARD8 subCode; /* RRNotify_OutputChange */ CARD16 sequenceNumber B16; - Time timestamp B32; /* time crtc was changed */ - Time configTimestamp B32; /* time crtc was changed */ + Time timestamp B32; /* time output was changed */ + Time configTimestamp B32; /* time config was changed */ Window window B32; /* window requesting notification */ RROutput output B32; /* affected output */ RRCrtc crtc B32; /* current crtc */ @@ -630,6 +714,70 @@ } xRROutputPropertyNotifyEvent; #define sz_xRROutputPropertyNotifyEvent 32 +typedef struct { + CARD8 reqType; + CARD8 randrReqType; + CARD16 length B16; + RRCrtc crtc B32; +} xRRGetPanningReq; +#define sz_xRRGetPanningReq 8 + +typedef struct { + BYTE type; + CARD8 status; + CARD16 sequenceNumber B16; + CARD32 length B32; + Time timestamp B32; + CARD16 left B16; + CARD16 top B16; + CARD16 width B16; + CARD16 height B16; + CARD16 track_left B16; + CARD16 track_top B16; + CARD16 track_width B16; + CARD16 track_height B16; + INT16 border_left B16; + INT16 border_top B16; + INT16 border_right B16; + INT16 border_bottom B16; +} xRRGetPanningReply; +#define sz_xRRGetPanningReply 36 + +typedef struct { + CARD8 reqType; + CARD8 randrReqType; + CARD16 length B16; + RRCrtc crtc B32; + Time timestamp B32; + CARD16 left B16; + CARD16 top B16; + CARD16 width B16; + CARD16 height B16; + CARD16 track_left B16; + CARD16 track_top B16; + CARD16 track_width B16; + CARD16 track_height B16; + INT16 border_left B16; + INT16 border_top B16; + INT16 border_right B16; + INT16 border_bottom B16; +} xRRSetPanningReq; +#define sz_xRRSetPanningReq 36 + +typedef struct { + BYTE type; + CARD8 status; + CARD16 sequenceNumber B16; + CARD32 length B32; + Time newTimestamp B32; + CARD32 pad1 B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; +} xRRSetPanningReply; +#define sz_xRRSetPanningReply 32 + #undef RRModeFlags #undef RRCrtc #undef RRMode diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/randrproto-1.2.2/randrproto.txt new/randrproto-1.2.99.4/randrproto.txt --- old/randrproto-1.2.2/randrproto.txt 2008-06-23 20:50:35.000000000 +0200 +++ new/randrproto-1.2.99.4/randrproto.txt 2009-02-25 17:07:26.000000000 +0100 @@ -1,6 +1,6 @@ The X Resize, Rotate and Reflect Extension - Version 1.2 - 2006-4-13 + Version 1.3 + 2006-20-7 Jim Gettys Jim.Gettys(a)hp.com @@ -110,6 +110,20 @@ requiring that nothing be connected to the second CRTC when driving a high resolution screen on the first. +1.3 Introduction to version 1.3 of the extension + +Version 1.3 builds on the changes made with version 1.2 and adds some new +capabilities without fundmentally changing the extension again. The +following features are added in this version: + + • Projective Transforms. The implementation work for general rotation + support made it trivial to add full projective transformations. These + can be used to scale the screen up/down as well as perform projector + keystone correct or other effects. + + • Panning. It was removed with RandR 1.2 because the old semantics didn't + fit any longer. With RandR 1.3 panning can be specified per crtc. + 1.1 Acknowledgements Our thanks to the contributors to the design found on the xpert mailing @@ -497,6 +511,12 @@ extension and the core protocol. They must be non-zero, or Value error results. + If panning is enabled, the width and height of the panning and the + tracking areas are adapted to the new size and clamped afterwards. + Disabled panning axes remain disabled. + Panning borders are disabled if their requirements are no longer met + (see RRSetPanning). + ┌─── RRGetScreenResources window: WINDOW @@ -528,10 +548,10 @@ This request explicitly asks the server to ensure that the configuration data is up-to-date wrt the hardware. If that requires - polling, this is when such polling would take place. Requests for - further information should not poll, but rather return the data - collected at this point. - + polling, this is when such polling would take place. If the + current configuration is all that's required, use + RRGetScreenResourcesCurrent instead. + ┌─── RRGetOutputInfo output: OUTPUT @@ -846,8 +866,10 @@ 'x' and 'y' indicate the position of this CRTC within the screen region. They will be set to 0 when the CRTC is disabled. - 'width' and 'height' indicate the size of the area presented by this - CRTC. + 'width' and 'height' indicate the size of the area within the screen + presented by this CRTC. This may be different than the size of the + mode due to rotation. They will be set to 0 when the CRTC is + disabled. 'mode' indicates which mode is active, or None indicating that the CRTC has been disabled and is not displaying the screen contents. @@ -925,6 +947,12 @@ then re-enabling the CRTC at the new configuration to avoid an invalid intermediate configuration. + If panning is enabled, the width and height of the panning and the + tracking areas are clamped to the new mode size. + Disabled panning axes remain disabled. + Panning borders are disabled if their requirements are no longer met + (see RRSetPanning). + When this request succeeds, 'status' contains Success and the requested changes to configuration will have been made. @@ -968,6 +996,250 @@ must be the size returned by RRGetCrtcGammaSize else a Value error results. +7.2. Extension Requests added in version 1.3 of the extension + +┌─── + RRGetScreenResourcesCurrent + window: WINDOW + ▶ + timestamp: TIMESTAMP + config-timestamp: TIMESTAMP + crtcs: LISTofCRTC + outputs: LISTofOUTPUT + modes: LISTofMODEINFO +└─── + Errors: Window + + RRGetScreenResourcesCurrent returns the list of outputs and crtcs + connected to the screen associated with 'window'. + + 'timestamp' indicates when the configuration was last set. + + 'config-timestamp' indicates when the configuration information last + changed. Requests to configure the output will fail unless the + timestamp indicates that the information the client is using is up + to date, to ensure clients can be well behaved in the face of race + conditions. + + 'crtcs' contains the list of CRTCs associated with the screen. + + 'outputs' contains the list of outputs associated with the screen. + + 'modes' contains the list of modes associated with the screen + + Unlike RRGetScreenResources, this merely returns the current + configuration, and does not poll for hardware changes. + +┌─── + RRSetCrtcTransform + crtc: CRTC + transform: TRANSFORM + filter: STRING8 + values: LISTofFIXED +└─── + Errors: Crtc, Match + + This request provides a mechanism that is more general than the + existing rotation and reflection values for describing the + transformation from frame buffer image to crtc presentation. + 'transform' is a full 2D projective transformation from screen + coordinate space to crtc coordinate space. This transformation is + applied before the rotation and reflection values to compute the + complete transform. + + 'filter' and 'values' specify a Render filter that may be used by the + server when transforming data from frame buffer to crtc. + + This request sets the transform to be used at the next + RRSetCrtcConfig request execution; it does not cause any change to + occur in the current configuration. + + When a non-identity transformation is in use, the rectangle returned + by RRGetCrtcInfo defines the bounding rectangle of the screen that is + projected to the crtc. It is this projected rectangle which must be + within the area of the screen when the mode is set. + +┌─── + RRGetCrtcTransform + crtc: CRTC + ▶ + pending-transform: TRANSFORM + pending-filter: STRING8 + pending-values: LISTofFIXED + current-transform: TRANSFORM + current-filter: STRING8 + current-values: LISTofFIXED +└─── + + This request returns the pending and current transforms for the + specified CRTC. The pending transform will be the same as the current + transform if no new pending transform has been set since the last call + to RRSetCrtcConfig. + +┌─── + RRGetPanning + crtc: CRTC + ▶ + status: RRCONFIGSTATUS + timestamp: TIMESTAMP + left, top, width, height: CARD16 + track_left, track_top, track_width, track_height: CARD16 + border_left, border_top, border_right, border_bottom: INT16 +└─── + + Errors: Crtc + + Version 1.3 adds panning support again. If multiple crtcs are active + the panning behavior can be defined per crtc individually. + RRGetPanning returns information about the currently set panning + configuration for the specified crtc. If the CRTC does not support + panning, all fields (except timestamp) will be 0. + + 'timestamp' indicates when the configuration was last set. + + All other entries are explained for RRSetPanning. + +┌─── + RRSetPanning + crtc: CRTC + timestamp: TIMESTAMP + left, top, width, height: CARD16 + track_left, track_top, track_width, track_height: CARD16 + border_left, border_top, border_right, border_bottom: INT16 + ▶ + status: RRCONFIGSTATUS + new-timestamp: TIMESTAMP +└─── + Errors: Crtc, Match + + This request sets the panning parameters. As soon as panning is + enabled, the CRTC position can change with every pointer move. + RRCrtcChangeNotify events are sent to the clients requesting those. + + If 'timestamp' is less than the time when the configuration was last + successfully set, the request is ignored and InvalidTime returned in + status. + + ┌──┳━━━━━━━━━━━━━━┳─────┬ ─ ─ ─ ─ ─ ┐ + │ ┃ CRTC ┃ │ + │ ┃ ┃ │ │ + │ ┃ X┃→ │ + │ ┃ ┃ │ │ framebuffer + │ ┗━━━━━━━━━━━━━━┛ │ + │ │ │ + │panning area │ + └───────────────────────┴ ─ ─ ─ ─ ─ ┘ + + 'left', 'top', 'width', and 'height' contain the total panning area + for this CRTC. 'width' has to be larger than or equal to the CRTC's + width or 0, and 'left'+'width' must be within the screen size, else a + Match error results. Equivalent restrictions for the height exist. + 'width' or 'height' set to 0 indicate that panning should be disabled + on the according axis. Setting 'width'/'height' to the CRTC's + width/height will disable panning on the X/Y axis as well, but + RRSetScreenSize will silently enable panning if the screen size is + increased. This does not happen if set to 0. + + ┌────────┳━━━━━━━━━━━━━━┳ ─ ─ ─ ─ ─ ┐ + │ ┃ CRTC ┃ + │ ┃ ┃ │ + │ ┃ ┃ + │ ┃ ┃ │ tracking area + │ ┗━━━━━━━━━━━━━━┫ X + │ ↓ │ ↓ │ + │panning area │ + └───────────────────────┴ ─ ─ ─ ─ ─ ┘ + + 'track_left', 'track_top', 'track_width', and 'track_height' contain + the pointer area for which the panning region is updated. For normal + use cases it should enclose the panning area minus borders, and is + typically set to either the panning area minus borders, or to the + total screen size. If set to the total screen size, the CRTC will pan + in the remaining axis even if the pointer is outside the panning area + on a different CRTC, as shown in the figure above. If the pointer is + outside the tracking area, the CRTC will not pan. Zero can be used as + an alias for the total screen size. + + ┌──┳━━━━━━━━━━━━━━┳────────────┐ + │ ┃ CRTC ┃ │ + │ ┃ ┃ │ + │ ┃ ┃→ │ + │ ┃ X←→┃ │ + │ ┃ border_right │ + │ ┗━━━━━━━━━━━━━━┛ │ + │ │ + │panning area │ + └──────────────────────────────┘ + + 'border_left', 'border_top', 'border_right', and 'border_bottom' + define the distances from the CRTC borders that will activate panning + if the pointer hits them. If the borders are 0, the screen will pan + when the pointer hits the CRTC borders (behavior of pre-RandR Xserver + panning). If the borders are positive, the screen will pan when the + pointer gets close to the CRTC borders, if they are negative, the + screen will only pan when the pointer is already way past the CRTC + borders. Negative values might confuse users and disable panning to + the very edges of the screen. Thus they are discouraged. + border_left + border_right has to be lower or equal than the CRTC's + width, else a Match error results. An equivalent restriction for the + height exists. + + Screen size changes update the panning and the tracking areas to the + new size. Both screen size changes and mode changes clamp these areas + to the current CRTC size. In these cases panning borders are disabled + if their requirements are no longer met. + + When this request succeeds, 'status' contains Success and the + requested changes to configuration will have been made. + + 'new-time-stamp' contains the time at which this request was + executed. + +┌─── + RRSetOutputPrimary + window: WINDOW + output: OUTPUT +└─── + Errors: Match, Output, Window + + RRSetOutputPrimary marks 'output' as the primary output for the + screen with the same root window as 'window'. This output's CRTC + will be sorted to the front of the list in Xinerama and RANDR + geometry requests for the benefit of older applications. The + default primary output is None, and None is a legal value to pass + to RRSetOutputPrimary. This request is expected to be used by + desktop environments to mark the screen that should hold the primary + menu bar or panel. + + If the named output is not connected to any CRTC, or if the Window + and Output are not attached to the same screen, BadMatch is generated. + In the latter case, errorValue will be the Window, not the Output. + + As this changes the logical layout of the screen, ConfigureNotify + and RRScreenChangeNotify will be generated on the appropriate root + window when the primary output is changed by this call. This request + also generates RROutputChangeNotify events on the outputs that gained + and lost primary status. + + If an output is disconnected asynchronously (eg. due to recabling), + the primary status does not change, but RROutputChangeNotify events + will be generated if the hardware is capable of detecting this; + clients are expected to reconfigure if appropriate. + + If an output is deleted (eg. due to device hotplug), the server will + act as though None was passed to RRSetOutputPrimary, including + generating the appropriate events. + +┌─── + RRGetOutputPrimary + window: WINDOW + ▶ + output: OUTPUT +└─── + Errors: Window + + RRGetOutputPrimary returns the primary output for the system. + ❧❧❧❧❧❧❧❧❧❧❧ 8. Extension Events @@ -990,12 +1262,12 @@ configTimestamp: TIMESTAMP time config data was changed root: WINDOW root window of screen window: WINDOW window requesting notification - size-id: SIZEID index of new size + size-id: SIZEID index of new SCREENSIZE subpixelOrder: SUBPIXELORDER order of subpixels - widthInPixels: CARD16 - heightInPixels: CARD16 - widthInMillimeters: CARD16 - heightInMillimeters: CARD16 + widthInPixels: CARD16 width in pixels of the new SCREENSIZE + heightInPixels: CARD16 height in pixels of the new SCREENSIZE + widthInMillimeters: CARD16 width in mm of the new SCREENSIZE + heightInMillimeters: CARD16 height in mm of the new SCREENSIZE └─── This event is generated whenever the screen configuration is changed and sent to requesting clients. 'timestamp' indicates when the @@ -1021,6 +1293,13 @@ just at the time when a display manager or log in script might be changing the screen size or configuration. + Note that the sizes in this event reflect the new SCREENSIZE and + thus will appear rotated by the 'rotation' parameter from the sizes + of the screen itself. In other words, when rotation is 90 or 270, + widthInPixels in this event will be the same as the height value + from a ConfigureNotify that reflects the same size change. This + will probably confuse developers. + 8.1 Events added in version 1.2 of the RandR extension ┌─── @@ -1065,27 +1344,26 @@ ┌─── RRCrtcChangeNotify timestamp: TIMESTAMP time monitor was changed - config-timestamp: TIMESTAMP time config data was changed - root: WINDOW root window of screen window: WINDOW window requesting notification crtc: CRTC CRTC which changed mode: MODE new mode rotation: ROTATION; new rotation x: INT16 x position of CRTC within screen y: INT16 y position of CRTC within screen + width: CARD16 width of new mode + height: CARD16 height of new mode └─── This event is generated whenever the CRTC configuration is changed and sent to requesting clients. 'timestamp' indicates when the - CRTC configuration was changed. 'config-timestamp' says when the - last time the configuration was changed. 'root' is the root of the - screen the change occurred on, 'window' is window selecting for this - event. + CRTC configuration was changed. 'window' is window selecting for this + event. 'mode' is the new mode, or None if the crtc is disabled. + 'x' and 'y' mark the location in the screen where this CRTC + is reading data. 'width' and 'height' indicate the size of the + mode. 'x', 'y, 'width' and 'height' are all zero when 'mode' is None. This event is sent whenever the monitor's configuration changes or if a new monitor configuration becomes available that was - not available in the past. In this case (config-timestamp in - the event not being equal to the config-timestamp returned in - the last call to RRGetCrtcModes), the client MUST call + not available in the past. In this case, the client MUST call RRGetCrtcModes to update its view of possible monitor configurations to have a correct view of possible monitor organizations. @@ -1100,7 +1378,173 @@ ❧❧❧❧❧❧❧❧❧❧❧ -9. Extension Versioning +9. Properties + +Properties are used for output specific parameters, and for announcing +static or rarely changing data. Announced data is typically +immutable. Properties are also used for evaluating new parameters +before adding them to the RandR protocol. + +The following properties are hereby declared official, and drivers SHOULD +prefix driver specific properties with '_', unless they are planned to be +added to this specification. List values, that are not declared by the table +below, and will remain driver specific or are not planned to be added to this +specification, SHOULD be prefixed with "_" as well in order to avoid name +space or semantics clashes with future extensions of these values. + +Beginning with version 1.3 of the RandR extension, certain properties +are mandatory and MUST be provided by implementations. Earlier +versions of the RandR extension MAY provide these properties as well, +as long as the semantics are not altered. Clients SHOULD fall back +gracefully to lower version functionality, though, if the driver +doesn't handle a mandatory property correctly. + +9.1 Known properties + + "EDID" aka RR_PROPERTY_RANDR_EDID + Type: int8 [n] + Flags: Immutable + Range/List: - + + Raw EDID data from the device attached to the according + output. Should include main EDID data and all extension + blocks. + + "SignalFormat" aka RR_PROPERTY_SIGNAL_FORMAT + Type: int32 / Atom + Flags: - + Range/List: unknown VGA TMDS LVDS Composite Composite-PAL + Composite-NTSC Composite-SECAM SVideo + Component DisplayPort + + Signal format / physical protocol format that is used for the + specified output. valid-values lists all possible formats on this + output, which SHOULD be a subset of the list above and MUST be static. + Values with dashes (Composite-PAL) describe more specific versions of + the base values (Composite) and SHOULD be used if known to the driver. + A driver MAY change this property of an output if the underlying + hardware indicates a protocol change (e.g. TV formats). Clients are + allowed to change the signal format in order to select a different + signal format (e.g. Composite etc.) or physical protocol (e.g. VGA or + TMDS on DVI-I). + Laptop panels SHOULD not be detected with this property, but rather by + ConnectorType. + + "SignalProperties" aka RR_PROPERTY_SIGNAL_FORMAT + Type: int32 [n] / Atom + Flags: - + Range/List: For Composite signals: + NTSC NTSC-M NTSC-J NTSC-N NTSC-4.43 NTSC-film + PAL PAL-B PAL-G PAL-H PAL-H PAL-I PAL-M PAL-D + PAL-N PAL-Nc PAL-L PAL-60 + SECAM SECAM-L SECAM-B SECAM-G SECAM-D SECAM-K + SECAM-H SECAM-K + For TMDS signals: + SingleLink DualLink + For DisplayPort signals: + Lane1 Lane2 Lane4 LowSpeed HiSpeed + + Properties of the signal format that is currently used for the + specified output. valid-values lists all possible properties on this + output, which SHOULD be a subset of the list above. It will change if + SignalFormat changes. Multiple properties are allowed. + Values with dashes (PAL-B) describe more specific versions of the base + values (PAL) and SHOULD be used if known to the driver. A driver MAY + change this property of an output if the underlying hardware indicates + a signal change (e.g. TV formats). Clients are allowed to change the + properties in order to select a different signal subformat. + + "ConnectorType" aka RR_PROPERTY_CONNECTOR_TYPE + Type: int32 / Atom + Flags: Immutable, Static + Range/List: unknown VGA DVI DVI‐I DVI‐A DVI‐D HDMI Panel + TV TV-Composite TV-SVideo TV-Component + TV-SCART TV-C4 DisplayPort + + Connector type, as far as known to the driver. + Values with dashes (TV‐Composite) describe more specific versions of + the base values (TV). The former SHOULD be used if the connector is + not capable of producing other signal formats. The later SHOULD be + used if the exact connector is unknown, or the connector is a + multi‐format connector that is not described otherwise. DVI, for + instance, SHOULD be handled like a DVI‐I connector, unless additional + information is available to the user agent. PANEL describes + laptop‐internal (normally LVDS) displays. TV, TV‐SCART, TV‐Component, + and TV‐C4 with signal format VGA are valid combinations and describe + RGB TV signals. + + "ConnectorNumber" aka RR_PROPERTY_CONNECTOR_NUMBER + Type: int32 + Flags: Immutable, Static + Range/List: 0- + + Outputs that route their signal to the same connector MUST + have the same connector number. Outputs with the same + connector number MUST route their signal to the same + connector, except if it is 0, which indicates unknown + connectivity. 1 is called the primary connector, 2 the + secondary. 3 is typically a TV connector, but that is completely + driver / hardware dependent. + Outputs with the same connector number SHOULD have the same + connector type. Meaning and client behavior for mismatching + connector types is undefined at the moment. + + "CompatibilityList" aka RR_PROPERTY_COMPATIBILITY_LIST + Type: int32 [2*n] / Atom pairs + Flags: Immutable + Range/List: 0- + + Some combinations of outputs on some cards cannot be served at all, + because the according encoder is only capable of driving one output at + a time. + This property lists all output + signal format pairs that can be + driven together with this output. NULL atoms specify any output / any + signal format, respectively. + This property MUST be symmetric, but may change with changing signal + format. I.e. if the property for DVI-1/TMDS specifies VGA-1/VGA to be + available, VGA-1/VGA has to list DVI-1/TMDS as well. + + "CloneList" aka RR_PROPERTY_CLONE_LIST + Type: int32 [2*n] / Atom pairs + Flags: Immutable + Range/List: 0- + + Some combinations of outputs on some cards cannot be served + independently from each other, because they are wired up to the same + encoder outputs. + This property lists all output + signal format pairs that are + driven together with this output, and thus can only be programmed in + clone mode with the same CRTC. + This property MUST be symmetric, but may change with changing signal + format. I.e. if the property for DVI-1/VGA specifies VGA-1/VGA to be + cloned, VGA-1/VGA has to list DVI-1/VGA as well. + Outputs / format pairs listed in this property MUST be included in the + CompatibilityList. + + +9.2 Properties introduced with version 1.2 of the RandR extension + +Property Immutable Mandatory since +──────── ───────── ─────────────── +EdidData yes n/a + +EdidData is provided by the RandR frontend, thus not driver specific. + + +9.3 Properties introduced with version 1.3 of the RandR extension + +Property Immutable Mandatory since +──────── ───────── ─────────────── +SignalFormat no RandR 1.3 +SignalProperties no not mandatory +ConnectorType yes: static RandR 1.3 +ConnectorNumber yes: static not mandatory +CompatibilityList yes not mandatory +CloneList yes not mandatory + + ❧❧❧❧❧❧❧❧❧❧❧ + +10. Extension Versioning The RandR extension was developed in parallel with the implementation to ensure the feasibility of various portions of the design. As @@ -1128,23 +1572,29 @@ 1.2: Separate screens from CRTCs and outputs, switch to full VESA modes + 1.3: Added cheap version of RRGetScreenResources. Added CRTC + transformations. Added panning. Added primary outputs. + Added standard properties. + Compatibility between 0.0 and 1.0 was *NOT* preserved, and 0.0 clients will fail against 1.0 servers. The wire encoding op-codes were changed for GetScreenInfo to ensure this failure in a relatively graceful way. Version 1.1 servers and clients are cross compatible with 1.0. Version 1.1 is considered to be stable and we intend upward compatibility from this point. Version 1.2 offers an extended model of the -system with multiple output support. It offers backward compatibility with -version 1.1. +system with multiple output support. Version 1.3 adds a cheap version of +GetScreenResources to avoid expensive DDC operations, CRTC transformations, +panning, and the primary output concept. 1.2 and 1.3 are backward-compatible +with 1.1. ❧❧❧❧❧❧❧❧❧❧❧ -10. Relationship with other extensions +11. Relationship with other extensions Two other extensions have a direct relationship with this extension. This section attempts to explain how these three are supposed to work together. -10.1 XFree86-VidModeExtension +11.1 XFree86-VidModeExtension XFree86-VidModeExtension changes the configuration of a single monitor attached to the screen without changing the configuration of the screen @@ -1161,7 +1611,7 @@ should be used in preference to XFree86-VidModeExtension where both are present. -10.2 Xinerama +11.2 Xinerama Xinerama provides a mechanism for describing the relationship between the overall screen display and monitors placed within that area. As such, it @@ -1434,6 +1884,7 @@ 2 n length of name 4c LISTofCRTC crtcs 4m LISTofMODE modes + 4o LISTofOUTPUT clones n STRING8 name p unused, p=pad(n) └─── @@ -1680,6 +2131,155 @@ p unused, p=pad(6n) └─── +A.2.2 Protocol Requests added with version 1.3 + +┌─── + RRGetScreenResourcesCurrent + 1 CARD8 major opcode + 1 25 RandR opcode + 2 2 length + 4 WINDOW window + ▶ + 1 1 Reply + 1 unused + 2 CARD16 sequence number + 4 c+o+8m+(b+p)/4 reply length + 4 TIMESTAMP timestamp + 4 TIMESTAMP config-timestamp + 2 c number of CRTCs + 2 o number of outputs + 2 m number of modeinfos + 2 b total bytes in mode names + 8 unused + 4c LISTofCRTC crtcs + 4o LISTofOUTPUT outputs + 32m LISTofMODEINFO modeinfos + b STRING8 mode names + p unused, p=pad(b) +└─── + +┌─── + RRSetCrtcTransform + 1 CARD8 major opcode + 1 26 RandR opcode + 2 12+(n+p)/4+v length + 4 CRTC crtc + 36 TRANSFORM transform + 2 CARD16 filter length + 2 unused + n STRING8 filter name + p unused, p=pad(n) + 4v FIXED filter params +└─── + +┌─── + RRGetCrtcTransform + 1 CARD8 major opcode + 1 27 RandR opcode + 2 2 length + 4 CRTC crtc + ▶ + 1 1 Reply + 1 unused + 2 CARD16 sequence number + 4 16+(pn+pnp)/4+(cn+cnp)/4+pf+cf reply length + 36 TRANSFORM pending transform + 1 BOOL has transforms + 3 unused + 36 TRANSFORM current transform + 4 unused + 2 pn pending filter name length + 2 pf pending filter num params + 2 cn current filter name length + 2 cf current filter num params + pn STRING8 pending filter name + pnp unused, pnp=pad(pn) + 4*pf FIXED pending filter params + cn STRING8 current filter name + cnp unused, cnp=pad(cn) + 4*cf FIXED current filter params +└─── + +┌─── + RRGetPanning + 1 CARD8 major opcode + 1 28 RandR opcode + 2 2 length + 4 CRTC crtc + ▶ + 1 1 Reply + 1 RRCONFIGSTATUS status + 2 CARD16 sequence number + 4 1 reply length + 4 TIMESTAMP timestamp + 2 CARD16 left + 2 CARD16 top + 2 CARD16 width + 2 CARD16 height + 2 CARD16 track_left + 2 CARD16 track_top + 2 CARD16 track_width + 2 CARD16 track_height + 2 INT16 border_left + 2 INT16 border_top + 2 INT16 border_right + 2 INT16 border_bottom +└─── +┌─── + RRSetPanning + 1 CARD8 major opcode + 1 29 RandR opcode + 2 9 length + 4 CRTC crtc + 4 TIMESTAMP timestamp + 2 CARD16 left + 2 CARD16 top + 2 CARD16 width + 2 CARD16 height + 2 CARD16 track_left + 2 CARD16 track_top + 2 CARD16 track_width + 2 CARD16 track_height + 2 INT16 border_left + 2 INT16 border_top + 2 INT16 border_right + 2 INT16 border_bottom + ▶ + 1 1 Reply + 1 RRCONFIGSTATUS status + 2 CARD16 sequence number + 4 0 reply length + 4 TIMESTAMP new timestamp + 20 unused +└─── + +┌─── + RRSetOutputPrimary + 1 CARD8 major opcode + 1 30 RandR opcode + 2 3 length + 4 WINDOW window + 4 OUTPUT output +└─── + +┌─── + RRGetOutputPrimary + 1 CARD8 major opcode + 1 31 RandR opcode + 2 2 length + 4 WINDOW window + ▶ + 1 1 Reply + 1 unused + 2 CARD16 sequence number + 4 CARD32 length + 4 OUTPUT output + 4 CARD32 pad1 + 4 CARD32 pad2 + 4 CARD32 pad3 + 4 CARD32 pad4 +└─── + A.3 Protocol Events ┌─── ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtk2-engines for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package gtk2-engines for openSUSE:Factory checked in at Thu Feb 26 03:56:50 CET 2009. -------- --- GNOME/gtk2-engines/gtk2-engines.changes 2009-02-17 23:48:29.000000000 +0100 +++ gtk2-engines/gtk2-engines.changes 2009-02-24 23:50:36.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Feb 24 23:49:02 CET 2009 - vuntz(a)novell.com + +- Drop gnome-themes-industrial-tree-insensitive-text-color.diff: + it's not needed anymore (it has been fixed upstream during some + rewrite) +- Drop indus_43092.diff: upstream doesn't want this and we don't + want to differ there, especially for a theme we don't use as the + default one. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-themes-industrial-tree-insensitive-text-color.diff indus_43092.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2-engines.spec ++++++ --- /var/tmp/diff_new_pack.dU8513/_old 2009-02-26 03:55:20.000000000 +0100 +++ /var/tmp/diff_new_pack.dU8513/_new 2009-02-26 03:55:20.000000000 +0100 @@ -25,7 +25,7 @@ BuildRequires: intltool Summary: Engines for GTK2 Themes Version: 2.17.3 -Release: 1 +Release: 2 License: LGPL v2.1 or later Group: System/GUI/GNOME Source: %{_name}-%{version}.tar.bz2 @@ -34,9 +34,6 @@ Conflicts: gnome-themes < 2.11.90 Requires: gtk2 >= 2.10.0 Url: http://www.gnome.org -# Fixes from gnome-themes -Patch6: indus_43092.diff -Patch14: gnome-themes-industrial-tree-insensitive-text-color.diff Provides: %{name}-devel = %{version}-%{release} Enhances: gtk2 # Prevent missing engine failures on bi-arch systems: @@ -59,12 +56,8 @@ %prep %setup -q -n %{_name}-%{version} -# Fixes from gnome-themes -%patch6 -%patch14 %build -#autoreconf -f -i %configure # FIXME: # --enable-lua\ @@ -89,6 +82,13 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Feb 24 2009 vuntz(a)novell.com +- Drop gnome-themes-industrial-tree-insensitive-text-color.diff: + it's not needed anymore (it has been fixed upstream during some + rewrite) +- Drop indus_43092.diff: upstream doesn't want this and we don't + want to differ there, especially for a theme we don't use as the + default one. * Tue Feb 17 2009 vuntz(a)novell.com - Update to version 2.17.3: + Relicense to LGPL 2.1 or later. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-xtrans-devel for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package xorg-x11-xtrans-devel for openSUSE:Factory checked in at Thu Feb 26 03:49:35 CET 2009. -------- --- xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.changes 2008-10-25 11:29:11.000000000 +0200 +++ xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.changes 2009-02-26 03:00:26.758760237 +0100 @@ -1,0 +2,5 @@ +Thu Feb 26 03:00:17 CET 2009 - sndirsch(a)suse.de + +- xtrans 1.2.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xtrans-1.2.1.tar.bz2 New: ---- xtrans-1.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-xtrans-devel.spec ++++++ --- /var/tmp/diff_new_pack.N31237/_old 2009-02-26 03:49:02.000000000 +0100 +++ /var/tmp/diff_new_pack.N31237/_new 2009-02-26 03:49:02.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-xtrans-devel (Version 7.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,9 +20,9 @@ Name: xorg-x11-xtrans-devel Url: http://xorg.freedesktop.org/ -%define tarball_version 1.2.1 +%define tarball_version 1.2.3 Version: 7.4 -Release: 4 +Release: 5 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/X11 @@ -81,6 +81,8 @@ /usr/share/aclocal/*.m4 %changelog +* Thu Feb 26 2009 sndirsch(a)suse.de +- xtrans 1.2.3 * Sat Oct 25 2008 sndirsch(a)suse.de - xtrans-sig11.diff * Before accessing the string it needs to be checked if the @@ -117,7 +119,7 @@ * Thu Aug 17 2006 sndirsch(a)suse.de - removed xorg-x11-xproto-devel from BuildRequires to improve autobuild deps -* Sun Aug 06 2006 sndirsch(a)suse.de +* Sat Aug 05 2006 sndirsch(a)suse.de - p_xauth.diff: * Let X authorization be tolerant to hostname changes (Bug #98627) * Wed Aug 02 2006 ro(a)suse.de ++++++ xtrans-1.2.1.tar.bz2 -> xtrans-1.2.3.tar.bz2 ++++++ ++++ 4493 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server-dmx for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package xorg-x11-server-dmx for openSUSE:Factory checked in at Thu Feb 26 03:48:54 CET 2009. -------- --- xorg-x11-server-dmx/xorg-x11-server-dmx.changes 2009-02-18 00:50:55.000000000 +0100 +++ xorg-x11-server-dmx/xorg-x11-server-dmx.changes 2009-02-25 21:40:42.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Feb 25 12:07:43 EST 2009 - davidr(a)novell.com + +- Fix colormap allocation. (bnc#479683) +- Allow up to 256 simultaneous displays. (bnc#477376) + +------------------------------------------------------------------- +Tue Feb 24 13:27:25 EST 2009 - davidr(a)novell.com + +- Make sure default backend server is always terminated. + (bnc#479149) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bug-477376-max-displays.diff bug-479149-set-xfake-death-signal.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server-dmx.spec ++++++ --- /var/tmp/diff_new_pack.g22219/_old 2009-02-26 03:43:34.000000000 +0100 +++ /var/tmp/diff_new_pack.g22219/_new 2009-02-26 03:43:34.000000000 +0100 @@ -38,7 +38,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3.99 -Release: 14 +Release: 16 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -99,6 +99,8 @@ Patch116: xserver-add-atKeynames.h.diff Patch117: bug-468393_dbus-conf-and-policy.diff Patch118: xserver-dmx-disable-xi.diff +Patch119: bug-479149-set-xfake-death-signal.diff +Patch120: bug-477376-max-displays.diff %description This package contains the X.Org Server. @@ -167,8 +169,10 @@ #%patch114 -p1 %patch115 -p1 %patch116 -p1 -%patch117 -p1 +#%patch117 -p1 %patch118 -p1 +%patch119 -p1 +%patch120 -p1 %build pushd libXi-1.1.99.1 @@ -263,6 +267,12 @@ %{_mandir}/man1/Xdmx.1* %changelog +* Wed Feb 25 2009 davidr(a)novell.com +- Fix colormap allocation. (bnc#479683) +- Allow up to 256 simultaneous displays. (bnc#477376) +* Tue Feb 24 2009 davidr(a)novell.com +- Make sure default backend server is always terminated. + (bnc#479149) * Tue Feb 17 2009 davidr(a)novell.com - Fix interface in dbus policy file. (bnc#468393) * Thu Feb 05 2009 davidr(a)novell.com ++++++ bug-477376-max-displays.diff ++++++ --- a/config/Makefile.am +++ b/config/Makefile.am @@ -19,4 +19,9 @@ if CONFIG_HAL libconfig_a_SOURCES += hal.c endif -EXTRA_DIST = xorg-server.conf x11-input.fdi +xorg-server.conf: + echo -e "<!DOCTYPE busconfig PUBLIC\n \"-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN\"\n \"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd\">\n<busconfig>\n\t<policy context=\"default\">" > $@ + for n in `seq 0 255`; do echo -e "\t\t<allow own=\"org.x.config.display$$n\"/>\n\t\t<allow send_destination=\"org.x.config.display$$n\"\n\t\t send_interface=\"org.x.config.input\"/>\n\t\t<allow send_destination=\"org.x.config.display$$n\"\n\t\t send_interface=\"org.x.config.dmx\"/>" >> $@; done + echo -e "\t</policy>\n</busconfig>" >> $@ + +EXTRA_DIST = x11-input.fdi --- a/config/xorg-server.conf +++ /dev/null @@ -1,13 +0,0 @@ -<!DOCTYPE busconfig PUBLIC - "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <policy context="default"> - <allow own="org.x.config.display0"/> - <allow send_destination="org.x.config.display0"/> - <allow send_interface="org.x.config.display0"/> - <allow own="org.x.config.display1"/> - <allow send_destination="org.x.config.display1"/> - <allow send_interface="org.x.config.display1"/> - </policy> -</busconfig> --- a/hw/dmx/dmxlaunch.c +++ b/hw/dmx/dmxlaunch.c @@ -59,7 +59,7 @@ static char *xbeProg = NULL; static char xbeDisplayBuf[256]; static char *xbeDisplay = NULL; -static int xbeDisplayOffset = 53; +static int xbeDisplayOffset = 256; static pid_t xbePid = 0; static int receivedUsr1 = 0; ++++++ bug-479149-set-xfake-death-signal.diff ++++++ --- a/hw/dmx/dmxlaunch.c +++ b/hw/dmx/dmxlaunch.c @@ -42,6 +42,7 @@ #include <sys/types.h> #include <sys/wait.h> #include <sys/stat.h> +#include <sys/prctl.h> #include <libgen.h> #include <fcntl.h> @@ -391,6 +392,7 @@ dmxLaunchDisplay (int argc, char *argv[], int index, char *vt) break; case 0: signal (SIGUSR1, SIG_IGN); + prctl (PR_SET_PDEATHSIG, SIGKILL); execv (xbeArgv[0], xbeArgv); perror (xbeArgv[0]); exit (2); ++++++ xserver-NOMAD.diff ++++++ --- /var/tmp/diff_new_pack.g22219/_old 2009-02-26 03:43:37.000000000 +0100 +++ /var/tmp/diff_new_pack.g22219/_new 2009-02-26 03:43:37.000000000 +0100 @@ -23947,14 +23947,16 @@ + void *data); #endif diff --git a/hw/dmx/dmxvisual.c b/hw/dmx/dmxvisual.c -index 7b8771f..0d90ae1 100644 +index 7b8771f..379a276 100644 --- a/hw/dmx/dmxvisual.c +++ b/hw/dmx/dmxvisual.c -@@ -93,7 +93,7 @@ Visual *dmxLookupVisual(ScreenPtr pScreen, VisualPtr pVisual) +@@ -92,8 +92,8 @@ Visual *dmxLookupVisual(ScreenPtr pScreen, VisualPtr pVisual) + for (i = 0; i < dmxScreen->beNumVisuals; i++) { if (pVisual->class == dmxScreen->beVisuals[i].class && - pVisual->bitsPerRGBValue == dmxScreen->beVisuals[i].bits_per_rgb && +- pVisual->bitsPerRGBValue == dmxScreen->beVisuals[i].bits_per_rgb && - pVisual->ColormapEntries == dmxScreen->beVisuals[i].colormap_size && ++ pVisual->bitsPerRGBValue <= dmxScreen->beVisuals[i].bits_per_rgb && + pVisual->ColormapEntries <= dmxScreen->beVisuals[i].colormap_size && pVisual->nplanes == dmxScreen->beVisuals[i].depth && pVisual->redMask == dmxScreen->beVisuals[i].red_mask && ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Thu Feb 26 03:43:26 CET 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-02-16 09:03:59.000000000 +0100 +++ xorg-x11-server/xorg-x11-server.changes 2009-02-24 12:09:23.352175327 +0100 @@ -1,0 +2,6 @@ +Tue Feb 24 12:08:59 CET 2009 - sndirsch(a)suse.de + +- bug474071-fix1.diff + * fixes Xserver issue of bnc #474071 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bug474071-fix1.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.t13292/_old 2009-02-26 03:40:57.000000000 +0100 +++ /var/tmp/diff_new_pack.t13292/_new 2009-02-26 03:40:57.000000000 +0100 @@ -29,7 +29,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 25 +Release: 27 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -113,6 +113,7 @@ Patch126: commit-a9e2030.diff Patch127: dpms_screensaver.diff Patch128: pci-legacy-mem-fallback.diff +Patch129: bug474071-fix1.diff %description This package contains the X.Org Server. @@ -235,6 +236,9 @@ %patch126 -p1 %patch127 -p1 %patch128 +pushd hw/xfree86/os-support/bus +%patch129 -p0 +popd %build pushd xorg-docs-* @@ -566,6 +570,9 @@ %endif %changelog +* Tue Feb 24 2009 sndirsch(a)suse.de +- bug474071-fix1.diff + * fixes Xserver issue of bnc #474071 * Mon Feb 16 2009 sndirsch(a)suse.de - /var/X11R6/bin no longer covered by FHS; switched to /var/lib/X11 (bnc #470969) ++++++ bug474071-fix1.diff ++++++ --- linuxPci.c.orig 2009-02-19 16:50:50.169751885 +0100 +++ linuxPci.c 2009-02-19 16:55:59.991516595 +0100 @@ -291,7 +291,7 @@ struct pci_id_match bridge_match = { PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, (PCI_CLASS_BRIDGE << 16) | (PCI_SUBCLASS_BRIDGE_PCI << 8), - 0 + (PCI_CLASS_BRIDGE << 16) | (PCI_SUBCLASS_BRIDGE_PCI << 8) }; struct pci_device *bridge; struct pci_device_iterator *iter; @@ -526,7 +526,6 @@ xf86MapLegacyIO(struct pci_device *dev) { const int domain = dev->domain; - struct pci_device *bridge = get_parent_bridge(dev); int fd; if (domain >= MAX_DOMAINS) @@ -534,9 +533,11 @@ if (DomainMmappedIO[domain] == NULL) { /* Permanently map all of I/O space */ - fd = linuxOpenLegacy(bridge, "legacy_io"); + fd = linuxOpenLegacy(dev, "legacy_io"); if (fd < 0) { - DomainMmappedIO[domain] = linuxMapPci(-1, VIDMEM_MMIO, bridge, + struct pci_device *bridge = get_parent_bridge(dev); + if (bridge != NULL) + DomainMmappedIO[domain] = linuxMapPci(-1, VIDMEM_MMIO, bridge, 0, linuxGetIOSize(bridge), PCIIOC_MMAP_IS_IO); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-proto-devel for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package xorg-x11-proto-devel for openSUSE:Factory checked in at Thu Feb 26 03:40:47 CET 2009. -------- --- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2008-09-11 14:22:48.000000000 +0200 +++ xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2009-02-26 03:07:53.630668344 +0100 @@ -1,0 +2,12 @@ +Thu Feb 26 03:07:29 CET 2009 - sndirsch(a)suse.de + +- util-macros 1.2.1 +- xproto 7.0.14 +- applewmproto 1.1.1 + +------------------------------------------------------------------- +Wed Feb 25 16:47:57 CET 2009 - sndirsch(a)suse.de + +- dri2proto 1.99.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- applewmproto-X11R7.0-1.0.3.tar.bz2 dri2proto-1.1.tar.bz2 util-macros-1.1.6.tar.bz2 xproto-7.0.13.tar.bz2 New: ---- applewmproto-1.1.1.tar.bz2 dri2proto-1.99.3.tar.bz2 util-macros-1.2.1.tar.bz2 xproto-7.0.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-proto-devel.spec ++++++ --- /var/tmp/diff_new_pack.vx4051/_old 2009-02-26 03:38:40.000000000 +0100 +++ /var/tmp/diff_new_pack.vx4051/_new 2009-02-26 03:38:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-proto-devel (Version 7.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,12 +21,12 @@ Name: xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 1 +Release: 4 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/X11 Summary: Include Files and Libraries mandatory for X11 Development -Source0: applewmproto-X11R7.0-1.0.3.tar.bz2 +Source0: applewmproto-1.1.1.tar.bz2 Source1: bigreqsproto-X11R7.0-1.0.2.tar.bz2 Source2: compositeproto-0.4.tar.bz2 Source3: damageproto-1.1.0.tar.bz2 @@ -44,7 +44,7 @@ Source15: resourceproto-X11R7.0-1.0.2.tar.bz2 Source16: scrnsaverproto-X11R7.1-1.1.0.tar.bz2 Source17: trapproto-X11R7.0-3.4.3.tar.bz2 -Source18: util-macros-1.1.6.tar.bz2 +Source18: util-macros-1.2.1.tar.bz2 Source19: videoproto-X11R7.0-2.2.2.tar.bz2 Source20: windowswmproto-X11R7.0-1.0.3.tar.bz2 Source21: xcmiscproto-X11R7.0-1.1.2.tar.bz2 @@ -56,14 +56,14 @@ Source27: xf86rushproto-X11R7.0-1.1.2.tar.bz2 Source28: xf86vidmodeproto-X11R7.0-2.2.2.tar.bz2 Source29: xineramaproto-X11R7.0-1.1.2.tar.bz2 -Source30: xproto-7.0.13.tar.bz2 +Source30: xproto-7.0.14.tar.bz2 Source31: xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2 Source32: evieext-X11R7.0-1.0.2.tar.bz2 Source33: xcb-proto-1.1.tar.bz2 Source34: libpthread-stubs-0.1.tar.bz2 Source35: vncproto-20070501.tar.bz2 Source36: xcliplistproto-20070501.tar.bz2 -Source37: dri2proto-1.1.tar.bz2 +Source37: dri2proto-1.99.3.tar.bz2 %description This package contains all necessary include files and libraries needed @@ -140,6 +140,12 @@ /usr/share/xcb/ %changelog +* Thu Feb 26 2009 sndirsch(a)suse.de +- util-macros 1.2.1 +- xproto 7.0.14 +- applewmproto 1.1.1 +* Wed Feb 25 2009 sndirsch(a)suse.de +- dri2proto 1.99.3 * Thu Sep 11 2008 sndirsch(a)suse.de - bumped release number to 7.4 * Tue Jul 29 2008 sndirsch(a)suse.de @@ -160,7 +166,7 @@ * Bug #16149: Make the field not be named 'delete' in C++ mode * Delete duplicate B32's in xRRScreenChangeNotifyEvent * Correct a copy'n'paste error in RRGetOutputInfo spec text -* Fri Jun 13 2008 sndirsch(a)suse.de +* Thu Jun 12 2008 sndirsch(a)suse.de - xproto 7.0.13 - xextproto 7.0.3 * Wed Mar 12 2008 sndirsch(a)suse.de @@ -190,7 +196,7 @@ - removed obsolete patch 'inputproto-1.4.diff' * Sat Sep 29 2007 sndirsch(a)suse.de - bumped version to 7.3 -* Sat Sep 29 2007 sndirsch(a)suse.de +* Fri Sep 28 2007 sndirsch(a)suse.de - renderproto-0.9.3 * Along with documentation updates, this release fixes several types for the X Server on 64-bit platforms, which had resulted @@ -198,11 +204,11 @@ server ABI on those platforms in fixing them. This is intended to be included in video driver ABI 2.0 (server 1.4), pending merge of the server dependency on this version. -* Fri Sep 07 2007 sndirsch(a)suse.de +* Thu Sep 06 2007 sndirsch(a)suse.de - xf86dgaproto 2.0.3 * This release is part of a pair with libXxf86dga that fixes a sign extension bug on I32L64 platforms. -* Sat Sep 01 2007 sndirsch(a)suse.de +* Fri Aug 31 2007 sndirsch(a)suse.de - inputproto 1.4.2.1: * The inputproto-1.4.2 tarball had a busted configure script, here are the new ones. @@ -272,7 +278,7 @@ - updated glproto to release 1.4.8: * (hopefully) last update of the GLX_EXT_texture_from_pixmap opcodes. -* Mon Aug 28 2006 sndirsch(a)suse.de +* Sun Aug 27 2006 sndirsch(a)suse.de - updated util-macros to release 1.1.1: * remove man suffix special-casing for GNU userland systems * Fri Jul 28 2006 sndirsch(a)suse.de ++++++ applewmproto-X11R7.0-1.0.3.tar.bz2 -> applewmproto-1.1.1.tar.bz2 ++++++ ++++ 7247 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/applewmproto-X11R7.0-1.0.3/applewm.h new/applewmproto-1.1.1/applewm.h --- old/applewmproto-X11R7.0-1.0.3/applewm.h 2004-04-23 20:43:56.000000000 +0200 +++ new/applewmproto-1.1.1/applewm.h 2008-09-26 22:53:23.000000000 +0200 @@ -70,6 +70,7 @@ /* "Kinds" of ActivationNotify events */ #define AppleWMIsActive 0 #define AppleWMIsInactive 1 +#define AppleWMReloadPreferences 2 /* "Kinds" of PasteboardNotify events */ #define AppleWMCopyToPasteboard 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/applewmproto-X11R7.0-1.0.3/applewmstr.h new/applewmproto-1.1.1/applewmstr.h --- old/applewmproto-X11R7.0-1.0.3/applewmstr.h 2004-04-23 20:43:56.000000000 +0200 +++ new/applewmproto-1.1.1/applewmstr.h 2008-10-17 07:16:02.000000000 +0200 @@ -36,12 +36,12 @@ #define APPLEWMNAME "Apple-WM" #define APPLE_WM_MAJOR_VERSION 1 /* current version numbers */ -#define APPLE_WM_MINOR_VERSION 0 -#define APPLE_WM_PATCH_VERSION 0 +#define APPLE_WM_MINOR_VERSION 1 +#define APPLE_WM_PATCH_VERSION 1 typedef struct _AppleWMQueryVersion { CARD8 reqType; /* always WMReqCode */ - CARD8 wmReqType; /* always X_WMQueryVersion */ + CARD8 wmReqType; /* always X_AppleWMQueryVersion */ CARD16 length B16; } xAppleWMQueryVersionReq; #define sz_xAppleWMQueryVersionReq 4 @@ -63,7 +63,7 @@ typedef struct _AppleWMDisableUpdate { CARD8 reqType; /* always WMReqCode */ - CARD8 wmReqType; /* always X_WMDisableUpdate */ + CARD8 wmReqType; /* always X_AppleWMDisableUpdate */ CARD16 length B16; CARD32 screen B32; } xAppleWMDisableUpdateReq; @@ -71,7 +71,7 @@ typedef struct _AppleWMReenableUpdate { CARD8 reqType; /* always WMReqCode */ - CARD8 wmReqType; /* always X_WMReenableUpdate */ + CARD8 wmReqType; /* always X_AppleWMReenableUpdate */ CARD16 length B16; CARD32 screen B32; } xAppleWMReenableUpdateReq; @@ -79,7 +79,7 @@ typedef struct _AppleWMSelectInput { CARD8 reqType; /* always WMReqCode */ - CARD8 wmReqType; /* always X_WMSelectInput */ + CARD8 wmReqType; /* always X_AppleWMSelectInput */ CARD16 length B16; CARD32 mask B32; } xAppleWMSelectInputReq; @@ -98,7 +98,7 @@ typedef struct _AppleWMSetWindowMenu { CARD8 reqType; /* always WMReqCode */ - CARD8 wmReqType; /* always X_WMSetWindowMenu */ + CARD8 wmReqType; /* always X_AppleWMSetWindowMenu */ CARD16 length B16; CARD16 nitems B16; CARD16 pad1 B16; @@ -107,7 +107,7 @@ typedef struct _AppleWMSetWindowMenuCheck { CARD8 reqType; /* always WMReqCode */ - CARD8 wmReqType; /* always X_WMSetWindowMenuCheck */ + CARD8 wmReqType; /* always X_AppleWMSetWindowMenuCheck */ CARD16 length B16; CARD32 index; } xAppleWMSetWindowMenuCheckReq; @@ -115,14 +115,14 @@ typedef struct _AppleWMSetFrontProcess { CARD8 reqType; /* always WMReqCode */ - CARD8 wmReqType; /* always X_WMSetFrontProcess */ + CARD8 wmReqType; /* always X_AppleWMSetFrontProcess */ CARD16 length B16; } xAppleWMSetFrontProcessReq; #define sz_xAppleWMSetFrontProcessReq 4 typedef struct _AppleWMSetWindowLevel { CARD8 reqType; /* always WMReqCode */ - CARD8 wmReqType; /* always X_WMSetWindowLevel */ + CARD8 wmReqType; /* always X_AppleWMSetWindowLevel */ CARD16 length B16; CARD32 window; CARD32 level; @@ -131,7 +131,7 @@ typedef struct _AppleWMSetCanQuit { CARD8 reqType; /* always WMReqCode */ - CARD8 wmReqType; /* always X_WMSetCanQuit */ + CARD8 wmReqType; /* always X_AppleWMSetCanQuit */ CARD16 length B16; CARD32 state; } xAppleWMSetCanQuitReq; @@ -139,7 +139,7 @@ typedef struct _AppleWMFrameGetRect { CARD8 reqType; /* always WMReqCode */ - CARD8 wmReqType; /* always X_WMFrameGetRect */ + CARD8 wmReqType; /* always X_AppleWMFrameGetRect */ CARD16 length B16; CARD16 frame_class B16; CARD16 frame_rect B16; @@ -172,7 +172,7 @@ typedef struct _AppleWMFrameHitTest { CARD8 reqType; /* always WMReqCode */ - CARD8 wmReqType; /* always X_WMFrameHitTest */ + CARD8 wmReqType; /* always X_AppleWMFrameHitTest */ CARD16 length B16; CARD16 frame_class B16; CARD16 pad1 B16; @@ -205,7 +205,7 @@ typedef struct _AppleWMFrameDraw { CARD8 reqType; /* always WMReqCode */ - CARD8 wmReqType; /* always X_WMFrameDraw */ + CARD8 wmReqType; /* always X_AppleWMFrameDraw */ CARD16 length B16; CARD32 screen B32; CARD32 window B32; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/applewmproto-X11R7.0-1.0.3/ChangeLog new/applewmproto-1.1.1/ChangeLog --- old/applewmproto-X11R7.0-1.0.3/ChangeLog 2005-12-21 03:30:07.000000000 +0100 +++ new/applewmproto-1.1.1/ChangeLog 2008-10-17 07:29:28.000000000 +0200 @@ -1,9 +1,125 @@ -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit b9b1c4d7faf2b1f1839c63bd333d47dd4110be01 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Thu Oct 16 22:16:59 2008 -0700 - * configure.ac: - Update package version for X11R7 release. + Updated configure.ac for 1.1.1 -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 923afec701c67b6a266b7c3435476d56007d3dc9 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Thu Oct 16 22:16:27 2008 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + Bump version numbers in the header. + +commit 04586bd0c4c82ac77867dc0e33ff20dc46d666ec +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Fri Sep 26 13:54:57 2008 -0700 + + 1.1.0 + +commit 5161cc4678112bb747a50b6c2da424186a9f8e6f +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Fri Sep 26 13:53:57 2008 -0700 + + Added AppleWMReloadPreferences notification + +commit 5d7270bada785e3649a65ef2fb96b97433f7a7f8 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Fri Sep 26 13:50:07 2008 -0700 + + Fixed comments X_WM -> X_AppleWM + +commit 5a698bdffc50c7c8e1f15a81268e4007df9ad309 +Author: James Cloos <cloos(a)jhcloos.com> +Date: Thu Dec 6 16:38:55 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 659330cba992065b00c62772db4cdad97abe430a +Author: James Cloos <cloos(a)jhcloos.com> +Date: Mon Sep 3 05:53:59 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit b432c3cefd6f7c9ef2f0d57ad8eb9a1bd82e2160 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Fri Jul 14 18:55:37 2006 -0700 + + renamed: .cvsignore -> .gitignore + +commit 3a2330ac1d1dac60290131c6b8c7682aa79af23d +Author: Kevin E Martin <kem(a)kem.org> +Date: Wed Dec 21 02:30:07 2005 +0000 + + Update package version for X11R7 release. + +commit bffea9897ea269918fb0596a6cb6d99d390a8d87 +Author: Adam Jackson <ajax(a)nwnk.net> +Date: Mon Dec 19 16:32:25 2005 +0000 + + Stub COPYING files + +commit 94dfb1c01151a7788dc53e75a7629d3806baeeb6 +Author: Kevin E Martin <kem(a)kem.org> +Date: Thu Dec 15 00:24:36 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit d41c59b12b477ecc085537364bedf5002a0655fa +Author: Eric Anholt <anholt(a)freebsd.org> +Date: Mon Nov 21 10:50:58 2005 +0000 + + Add missing .cvsignores for protos. + +commit 86ac0dce3bded86609841c36023a890b1ca0bdde +Author: Kevin E Martin <kem(a)kem.org> +Date: Wed Oct 19 02:48:13 2005 +0000 + + Update package version number for RC1 release. + +commit 50460c94c80c78b83c044123e555637eace71991 +Author: Adam Jackson <ajax(a)nwnk.net> +Date: Fri Sep 30 22:32:18 2005 +0000 + + AppleWM protocol + +commit 5ea56dacedbe14bda0155d229afd798cae0fc78c +Author: Egbert Eich <eich(a)suse.de> +Date: Fri Apr 23 18:43:56 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 26a5934d1d1245ff283e27d5f262edc078b736f8 +Author: Egbert Eich <eich(a)suse.de> +Date: Sun Mar 14 08:32:27 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit a0262f0659f873cf0be2d9ee6b3924ad854d146c +Author: Egbert Eich <eich(a)suse.de> +Date: Wed Mar 3 12:11:33 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 8d10307ba6312bc909a4e3653586f0742edfa222 +Author: Egbert Eich <eich(a)suse.de> +Date: Thu Feb 26 13:35:34 2004 +0000 + + readding XFree86's cvs IDs + +commit a95c01bccf8395e5d54a3e63439c07822ea6a711 +Author: Egbert Eich <eich(a)suse.de> +Date: Thu Feb 26 09:22:48 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 79032b23c8b7d85a1fa211ea749172dff1d77ba8 +Author: Kaleb Keithley <kaleb(a)freedesktop.org> +Date: Tue Nov 25 19:28:16 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit c94d31363f44ecb76914f98101d58c012f027c9b +Author: Kaleb Keithley <kaleb(a)freedesktop.org> +Date: Tue Nov 25 19:28:16 2003 +0000 + + Initial revision diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/applewmproto-X11R7.0-1.0.3/configure.ac new/applewmproto-1.1.1/configure.ac --- old/applewmproto-X11R7.0-1.0.3/configure.ac 2005-12-21 03:30:07.000000000 +0100 +++ new/applewmproto-1.1.1/configure.ac 2008-10-17 07:16:37.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([AppleWMProto], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] +AC_INIT([AppleWMProto], [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/applewmproto-X11R7.0-1.0.3/Makefile.am new/applewmproto-1.1.1/Makefile.am --- old/applewmproto-X11R7.0-1.0.3/Makefile.am 2005-10-01 00:32:18.000000000 +0200 +++ new/applewmproto-1.1.1/Makefile.am 2008-09-25 03:56:08.000000000 +0200 @@ -7,3 +7,13 @@ pkgconfig_DATA = applewmproto.pc EXTRA_DIST = autogen.sh applewmproto.pc.in + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/applewmproto-X11R7.0-1.0.3/missing new/applewmproto-1.1.1/missing --- old/applewmproto-X11R7.0-1.0.3/missing 2005-12-21 07:54:42.000000000 +0100 +++ new/applewmproto-1.1.1/missing 2008-09-26 22:55:08.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2006-05-10.23 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -15,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +44,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -74,11 +87,15 @@ lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to <bug-automake(a)gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,14 +104,44 @@ exit 1 ;; - aclocal*) +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case $1 in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $1 in + aclocal*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -102,13 +149,8 @@ ;; autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -116,13 +158,8 @@ ;; autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +177,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -156,20 +188,15 @@ ;; autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -185,74 +212,67 @@ bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -262,32 +282,36 @@ ;; makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +347,8 @@ *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +358,10 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: ++++++ dri2proto-1.1.tar.bz2 -> dri2proto-1.99.3.tar.bz2 ++++++ ++++ 2342 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dri2proto-1.1/configure.ac new/dri2proto-1.99.3/configure.ac --- old/dri2proto-1.1/configure.ac 2008-04-03 01:10:12.000000000 +0200 +++ new/dri2proto-1.99.3/configure.ac 2008-12-02 02:56:46.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([DRI2Proto], [1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] +AC_INIT([DRI2Proto], [1.99.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dri2proto-1.1/dri2proto.h new/dri2proto-1.99.3/dri2proto.h --- old/dri2proto-1.1/dri2proto.h 2008-03-26 20:58:24.000000000 +0100 +++ new/dri2proto-1.99.3/dri2proto.h 2008-12-01 20:55:42.000000000 +0100 @@ -39,14 +39,23 @@ #define DRI2NumberErrors 0 #define DRI2NumberEvents 0 -#define DRI2NumberRequests 6 +#define DRI2NumberRequests 7 #define X_DRI2QueryVersion 0 #define X_DRI2Connect 1 -#define X_DRI2AuthConnection 2 +#define X_DRI2Authenticate 2 #define X_DRI2CreateDrawable 3 #define X_DRI2DestroyDrawable 4 -#define X_DRI2ReemitDrawableInfo 5 +#define X_DRI2GetBuffers 5 +#define X_DRI2CopyRegion 6 + +typedef struct { + CARD32 attachment B32; + CARD32 name B32; + CARD32 pitch B32; + CARD32 cpp B32; + CARD32 flags B32; +} xDRI2Buffer; typedef struct { CARD8 reqType; @@ -75,9 +84,10 @@ CARD8 reqType; CARD8 dri2ReqType; CARD16 length B16; - CARD32 screen B32; + CARD32 window B32; + CARD32 driverType B32; } xDRI2ConnectReq; -#define sz_xDRI2ConnectReq 8 +#define sz_xDRI2ConnectReq 12 typedef struct { BYTE type; /* X_Reply */ @@ -85,11 +95,11 @@ CARD16 sequenceNumber B16; CARD32 length B32; CARD32 driverNameLength B32; - CARD32 busIdLength B32; - CARD32 sareaHandle B32; + CARD32 deviceNameLength B32; CARD32 pad2 B32; CARD32 pad3 B32; CARD32 pad4 B32; + CARD32 pad5 B32; } xDRI2ConnectReply; #define sz_xDRI2ConnectReply 32 @@ -97,10 +107,10 @@ CARD8 reqType; CARD8 dri2ReqType; CARD16 length B16; - CARD32 screen B32; + CARD32 window B32; CARD32 magic B32; -} xDRI2AuthConnectionReq; -#define sz_xDRI2AuthConnectionReq 12 +} xDRI2AuthenticateReq; +#define sz_xDRI2AuthenticateReq 12 typedef struct { BYTE type; /* X_Reply */ @@ -113,8 +123,8 @@ CARD32 pad4 B32; CARD32 pad5 B32; CARD32 pad6 B32; -} xDRI2AuthConnectionReply; -#define sz_xDRI2AuthConnectionReply 32 +} xDRI2AuthenticateReply; +#define sz_xDRI2AuthenticateReply 32 typedef struct { CARD8 reqType; @@ -122,50 +132,62 @@ CARD16 length B16; CARD32 drawable B32; } xDRI2CreateDrawableReq; -#define sz_xDRI2CreateDrawableReq 8 +#define sz_xDRI2CreateDrawableReq 8 + +typedef struct { + CARD8 reqType; + CARD8 dri2ReqType; + CARD16 length B16; + CARD32 drawable B32; +} xDRI2DestroyDrawableReq; +#define sz_xDRI2DestroyDrawableReq 8 + +typedef struct { + CARD8 reqType; + CARD8 dri2ReqType; + CARD16 length B16; + CARD32 drawable B32; + CARD32 count B32; +} xDRI2GetBuffersReq; +#define sz_xDRI2GetBuffersReq 12 typedef struct { BYTE type; /* X_Reply */ BYTE pad1; CARD16 sequenceNumber B16; CARD32 length B32; - CARD32 handle B32; - CARD32 head B32; + CARD32 width B32; + CARD32 height B32; + CARD32 count B32; CARD32 pad2 B32; CARD32 pad3 B32; CARD32 pad4 B32; - CARD32 pad5 B32; -} xDRI2CreateDrawableReply; -#define sz_xDRI2CreateDrawableReply 32 - -typedef struct { - CARD8 reqType; - CARD8 dri2ReqType; - CARD16 length B16; - CARD32 drawable B32; -} xDRI2DestroyDrawableReq; -#define sz_xDRI2DestroyDrawableReq 8 +} xDRI2GetBuffersReply; +#define sz_xDRI2GetBuffersReply 32 typedef struct { CARD8 reqType; CARD8 dri2ReqType; CARD16 length B16; CARD32 drawable B32; -} xDRI2ReemitDrawableInfoReq; -#define sz_xDRI2ReemitDrawableInfoReq 8 + CARD32 region B32; + CARD32 dest B32; + CARD32 src B32; +} xDRI2CopyRegionReq; +#define sz_xDRI2CopyRegionReq 20 typedef struct { BYTE type; /* X_Reply */ BYTE pad1; CARD16 sequenceNumber B16; CARD32 length B32; - CARD32 head B32; CARD32 pad2 B32; CARD32 pad3 B32; CARD32 pad4 B32; CARD32 pad5 B32; CARD32 pad6 B32; -} xDRI2ReemitDrawableInfoReply; -#define sz_xDRI2ReemitDrawableInfoReply 32 + CARD32 pad7 B32; +} xDRI2CopyRegionReply; +#define sz_xDRI2CopyRegionReply 32 #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dri2proto-1.1/dri2tokens.h new/dri2proto-1.99.3/dri2tokens.h --- old/dri2proto-1.1/dri2tokens.h 1970-01-01 01:00:00.000000000 +0100 +++ new/dri2proto-1.99.3/dri2tokens.h 2008-10-15 04:24:48.000000000 +0200 @@ -0,0 +1,48 @@ +/* + * Copyright © 2008 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Soft- + * ware"), 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 Soft- + * ware 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 MERCHANTABIL- + * ITY, 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 CONSE- + * QUENTIAL 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 PERFOR- + * MANCE 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. + * + * Authors: + * Kristian Høgsberg (krh(a)redhat.com) + */ + +#ifndef _DRI2_TOKENS_H_ +#define _DRI2_TOKENS_H_ + +#define DRI2BufferFrontLeft 0 +#define DRI2BufferBackLeft 1 +#define DRI2BufferFrontRight 2 +#define DRI2BufferBackRight 3 +#define DRI2BufferDepth 4 +#define DRI2BufferStencil 5 +#define DRI2BufferAccum 6 +#define DRI2BufferFakeFrontLeft 7 +#define DRI2BufferFakeFrontRight 8 + +#define DRI2DriverDRI 0 + +#endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dri2proto-1.1/Makefile.am new/dri2proto-1.99.3/Makefile.am --- old/dri2proto-1.1/Makefile.am 2008-03-12 19:43:59.000000000 +0100 +++ new/dri2proto-1.99.3/Makefile.am 2008-08-13 18:35:48.000000000 +0200 @@ -1,5 +1,5 @@ dri2dir = $(includedir)/X11/extensions -dri2_HEADERS = dri2proto.h +dri2_HEADERS = dri2proto.h dri2tokens.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = dri2proto.pc ++++++ util-macros-1.1.6.tar.bz2 -> util-macros-1.2.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.6/aclocal.m4 new/util-macros-1.2.1/aclocal.m4 --- old/util-macros-1.1.6/aclocal.m4 2008-03-05 20:52:16.000000000 +0100 +++ new/util-macros-1.2.1/aclocal.m4 2008-12-17 00:26:36.000000000 +0100 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,15 +11,12 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.61],, -[m4_warning([this file was generated for autoconf 2.61. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +31,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], +m4_if([$1], [1.10], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,10 +47,8 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10])dnl +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -111,13 +106,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 13 +# serial 12 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -222,17 +217,16 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. -_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $_am_arg | $_am_arg:* ) + $1 | $1:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -452,7 +446,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.6/ChangeLog new/util-macros-1.2.1/ChangeLog --- old/util-macros-1.1.6/ChangeLog 2008-03-05 20:52:23.000000000 +0100 +++ new/util-macros-1.2.1/ChangeLog 2008-12-17 00:27:30.000000000 +0100 @@ -1,3 +1,90 @@ +commit 58803c60b73110a49aecec4202e7820887633bcc +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Tue Dec 16 15:05:46 2008 -0800 + + Version bump: 1.2.1 + +commit e1d9461d1325bb7e48ef616650eb1d49f8945c2b +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Tue Dec 16 15:05:05 2008 -0800 + + Replace gitweb URL with cgit URL in README + +commit 55e8d740881ef622376440819119641e67aeb285 +Author: Peter Breitenlohner <peb(a)mppmu.mpg.de> +Date: Mon Dec 8 17:40:31 2008 +0100 + + fix distcheck target + + Arrange that distcleancheck ignores ChangeLog left over by distclean. + + Don't mention ChangeLog under *CLEANFILES, can't be rebuilt from release + tarball; ChangeLog is automatically distributed, no need to mention it. + +commit 88920d0896be5194f626888d5d8b54edd1ffe1f6 +Author: Matthieu Herrb <matthieu.herrb(a)laas.fr> +Date: Wed Dec 10 08:45:56 2008 +0100 + + use more CWARNFLAGS with gcc 3.4 too. + + Only gcc 3.3 and earlier version don't support them. + Reported and tested by Peter Breitenlohner. + +commit 9ff834493ece0a0ea7d7f15c1706bab022362cc5 +Author: Matthieu Herrb <matthieu.herrb(a)laas.fr> +Date: Sun Dec 7 11:54:39 2008 +0100 + + Fix CWARNFLAGS for gcc versions < 4 + +commit 1d2a0c58ffa7be9c47ea0a097f54e012cf5d44de +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Wed Jul 30 13:47:04 2008 -0700 + + Allow setting XORG_SGML_PATH to a non-default path when running configure + +commit dcbbcb582cf712e59c1474632380943bea8f1a5e +Author: Peter Breitenlohner <peb(a)mppmu.mpg.de> +Date: Fri Nov 14 23:06:48 2008 +0100 + + bump to 1.2.0 + +commit 0e8c41dd09080cf692b7437bb23435137febaf26 +Author: Peter Breitenlohner <peb(a)mppmu.mpg.de> +Date: Fri Nov 14 23:05:45 2008 +0100 + + fix XORG_PROG_RAWCPP for cygwin + + Patch by Yaakov Selkowitz from xorg mailing list + http://lists.freedesktop.org/archives/xorg/attachments/20081016/04a64242/at… + +commit 4cce4c8169a252bce129411dbf70c3212974e7ca +Author: Peter Breitenlohner <peb(a)mppmu.mpg.de> +Date: Fri Nov 14 22:59:28 2008 +0100 + + define XORG_CWARNFLAGS macro + +commit 2663b7a6b31e5e3d03b42a50b27f64737a35e9aa +Author: Peter Breitenlohner <peb(a)mppmu.mpg.de> +Date: Fri Nov 14 22:38:27 2008 +0100 + + define and use XORG_CHANGELOG macro + +commit b8a5186c585b4f01971457f0d59cc7480cf528e8 +Author: Peter Breitenlohner <peb(a)mppmu.mpg.de> +Date: Fri Nov 14 22:26:06 2008 +0100 + + reorganize autoconf macro files + + append xorgversion.m4 to xorg-macros.m4.in, instead of installing + it as separate file. + Avoid copying some code from xorgversion.m4 to configure.ac. + +commit a3a533044de7c8c360d0de312ac75b32db04e35e +Author: Adam Jackson <ajax(a)redhat.com> +Date: Wed Mar 5 14:53:00 2008 -0500 + + bump to 1.1.6 + commit e1c1ee013e72dafd7b00ca96a8d4a25273b88e15 Author: Jeremy Huddleston <jeremy(a)tifa-2.local> Date: Sat Feb 16 02:18:50 2008 -0800 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.6/configure new/util-macros-1.2.1/configure --- old/util-macros-1.1.6/configure 2008-03-05 20:52:18.000000000 +0100 +++ new/util-macros-1.2.1/configure 2008-12-17 00:26:37.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for util-macros 1.1.6. +# Generated by GNU Autoconf 2.61 for util-macros 1.2.1. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='util-macros' PACKAGE_TARNAME='util-macros' -PACKAGE_VERSION='1.1.6' -PACKAGE_STRING='util-macros 1.1.6' +PACKAGE_VERSION='1.2.1' +PACKAGE_STRING='util-macros 1.2.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_subst_vars='SHELL @@ -637,6 +637,8 @@ AMTAR am__tar am__untar +CHANGELOG_CMD +distcleancheck_listfiles LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -1145,7 +1147,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures util-macros 1.1.6 to adapt to many kinds of systems. +\`configure' configures util-macros 1.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1211,7 +1213,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of util-macros 1.1.6:";; + short | recursive ) echo "Configuration of util-macros 1.2.1:";; esac cat <<\_ACEOF @@ -1219,8 +1221,7 @@ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-release-version=STRING - Use release version string in package name - + Use release version string in package name Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. _ACEOF @@ -1283,7 +1284,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -util-macros configure 1.1.6 +util-macros configure 1.2.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1297,7 +1298,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by util-macros $as_me 1.1.6, which was +It was created by util-macros $as_me 1.2.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1987,7 +1988,7 @@ # Define the identity of the package. PACKAGE='util-macros' - VERSION='1.1.6' + VERSION='1.2.1' cat >>confdefs.h <<_ACEOF @@ -2134,9 +2135,31 @@ -# Since this is the package that installs the xorgversion.m4 file, we -# cannot use it here. Therefore, we copy the code from the m4 file. -# Please try to keep them in sync. +# This is the package that installs xorgversion.m4 as part of xorg-macros.m4. +# In order to use xorgversion.m4 here, we include it explicitly. + +# XORG_RELEASE_VERSION +# -------------------- +# Adds --with/without-release-string and changes the PACKAGE and +# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If +# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also +# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. + + + +# XORG_CHANGELOG() +# ---------------- +# Minimum version: 1.2.0 +# +# Defines the variable CHANGELOG_CMD as the command to generate +# ChangeLog from git. +# +# Arrange that distcleancheck ignores ChangeLog left over by distclean. +# + # XORG_CHANGELOG + + + # Check whether --with-release-version was given. if test "${with_release_version+set}" = set; then @@ -2145,14 +2168,46 @@ RELEASE_VERSION="" fi -if test "x$RELEASE_VERSION" != "x"; then - PACKAGE="$PACKAGE-$RELEASE_VERSION" - PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" - { echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5 + if test "x$RELEASE_VERSION" != "x"; then + PACKAGE="$PACKAGE-$RELEASE_VERSION" + PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" + { echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5 echo "$as_me: Building with package name set to $PACKAGE" >&6;} -fi + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` +_ACEOF + + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` + if test "x$PVM" = "x"; then + PVM="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MINOR $PVM +_ACEOF + + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` + if test "x$PVP" = "x"; then + PVP="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_PATCHLEVEL $PVP +_ACEOF + + + +CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \ +mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \ +echo 'git directory not found: installing possibly empty changelog.' >&2)" + +distcleancheck_listfiles='find . -type f ! -name ChangeLog -print' + + -ac_config_files="$ac_config_files Makefile xorg-macros.m4" +ac_config_files="$ac_config_files Makefile xorg-macros.m4:xorg-macros.m4.in:xorgversion.m4" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -2580,7 +2635,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by util-macros $as_me 1.1.6, which was +This file was extended by util-macros $as_me 1.2.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2623,7 +2678,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -util-macros config.status 1.1.6 +util-macros config.status 1.2.1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -2724,7 +2779,7 @@ do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "xorg-macros.m4") CONFIG_FILES="$CONFIG_FILES xorg-macros.m4" ;; + "xorg-macros.m4") CONFIG_FILES="$CONFIG_FILES xorg-macros.m4:xorg-macros.m4.in:xorgversion.m4" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -2844,11 +2899,13 @@ AMTAR!$AMTAR$ac_delim am__tar!$am__tar$ac_delim am__untar!$am__untar$ac_delim +CHANGELOG_CMD!$CHANGELOG_CMD$ac_delim +distcleancheck_listfiles!$distcleancheck_listfiles$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 61; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.6/configure.ac new/util-macros-1.2.1/configure.ac --- old/util-macros-1.1.6/configure.ac 2008-03-05 20:52:00.000000000 +0100 +++ new/util-macros-1.2.1/configure.ac 2008-12-16 23:56:48.000000000 +0100 @@ -23,22 +23,15 @@ AC_PREREQ([2.57]) AC_INIT([util-macros], - [1.1.6], + [1.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] AM_INIT_AUTOMAKE([foreign dist-bzip2]) -# Since this is the package that installs the xorgversion.m4 file, we -# cannot use it here. Therefore, we copy the code from the m4 file. -# Please try to keep them in sync. -AC_ARG_WITH(release-version, - AC_HELP_STRING([--with-release-version=STRING] - [Use release version string in package name]), - [RELEASE_VERSION="$withval"], - [RELEASE_VERSION=""]) -if test "x$RELEASE_VERSION" != "x"; then - PACKAGE="$PACKAGE-$RELEASE_VERSION" - PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" - AC_MSG_NOTICE([Building with package name set to $PACKAGE]) -fi +# This is the package that installs xorgversion.m4 as part of xorg-macros.m4. +# In order to use xorgversion.m4 here, we include it explicitly. +m4_include([xorgversion.m4]) -AC_OUTPUT([Makefile xorg-macros.m4]) +XORG_RELEASE_VERSION +XORG_CHANGELOG + +AC_OUTPUT([Makefile xorg-macros.m4:xorg-macros.m4.in:xorgversion.m4]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.6/install-sh new/util-macros-1.2.1/install-sh --- old/util-macros-1.1.6/install-sh 2008-03-05 20:52:20.000000000 +0100 +++ new/util-macros-1.2.1/install-sh 2008-12-17 00:26:38.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-12-25.00 +scriptversion=2006-10-14.15 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -48,7 +48,7 @@ # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} +doit="${DOITPROG-}" if test -z "$doit"; then doit_exec=exec else @@ -58,49 +58,34 @@ # Put in absolute file names if you don't have them in your path; # or use environment vars. -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" +posix_glob= posix_mkdir= # Desired mode of installed file. mode=0755 -chgrpcmd= chmodcmd=$chmodprog chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" +chgrpcmd= stripcmd= - +rmcmd="$rmprog -f" +mvcmd="$mvprog" src= dst= dir_arg= -dst_arg= - -copy_on_change=false +dstarg= no_target_directory= -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -110,55 +95,65 @@ In the 4th, create DIRECTORIES. Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG " while test $# -ne 0; do case $1 in - -c) ;; - - -C) copy_on_change=true;; + -c) shift + continue;; - -d) dir_arg=true;; + -d) dir_arg=true + shift + continue;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift + shift + continue;; --help) echo "$usage"; exit $?;; -m) mode=$2 + shift + shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac - shift;; + continue;; -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - shift;; - - -T) no_target_directory=true;; + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; --version) echo "$0 $scriptversion"; exit $?;; @@ -170,22 +165,21 @@ *) break;; esac - shift done -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then +if test $# -ne 0 && test -z "$dir_arg$dstarg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do - if test -n "$dst_arg"; then + if test -n "$dstarg"; then # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" + set fnord "$@" "$dstarg" shift # fnord fi shift # arg - dst_arg=$arg + dstarg=$arg done fi @@ -230,7 +224,7 @@ do # Protect names starting with `-'. case $src in - -*) src=./$src;; + -*) src=./$src ;; esac if test -n "$dir_arg"; then @@ -248,22 +242,22 @@ exit 1 fi - if test -z "$dst_arg"; then + if test -z "$dstarg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg + dst=$dstarg # Protect names starting with `-'. case $dst in - -*) dst=./$dst;; + -*) dst=./$dst ;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 + echo "$0: $dstarg: Is a directory" >&2 exit 1 fi dstdir=$dst @@ -384,19 +378,26 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - -*) prefix='./';; - *) prefix='';; + /*) prefix=/ ;; + -*) prefix=./ ;; + *) prefix= ;; esac - eval "$initialize_posix_glob" + case $posix_glob in + '') + if (set -f) 2>/dev/null; then + posix_glob=true + else + posix_glob=false + fi ;; + esac oIFS=$IFS IFS=/ - $posix_glob set -f + $posix_glob && set -f set fnord $dstdir shift - $posix_glob set +f + $posix_glob && set +f IFS=$oIFS prefixes= @@ -458,54 +459,41 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dst"; then + $doit $rmcmd -f "$dst" 2>/dev/null \ + || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ + && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ + || { + echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + } || exit 1 trap '' 0 fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.6/Makefile.am new/util-macros-1.2.1/Makefile.am --- old/util-macros-1.1.6/Makefile.am 2008-03-05 20:51:13.000000000 +0100 +++ new/util-macros-1.2.1/Makefile.am 2008-12-16 23:47:36.000000000 +0100 @@ -20,15 +20,17 @@ # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. aclocaldir = $(datadir)/aclocal -aclocal_DATA = xorgversion.m4 xorg-macros.m4 +aclocal_DATA = xorg-macros.m4 -EXTRA_DIST = $(aclocal_DATA) ChangeLog +# Previous versions used to install xorgversion.m4, now integrated +# into xorg-macros.m4. Explicitly remove that old file in order not +# to have a macro defined in two different files. +install-data-hook: + rm -f $(DESTDIR)$(aclocaldir)/xorgversion.m4 .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog - -DISTCLEANFILES = ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.6/Makefile.in new/util-macros-1.2.1/Makefile.in --- old/util-macros-1.1.6/Makefile.in 2008-03-05 20:52:20.000000000 +0100 +++ new/util-macros-1.2.1/Makefile.in 2008-12-17 00:26:38.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -54,9 +54,11 @@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/xorg-macros.m4.in \ - $(top_srcdir)/configure COPYING ChangeLog install-sh missing + $(srcdir)/xorgversion.m4 $(top_srcdir)/configure COPYING \ + ChangeLog install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/xorgversion.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -84,13 +86,13 @@ DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +CHANGELOG_CMD = @CHANGELOG_CMD@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ @@ -129,6 +131,7 @@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ @@ -156,9 +159,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ aclocaldir = $(datadir)/aclocal -aclocal_DATA = xorgversion.m4 xorg-macros.m4 -EXTRA_DIST = $(aclocal_DATA) ChangeLog -DISTCLEANFILES = ChangeLog +aclocal_DATA = xorg-macros.m4 all: all-am .SUFFIXES: @@ -195,7 +196,7 @@ cd $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -xorg-macros.m4: $(top_builddir)/config.status $(srcdir)/xorg-macros.m4.in +xorg-macros.m4: $(top_builddir)/config.status $(srcdir)/xorg-macros.m4.in $(srcdir)/xorgversion.m4 cd $(top_builddir) && $(SHELL) ./config.status $@ install-aclocalDATA: $(aclocal_DATA) @$(NORMAL_INSTALL) @@ -264,10 +265,6 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -295,8 +292,6 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -382,7 +377,6 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -407,6 +401,8 @@ info-am: install-data-am: install-aclocalDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am @@ -444,14 +440,14 @@ uninstall-am: uninstall-aclocalDATA -.MAKE: install-am install-strip +.MAKE: install-am install-data-am install-strip .PHONY: all all-am am--refresh check check-am clean clean-generic dist \ - dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \ - dist-tarZ dist-zip distcheck distclean distclean-generic \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-aclocalDATA install-am \ - install-data install-data-am install-dvi install-dvi-am \ + dist-all dist-bzip2 dist-gzip dist-hook dist-shar dist-tarZ \ + dist-zip distcheck distclean distclean-generic distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-aclocalDATA install-am install-data \ + install-data-am install-data-hook install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ @@ -460,10 +456,16 @@ pdf-am ps ps-am uninstall uninstall-aclocalDATA uninstall-am +# Previous versions used to install xorgversion.m4, now integrated +# into xorg-macros.m4. Explicitly remove that old file in order not +# to have a macro defined in two different files. +install-data-hook: + rm -f $(DESTDIR)$(aclocaldir)/xorgversion.m4 + .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.6/README new/util-macros-1.2.1/README --- old/util-macros-1.1.6/README 2008-03-05 20:51:13.000000000 +0100 +++ new/util-macros-1.2.1/README 2008-12-16 23:58:11.000000000 +0100 @@ -15,7 +15,7 @@ git://anongit.freedesktop.org/git/xorg/util/macros - http://gitweb.freedesktop.org/?p=xorg-util-macros;a=summary + http://cgit.freedesktop.org/xorg/util/macros/ For more information on the git code manager, see: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.6/xorg-macros.m4 new/util-macros-1.2.1/xorg-macros.m4 --- old/util-macros-1.1.6/xorg-macros.m4 2008-03-05 20:52:22.000000000 +0100 +++ new/util-macros-1.2.1/xorg-macros.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,425 +0,0 @@ -dnl -dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. -dnl -dnl Permission is hereby granted, free of charge, to any person obtaining a -dnl copy of this software and associated documentation files (the -dnl "Software"), to deal in the Software without restriction, including -dnl without limitation the rights to use, copy, modify, merge, publish, -dnl distribute, and/or sell copies of the Software, and to permit persons -dnl to whom the Software is furnished to do so, provided that the above -dnl copyright notice(s) and this permission notice appear in all copies of -dnl the Software and that both the above copyright notice(s) and this -dnl permission notice appear in supporting documentation. -dnl -dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Except as contained in this notice, the name of a copyright holder -dnl shall not be used in advertising or otherwise to promote the sale, use -dnl or other dealings in this Software without prior written authorization -dnl of the copyright holder. - -# XORG_MACROS_VERSION(required-version) -# ------------------------------------- -# Minimum version: 1.1.0 -# -# If you're using a macro added in Version 1.1 or newer, include this in -# your configure.ac with the minimum required version, such as: -# XORG_MACROS_VERSION(1.1) -# -# To force at least a version with this macro defined, also add: -# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -# -# -# See the "minimum version" comment for each macro you use to see what -# version you require. -AC_DEFUN([XORG_MACROS_VERSION],[ - [XORG_MACROS_needed_version=$1 - XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` - XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] - AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) - [XORG_MACROS_version=1.1.6 - XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` - XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] - if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then - AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x]) - fi - if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then - AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer]) - fi - AC_MSG_RESULT([yes, $XORG_MACROS_version]) -]) # XORG_MACROS_VERSION - -# XORG_PROG_RAWCPP() -# ------------------ -# Minimum version: 1.0.0 -# -# Find cpp program and necessary flags for use in pre-processing text files -# such as man pages and config files -AC_DEFUN([XORG_PROG_RAWCPP],[ -AC_REQUIRE([AC_PROG_CPP]) -AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], - [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) - -# Check for flag to avoid builtin definitions - assumes unix is predefined, -# which is not the best choice for supporting other OS'es, but covers most -# of the ones we need for now. -AC_MSG_CHECKING([if $RAWCPP requires -undef]) -AC_LANG_CONFTEST([Does cpp redefine unix ?]) -if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then - AC_MSG_RESULT([no]) -else - if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then - RAWCPPFLAGS=-undef - AC_MSG_RESULT([yes]) - else - AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.]) - fi -fi -rm -f conftest.$ac_ext - -AC_MSG_CHECKING([if $RAWCPP requires -traditional]) -AC_LANG_CONFTEST([Does cpp preserve "whitespace"?]) -if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then - AC_MSG_RESULT([no]) -else - if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then - RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" - AC_MSG_RESULT([yes]) - else - AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.]) - fi -fi -rm -f conftest.$ac_ext -AC_SUBST(RAWCPPFLAGS) -]) # XORG_PROG_RAWCPP - -# XORG_MANPAGE_SECTIONS() -# ----------------------- -# Minimum version: 1.0.0 -# -# Determine which sections man pages go in for the different man page types -# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files. -# Not sure if there's any better way than just hardcoding by OS name. -# Override default settings by setting environment variables - -AC_DEFUN([XORG_MANPAGE_SECTIONS],[ -AC_REQUIRE([AC_CANONICAL_HOST]) - -if test x$APP_MAN_SUFFIX = x ; then - APP_MAN_SUFFIX=1 -fi -if test x$APP_MAN_DIR = x ; then - APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' -fi - -if test x$LIB_MAN_SUFFIX = x ; then - LIB_MAN_SUFFIX=3 -fi -if test x$LIB_MAN_DIR = x ; then - LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' -fi - -if test x$FILE_MAN_SUFFIX = x ; then - case $host_os in - solaris*) FILE_MAN_SUFFIX=4 ;; - *) FILE_MAN_SUFFIX=5 ;; - esac -fi -if test x$FILE_MAN_DIR = x ; then - FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' -fi - -if test x$MISC_MAN_SUFFIX = x ; then - case $host_os in - solaris*) MISC_MAN_SUFFIX=5 ;; - *) MISC_MAN_SUFFIX=7 ;; - esac -fi -if test x$MISC_MAN_DIR = x ; then - MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' -fi - -if test x$DRIVER_MAN_SUFFIX = x ; then - case $host_os in - solaris*) DRIVER_MAN_SUFFIX=7 ;; - *) DRIVER_MAN_SUFFIX=4 ;; - esac -fi -if test x$DRIVER_MAN_DIR = x ; then - DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' -fi - -if test x$ADMIN_MAN_SUFFIX = x ; then - case $host_os in - solaris*) ADMIN_MAN_SUFFIX=1m ;; - *) ADMIN_MAN_SUFFIX=8 ;; - esac -fi -if test x$ADMIN_MAN_DIR = x ; then - ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' -fi - - -AC_SUBST([APP_MAN_SUFFIX]) -AC_SUBST([LIB_MAN_SUFFIX]) -AC_SUBST([FILE_MAN_SUFFIX]) -AC_SUBST([MISC_MAN_SUFFIX]) -AC_SUBST([DRIVER_MAN_SUFFIX]) -AC_SUBST([ADMIN_MAN_SUFFIX]) -AC_SUBST([APP_MAN_DIR]) -AC_SUBST([LIB_MAN_DIR]) -AC_SUBST([FILE_MAN_DIR]) -AC_SUBST([MISC_MAN_DIR]) -AC_SUBST([DRIVER_MAN_DIR]) -AC_SUBST([ADMIN_MAN_DIR]) -]) # XORG_MANPAGE_SECTIONS - -# XORG_CHECK_LINUXDOC -# ------------------- -# Minimum version: 1.0.0 -# -# Defines the variable MAKE_TEXT if the necessary tools and -# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt. -# Whether or not the necessary tools and files are found can be checked -# with the AM_CONDITIONAL "BUILD_LINUXDOC" -AC_DEFUN([XORG_CHECK_LINUXDOC],[ -XORG_SGML_PATH=$prefix/share/sgml -HAVE_DEFS_ENT= - -if test x"$cross_compiling" = x"yes" ; then - HAVE_DEFS_ENT=no -else - AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) -fi - -AC_PATH_PROG(LINUXDOC, linuxdoc) -AC_PATH_PROG(PS2PDF, ps2pdf) - -AC_MSG_CHECKING([Whether to build documentation]) - -if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then - BUILDDOC=yes -else - BUILDDOC=no -fi - -AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes]) - -AC_MSG_RESULT([$BUILDDOC]) - -AC_MSG_CHECKING([Whether to build pdf documentation]) - -if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then - BUILDPDFDOC=yes -else - BUILDPDFDOC=no -fi - -AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) - -AC_MSG_RESULT([$BUILDPDFDOC]) - -MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" -MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps" -MAKE_PDF="$PS2PDF" -MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0" - -AC_SUBST(MAKE_TEXT) -AC_SUBST(MAKE_PS) -AC_SUBST(MAKE_PDF) -AC_SUBST(MAKE_HTML) -]) # XORG_CHECK_LINUXDOC - -# XORG_CHECK_DOCBOOK -# ------------------- -# Minimum version: 1.0.0 -# -# Checks for the ability to build output formats from SGML DocBook source. -# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC" -# indicates whether the necessary tools and files are found and, if set, -# $(MAKE_XXX) blah.sgml will produce blah.xxx. -AC_DEFUN([XORG_CHECK_DOCBOOK],[ -XORG_SGML_PATH=$prefix/share/sgml -HAVE_DEFS_ENT= -BUILDTXTDOC=no -BUILDPDFDOC=no -BUILDPSDOC=no -BUILDHTMLDOC=no - -AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) - -AC_PATH_PROG(DOCBOOKPS, docbook2ps) -AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) -AC_PATH_PROG(DOCBOOKHTML, docbook2html) -AC_PATH_PROG(DOCBOOKTXT, docbook2txt) - -AC_MSG_CHECKING([Whether to build text documentation]) -if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x && - test x$BUILD_TXTDOC != xno; then - BUILDTXTDOC=yes -fi -AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes]) -AC_MSG_RESULT([$BUILDTXTDOC]) - -AC_MSG_CHECKING([Whether to build PDF documentation]) -if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x && - test x$BUILD_PDFDOC != xno; then - BUILDPDFDOC=yes -fi -AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) -AC_MSG_RESULT([$BUILDPDFDOC]) - -AC_MSG_CHECKING([Whether to build PostScript documentation]) -if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x && - test x$BUILD_PSDOC != xno; then - BUILDPSDOC=yes -fi -AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes]) -AC_MSG_RESULT([$BUILDPSDOC]) - -AC_MSG_CHECKING([Whether to build HTML documentation]) -if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x && - test x$BUILD_HTMLDOC != xno; then - BUILDHTMLDOC=yes -fi -AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes]) -AC_MSG_RESULT([$BUILDHTMLDOC]) - -MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT" -MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS" -MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF" -MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML" - -AC_SUBST(MAKE_TEXT) -AC_SUBST(MAKE_PS) -AC_SUBST(MAKE_PDF) -AC_SUBST(MAKE_HTML) -]) # XORG_CHECK_DOCBOOK - -# XORG_CHECK_MALLOC_ZERO -# ---------------------- -# Minimum version: 1.0.0 -# -# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if -# malloc(0) returns NULL. Packages should add one of these cflags to -# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them. -AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[ -AC_ARG_ENABLE(malloc0returnsnull, - AC_HELP_STRING([--enable-malloc0returnsnull], - [malloc(0) returns NULL (default: auto)]), - [MALLOC_ZERO_RETURNS_NULL=$enableval], - [MALLOC_ZERO_RETURNS_NULL=auto]) - -AC_MSG_CHECKING([whether malloc(0) returns NULL]) -if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then - AC_RUN_IFELSE([ -char *malloc(); -char *realloc(); -char *calloc(); -main() { - char *m0, *r0, *c0, *p; - m0 = malloc(0); - p = malloc(10); - r0 = realloc(p,0); - c0 = calloc(0); - exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1); -}], - [MALLOC_ZERO_RETURNS_NULL=yes], - [MALLOC_ZERO_RETURNS_NULL=no]) -fi -AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL]) - -if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then - MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL" - XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS - XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC" -else - MALLOC_ZERO_CFLAGS="" - XMALLOC_ZERO_CFLAGS="" - XTMALLOC_ZERO_CFLAGS="" -fi - -AC_SUBST([MALLOC_ZERO_CFLAGS]) -AC_SUBST([XMALLOC_ZERO_CFLAGS]) -AC_SUBST([XTMALLOC_ZERO_CFLAGS]) -]) # XORG_CHECK_MALLOC_ZERO - -# XORG_WITH_LINT() -# ---------------- -# Minimum version: 1.1.0 -# -# Sets up flags for source checkers such as lint and sparse if --with-lint -# is specified. (Use --with-lint=sparse for sparse.) -# Sets $LINT to name of source checker passed with --with-lint (default: lint) -# Sets $LINT_FLAGS to flags to pass to source checker -# Sets LINT automake conditional if enabled (default: disabled) -# -AC_DEFUN([XORG_WITH_LINT],[ - -# Allow checking code with lint, sparse, etc. -AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint], - [Use a lint-style source code checker (default: disabled)])], - [use_lint=$withval], [use_lint=no]) -if test "x$use_lint" = "xyes" ; then - LINT="lint" -else - LINT="$use_lint" -fi -if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then - case $LINT in - lint|*/lint) - case $host_os in - solaris*) - LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" - ;; - esac - ;; - esac -fi - -AC_SUBST(LINT) -AC_SUBST(LINT_FLAGS) -AM_CONDITIONAL(LINT, [test x$LINT != xno]) - -]) # XORG_WITH_LINT - -# XORG_LINT_LIBRARY(LIBNAME) -# -------------------------- -# Minimum version: 1.1.0 -# -# Sets up flags for building lint libraries for checking programs that call -# functions in the library. -# Disabled by default, enable with --enable-lint-library -# Sets: -# @LINTLIB@ - name of lint library file to make -# MAKE_LINT_LIB - automake conditional -# - -AC_DEFUN([XORG_LINT_LIBRARY],[ -AC_REQUIRE([XORG_WITH_LINT]) -# Build lint "library" for more indepth checks of programs calling this library -AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library], - [Create lint library (default: disabled)])], - [make_lint_lib=$enableval], [make_lint_lib=no]) -if test "x$make_lint_lib" != "xno" ; then - if test "x$LINT" = "xno" ; then - AC_MSG_ERROR([Cannot make lint library without --with-lint]) - fi - if test "x$make_lint_lib" = "xyes" ; then - LINTLIB=llib-l$1.ln - else - LINTLIB=$make_lint_lib - fi -fi -AC_SUBST(LINTLIB) -AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) - -]) # XORG_LINT_LIBRARY diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.6/xorg-macros.m4.in new/util-macros-1.2.1/xorg-macros.m4.in --- old/util-macros-1.1.6/xorg-macros.m4.in 2008-03-05 20:51:14.000000000 +0100 +++ new/util-macros-1.2.1/xorg-macros.m4.in 2008-12-16 23:47:33.000000000 +0100 @@ -1,3 +1,4 @@ +dnl @configure_input@ dnl dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. dnl @@ -79,6 +80,10 @@ if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then RAWCPPFLAGS=-undef AC_MSG_RESULT([yes]) + # under Cygwin unix is still defined even with -undef + elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then + RAWCPPFLAGS="-undef -ansi" + AC_MSG_RESULT([yes, with -ansi]) else AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.]) fi @@ -191,7 +196,9 @@ # Whether or not the necessary tools and files are found can be checked # with the AM_CONDITIONAL "BUILD_LINUXDOC" AC_DEFUN([XORG_CHECK_LINUXDOC],[ -XORG_SGML_PATH=$prefix/share/sgml +if test x$XORG_SGML_PATH = x ; then + XORG_SGML_PATH=$prefix/share/sgml +fi HAVE_DEFS_ENT= if test x"$cross_compiling" = x"yes" ; then @@ -247,7 +254,9 @@ # indicates whether the necessary tools and files are found and, if set, # $(MAKE_XXX) blah.sgml will produce blah.xxx. AC_DEFUN([XORG_CHECK_DOCBOOK],[ -XORG_SGML_PATH=$prefix/share/sgml +if test x$XORG_SGML_PATH = x ; then + XORG_SGML_PATH=$prefix/share/sgml +fi HAVE_DEFS_ENT= BUILDTXTDOC=no BUILDPDFDOC=no @@ -423,3 +432,29 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) ]) # XORG_LINT_LIBRARY + +# XORG_CWARNFLAGS +# --------------- +# Minimum version: 1.2.0 +# +# Defines CWARNFLAGS to enable C compiler warnings. +# +AC_DEFUN([XORG_CWARNFLAGS], [ +AC_REQUIRE([AC_PROG_CC]) +if test "x$GCC" = xyes ; then + CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ +-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ +-Wbad-function-cast" + case `gcc -dumpversion` in + 3.4.* | 4.*) + CWARNFLAGS+=" -Wold-style-definition -Wdeclaration-after-statement" + ;; + esac +else + AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) + if test "x$SUNCC" = "xyes"; then + CWARNFLAGS="-v" + fi +fi +AC_SUBST(CWARNFLAGS) +]) # XORG_CWARNFLAGS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.6/xorgversion.m4 new/util-macros-1.2.1/xorgversion.m4 --- old/util-macros-1.1.6/xorgversion.m4 2008-03-05 20:51:14.000000000 +0100 +++ new/util-macros-1.2.1/xorgversion.m4 2008-12-16 23:47:36.000000000 +0100 @@ -59,3 +59,20 @@ [$PVP], [Patch version of this package]) ]) + +# XORG_CHANGELOG() +# ---------------- +# Minimum version: 1.2.0 +# +# Defines the variable CHANGELOG_CMD as the command to generate +# ChangeLog from git. +# +# Arrange that distcleancheck ignores ChangeLog left over by distclean. +# +AC_DEFUN([XORG_CHANGELOG], [ +CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \ +mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \ +echo 'git directory not found: installing possibly empty changelog.' >&2)" +AC_SUBST([CHANGELOG_CMD]) +AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print']) +]) # XORG_CHANGELOG ++++++ xproto-7.0.13.tar.bz2 -> xproto-7.0.14.tar.bz2 ++++++ ++++ 3086 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xproto-7.0.13/ChangeLog new/xproto-7.0.14/ChangeLog --- old/xproto-7.0.13/ChangeLog 2008-05-29 02:10:33.000000000 +0200 +++ new/xproto-7.0.14/ChangeLog 2008-10-23 14:14:20.000000000 +0200 @@ -1,3 +1,76 @@ +commit 33a7de5cdacb59503b26c6523ffb33dba118faed +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Thu Oct 23 22:41:01 2008 +1030 + + Bump to 7.0.14. + +commit 1cf41088ff751e60071a519466b5a51b65c7626a +Author: Bastien Nocera <bnocera(a)redhat.com> +Date: Wed Oct 15 14:20:45 2008 +1030 + + Keysyms needed for some HID remote controls to work under X. #16519 + + In particular, this enables Sony Ericsson phones and PS3 BD remotes. + + X.Org Bug 16519 <https://bugs.freedesktop.org/show_bug.cgi?id=16519> + + Signed-off-by: Peter Hutterer <peter.hutterer(a)redhat.com> + +commit 0b541b3fa282531c97c6ecee574c8b92b1489bfc +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Tue Oct 14 21:56:14 2008 +1030 + + Fix typos in comments (UP/DOWN TACK and LEFT/RIGHT TACK wrong way round). + + Spotted by Erik Streb and Julien Cristau. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)redhat.com> + +commit c94477f16356790741ebc139d2d0b15d79c83e28 +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Tue Oct 14 21:54:16 2008 +1030 + + Revert "Fix typos in comments (UP/DOWN TACK and LEFT/RIGHT TACK wrong way round)." + + Codepoints should have moved with the comments. See next commit for correct + patch. + + This reverts commit 2945d2f97c264783e4050a8f6c3016290014b9e2. + +commit 2945d2f97c264783e4050a8f6c3016290014b9e2 +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Tue Oct 14 21:04:08 2008 +1030 + + Fix typos in comments (UP/DOWN TACK and LEFT/RIGHT TACK wrong way round). + + Spotted by Erik Streb. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)redhat.com> + +commit 610eb9698316b7cdfe378ce7776c4520f8b061ff +Author: Peter Hutterer <peter.hutterer(a)redhat.com> +Date: Mon Oct 13 12:01:16 2008 +1030 + + Add keysyms for XF86XK_Battery, XF86XK_Bluetooth, XF86XK_WLAN, XF86XK_UWB. + +commit 0846d7adfe790897e879c5ed53d4f81db459a20d +Author: James Cloos <cloos(a)jhcloos.com> +Date: Sun Jul 13 17:57:09 2008 -0400 + + Add dead_perispomeni to keysymdef.h + + Make the dead_perispomeni keysym an alias to dead_tilde + (which is currently used for entering characters with + perispomeni). + + Cf: https://bugs.freedesktop.org/show_bug.cgi?id=14013 + +commit 38edd9839fa8495602378af36c67b2477b24eca2 +Author: James Cloos <cloos(a)jhcloos.com> +Date: Sun Jul 13 17:54:47 2008 -0400 + + fix typo in commit 40ed4eef + commit 53859ee4e431c21000e282971894dbe9384ed205 Author: Peter Hutterer <peter(a)cs.unisa.edu.au> Date: Wed May 28 17:17:38 2008 +0930 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xproto-7.0.13/configure.ac new/xproto-7.0.14/configure.ac --- old/xproto-7.0.13/configure.ac 2008-05-29 01:59:44.000000000 +0200 +++ new/xproto-7.0.14/configure.ac 2008-10-23 13:47:33.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([Xproto], [7.0.13], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] +AC_INIT([Xproto], [7.0.14], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_CONFIG_HEADER([do-not-use-config.h]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xproto-7.0.13/keysymdef.h new/xproto-7.0.14/keysymdef.h --- old/xproto-7.0.13/keysymdef.h 2008-05-22 01:57:34.000000000 +0200 +++ new/xproto-7.0.14/keysymdef.h 2008-10-15 05:54:49.000000000 +0200 @@ -385,6 +385,7 @@ #define XK_dead_acute 0xfe51 #define XK_dead_circumflex 0xfe52 #define XK_dead_tilde 0xfe53 +#define XK_dead_perispomeni 0xfe53 /* alias for dead_tilde */ #define XK_dead_macron 0xfe54 #define XK_dead_breve 0xfe55 #define XK_dead_abovedot 0xfe56 @@ -404,7 +405,7 @@ #define XK_dead_abovecomma 0xfe64 #define XK_dead_psili 0xfe64 /* alias for dead_abovecomma */ #define XK_dead_abovereversedcomma 0xfe65 -#define XK_dead_dasia 0xfe66 /* alias for dead_abovereversedcomma */ +#define XK_dead_dasia 0xfe65 /* alias for dead_abovereversedcomma */ #define XK_dead_belowring 0xfe67 #define XK_dead_belowmacron 0xfe68 #define XK_dead_belowcircumflex 0xfe69 @@ -1495,20 +1496,20 @@ #define XK_downcaret 0x0ba8 /*(U+2228 LOGICAL OR)*/ #define XK_upcaret 0x0ba9 /*(U+2227 LOGICAL AND)*/ #define XK_overbar 0x0bc0 /*(U+00AF MACRON)*/ -#define XK_downtack 0x0bc2 /* U+22A5 UP TACK */ +#define XK_downtack 0x0bc2 /* U+22A4 DOWN TACK */ #define XK_upshoe 0x0bc3 /*(U+2229 INTERSECTION)*/ #define XK_downstile 0x0bc4 /* U+230A LEFT FLOOR */ #define XK_underbar 0x0bc6 /*(U+005F LOW LINE)*/ #define XK_jot 0x0bca /* U+2218 RING OPERATOR */ #define XK_quad 0x0bcc /* U+2395 APL FUNCTIONAL SYMBOL QUAD */ -#define XK_uptack 0x0bce /* U+22A4 DOWN TACK */ +#define XK_uptack 0x0bce /* U+22A5 UP TACK */ #define XK_circle 0x0bcf /* U+25CB WHITE CIRCLE */ #define XK_upstile 0x0bd3 /* U+2308 LEFT CEILING */ #define XK_downshoe 0x0bd6 /*(U+222A UNION)*/ #define XK_rightshoe 0x0bd8 /*(U+2283 SUPERSET OF)*/ #define XK_leftshoe 0x0bda /*(U+2282 SUBSET OF)*/ -#define XK_lefttack 0x0bdc /* U+22A2 RIGHT TACK */ -#define XK_righttack 0x0bfc /* U+22A3 LEFT TACK */ +#define XK_lefttack 0x0bdc /* U+22A3 LEFT TACK */ +#define XK_righttack 0x0bfc /* U+22A2 RIGHT TACK */ #endif /* XK_APL */ /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xproto-7.0.13/missing new/xproto-7.0.14/missing --- old/xproto-7.0.13/missing 2008-05-22 01:58:07.000000000 +0200 +++ new/xproto-7.0.14/missing 2008-04-16 05:46:01.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2003-09-02.23 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -19,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -60,11 +62,6 @@ msg="probably too old" fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -82,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -92,10 +90,12 @@ yacc create \`y.tab.[ch]', if possible, from existing .[ch] Send bug reports to <bug-automake(a)gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -104,12 +104,42 @@ exit 1 ;; - aclocal*) +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case $1 in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $1 in + aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want @@ -119,11 +149,6 @@ ;; autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -133,11 +158,6 @@ ;; autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -147,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -157,11 +177,6 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. @@ -173,11 +188,6 @@ ;; autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -185,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -207,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -237,39 +247,32 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -279,11 +282,6 @@ ;; makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -291,20 +289,29 @@ call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xproto-7.0.13/XF86keysym.h new/xproto-7.0.14/XF86keysym.h --- old/xproto-7.0.13/XF86keysym.h 2008-05-22 01:57:34.000000000 +0200 +++ new/xproto-7.0.14/XF86keysym.h 2008-10-15 05:54:49.000000000 +0200 @@ -183,6 +183,29 @@ #define XF86XK_Pictures 0x1008FF91 /* Show pictures */ #define XF86XK_Music 0x1008FF92 /* Launch music application */ +#define XF86XK_Battery 0x1008FF93 /* Display battery information */ +#define XF86XK_Bluetooth 0x1008FF94 /* Enable/disable Bluetooth */ +#define XF86XK_WLAN 0x1008FF95 /* Enable/disable WLAN */ +#define XF86XK_UWB 0x1008FF96 /* Enable/disable UWB */ + +#define XF86XK_AudioForward 0x1008FF97 /* fast-forward audio track */ +#define XF86XK_AudioRepeat 0x1008FF98 /* toggle repeat mode */ +#define XF86XK_AudioRandomPlay 0x1008FF99 /* toggle shuffle mode */ +#define XF86XK_Subtitle 0x1008FF9A /* cycle through subtitle */ +#define XF86XK_AudioCycleTrack 0x1008FF9B /* cycle through audio tracks */ +#define XF86XK_CycleAngle 0x1008FF9C /* cycle through angles */ +#define XF86XK_FrameBack 0x1008FF9D /* video: go one frame back */ +#define XF86XK_FrameForward 0x1008FF9E /* video: go one frame forward */ +#define XF86XK_Time 0x1008FF9F /* display, or shows an entry for time seeking */ +#define XF86XK_Select 0x1008FFA0 /* Select button on joypads and remotes */ +#define XF86XK_View 0x1008FFA1 /* Show a view options/properties */ +#define XF86XK_TopMenu 0x1008FFA2 /* Go to a top-level menu in a video */ + +#define XF86XK_Red 0x1008FFA3 /* Red button */ +#define XF86XK_Green 0x1008FFA4 /* Green button */ +#define XF86XK_Yellow 0x1008FFA5 /* Yellow button */ +#define XF86XK_Blue 0x1008FFA6 /* Blue button */ + /* Keys for special action keys (hot keys) */ /* Virtual terminals on some operating systems */ #define XF86XK_Switch_VT_1 0x1008FE01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-libX11 for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package xorg-x11-libX11 for openSUSE:Factory checked in at Thu Feb 26 03:38:30 CET 2009. -------- --- xorg-x11-libX11/xorg-x11-libX11.changes 2009-01-28 16:24:30.000000000 +0100 +++ xorg-x11-libX11/xorg-x11-libX11.changes 2009-02-24 14:14:06.872929579 +0100 @@ -1,0 +2,6 @@ +Tue Feb 24 14:13:11 CET 2009 - sndirsch(a)suse.de + +- scim_swallow1.diff/scim_swallow2.diff: + * fix for bnc #434865 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- scim_swallow1.diff scim_swallow2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libX11.spec ++++++ --- /var/tmp/diff_new_pack.kq2096/_old 2009-02-26 03:37:06.000000000 +0100 +++ /var/tmp/diff_new_pack.kq2096/_new 2009-02-26 03:37:06.000000000 +0100 @@ -28,7 +28,7 @@ PreReq: coreutils Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 4 +Release: 6 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -56,6 +56,8 @@ Patch16: xkb-rangefix.diff Patch17: Xcms.diff Patch18: compose-zh_CN.UTF-8.diff +Patch19: scim_swallow1.diff +Patch20: scim_swallow2.diff %description This package contains the X.Org X11 library. @@ -139,6 +141,8 @@ %patch16 -p0 %patch17 -p0 %patch18 -p0 +%patch19 -p1 +%patch20 -p1 %build autoreconf -fi @@ -210,6 +214,9 @@ %{_mandir}/man3/* %changelog +* Tue Feb 24 2009 sndirsch(a)suse.de +- scim_swallow1.diff/scim_swallow2.diff: + * fix for bnc #434865 * Wed Jan 28 2009 sndirsch(a)suse.de - compose-zh_CN.UTF-8.diff * added missing entry in compose.dir for zh_CN.UTF-8 (bnc #461243) ++++++ scim_swallow1.diff ++++++ diff -u -r libX11-1.1.4/modules/im/ximcp/imDefIc.c libX11-1.1.4.xim-fix/modules/im/ximcp/imDefIc.c --- libX11-1.1.4/modules/im/ximcp/imDefIc.c 2008-10-30 16:48:31.000000000 +0100 +++ libX11-1.1.4.xim-fix/modules/im/ximcp/imDefIc.c 2008-10-30 16:41:13.000000000 +0100 @@ -974,8 +974,6 @@ (void)_XimWrite(im, len, (XPointer)buf); _XimFlush(im); - MARK_FOCUSED(ic); - _XimRegisterFilter(ic); return; } @@ -1023,8 +1021,6 @@ (void)_XimWrite(im, len, (XPointer)buf); _XimFlush(im); - UNMARK_FOCUSED(ic); - _XimUnregisterFilter(ic); return; } diff -u -r libX11-1.1.4/modules/im/ximcp/imDefLkup.c libX11-1.1.4.xim-fix/modules/im/ximcp/imDefLkup.c --- libX11-1.1.4/modules/im/ximcp/imDefLkup.c 2008-10-30 16:48:31.000000000 +0100 +++ libX11-1.1.4.xim-fix/modules/im/ximcp/imDefLkup.c 2008-10-30 16:46:18.000000000 +0100 @@ -216,13 +216,8 @@ Xic ic, BITMASK16 mode) { - if (mode & XimSYNCHRONUS) /* SYNC Request */ { - if (IS_FOCUSED(ic)) - MARK_NEED_SYNC_REPLY(ic); - else - _XimProcSyncReply(ic->core.im, ic); - } - + if (mode & XimSYNCHRONUS) /* SYNC Request */ + MARK_NEED_SYNC_REPLY(ic->core.im); return True; } @@ -359,7 +354,7 @@ ev->xany.serial |= serial << 16; ev->xany.send_event = False; ev->xany.display = d; - MARK_FABLICATED(ic); + MARK_FABRICATED(ic->core.im); return; } @@ -712,7 +707,7 @@ if (ic->private.proto.registed_filter_event & (KEYPRESS_MASK | KEYRELEASE_MASK)) - MARK_FABLICATED(ic); + MARK_FABRICATED(im); ev.type = KeyPress; ev.send_event = False; diff -u -r libX11-1.1.4/modules/im/ximcp/imExten.c libX11-1.1.4.xim-fix/modules/im/ximcp/imExten.c --- libX11-1.1.4/modules/im/ximcp/imExten.c 2008-03-06 21:45:06.000000000 +0100 +++ libX11-1.1.4.xim-fix/modules/im/ximcp/imExten.c 2008-10-30 16:41:19.000000000 +0100 @@ -162,7 +162,7 @@ XPutBackEvent(im->core.display, &ev); _XimRespSyncReply(ic, buf_s[0]); - MARK_FABLICATED(ic); + MARK_FABRICATED(im); return True; } diff -u -r libX11-1.1.4/src/xlibi18n/XimintP.h libX11-1.1.4.xim-fix/src/xlibi18n/XimintP.h --- libX11-1.1.4/src/xlibi18n/XimintP.h 2008-03-06 21:45:06.000000000 +0100 +++ libX11-1.1.4.xim-fix/src/xlibi18n/XimintP.h 2008-10-30 16:41:19.000000000 +0100 @@ -144,6 +144,8 @@ #define DELAYBINDABLE (1L << 3) #define RECONNECTABLE (1L << 4) #endif /* XIM_CONNECTABLE */ +#define FABRICATED (1L << 5) +#define NEED_SYNC_REPLY (1L << 6) /* * macro for the flag of XIMPrivateRec @@ -182,6 +184,20 @@ (((Xim)im)->private.proto.flag &= ~(DELAYBINDABLE|RECONNECTABLE)) #endif /* XIM_CONNECTABLE */ +#define IS_FABRICATED(im) \ + (((Xim)im)->private.proto.flag & FABRICATED) +#define MARK_FABRICATED(im) \ + (((Xim)im)->private.proto.flag |= FABRICATED) +#define UNMARK_FABRICATED(im) \ + (((Xim)im)->private.proto.flag &= ~FABRICATED) + +#define IS_NEED_SYNC_REPLY(im) \ + (((Xim)im)->private.proto.flag & NEED_SYNC_REPLY) +#define MARK_NEED_SYNC_REPLY(im) \ + (((Xim)im)->private.proto.flag |= NEED_SYNC_REPLY) +#define UNMARK_NEED_SYNC_REPLY(im) \ + (((Xim)im)->private.proto.flag &= ~NEED_SYNC_REPLY) + /* * bit mask for the register_filter_event of XIMPrivateRec/XICPrivateRec */ @@ -242,9 +258,6 @@ * bit mask for the flag of XICPrivateRec */ #define IC_CONNECTED (1L) -#define FABLICATED (1L << 1) -#define NEED_SYNC_REPLY (1L << 2) -#define FOCUSED (1L << 3) /* * macro for the flag of XICPrivateRec @@ -256,27 +269,6 @@ #define UNMARK_IC_CONNECTED(ic) \ (((Xic)ic)->private.proto.flag &= ~IC_CONNECTED) -#define IS_FABLICATED(ic) \ - (((Xic)ic)->private.proto.flag & FABLICATED) -#define MARK_FABLICATED(ic) \ - (((Xic)ic)->private.proto.flag |= FABLICATED) -#define UNMARK_FABLICATED(ic) \ - (((Xic)ic)->private.proto.flag &= ~FABLICATED) - -#define IS_NEED_SYNC_REPLY(ic) \ - (((Xic)ic)->private.proto.flag & NEED_SYNC_REPLY) -#define MARK_NEED_SYNC_REPLY(ic) \ - (((Xic)ic)->private.proto.flag |= NEED_SYNC_REPLY) -#define UNMARK_NEED_SYNC_REPLY(ic) \ - (((Xic)ic)->private.proto.flag &= ~NEED_SYNC_REPLY) - -#define IS_FOCUSED(ic) \ - (((Xic)ic)->private.proto.flag & FOCUSED) -#define MARK_FOCUSED(ic) \ - (((Xic)ic)->private.proto.flag |= FOCUSED) -#define UNMARK_FOCUSED(ic) \ - (((Xic)ic)->private.proto.flag &= ~FOCUSED) - /* * macro for the filter_event_mask of XICPrivateRec */ ++++++ scim_swallow2.diff ++++++ diff --git a/modules/im/ximcp/imDefFlt.c b/modules/im/ximcp/imDefFlt.c index 685d515..fb12869 100644 --- a/modules/im/ximcp/imDefFlt.c +++ b/modules/im/ximcp/imDefFlt.c @@ -143,13 +143,11 @@ _XimProtoKeypressFilter( Xic ic, XKeyEvent *ev) { -#ifdef XIM_CONNECTABLE Xim im = (Xim)ic->core.im; -#endif - if (IS_FABLICATED(ic)) { + if (IS_FABRICATED(im)) { _XimPendingFilter(ic); - UNMARK_FABLICATED(ic); + UNMARK_FABRICATED(im); return NOTFILTERD; } @@ -206,13 +204,11 @@ _XimProtoKeyreleaseFilter( Xic ic, XKeyEvent *ev) { -#ifdef XIM_CONNECTABLE Xim im = (Xim)ic->core.im; -#endif - if (IS_FABLICATED(ic)) { + if (IS_FABRICATED(im)) { _XimPendingFilter(ic); - UNMARK_FABLICATED(ic); + UNMARK_FABRICATED(im); return NOTFILTERD; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Thu Feb 26 03:36:59 CET 2009. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-02-23 12:04:21.000000000 +0100 +++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-02-25 16:34:24.148129049 +0100 @@ -1,0 +2,34 @@ +Wed Feb 25 16:20:36 CET 2009 - sndirsch(a)suse.de + +- xf86-video-intel 2.6.2 + * Here comes a pretty significant bugfix release for the 2.6 2D + series. The goal of this release is to get out the major fixes + for GEM and KMS that we think we've pounded on enough to be stable + -- certainly more stable than previously. Notable fixes include a + significant BO memory usage reduction (which many have suffered + from with compositing), textured XV suppor twith KMS, and rotation + support with KMS. Some infrequent failure to render/xv with GEM + on 965 (dmesg warnings about being unable to bind objects) should + also be fixed. + But perhaps the exciting thing for most people will be the dynamic + front buffer allocation. We nearly slipped this into 2.6.0, but + decided that it was just a little too new. Well, turns out it was + actually in good shape, and it's time to get it out there. You'll + need UXA to do this. +- obsoletes xf86-video-intel-nottm.diff, xf86-video-intel-SDVO_LVDS.diff, + xf86-video-intel-commit-1e974ff.diff +- adjusted xf86-video-intel-bug18462.diff + +------------------------------------------------------------------- +Wed Feb 25 14:31:30 CET 2009 - sndirsch(a)suse.de + +- xf86-video-ati-ia64_screen_blank.diff + * fixes console screen blanking on IA64 (bnc #155646) + +------------------------------------------------------------------- +Tue Feb 24 12:23:41 CET 2009 - sndirsch(a)suse.de + +- xf86-video-ati-bug474071-fix2.diff + * fixes driver issue of bnc #474071 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-video-intel-2.5.0.tar.bz2 xf86-video-intel-commit-1e974ff.diff xf86-video-intel-nottm.diff xf86-video-intel-SDVO_LVDS.diff New: ---- xf86-video-ati-bug474071-fix2.diff xf86-video-ati-ia64_screen_blank.diff xf86-video-intel-2.6.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.h30668/_old 2009-02-26 03:35:23.000000000 +0100 +++ /var/tmp/diff_new_pack.h30668/_new 2009-02-26 03:35:23.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 38 +Release: 40 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -66,7 +66,7 @@ Source42: xf86-video-voodoo-1.2.0.tar.bz2 Source43: xf86-video-impact-0.2.0.tar.bz2 Source44: HALlib-4.1.tar.gz -Source45: xf86-video-intel-2.5.0.tar.bz2 +Source45: xf86-video-intel-2.6.2.tar.bz2 Source46: xf86-video-ati-6.9.0.tar.bz2 Source48: xf86-video-mga-1.9.100.tar.bz2 Source50: xf86-video-xgi-1.5.0.tar.bz2 @@ -75,7 +75,6 @@ Source54: xf86-video-mach64-6.8.0.tar.bz2 Source55: xf86-video-r128-6.8.0.tar.bz2 Source100: sax2-hwinfo-data.tar.gz -Patch1: xf86-video-intel-nottm.diff Patch3: ps_nv.diff Patch4: xf86-video-nv.diff Patch10: xf86-video-tdfx.diff @@ -95,11 +94,11 @@ Patch60: xf86-video-mga-ba37697.diff Patch61: xf86-video-intel-bug18462.diff Patch62: xf86-video-intel-NoFBC-945GME.diff -Patch63: xf86-video-intel-SDVO_LVDS.diff Patch64: xf86-video-vesa_DefaultRefresh.diff -Patch65: xf86-video-intel-commit-1e974ff.diff Patch66: xf86-video-intel-sdvo_detect.diff Patch67: xf86-video-intel-bfo17988.diff +Patch68: xf86-video-ati-bug474071-fix2.diff +Patch69: xf86-video-ati-ia64_screen_blank.diff Patch103: xf86-video-ati-6.7.197-r128-xvideo.patch Patch104: xf86-video-ati-disable-dri-bug437651-ia64only.diff @@ -126,12 +125,9 @@ %patch30 -p1 popd pushd xf86-video-intel-* -%patch1 %patch57 -p1 %patch61 -p1 %patch62 -p1 -%patch63 -p1 -%patch65 -p1 %if %suse_version > 1110 %patch66 -p1 %endif @@ -180,6 +176,8 @@ popd pushd xf86-video-ati-* %patch58 -p1 +%patch68 -p2 +%patch69 -p2 popd %build @@ -272,6 +270,31 @@ /var/lib/hardware/ids/20.%{name} %changelog +* Wed Feb 25 2009 sndirsch(a)suse.de +- xf86-video-intel 2.6.2 + * Here comes a pretty significant bugfix release for the 2.6 2D + series. The goal of this release is to get out the major fixes + for GEM and KMS that we think we've pounded on enough to be stable + -- certainly more stable than previously. Notable fixes include a + significant BO memory usage reduction (which many have suffered + from with compositing), textured XV suppor twith KMS, and rotation + support with KMS. Some infrequent failure to render/xv with GEM + on 965 (dmesg warnings about being unable to bind objects) should + also be fixed. + But perhaps the exciting thing for most people will be the dynamic + front buffer allocation. We nearly slipped this into 2.6.0, but + decided that it was just a little too new. Well, turns out it was + actually in good shape, and it's time to get it out there. You'll + need UXA to do this. +- obsoletes xf86-video-intel-nottm.diff, xf86-video-intel-SDVO_LVDS.diff, + xf86-video-intel-commit-1e974ff.diff +- adjusted xf86-video-intel-bug18462.diff +* Wed Feb 25 2009 sndirsch(a)suse.de +- xf86-video-ati-ia64_screen_blank.diff + * fixes console screen blanking on IA64 (bnc #155646) +* Tue Feb 24 2009 sndirsch(a)suse.de +- xf86-video-ati-bug474071-fix2.diff + * fixes driver issue of bnc #474071 * Mon Feb 23 2009 sndirsch(a)suse.de - xf86-video-intel-bfo17988.diff * disables update_dsparb function for 945GM (bfo #17988) ++++++ xf86-video-ati-bug474071-fix2.diff ++++++ --- xorg-x11-driver-video-7.4/xf86-video-ati-6.9.0/src/radeon_driver.c.orig 2009-02-23 16:22:50.955408060 +0100 +++ xorg-x11-driver-video-7.4/xf86-video-ati-6.9.0/src/radeon_driver.c 2009-02-23 17:53:02.971877917 +0100 @@ -208,6 +208,7 @@ uint32_t MEM_CNTL; uint32_t MEMSIZE; uint32_t MPP_TB_CONFIG; + unsigned char MISC_OUT; }; static Bool RADEONMapMMIO(ScrnInfoPtr pScrn); @@ -263,14 +264,17 @@ RADEONInfoPtr info = RADEONPTR(pScrn); unsigned char *RADEONMMIO = info->MMIO; uint32_t CardTmp; - static struct RADEONInt10Save SaveStruct = { 0, 0, 0 }; + static struct RADEONInt10Save SaveStruct = { 0, 0, 0, 0 }; if (!IS_AVIVO_VARIANT) { + OUTREG(0,RADEON_MEM_CNTL); /* Save the values and zap MEM_CNTL */ SaveStruct.MEM_CNTL = INREG(RADEON_MEM_CNTL); SaveStruct.MEMSIZE = INREG(RADEON_CONFIG_MEMSIZE); SaveStruct.MPP_TB_CONFIG = INREG(RADEON_MPP_TB_CONFIG); - +#if !defined(__powerpc__) && !defined(__sparc__) + SaveStruct.MISC_OUT = inb(pScrn->domainIOBase + RADEON_GENMO_RD); +#endif /* * Zap MEM_CNTL and set MPP_TB_CONFIG<31:24> to 4 */ @@ -332,6 +336,14 @@ CardTmp |= (pSave->MPP_TB_CONFIG & 0xff000000u); OUTREG(RADEON_MPP_TB_CONFIG, CardTmp); } +#if !defined(__powerpc__) && !defined(__sparc__) + if (CardTmp != pSave->MISC_OUT) { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Restoring MiscOut (%x), setting to %x\n", + CardTmp, pSave->MEM_CNTL); + outb(pScrn->domainIOBase + RADEON_GENMO_WT, pSave->MISC_OUT); + } +#endif } /* Allocate our private RADEONInfoRec */ @@ -2731,7 +2743,7 @@ goto fail1; } -#if !defined(__alpha__) +#if !defined(__alpha__) && !defined (__ia64__) if ( #ifndef XSERVER_LIBPCIACCESS xf86GetPciDomain(info->PciTag) || ++++++ xf86-video-ati-ia64_screen_blank.diff ++++++ --- xorg-x11-driver-video-7.4/xf86-video-ati-6.9.0/src/radeon_driver.c.orig1 2009-02-24 14:28:57.000000000 +0100 +++ xorg-x11-driver-video-7.4/xf86-video-ati-6.9.0/src/radeon_driver.c 2009-02-24 16:52:37.000000000 +0100 @@ -209,6 +209,7 @@ struct RADEONInt10Save { uint32_t MEMSIZE; uint32_t MPP_TB_CONFIG; unsigned char MISC_OUT; + unsigned char ATTR[0x10]; }; static Bool RADEONMapMMIO(ScrnInfoPtr pScrn); @@ -258,13 +259,67 @@ RADEONEntPtr RADEONEntPriv(ScrnInfoPtr p return pPriv->ptr; } +#if !defined(__powerpc__) && !defined(__sparc__) +/* + * + */ +void +RADEONPreInt10SaveVGA(ScrnInfoPtr pScrn, struct RADEONInt10Save *pSave) +{ + IOADDRESS Base = pScrn->domainIOBase; + unsigned int Stat1Reg; + int i; + + pSave->MISC_OUT = inb(pScrn->domainIOBase + RADEON_GENMO_RD); + Stat1Reg = (pSave->MISC_OUT & 0x1) ? 0x3DA : 0x3BA; + { + for (i = 0; i < 0x10; i++) { + inb(Base + Stat1Reg); + outb(Base + RADEON_ATTRX, i); + pSave->ATTR[i] = inb(Base + RADEON_ATTRDR); + } + } +} + +/* + * + */ +void +RADEONPostInt10CheckVGA(ScrnInfoPtr pScrn, struct RADEONInt10Save *pSave) +{ + IOADDRESS Base = pScrn->domainIOBase; + unsigned int Stat1Reg = (pSave->MISC_OUT & 0x1) ? 0x3DA : 0x3BA; + unsigned char CardTmp = inb(pScrn->domainIOBase + RADEON_GENMO_RD); + int i; + + if (CardTmp != pSave->MISC_OUT) { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Restoring MiscOut (%x), setting to %x\n", + CardTmp, pSave->MEM_CNTL); + outb(pScrn->domainIOBase + RADEON_GENMO_WT, pSave->MISC_OUT); + } + + for (i = 0; i < 0x10; i++) { + inb(Base + Stat1Reg); + outb(Base + RADEON_ATTRX, i); + CardTmp = inb(Base + RADEON_ATTRDR); + if ( CardTmp != pSave->ATTR[i] ) { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Restoring AttrReg[0x%i]: 0x%x to 0x%x\n", + i, CardTmp, pSave->ATTR[i]); + outb(Base + RADEON_ATTRDW, pSave->ATTR[i]); + } + } +} +#endif + static void RADEONPreInt10Save(ScrnInfoPtr pScrn, void **pPtr) { RADEONInfoPtr info = RADEONPTR(pScrn); unsigned char *RADEONMMIO = info->MMIO; uint32_t CardTmp; - static struct RADEONInt10Save SaveStruct = { 0, 0, 0, 0 }; + static struct RADEONInt10Save SaveStruct = { 0, 0, 0, 0, {0} }; if (!IS_AVIVO_VARIANT) { OUTREG(0,RADEON_MEM_CNTL); @@ -272,8 +327,9 @@ RADEONPreInt10Save(ScrnInfoPtr pScrn, vo SaveStruct.MEM_CNTL = INREG(RADEON_MEM_CNTL); SaveStruct.MEMSIZE = INREG(RADEON_CONFIG_MEMSIZE); SaveStruct.MPP_TB_CONFIG = INREG(RADEON_MPP_TB_CONFIG); + #if !defined(__powerpc__) && !defined(__sparc__) - SaveStruct.MISC_OUT = inb(pScrn->domainIOBase + RADEON_GENMO_RD); + RADEONPreInt10SaveVGA(pScrn, &SaveStruct); #endif /* * Zap MEM_CNTL and set MPP_TB_CONFIG<31:24> to 4 @@ -337,12 +393,7 @@ RADEONPostInt10Check(ScrnInfoPtr pScrn, OUTREG(RADEON_MPP_TB_CONFIG, CardTmp); } #if !defined(__powerpc__) && !defined(__sparc__) - if (CardTmp != pSave->MISC_OUT) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Restoring MiscOut (%x), setting to %x\n", - CardTmp, pSave->MEM_CNTL); - outb(pScrn->domainIOBase + RADEON_GENMO_WT, pSave->MISC_OUT); - } + RADEONPostInt10CheckVGA(pScrn, pSave); #endif } ++++++ xf86-video-intel-2.5.0.tar.bz2 -> xf86-video-intel-2.6.2.tar.bz2 ++++++ ++++ 42115 lines of diff (skipped) ++++++ xf86-video-intel-bug18462.diff ++++++ --- /var/tmp/diff_new_pack.h30668/_old 2009-02-26 03:35:25.000000000 +0100 +++ /var/tmp/diff_new_pack.h30668/_new 2009-02-26 03:35:25.000000000 +0100 @@ -1,25 +1,3 @@ -commit 0fe61b0b7e3bbe8ced1b0ad2be72c438d200c64b -Author: Zhenyu Wang <zhenyu.z.wang(a)intel.com> -Date: Tue Dec 9 19:19:58 2008 +0800 - - Remove Cappuccino SlimPRO SP625F 855GM LVDS quirk - - It breaks bug #18462 on IBM 855GM with same subdevice ids. - -diff --git a/src/i830_quirks.c b/src/i830_quirks.c -index 155cb44..54e3af6 100644 ---- a/src/i830_quirks.c -+++ b/src/i830_quirks.c -@@ -229,9 +229,6 @@ static i830_quirk i830_quirk_list[] = { - { PCI_CHIP_I965_GM, 0xa0a0, SUBSYS_ANY, quirk_ignore_lvds }, - { PCI_CHIP_I965_GM, 0x8086, 0x1999, quirk_ignore_lvds }, - -- /* Cappuccino SlimPRO SP625F, bz #11368 */ -- { PCI_CHIP_I855_GM, 0x8086, 0x3582, quirk_ignore_lvds }, -- - /* Apple Mac mini has no lvds, but macbook pro does */ - { PCI_CHIP_I945_GM, 0x8086, 0x7270, quirk_mac_mini }, - commit 4d7a95959d8223aec41550eb19f60b3edd7210a1 Author: Zhenyu Wang <zhenyu.z.wang(a)intel.com> Date: Tue Dec 9 19:48:11 2008 +0800 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11 for openSUSE:Factory
by root＠Hilbert.suse.de 26 Feb '09

26 Feb '09

Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Thu Feb 26 03:33:21 CET 2009. -------- --- xorg-x11/xorg-x11.changes 2009-02-16 09:05:40.000000000 +0100 +++ xorg-x11/xorg-x11.changes 2009-02-25 20:45:31.483884335 +0100 @@ -1,0 +2,12 @@ +Wed Feb 25 20:44:50 CET 2009 - sndirsch(a)suse.de + +- mkfontscale 1.0.6 +- xinit 1.1.1 +- xedit 1.1.2 + +------------------------------------------------------------------- +Tue Feb 24 15:55:41 CET 2009 - sndirsch(a)suse.de + +- added xrestop sources; added provides/obsoletes for xrestop + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mkfontscale-1.0.5.tar.bz2 xedit-1.1.1.tar.bz2 xinit-1.1.0.tar.bz2 New: ---- mkfontscale-1.0.6.tar.bz2 xedit-1.1.2.tar.bz2 xinit-1.1.1.tar.bz2 xrestop-0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.v18426/_old 2009-02-26 03:28:38.000000000 +0100 +++ /var/tmp/diff_new_pack.v18426/_new 2009-02-26 03:28:38.000000000 +0100 @@ -26,7 +26,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 12 +Release: 13 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -37,8 +37,8 @@ %endif Requires: %{name}-xauth Recommends: dbus-1-x11 -Provides: XFree86 xcompmgr -Obsoletes: xcompmgr +Provides: XFree86 xcompmgr xrestop +Obsoletes: xcompmgr xrestop Summary: X.Org core and sample applications Source0: appres-1.0.1.tar.bz2 Source1: bdftopcf-1.0.1.tar.bz2 @@ -54,7 +54,7 @@ Source11: listres-X11R7.0-1.0.1.tar.bz2 Source12: luit-1.0.3.tar.bz2 Source14: mkfontdir-1.0.4.tar.bz2 -Source15: mkfontscale-1.0.5.tar.bz2 +Source15: mkfontscale-1.0.6.tar.bz2 Source16: oclock-X11R7.0-1.0.1.tar.bz2 Source17: proxymngr-X11R7.0-1.0.1.tar.bz2 Source18: rgb-1.0.3.tar.bz2 @@ -80,7 +80,7 @@ Source38: xditview-X11R7.0-1.0.1.tar.bz2 Source39: xdm-1.1.8.tar.bz2 Source40: xdpyinfo-1.0.3.tar.bz2 -Source42: xedit-1.1.1.tar.bz2 +Source42: xedit-1.1.2.tar.bz2 Source43: xev-1.0.3.tar.bz2 Source44: xeyes-X11R7.0-1.0.1.tar.bz2 Source45: xf86dga-1.0.2.tar.bz2 @@ -93,7 +93,7 @@ Source52: xgamma-1.0.2.tar.bz2 Source53: xgc-X11R7.0-1.0.1.tar.bz2 Source54: xhost-1.0.2.tar.bz2 -Source55: xinit-1.1.0.tar.bz2 +Source55: xinit-1.1.1.tar.bz2 Source56: xkbcomp-1.0.5.tar.bz2 Source57: xkbevd-X11R7.1-1.0.2.tar.bz2 Source58: xkbprint-X11R7.0-1.0.1.tar.bz2 @@ -136,6 +136,7 @@ Source96: xbacklight-1.1.tar.bz2 Source97: xinput-1.3.0.tar.bz2 Source98: xcompmgr-1.1.4.tar.bz2 +Source99: xrestop-0.4.tar.gz Source200: misc.tar.bz2 Source201: twm.tar.bz2 Source202: xdm.tar.bz2 @@ -533,6 +534,12 @@ %{_mandir}/man1/xauth.1* %changelog +* Wed Feb 25 2009 sndirsch(a)suse.de +- mkfontscale 1.0.6 +- xinit 1.1.1 +- xedit 1.1.2 +* Tue Feb 24 2009 sndirsch(a)suse.de +- added xrestop sources; added provides/obsoletes for xrestop * Mon Feb 16 2009 sndirsch(a)suse.de - /etc/X11/xdm/SuSEconfig.xdm: * /var/X11R6/bin no longer covered by FHS; switched to ++++++ mkfontscale-1.0.5.tar.bz2 -> mkfontscale-1.0.6.tar.bz2 ++++++ ++++ 6124 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontscale-1.0.5/ChangeLog new/mkfontscale-1.0.6/ChangeLog --- old/mkfontscale-1.0.5/ChangeLog 2008-05-11 00:05:08.000000000 +0200 +++ new/mkfontscale-1.0.6/ChangeLog 2008-12-19 01:59:50.000000000 +0100 @@ -1,3 +1,39 @@ +commit a34031ea9074a453aee217b5845d07333019f26c +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Dec 18 16:56:12 2008 -0800 + + Version 1.0.6 + +commit 95c7da3a2717a0352cdd08830fdd1dd1a4024dda +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Dec 18 16:55:56 2008 -0800 + + man page typo fix + +commit 0d1a2b7970c0eadb834fc2a6c3a68a09691b84ea +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Wed Dec 17 19:29:54 2008 -0800 + + Add hooks for checking sources with lint/sparse/etc. + +commit 3ae585a3f08cb660c6ce6838557c94f88821b7a5 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Wed Dec 17 19:22:27 2008 -0800 + + Add basic README with URL's of git, bugzilla & mailing list + +commit 03f6a08c503ff12e2457a9ccc13bfbb801e2161d +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Wed Dec 17 19:19:03 2008 -0800 + + Use XORG_CWARNFLAGS & XORG_CHANGELOG from xorg-macros 1.2 + +commit 0ca983a6bac03489fb0d2ad158114a811eb276a2 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Wed Nov 5 10:07:33 2008 -0800 + + Add support for bzip2 compressed fonts if configured --with-bzip2 + commit 8126d2b694f48cc8137be05705a125f7d02e7e12 Author: Julien Cristau <jcristau(a)debian.org> Date: Sun May 11 00:03:44 2008 +0200 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontscale-1.0.5/config.h.in new/mkfontscale-1.0.6/config.h.in --- old/mkfontscale-1.0.5/config.h.in 2008-05-11 00:04:56.000000000 +0200 +++ new/mkfontscale-1.0.6/config.h.in 2008-12-19 01:57:37.000000000 +0100 @@ -1,8 +1,38 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `bz2' library (-lbz2). */ +#undef HAVE_LIBBZ2 + /* Define to 1 if you have the `z' library (-lz). */ #undef HAVE_LIBZ +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + /* Name of package */ #undef PACKAGE @@ -30,5 +60,11 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + /* Version number of package */ #undef VERSION + +/* Support bzip2 for bitmap fonts */ +#undef X_BZIP2_FONT_COMPRESSION diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontscale-1.0.5/configure.ac new/mkfontscale-1.0.6/configure.ac --- old/mkfontscale-1.0.5/configure.ac 2008-05-11 00:03:13.000000000 +0200 +++ new/mkfontscale-1.0.6/configure.ac 2008-12-18 04:30:00.000000000 +0100 @@ -21,18 +21,33 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(mkfontscale, [1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] mkfontscale) +AC_INIT(mkfontscale, [1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] mkfontscale) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) +# Require xorg-macros version >= 1.2.0 for XORG_CWARNFLAGS & XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) + AC_PROG_CC +XORG_CWARNFLAGS AC_PROG_INSTALL AC_CHECK_LIB(z, gzopen, [], [AC_MSG_ERROR([zlib is required, but was not found.])]) +AC_ARG_WITH(bzip2, + AS_HELP_STRING([--with-bzip2], + [Support bzip2 compressed bitmap fonts]), + [], [with_bzip2=no]) +if test "x$with_bzip2" = xyes; then + AC_CHECK_LIB(bz2, BZ2_bzopen, [], + AC_MSG_ERROR([*** libbz2 is required for bzip2 support])) + AC_DEFINE(X_BZIP2_FONT_COMPRESSION,1,[Support bzip2 for bitmap fonts]) +fi + # Checks for pkg-config packages PKG_CHECK_MODULES(MKFONTSCALE, fontenc freetype2) AC_SUBST(MKFONTSCALE_CFLAGS) @@ -41,7 +56,11 @@ PKG_CHECK_MODULES(X11, xproto) AC_SUBST(X11_CFLAGS) +dnl Allow checking code with lint, sparse, etc. +XORG_WITH_LINT + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontscale-1.0.5/COPYING new/mkfontscale-1.0.6/COPYING --- old/mkfontscale-1.0.5/COPYING 2008-05-11 00:01:42.000000000 +0200 +++ new/mkfontscale-1.0.6/COPYING 2008-11-05 18:11:56.000000000 +0100 @@ -17,3 +17,31 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Copyright 2008 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. + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontscale-1.0.5/ident.c new/mkfontscale-1.0.6/ident.c --- old/mkfontscale-1.0.5/ident.c 2008-04-28 21:23:47.000000000 +0200 +++ new/mkfontscale-1.0.6/ident.c 2008-11-05 18:14:35.000000000 +0100 @@ -19,6 +19,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/* Copyright 2008 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. + */ /* $XFree86: xc/programs/mkfontscale/ident.c,v 1.3tsi Exp $ */ /* The function identifyBitmap returns -1 if filename is definitively not @@ -26,11 +53,17 @@ and 0 if it should be processed normally. identifyBitmap is much faster than parsing the whole font. */ +#include "config.h" + #include <stdlib.h> #include <string.h> #include "zlib.h" #include "ident.h" +#ifdef X_BZIP2_FONT_COMPRESSION +# include <bzlib.h> +#endif + #define PCF_VERSION (('p'<<24)|('c'<<16)|('f'<<8)|1) #define PCF_PROPERTIES (1 << 0) @@ -40,40 +73,150 @@ unsigned value; } PropRec, *PropPtr; -static int pcfIdentify(gzFile f, char **name); -static int bdfIdentify(gzFile f, char **name); +#ifdef X_BZIP2_FONT_COMPRESSION +typedef struct { + enum { gzFontFile, bz2FontFile } type; + union { + gzFile gz; + BZFILE *bz2; + } f; + unsigned pos; +} fontFile; + +static inline void * +fontFileOpen(fontFile *ff, const char *filename) { + int n = strlen(filename); + + if (strcmp(filename + n - 4, ".bz2") == 0) { + ff->type = bz2FontFile; + ff->f.bz2 = BZ2_bzopen(filename, "rb"); + ff->pos = 0; + return ff->f.bz2; + } else { + ff->type = gzFontFile; + ff->f.gz = gzopen(filename, "rb"); + return ff->f.gz; + } +} + +static inline int +fontFileRead(fontFile *ff, void *buf, unsigned len) +{ + if (ff->type == gzFontFile) { + return gzread(ff->f.gz, buf, len); + } else { + int r = BZ2_bzread(ff->f.bz2, buf, len); + ff->pos += r; + return r; + } +} + +static inline int +fontFileGetc(fontFile *ff) +{ + if (ff->type == gzFontFile) { + return gzgetc(ff->f.gz); + } else { + char buf; + if (BZ2_bzread(ff->f.bz2, &buf, 1) != 1) { + return -1; + } else { + ff->pos += 1; + return (int) buf; + } + } +} + +static int +fontFileSeek(fontFile *ff, z_off_t offset, int whence) +{ + if (ff->type == gzFontFile) { + return gzseek(ff->f.gz, offset, whence); + } else { + /* bzlib has no easy equivalent so we have to fake it, + * fortunately, we only have to handle a couple of cases + */ + int n; + char buf[BUFSIZ]; + + switch (whence) { + case SEEK_SET: + n = offset - ff->pos; + break; + case SEEK_CUR: + n = offset; + break; + default: + return -1; + } + + while (n > BUFSIZ) { + if (BZ2_bzread(ff->f.bz2, buf, BUFSIZ) != BUFSIZ) + return -1; + n -= BUFSIZ; + } + if (BZ2_bzread(ff->f.bz2, buf, n) != n) + return -1; + ff->pos = offset; + return offset; + } +} + + +static inline int +fontFileClose(fontFile *ff) +{ + if (ff->type == gzFontFile) { + return gzclose(ff->f.gz); + } else { + BZ2_bzclose(ff->f.bz2); + return 0; + } +} + +#else /* no bzip2, only gzip */ +typedef gzFile fontFile; +# define fontFileOpen(ff, filename) (*(ff) = gzopen(filename, "rb")) +# define fontFileRead(ff, buf, len) gzread(*(ff), buf, len) +# define fontFileGetc(ff) gzgetc(*(ff)) +# define fontFileSeek(ff, off, whence) gzseek(*(ff), off, whence) +# define fontFileClose(ff) gzclose(*(ff)) +#endif + +static int pcfIdentify(fontFile *f, char **name); +static int bdfIdentify(fontFile *f, char **name); static int -getLSB32(gzFile f) +getLSB32(fontFile *f) { int rc; unsigned char c[4]; - rc = gzread(f, c, 4); + rc = fontFileRead(f, c, 4); if(rc != 4) return -1; return (c[0]) | (c[1] << 8) | (c[2] << 16) | (c[3] << 24); } static int -getInt8(gzFile f, int format) +getInt8(fontFile *f, int format) { unsigned char c; int rc; - rc = gzread(f, &c, 1); + rc = fontFileRead(f, &c, 1); if(rc != 1) return -1; return c; } static int -getInt32(gzFile f, int format) +getInt32(fontFile *f, int format) { int rc; unsigned char c[4]; - rc = gzread(f, c, 4); + rc = fontFileRead(f, c, 4); if(rc != 4) return -1; @@ -84,43 +227,27 @@ } } -static int -pcfskip(gzFile f, int n) -{ - char buf[32]; - int i, rc; - while(n > 0) { - i = (n > 32 ? 32 : n); - rc = gzread(f, buf, i); - if(rc != i) - return -1; - n -= rc; - } - return 1; -} - int -bitmapIdentify(char *filename, char **name) +bitmapIdentify(const char *filename, char **name) { - gzFile f; + fontFile ff; int magic; - f = gzopen(filename, "rb"); - if(f == NULL) - return -1; + if (fontFileOpen(&ff, filename) == NULL) + return -1; - magic = getLSB32(f); + magic = getLSB32(&ff); if(magic == PCF_VERSION) - return pcfIdentify(f, name); + return pcfIdentify(&ff, name); else if(magic == ('S' | ('T' << 8) | ('A' << 16) | ('R') << 24)) - return bdfIdentify(f, name); + return bdfIdentify(&ff, name); - gzclose(f); + fontFileClose(&ff); return 0; } static int -pcfIdentify(gzFile f, char **name) +pcfIdentify(fontFile *f, char **name) { int prop_position; PropPtr props = NULL; @@ -146,7 +273,7 @@ if(prop_position < 0) goto fail; - rc = gzseek(f, prop_position, SEEK_SET); + rc = fontFileSeek(f, prop_position, SEEK_SET); if(rc < 0) goto fail; @@ -166,7 +293,7 @@ props[i].value = getInt32(f, format); } if(nprops & 3) { - rc = pcfskip(f, 4 - (nprops & 3)); + rc = fontFileSeek(f, 4 - (nprops & 3), SEEK_CUR); if(rc < 0) goto fail; } @@ -178,7 +305,7 @@ if(!strings) goto fail; - rc = gzread(f, strings, string_size); + rc = fontFileRead(f, strings, string_size); if(rc != string_size) goto fail; @@ -201,26 +328,26 @@ *name = s; free(strings); free(props); - gzclose(f); + fontFileClose(f); return 1; fail: if(strings) free(strings); if(props) free(props); - gzclose(f); + fontFileClose(f); return 0; } #define NKEY 20 static char* -getKeyword(gzFile *f, int *eol) +getKeyword(fontFile *f, int *eol) { static char keyword[NKEY + 1]; int c, i; i = 0; while(i < NKEY) { - c = gzgetc(f); + c = fontFileGetc(f); if(c == ' ' || c == '\n') { if(i <= 0) return NULL; @@ -237,11 +364,11 @@ } static int -bdfskip(gzFile *f) +bdfskip(fontFile *f) { int c; do { - c = gzgetc(f); + c = fontFileGetc(f); } while(c >= 0 && c != '\n'); if(c < 0) return -1; @@ -249,7 +376,7 @@ } static char * -bdfend(gzFile *f) +bdfend(fontFile *f) { int c; char *buf = NULL; @@ -257,7 +384,7 @@ int i = 0; do { - c = gzgetc(f); + c = fontFileGetc(f); } while (c == ' '); while(i < 1000) { @@ -282,7 +409,7 @@ return buf; } buf[i++] = c; - c = gzgetc(f); + c = fontFileGetc(f); } fail: @@ -292,7 +419,7 @@ } static int -bdfIdentify(gzFile f, char **name) +bdfIdentify(fontFile *f, char **name) { char *k; int rc; @@ -320,12 +447,12 @@ if(k == NULL) goto fail; *name = k; - gzclose(f); + fontFileClose(f); return 1; } else if(strcmp(k, "CHARS") == 0) goto fail; } fail: - gzclose(f); + fontFileClose(f); return 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontscale-1.0.5/ident.h new/mkfontscale-1.0.6/ident.h --- old/mkfontscale-1.0.5/ident.h 2006-11-06 00:49:59.000000000 +0100 +++ new/mkfontscale-1.0.6/ident.h 2008-08-22 03:48:06.000000000 +0200 @@ -25,6 +25,6 @@ #ifndef _MKS_IDENT_H_ #define _MKS_IDENT_H_ 1 -int bitmapIdentify(char *filename, char **xlfd); +int bitmapIdentify(const char *filename, char **xlfd); #endif /* _MKS_IDENT_H_ */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontscale-1.0.5/Makefile.am new/mkfontscale-1.0.6/Makefile.am --- old/mkfontscale-1.0.5/Makefile.am 2008-04-28 21:23:47.000000000 +0200 +++ new/mkfontscale-1.0.6/Makefile.am 2008-12-18 04:27:28.000000000 +0100 @@ -21,7 +21,8 @@ bin_PROGRAMS = mkfontscale -mkfontscale_CFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE +AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE +AM_CFLAGS = $(CWARNFLAGS) mkfontscale_LDADD = @MKFONTSCALE_LIBS@ mkfontscale_SOURCES = \ @@ -67,12 +68,17 @@ .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog - .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog + +if LINT +ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) + +lint: + $(LINT) $(ALL_LINT_FLAGS) $(mkfontscale_SOURCES) +endif LINT diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontscale-1.0.5/mkfontscale.c new/mkfontscale-1.0.6/mkfontscale.c --- old/mkfontscale-1.0.5/mkfontscale.c 2008-05-11 00:01:42.000000000 +0200 +++ new/mkfontscale-1.0.6/mkfontscale.c 2008-08-22 03:35:00.000000000 +0200 @@ -740,6 +740,10 @@ return 4; if(strcmp(filename + n - 3, ".gz") == 0) return 3; +#ifdef X_BZIP2_FONT_COMPRESSION + if(strcmp(filename + n - 4, ".bz2") == 0) + return 2; +#endif if(strcmp(filename + n - 2, ".Z") == 0) return 2; if(strcmp(filename + n - 4, ".bdf") == 0) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontscale-1.0.5/mkfontscale.man new/mkfontscale-1.0.6/mkfontscale.man --- old/mkfontscale-1.0.5/mkfontscale.man 2008-04-28 21:23:47.000000000 +0200 +++ new/mkfontscale-1.0.6/mkfontscale.man 2008-12-19 01:55:05.000000000 +0100 @@ -110,7 +110,7 @@ .B -p Specifies a prefix that is prepended to the encoding file path names when they are written to the "encodings.dir" file. The prefix is -prepended litterally: if a `/' is required between the prefix and the path +prepended literally: if a `/' is required between the prefix and the path names, it must be supplied explicitly as part of the prefix. .TP .B \-r diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontscale-1.0.5/README new/mkfontscale-1.0.6/README --- old/mkfontscale-1.0.5/README 2006-11-06 00:49:59.000000000 +0100 +++ new/mkfontscale-1.0.6/README 2008-12-18 04:20:10.000000000 +0100 @@ -0,0 +1,21 @@ +mkfontscale creates the fonts.scale and fonts.dir index files used by the +legacy X11 font system. + +Please submit bugs & patches to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/app/mkfontscale + + http://cgit.freedesktop.org/xorg/app/mkfontscale + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage ++++++ ps_suse.diff ++++++ --- /var/tmp/diff_new_pack.v18426/_old 2009-02-26 03:28:40.000000000 +0100 +++ /var/tmp/diff_new_pack.v18426/_new 2009-02-26 03:28:40.000000000 +0100 @@ -18,7 +18,7 @@ Color --- xinit-X11R7.1-1.0.2.orig/xinitrc.cpp 2006-08-19 11:02:26.000000000 +0200 -+++ xinit-1.1.0/xinitrc.cpp 2006-08-19 11:02:35.000000000 +0200 ++++ xinit-1.1.1/xinitrc.cpp 2006-08-19 11:02:35.000000000 +0200 @@ -68,8 +68,10 @@ #endif @@ -33,7 +33,7 @@ -exec XTERM -geometry 80x66+0+0 -name login +exec TWM --- xinit-X11R7.1-1.0.2.orig/startx.cpp 2006-08-19 11:02:26.000000000 +0200 -+++ xinit-1.1.0/startx.cpp 2006-08-19 11:14:43.000000000 +0200 ++++ xinit-1.1.1/startx.cpp 2006-08-19 11:14:43.000000000 +0200 @@ -62,10 +62,115 @@ sysclientrc=XINITDIR/xinitrc #endif @@ -158,6 +158,6 @@ +XCOMM handle TCP port 6000 +test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \ + serverargs="$serverargs -nolisten tcp" - XINIT $client $clientargs -- $server $display $serverargs - #endif - + + #ifdef __APPLE__ + eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs ++++++ p_xauth.diff ++++++ --- /var/tmp/diff_new_pack.v18426/_old 2009-02-26 03:28:40.000000000 +0100 +++ /var/tmp/diff_new_pack.v18426/_new 2009-02-26 03:28:40.000000000 +0100 @@ -289,12 +289,12 @@ } doWrite = 1; --- programs/xinit/startx.cpp.orig 2005-11-11 11:16:53.000000000 +0100 -+++ xinit-1.1.0/startx.cpp 2005-11-11 11:35:19.000000000 +0100 ++++ xinit-1.1.1/startx.cpp 2005-11-11 11:35:19.000000000 +0100 @@ -328,6 +328,7 @@ . /etc/sysconfig/displaymanager test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \ serverargs="$serverargs -nolisten tcp" +export XAUTHLOCALHOSTNAME=`hostname` - XINIT $client $clientargs -- $server $display $serverargs - #endif - + + #ifdef __APPLE__ + eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs ++++++ xedit-1.1.1.tar.bz2 -> xedit-1.1.2.tar.bz2 ++++++ ++++ 4142 lines of diff (skipped) ++++++ xinit-1.1.0.tar.bz2 -> xinit-1.1.1.tar.bz2 ++++++ ++++ 5076 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.1.0/ChangeLog new/xinit-1.1.1/ChangeLog --- old/xinit-1.1.0/ChangeLog 2008-06-12 21:26:28.000000000 +0200 +++ new/xinit-1.1.1/ChangeLog 2008-12-18 00:24:43.000000000 +0100 @@ -1,3 +1,125 @@ +commit 46d641fdd020d07a9b4bd0364cf126643342a7e3 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Wed Dec 17 15:19:38 2008 -0800 + + xinit 1.1.1 + +commit c340932db548d1a3d4fc5bbc682b7730e5b2cf4a +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Wed Dec 17 13:00:23 2008 -0800 + + Apple: Allow defaults option that maps to a -dpi server command line in startx + +commit 89c1675d128da3477cac6858c4249b839ec68346 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Sat Dec 13 00:14:54 2008 -0800 + + OSX: Don't use login/bash -c hack anymore for org.x.startx LaunchAgent + +commit 13accec7614960965470f17894bc9212842ea6d7 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Tue Dec 9 21:15:13 2008 -0800 + + OSX: More prefix fixes + +commit e06ebf63e2c91e590fc1091e5ea2e49bab835526 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Wed Dec 3 11:19:48 2008 -0800 + + OSX: Fixed bad prefix + +commit 4ee72a6f1fc5d045adb71260107ca605ec68a84a +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Tue Dec 2 20:56:11 2008 -0800 + + OSX Tiger: Fix discovery of mach port + +commit ca9cb9750d2dd480240a37cdbd94fdba0a34da4c +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Tue Dec 2 20:31:10 2008 -0800 + + Apple: Honor X11_PREFS_DOMAIN if it's set (1.4.2-apple26 and later) + +commit 754efe651165ea7dd034f6b0ce75ef785deab826 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Fri Nov 28 23:23:14 2008 -0800 + + OSX Tiger: Hopefully the last fix for Tiger users... + +commit f04db53e71c681379ec49494c9ab727bc5269b30 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Fri Nov 28 11:20:25 2008 -0800 + + OSX Tiger: More compilation fixes... + +commit ed6dc88f5cbaaad08a282c44ae333a938f6f4216 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Thu Nov 27 00:47:31 2008 -0800 + + OSX: Create privleged_startx on Tiger + + Launchd in Tiger doesn't support OnDemand loading, so this is + a KeepAlive idle daemon on Tiger. + +commit 9f761b5a8512a8ad8b1475a3684e1a23d953916f +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Sat Nov 22 10:52:35 2008 -0800 + + Apple: Use AvailabilityMacros.h for Tiger compatability + +commit 0c0b73812efe75496e154730787402538a268bac +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Thu Aug 28 19:10:59 2008 -0700 + + Apple: Make VPATH builds work on darwin + + Patch from Peter O'Gorman <peter(a)pogma.com> + +commit 0753882b89a451c9bdd053c2915a80fbcdbb0b77 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Tue Aug 5 14:58:48 2008 -0700 + + Apple: sleep() to avoid innocent error message spew + +commit 79871c9b9daa1fad1b84af8f7eb54fced7526b2e +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Tue Aug 5 14:11:24 2008 -0700 + + Fix build of startx & xinitrc with Solaris make + + For some reason, having the dependencies explictly listed + causes it to ignore the suffix implicit rule for .cpp. + +commit 9cc39e441b8741b4b0b878d00e09f0366ff36146 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Mon Aug 4 14:40:49 2008 -0700 + + Support the instant-off API in SnowLeopard. + +commit 7d41013b0e295ec0444c2f9099679bb6018c812f +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Wed Jul 2 16:36:24 2008 -0700 + + Apple: Using eval to protect people who have spaces in their home path. + +commit 9632367abd03108f3636b05e9f2fd92f5c28dabe +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Sun Jun 29 18:24:13 2008 -0700 + + startx.cpp: Made some things a little more friendly for people who have spaces in pathnames. + +commit c5bd51b3a31b3b290dec9f978779a56161308bb4 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Sun Jun 29 17:50:44 2008 -0700 + + Apple: privleged_startx: Increase the timeout so slower machines don't get a stray process warning in their system log. + +commit a5a8ea7c8452908c2c4c9c822f5b4f7382c03630 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Thu Jun 12 15:27:11 2008 -0400 + + xinit 1.1.0 + commit 44e2ee01b456deb2630d21786d19ee2734d2f40a Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> Date: Wed May 28 12:01:35 2008 -0700 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.1.0/configure.ac new/xinit-1.1.1/configure.ac --- old/xinit-1.1.0/configure.ac 2008-06-12 21:26:07.000000000 +0200 +++ new/xinit-1.1.1/configure.ac 2008-12-18 00:18:08.000000000 +0100 @@ -21,7 +21,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(xinit,[1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit) +AC_INIT(xinit,[1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE @@ -102,18 +102,17 @@ if test "x$LAUNCHD" = "xauto"; then unset LAUNCHD - case $host_os in - darwin8*) - LAUNCHD=no - ;; - *) - AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no]) - ;; - esac + AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no]) fi +TIGER_LAUNCHD=no if test "x$LAUNCHD" = "xyes" ; then AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available]) + case $host_os in + darwin8*) + TIGER_LAUNCHD=yes + ;; + esac else launchagentsdir="" launchdaemonsdir="" @@ -121,6 +120,7 @@ AC_SUBST([launchagentsdir]) AC_SUBST([launchdaemonsdir]) AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = "xyes"]) +AM_CONDITIONAL(TIGER_LAUNCHD, [test "x$TIGER_LAUNCHD" = "xyes"]) # Checks for pkg-config packages PKG_CHECK_MODULES(XINIT, x11) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.1.0/Makefile.am new/xinit-1.1.1/Makefile.am --- old/xinit-1.1.0/Makefile.am 2008-06-12 21:25:46.000000000 +0200 +++ new/xinit-1.1.1/Makefile.am 2008-08-05 23:58:52.000000000 +0200 @@ -67,9 +67,6 @@ DIST_SUBDIRS = privileged_startx -xinitrc: xinitrc.cpp Makefile -startx: startx.cpp Makefile - xinitrc_DATA = xinitrc CLEANFILES = xinitrc startx $(appman_DATA) $(launchagents_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.1.0/org.x.startx.plist.cpp new/xinit-1.1.1/org.x.startx.plist.cpp --- old/xinit-1.1.0/org.x.startx.plist.cpp 2008-05-21 20:09:16.000000000 +0200 +++ new/xinit-1.1.1/org.x.startx.plist.cpp 2008-12-13 09:13:12.000000000 +0100 @@ -6,9 +6,6 @@ <string>org.x.startx</string> <key>ProgramArguments</key> <array> - <string>/bin/bash</string> - <string>--login</string> - <string>-c</string> <string>__bindir__/startx</string> </array> <key>Sockets</key> @@ -21,5 +18,7 @@ </dict> <key>ServiceIPC</key> <true/> + <key>EnableTransactions</key> + <true/> </dict> </plist> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.1.0/privileged_startx/20-font_cache.cpp new/xinit-1.1.1/privileged_startx/20-font_cache.cpp --- old/xinit-1.1.0/privileged_startx/20-font_cache.cpp 2008-05-21 20:09:16.000000000 +0200 +++ new/xinit-1.1.1/privileged_startx/20-font_cache.cpp 2008-12-03 20:19:44.000000000 +0100 @@ -27,9 +27,9 @@ XCOMM prior written authorization. if [ -x BINDIR/font_cache ] ; then - BINDIR/font_cache & + BINDIR/font_cache -s & elif [ -x BINDIR/font_cache.sh ] ; then BINDIR/font_cache.sh -s & -elif [ -x /usr/X11/bin/fc-cache ] ; then +elif [ -x BINDIR/fc-cache ] ; then BINDIR/fc-cache & fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.1.0/privileged_startx/client.c new/xinit-1.1.1/privileged_startx/client.c --- old/xinit-1.1.0/privileged_startx/client.c 2008-05-21 20:09:16.000000000 +0200 +++ new/xinit-1.1.1/privileged_startx/client.c 2008-11-29 08:23:08.000000000 +0100 @@ -34,6 +34,8 @@ #include <stdlib.h> #include <stdbool.h> +#include <AvailabilityMacros.h> + #include "privileged_startx.h" int client_main(void) { @@ -42,7 +44,11 @@ kr = bootstrap_look_up(bootstrap_port, BOOTSTRAP_NAME, &mp); if (kr != KERN_SUCCESS) { +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 fprintf(stderr, "bootstrap_look_up(): %s\n", bootstrap_strerror(kr)); +#else + fprintf(stderr, "bootstrap_look_up(): %ul\n", (unsigned long)kr); +#endif exit(EXIT_FAILURE); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.1.0/privileged_startx/Makefile.am new/xinit-1.1.1/privileged_startx/Makefile.am --- old/xinit-1.1.0/privileged_startx/Makefile.am 2008-05-21 20:09:16.000000000 +0200 +++ new/xinit-1.1.1/privileged_startx/Makefile.am 2008-11-26 12:33:58.000000000 +0100 @@ -34,9 +34,12 @@ privstartx_SCRIPTS = 10-tmpdirs 20-font_cache AM_CPPFLAGS = -DXINITDIR=\"$(xinitrcdir)\" -DSCRIPTDIR=\"$(privstartxdir)\" -DBINDIR=\"$(bindir)\" - CPP_FILES_FLAGS = -DXINITDIR="$(xinitrcdir)" -DSCRIPTDIR="$(privstartxdir)" -DBINDIR="$(bindir)" +if TIGER_LAUNCHD +CPP_FILES_FLAGS += -DTIGER_LAUNCHD +endif + dist_privileged_startx_SOURCES = \ server.c \ client.c \ @@ -70,5 +73,5 @@ privileged_startx.defs \ privileged_startx_types.h -$(BUILT_SOURCES): privileged_startx.defs - mig -sheader privileged_startxServer.h privileged_startx.defs +$(BUILT_SOURCES): $(srcdir)/privileged_startx.defs + mig -sheader privileged_startxServer.h $(srcdir)/privileged_startx.defs Files old/xinit-1.1.0/privileged_startx/._org.x.privileged_startx.plist.cpp and new/xinit-1.1.1/privileged_startx/._org.x.privileged_startx.plist.cpp differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.1.0/privileged_startx/org.x.privileged_startx.plist.cpp new/xinit-1.1.1/privileged_startx/org.x.privileged_startx.plist.cpp --- old/xinit-1.1.0/privileged_startx/org.x.privileged_startx.plist.cpp 2008-05-21 20:09:16.000000000 +0200 +++ new/xinit-1.1.1/privileged_startx/org.x.privileged_startx.plist.cpp 2008-11-26 13:29:08.000000000 +0100 @@ -4,18 +4,25 @@ <dict> <key>Label</key> <string>org.x.privileged_startx</string> - <key>MachServices</key> - <dict> - <key>org.x.privileged_startx</key> - <true/> - </dict> <key>ProgramArguments</key> <array> <string>XINITDIR/privileged_startx</string> <string>-d</string> <string>SCRIPTDIR</string> </array> +#ifdef TIGER_LAUNCHD + <key>KeepAlive</key> + <true/> +#else + <key>MachServices</key> + <dict> + <key>org.x.privileged_startx</key> + <true/> + </dict> <key>TimeOut</key> - <integer>60</integer> + <integer>120</integer> + <key>EnableTransactions</key> + <true/> +#endif </dict> </plist> Files old/xinit-1.1.0/privileged_startx/._privileged_startx.c and new/xinit-1.1.1/privileged_startx/._privileged_startx.c differ Files old/xinit-1.1.0/privileged_startx/._server.c and new/xinit-1.1.1/privileged_startx/._server.c differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.1.0/privileged_startx/server.c new/xinit-1.1.1/privileged_startx/server.c --- old/xinit-1.1.0/privileged_startx/server.c 2008-05-21 20:09:16.000000000 +0200 +++ new/xinit-1.1.1/privileged_startx/server.c 2008-12-03 05:55:29.000000000 +0100 @@ -40,7 +40,6 @@ #include <sys/time.h> #include <launch.h> #include <asl.h> -#include <pthread.h> #include <errno.h> #include "privileged_startx.h" @@ -51,6 +50,10 @@ union __ReplyUnion__privileged_startx_subsystem rep; }; +#ifdef LAUNCH_JOBKEY_MACHSERVICES +#include <pthread.h> +static void* idle_thread(void* param __attribute__((unused))); + /* globals to trigger idle exit */ #define DEFAULT_IDLE_TIMEOUT 60 /* 60 second timeout, then the server exits */ @@ -61,6 +64,7 @@ }; struct idle_globals idle_globals; +#endif #ifndef SCRIPTDIR #define SCRIPTDIR="/usr/X11/lib/X11/xinit/privileged_startx.d" @@ -69,13 +73,46 @@ /* Default script dir */ const char *script_dir = SCRIPTDIR; -static void* idle_thread(void* param __attribute__((unused))); +#ifndef LAUNCH_JOBKEY_MACHSERVICES +static mach_port_t checkin_or_register(char *bname) { + kern_return_t kr; + mach_port_t mp; + + /* If we're started by launchd or the old mach_init */ + kr = bootstrap_check_in(bootstrap_port, bname, &mp); + if (kr == KERN_SUCCESS) + return mp; + + /* We probably were not started by launchd or the old mach_init */ + kr = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &mp); + if (kr != KERN_SUCCESS) { + fprintf(stderr, "mach_port_allocate(): %s\n", mach_error_string(kr)); + exit(EXIT_FAILURE); + } + + kr = mach_port_insert_right(mach_task_self(), mp, mp, MACH_MSG_TYPE_MAKE_SEND); + if (kr != KERN_SUCCESS) { + fprintf(stderr, "mach_port_insert_right(): %s\n", mach_error_string(kr)); + exit(EXIT_FAILURE); + } + + kr = bootstrap_register(bootstrap_port, bname, mp); + if (kr != KERN_SUCCESS) { + fprintf(stderr, "bootstrap_register(): %s\n", mach_error_string(kr)); + exit(EXIT_FAILURE); + } + + return mp; +} +#endif int server_main(const char *dir) { mach_msg_size_t mxmsgsz = sizeof(union MaxMsgSize) + MAX_TRAILER_SIZE; mach_port_t mp; kern_return_t kr; +#ifdef LAUNCH_JOBKEY_MACHSERVICES long idle_timeout = DEFAULT_IDLE_TIMEOUT; +#endif launch_data_t config = NULL, checkin = NULL; checkin = launch_data_new_string(LAUNCH_KEY_CHECKIN); @@ -85,6 +122,13 @@ exit(EXIT_FAILURE); } + if(dir) { + script_dir = dir; + asl_log(NULL, NULL, ASL_LEVEL_DEBUG, + "script directory set: %s", script_dir); + } + +#ifdef LAUNCH_JOBKEY_MACHSERVICES launch_data_t tmv; tmv = launch_data_dict_lookup(config, LAUNCH_JOBKEY_TIMEOUT); if (tmv) { @@ -93,12 +137,6 @@ "idle timeout set: %ld seconds", idle_timeout); } - if(dir) { - script_dir = dir; - asl_log(NULL, NULL, ASL_LEVEL_DEBUG, - "script directory set: %s", script_dir); - } - launch_data_t svc; svc = launch_data_dict_lookup(config, LAUNCH_JOBKEY_MACHSERVICES); if (!svc) { @@ -114,6 +152,10 @@ } mp = launch_data_get_machport(svc); +#else + mp = checkin_or_register("org.x.privileged_startx"); +#endif + if (mp == MACH_PORT_NULL) { asl_log(NULL, NULL, ASL_LEVEL_ERR, "NULL mach service: %s", BOOTSTRAP_NAME); @@ -129,12 +171,14 @@ exit(EXIT_FAILURE); } +#ifdef LAUNCH_JOBKEY_MACHSERVICES /* spawn a thread to monitor our idle timeout */ pthread_t thread; idle_globals.mp = mp; idle_globals.timeout = idle_timeout; gettimeofday(&idle_globals.lastmsg, NULL); pthread_create(&thread, NULL, &idle_thread, NULL); +#endif /* Main event loop */ kr = mach_msg_server(privileged_startx_server, mxmsgsz, mp, 0); @@ -161,8 +205,10 @@ const char * path_argv[2] = {script_dir, NULL}; +#ifdef LAUNCH_JOBKEY_MACHSERVICES /* Store that we were called, so the idle timer will reset */ gettimeofday(&idle_globals.lastmsg, NULL); +#endif /* script_dir contains a set of files to run with root privs when X11 starts */ ftsp = fts_open(path_argv, FTS_PHYSICAL, ftscmp); @@ -222,6 +268,7 @@ } kern_return_t do_idle_exit(mach_port_t test_port __attribute__((unused))) { +#ifdef LAUNCH_JOBKEY_MACHSERVICES struct timeval now; gettimeofday(&now, NULL); @@ -231,8 +278,12 @@ } return KERN_SUCCESS; +#else + return KERN_FAILURE; +#endif } +#ifdef LAUNCH_JOBKEY_MACHSERVICES static void *idle_thread(void* param __attribute__((unused))) { for(;;) { struct timeval now; @@ -248,3 +299,4 @@ } return NULL; } +#endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.1.0/startx.cpp new/xinit-1.1.1/startx.cpp --- old/xinit-1.1.0/startx.cpp 2008-06-12 21:25:46.000000000 +0200 +++ new/xinit-1.1.1/startx.cpp 2008-12-17 21:59:54.000000000 +0100 @@ -84,27 +84,31 @@ #ifdef __APPLE__ +if [ "x$X11_PREFS_DOMAIN" = x ] ; then + X11_PREFS_DOMAIN="org.x.X11" +fi + XCOMM Initialize defaults (this will cut down on "safe" error messages) -if ! defaults read org.x.X11 cache_fonts >& /dev/null ; then - defaults write org.x.X11 cache_fonts -bool true +if ! defaults read $X11_PREFS_DOMAIN cache_fonts >& /dev/null ; then + defaults write $X11_PREFS_DOMAIN cache_fonts -bool true fi -if ! defaults read org.x.X11 no_auth >& /dev/null ; then - defaults write org.x.X11 no_auth -bool false +if ! defaults read $X11_PREFS_DOMAIN no_auth >& /dev/null ; then + defaults write $X11_PREFS_DOMAIN no_auth -bool false fi -if ! defaults read org.x.X11 nolisten_tcp >& /dev/null ; then - defaults write org.x.X11 nolisten_tcp -bool true +if ! defaults read $X11_PREFS_DOMAIN nolisten_tcp >& /dev/null ; then + defaults write $X11_PREFS_DOMAIN nolisten_tcp -bool true fi XCOMM First, start caching fonts -if [ x`defaults read org.x.X11 cache_fonts` = x1 ] ; then - if [ -x /usr/X11/bin/font_cache ] ; then - /usr/X11/bin/font_cache & - elif [ -x /usr/X11/bin/font_cache.sh ] ; then - /usr/X11/bin/font_cache.sh & - elif [ -x /usr/X11/bin/fc-cache ] ; then - /usr/X11/bin/fc-cache & +if [ x`defaults read $X11_PREFS_DOMAIN cache_fonts` = x1 ] ; then + if [ -x $bindir/font_cache ] ; then + $bindir/font_cache & + elif [ -x $bindir/font_cache.sh ] ; then + $bindir/font_cache.sh & + elif [ -x $bindir/fc-cache ] ; then + $bindir/fc-cache & fi fi @@ -114,16 +118,20 @@ XINITDIR/privileged_startx fi -if [ x`defaults read org.x.X11 no_auth` = x0 ] ; then +if [ x`defaults read $X11_PREFS_DOMAIN no_auth` = x0 ] ; then enable_xauth=1 else enable_xauth=0 fi -if [ x`defaults read org.x.X11 nolisten_tcp` = x1 ] ; then +if [ x`defaults read $X11_PREFS_DOMAIN nolisten_tcp` = x1 ] ; then defaultserverargs="$defaultserverargs -nolisten tcp" fi +if defaults read $X11_PREFS_DOMAIN dpi >& /dev/null ; then + defaultserverargs="$defaultserverargs -dpi `defaults read $X11_PREFS_DOMAIN dpi`" +fi + for ((d=0; ; d++)) ; do [[ -e /tmp/.X$d-lock ]] || break done @@ -133,19 +141,6 @@ enable_xauth=1 #endif - -if [ -f $userclientrc ]; then - defaultclientargs=$userclientrc -elif [ -f $sysclientrc ]; then - defaultclientargs=$sysclientrc -#if defined(__SCO__) || defined(__UNIXWARE__) -elif [ -f $scouserclientrc ]; then - defaultclientargs=$scouserclientrc -elif [ -f $scosysclientrc ]; then - defaultclientargs=$scosysclientrc -#endif -fi - #if defined(__SCO__) || defined(__UNIXWARE__) XCOMM SCO -t option: do not start an X server @@ -202,11 +197,23 @@ XCOMM process client arguments if [ x"$client" = x ]; then + client=$defaultclient + XCOMM if no client arguments either, use rc file instead if [ x"$clientargs" = x ]; then - client="$defaultclientargs" - else - client=$defaultclient + if [ -f "$userclientrc" ]; then + client=$userclientrc + elif [ -f "$sysclientrc" ]; then + client=$sysclientrc +#if defined(__SCO__) || defined(__UNIXWARE__) + elif [ -f "$scouserclientrc" ]; then + client=$scouserclientrc + elif [ -f "$scosysclientrc" ]; then + client=$scosysclientrc +#endif + fi + + clientargs=$defaultclientargs fi fi @@ -217,9 +224,9 @@ XCOMM if no server arguments or display either, use defaults if [ x"$serverargs" = x -a x"$display" = x ]; then XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments - if [ -f $userserverrc ]; then + if [ -f "$userserverrc" ]; then server=$userserverrc - elif [ -f $sysserverrc ]; then + elif [ -f "$sysserverrc" ]; then server=$sysserverrc fi @@ -268,11 +275,15 @@ XCOMM create a file with auth information for the server. ':0' is a dummy. xserverauthfile=$HOME/.serverauth.$$ - trap "rm -f $xserverauthfile" HUP INT QUIT ILL TRAP KILL BUS TERM - xauth -q -f $xserverauthfile << EOF + trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM + xauth -q -f "$xserverauthfile" << EOF add :$dummy . $mcookie EOF +#ifdef __APPLE__ + serverargs=${serverargs}" -auth '"${xserverauthfile}"'" +#else serverargs=${serverargs}" -auth "${xserverauthfile} +#endif XCOMM now add the same credentials to the client authority file XCOMM if '$displayname' already exists do not overwrite it as another @@ -287,7 +298,7 @@ removelist="$displayname $removelist" else dummy=$(($dummy+1)); - XAUTH -q -f $xserverauthfile << EOF + XAUTH -q -f "$xserverauthfile" << EOF add :$dummy . $authcookie EOF fi @@ -298,10 +309,16 @@ if [ "$REMOTE_SERVER" = "TRUE" ]; then exec SHELL_CMD ${client} else - XINIT $client $clientargs -- $server $display $serverargs + XINIT "$client" $clientargs -- "$server" $display $serverargs fi #else -XINIT $client $clientargs -- $server $display $serverargs + +#ifdef __APPLE__ +eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs +#else +XINIT "$client" $clientargs -- "$server" $display $serverargs +#endif + #endif if [ x"$enable_xauth" = x1 ] ; then @@ -309,7 +326,7 @@ XAUTH remove $removelist fi if [ x"$xserverauthfile" != x ]; then - rm -f $xserverauthfile + rm -f "$xserverauthfile" fi fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.1.0/xinit.c new/xinit-1.1.1/xinit.c --- old/xinit-1.1.0/xinit.c 2008-05-21 20:09:16.000000000 +0200 +++ new/xinit-1.1.1/xinit.c 2008-11-22 19:52:00.000000000 +0100 @@ -60,6 +60,13 @@ #include <setjmp.h> #include <stdarg.h> +#ifdef __APPLE__ +#include <AvailabilityMacros.h> +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 +#include <vproc.h> +#endif +#endif + #if !defined(SIGCHLD) && defined(SIGCLD) #define SIGCHLD SIGCLD #endif @@ -250,6 +257,11 @@ int client_args_given = 0, server_args_given = 0; int start_of_client_args, start_of_server_args; struct sigaction sa; +#ifdef __APPLE__ +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 + vproc_transaction_t vt; +#endif +#endif #ifdef __UNIXOS2__ envsave = envp; /* circumvent an EMX problem */ @@ -426,6 +438,13 @@ signal(SIGALRM, sigAlarm); signal(SIGUSR1, sigUsr1); + +#ifdef __APPLE__ +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 + vt = vproc_transaction_begin(NULL); +#endif +#endif + if (startServer(server) > 0 && startClient(client) > 0) { pid = -1; @@ -434,6 +453,13 @@ ) pid = wait(NULL); } + +#ifdef __APPLE__ +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 + vproc_transaction_end(NULL, vt); +#endif +#endif + signal(SIGTERM, SIG_IGN); signal(SIGQUIT, SIG_IGN); signal(SIGINT, SIG_IGN); @@ -464,15 +490,23 @@ int ncycles = 120; /* # of cycles to wait */ int cycles; /* Wait cycle count */ +#ifdef __APPLE__ + /* For Apple, we don't get signaled by the server when it's ready, so we just + * want to sleep now since we're going to sleep later anyways and this allows us + * to avoid the awkard, "why is there an error message in the log" questions + * from users. + */ + + sleep(2); +#endif + for (cycles = 0; cycles < ncycles; cycles++) { if ((xd = XOpenDisplay(displayNum))) { return(TRUE); } else { -#define MSG "X server to begin accepting connections" - if (!processTimeout (1, MSG)) + if (!processTimeout (1, "X server to begin accepting connections")) break; -#undef MSG } } Files old/xinit-1.1.0/._xinitrc.cpp and new/xinit-1.1.1/._xinitrc.cpp differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0