Revert to 1.4.2.1. The change that pulls Xmd.h in more headers is

causing too much problems in ports. requested by espie@ and deraadt@
This commit is contained in:
matthieu 2008-06-03 05:13:48 +00:00
parent 35417f08d8
commit c6b3b52580
4 changed files with 5 additions and 256 deletions

View File

@ -1,244 +1,4 @@
commit 096b20bf5492d248b5c8ff0c1c28e221d59db724
Author: Jesse Barnes <jesse.barnes@intel.com>
Date: Mon Jan 21 15:28:49 2008 -0800
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
Use Xmd.h instead of X.h to pull in CARD32 definition
On 64 bit hosts, CARD32 may be undefined unless we use Xmd.h to define it for
us. Apparently X.h is no longer sufficient.
commit 9359e625787761e6b3df15f29bbf842c67a9516d
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:39:02 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
commit 4b22047f347d8fd65a36b2fc90e1a87dff8e93e3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Sep 27 12:27:19 2007 -0400
XI.h needs X.h for CARD32 on 64-bit systems.
commit f033750780b74d72056da93fd9a91140a978891b
Merge: 369dd28... 96b0c13...
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 06:17:20 2007 -0400
Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/proto/inputproto
commit 369dd283cfcf006e2cfe3496ebc5157839a3d04e
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:54:06 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
commit 96b0c13a5a689b3a6dbc4249ca4ef364f778c003
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Aug 31 17:58:27 2007 +0930
Bump to 1.4.2.1
No source changes, the 1.4.2 tarball had a busted configure script.
commit 310a93f8e194aa070b0f1d40c8fd5ae941908dbe
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 26 11:06:18 2007 +0930
bump to 1.4.2
commit c9bed7d4750c314002c16430a4dd75f95cc2f78d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 24 22:53:27 2007 +0930
Add flags to be used for DevicePrensence's devchange field.
commit c608d82c6b5b87ddc8d14862f528bdd69f5f5b72
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Feb 15 16:33:07 2007 +0200
bump to 1.4.1
commit ad2edb61ffd8baf87b9ab249aa36b0c04a765f79
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jan 9 13:32:39 2007 +1030
Fix typo in DevicePresence() macro
commit a0be30da79e35e7d503c6eeb9021c2f63beb2176
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 16:40:11 2006 +0300
DeviceAbs{Area,Calib}: properly align 32-bit types
Decorate CARD32s and INT32s with B32.
commit b1b3dbfd9b00d47c84c213bc6b7d61c5e8c80466
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 16:30:56 2006 +0300
DevicePresenceNotify: add deviceid field, with explanation
Add deviceid field, and an explanation of same in XInput.h.
deviceid is only used if a specific device changed, and control
is non-zero if a specific control on that device changed.
commit 06ffd1e6b600d4e3f55ce7da69448a284ff5dac6
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Sat Oct 21 03:58:53 2006 -0400
DEVICE_TOUCHPAD -> DEVICE_ABS_CALIB.
As it's really calibration for absolute devices, add some stuff.
DEVICE_ABS_AREA
Defines the area of the screen that an absolute device covers if it is sending
core events.
commit 1fab95863efc2bbf9a5b836b3de31da4a956b4bd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 20 00:33:13 2006 +0300
add DEVICE_ENABLE control, add core indication
Add DEVICE_ENABLE control, which allows specific devices to be
enabled or disabled at runtime.
Add 'iscore' flag to DEVICE_CORE, which indicates whether or not the
device is a virtual core device.
commit 926251a486b57197d735a426887acad6fdfd7dc6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 18 11:56:37 2006 -0400
add XExtensionKeyboard and XExtensionPointer classes
Add two new classes of device, XExtensionKeyboard, and XExtensionPointer.
commit 7a4a2a3e733378abced0a184627adfda4ed387b9
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Mon Jul 17 19:34:45 2006 -0400
add DevicePresenceNotify event, clean up
Add DevicePresenceNotify event, which indicates that something in the device
list changed (Kristian Høgsberg, Red Hat).
Add a core event control, which toggles the sending or not of core events by
an extended device.
Clean up some random detritus from the MetroLink merge.
commit 6767671f502964d385aa41de3a45fb479c6330c0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jul 14 18:56:18 2006 -0700
renamed: .cvsignore -> .gitignore
commit 4cc2697880ae61723094dacf78ffe77d81f6e0ee
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:37 2005 +0000
Update package version number for final X11R7 release candidate.
commit 3ade2fe8443f572abeee73b4fa8e986e4a054017
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:48:14 2005 +0000
Update package version number for RC1 release.
commit 67498db2df7435d9d59eda4ac444c6560da839b3
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Aug 2 19:19:38 2005 +0000
Add basic .cvsignore files for proto modules.
commit 742a1eb222d662fc9247ab7c1bd337ffef01eafb
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:55 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
commit 9161a356397a07002e03cf1846d212c7154f4c52
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat May 21 04:04:21 2005 +0000
Set version to 1.3.
commit 492f0a9e16bfe9cfb2c7b888b5b5e511db2bf83b
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 19 00:22:39 2005 +0000
revert last change, didn't do right thing at all, sorry for the noise
commit ec71e17293b90ff5eeaa97566751fc5c3955904a
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 19 00:10:18 2005 +0000
Require automake 1.7 in AM_INIT_AUTOMAKE
commit 242316c65e53d1bba244e4f35e5a93718b0ea8d0
Author: Josh Triplett <josh@speakeasy.net>
Date: Mon May 16 03:30:03 2005 +0000
Add COPYING file for Input.
commit 5c5945a47990b7bc077bcfdbabb6e0003cbf1659
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon May 9 18:20:04 2005 +0000
Change all the protonames from <extension>Ext to <extension>Proto.
commit 518f527ab685d2d082796460113bb7a9ea9bfe15
Author: Kevin E Martin <kem@kem.org>
Date: Fri May 6 01:46:30 2005 +0000
Initial build system files for proto module.
commit 4254b2967e3c5f256138f35de1ab49efff87220c
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 18:43:06 2004 +0000
Merging XORG-CURRENT into trunk
commit ca910a158bdc060d17cf3c00f93c82c3a6ee6f05
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:31:35 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit 08e413c25f385e51466ef3309d880c1f63bf0a73
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:10:54 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 1b98dbf2eab5a8ef74afda0c669c9fdfc6461cda
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:35:11 2004 +0000
readding XFree86's cvs IDs
commit f276a601f272742ea8570fae4326c172cf4b8723
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:22:27 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit 47d36cccfdf0e65848bb2e9595779501a76d6000
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:28:02 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit 4383a95e0bbc2f09394deefc453c2edd1c813d0f
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:42 2003 +0000
XFree86 4.3.0.1
commit 51468f1607f0b88576628c89e85d159afbb4628e
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 15:54:35 2003 +0000
R6.6 is the Xorg base-line
* configure.ac:
Update package version number for final X11R7 release candidate.

View File

@ -8,13 +8,3 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = inputproto.pc
EXTRA_DIST = autogen.sh inputproto.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

View File

@ -50,9 +50,8 @@ SOFTWARE.
/* Definitions used by the server, library and client */
#ifndef _XI_H_
#define _XI_H_
#include <X11/Xmd.h> /* CARD32 */
#define _XI_H_
#define sz_xGetExtensionVersionReq 8
#define sz_xGetExtensionVersionReply 32

View File

@ -1,5 +1,5 @@
AC_PREREQ([2.57])
AC_INIT([InputProto], [1.4.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AC_INIT([InputProto], [1.4.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION