From e89404f8dc67932eab7fbc163e8b6c645943cc05 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Fri, 14 Nov 2003 16:48:43 +0000 Subject: Initial revision --- xf86misc.h | 163 +++++++++++++++++++++++++++++++++++++++++++++ xf86mscstr.h | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 375 insertions(+) create mode 100644 xf86misc.h create mode 100644 xf86mscstr.h diff --git a/xf86misc.h b/xf86misc.h new file mode 100644 index 0000000..3cdd2d7 --- /dev/null +++ b/xf86misc.h @@ -0,0 +1,163 @@ +/* $XFree86: xc/include/extensions/xf86misc.h,v 3.16 2002/11/20 04:04:56 dawes Exp $ */ + +/* + * Copyright (c) 1995, 1996 The XFree86 Project, Inc + */ + +/* THIS IS NOT AN X CONSORTIUM STANDARD */ + +#ifndef _XF86MISC_H_ +#define _XF86MISC_H_ + +#include + +#define X_XF86MiscQueryVersion 0 +#ifdef _XF86MISC_SAVER_COMPAT_ +#define X_XF86MiscGetSaver 1 +#define X_XF86MiscSetSaver 2 +#endif +#define X_XF86MiscGetMouseSettings 3 +#define X_XF86MiscGetKbdSettings 4 +#define X_XF86MiscSetMouseSettings 5 +#define X_XF86MiscSetKbdSettings 6 +#define X_XF86MiscSetGrabKeysState 7 +#define X_XF86MiscSetClientVersion 8 +#define X_XF86MiscGetFilePaths 9 + +#define XF86MiscNumberEvents 0 + +#define XF86MiscBadMouseProtocol 0 +#define XF86MiscBadMouseBaudRate 1 +#define XF86MiscBadMouseFlags 2 +#define XF86MiscBadMouseCombo 3 +#define XF86MiscBadKbdType 4 +#define XF86MiscModInDevDisabled 5 +#define XF86MiscModInDevClientNotLocal 6 +#define XF86MiscNoModule 7 +#define XF86MiscNumberErrors (XF86MiscNoModule + 1) + +/* Never renumber these */ +#define MTYPE_MICROSOFT 0 +#define MTYPE_MOUSESYS 1 +#define MTYPE_MMSERIES 2 +#define MTYPE_LOGITECH 3 +#define MTYPE_BUSMOUSE 4 +#define MTYPE_LOGIMAN 5 +#define MTYPE_PS_2 6 +#define MTYPE_MMHIT 7 +#define MTYPE_GLIDEPOINT 8 +#define MTYPE_IMSERIAL 9 +#define MTYPE_THINKING 10 +#define MTYPE_IMPS2 11 +#define MTYPE_THINKINGPS2 12 +#define MTYPE_MMANPLUSPS2 13 +#define MTYPE_GLIDEPOINTPS2 14 +#define MTYPE_NETPS2 15 +#define MTYPE_NETSCROLLPS2 16 +#define MTYPE_SYSMOUSE 17 +#define MTYPE_AUTOMOUSE 18 +#define MTYPE_ACECAD 19 +#define MTYPE_EXPPS2 20 + +#define MTYPE_XQUEUE 127 +#define MTYPE_OSMOUSE 126 +#define MTYPE_UNKNOWN 125 + +#define KTYPE_UNKNOWN 0 +#define KTYPE_84KEY 1 +#define KTYPE_101KEY 2 +#define KTYPE_OTHER 3 +#define KTYPE_XQUEUE 4 + +#define MF_CLEAR_DTR 1 +#define MF_CLEAR_RTS 2 +#define MF_REOPEN 128 + +#ifndef _XF86MISC_SERVER_ + +/* return values for XF86MiscSetGrabKeysState */ +#define MiscExtGrabStateSuccess 0 /* No errors */ +#define MiscExtGrabStateLocked 1 /* A client already requested that + * grabs cannot be removed/killed */ +#define MiscExtGrabStateAlready 2 /* Request for enabling/disabling + * grab removeal/kill already done */ + +_XFUNCPROTOBEGIN + +typedef struct { + char* device; + int type; + int baudrate; + int samplerate; + int resolution; + int buttons; + Bool emulate3buttons; + int emulate3timeout; + Bool chordmiddle; + int flags; +} XF86MiscMouseSettings; + +typedef struct { + int type; + int rate; + int delay; + Bool servnumlock; +} XF86MiscKbdSettings; + +typedef struct { + char* configfile; + char* modulepath; + char* logfile; +} XF86MiscFilePaths; + +Bool XF86MiscQueryVersion( + Display* /* dpy */, + int* /* majorVersion */, + int* /* minorVersion */ +); + +Bool XF86MiscQueryExtension( + Display* /* dpy */, + int* /* event_base */, + int* /* error_base */ +); + +Bool XF86MiscSetClientVersion( + Display *dpy /* dpy */ +); + +Status XF86MiscGetMouseSettings( + Display* /* dpy */, + XF86MiscMouseSettings* /* mouse info */ +); + +Status XF86MiscGetKbdSettings( + Display* /* dpy */, + XF86MiscKbdSettings* /* keyboard info */ +); + +Status XF86MiscSetMouseSettings( + Display* /* dpy */, + XF86MiscMouseSettings* /* mouse info */ +); + +Status XF86MiscSetKbdSettings( + Display* /* dpy */, + XF86MiscKbdSettings* /* keyboard info */ +); + +int XF86MiscSetGrabKeysState( + Display* /* dpy */, + Bool /* enabled */ +); + +Status XF86MiscGetFilePaths( + Display* /* dpy */, + XF86MiscFilePaths* /* file paths/locations */ +); + +_XFUNCPROTOEND + +#endif + +#endif diff --git a/xf86mscstr.h b/xf86mscstr.h new file mode 100644 index 0000000..70904aa --- /dev/null +++ b/xf86mscstr.h @@ -0,0 +1,212 @@ +/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.12 2002/11/20 04:04:56 dawes Exp $ */ + +/* + * Copyright (c) 1995, 1996 The XFree86 Project, Inc + */ + +/* THIS IS NOT AN X CONSORTIUM STANDARD */ + +#ifndef _XF86MISCSTR_H_ +#define _XF86MISCSTR_H_ + +#include + +#define XF86MISCNAME "XFree86-Misc" + +#define XF86MISC_MAJOR_VERSION 0 /* current version numbers */ +#define XF86MISC_MINOR_VERSION 7 + +typedef struct _XF86MiscQueryVersion { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscQueryVersion */ + CARD16 length B16; +} xXF86MiscQueryVersionReq; +#define sz_xXF86MiscQueryVersionReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + BOOL pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD16 majorVersion B16; /* major version of XFree86-Misc */ + CARD16 minorVersion B16; /* minor version of XFree86-Misc */ + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; + CARD32 pad6 B32; +} xXF86MiscQueryVersionReply; +#define sz_xXF86MiscQueryVersionReply 32 + +#ifdef _XF86MISC_SAVER_COMPAT_ +typedef struct _XF86MiscGetSaver { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscGetSaver */ + CARD16 length B16; + CARD16 screen B16; + CARD16 pad B16; +} xXF86MiscGetSaverReq; +#define sz_xXF86MiscGetSaverReq 8 + +typedef struct _XF86MiscSetSaver { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscSetSaver */ + CARD16 length B16; + CARD16 screen B16; + CARD16 pad B16; + CARD32 suspendTime B32; + CARD32 offTime B32; +} xXF86MiscSetSaverReq; +#define sz_xXF86MiscSetSaverReq 16 + +typedef struct { + BYTE type; + BOOL pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 suspendTime B32; + CARD32 offTime B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; +} xXF86MiscGetSaverReply; +#define sz_xXF86MiscGetSaverReply 32 +#endif + +typedef struct _XF86MiscGetMouseSettings { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscGetMouseSettings */ + CARD16 length B16; +} xXF86MiscGetMouseSettingsReq; +#define sz_xXF86MiscGetMouseSettingsReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + BOOL pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 mousetype B32; + CARD32 baudrate B32; + CARD32 samplerate B32; + CARD32 resolution B32; + CARD32 buttons B32; + BOOL emulate3buttons; + BOOL chordmiddle; + CARD16 pad2 B16; + CARD32 emulate3timeout B32; + CARD32 flags B32; + CARD32 devnamelen B32; /* strlen(device)+1 */ +} xXF86MiscGetMouseSettingsReply; +#define sz_xXF86MiscGetMouseSettingsReply 44 + +typedef struct _XF86MiscGetKbdSettings { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscGetKbdSettings */ + CARD16 length B16; +} xXF86MiscGetKbdSettingsReq; +#define sz_xXF86MiscGetKbdSettingsReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + BOOL pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 kbdtype B32; + CARD32 rate B32; + CARD32 delay B32; + BOOL servnumlock; + BOOL pad2; + CARD16 pad3 B16; + CARD32 pad4 B32; + CARD32 pad5 B32; +} xXF86MiscGetKbdSettingsReply; +#define sz_xXF86MiscGetKbdSettingsReply 32 + +typedef struct _XF86MiscSetMouseSettings { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscSetMouseSettings */ + CARD16 length B16; + CARD32 mousetype B32; + CARD32 baudrate B32; + CARD32 samplerate B32; + CARD32 resolution B32; + CARD32 buttons B32; + BOOL emulate3buttons; + BOOL chordmiddle; + CARD16 devnamelen B16; + CARD32 emulate3timeout B32; + CARD32 flags B32; +} xXF86MiscSetMouseSettingsReq; +#define sz_xXF86MiscSetMouseSettingsReq 36 + +typedef struct _XF86MiscSetKbdSettings { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscSetKbdSettings */ + CARD16 length B16; + CARD32 kbdtype B32; + CARD32 rate B32; + CARD32 delay B32; + BOOL servnumlock; + BOOL pad1; + CARD16 pad2 B16; +} xXF86MiscSetKbdSettingsReq; +#define sz_xXF86MiscSetKbdSettingsReq 20 + +typedef struct _XF86MiscSetGrabKeysState { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscSetKbdSettings */ + CARD16 length B16; + BOOL enable; + BOOL pad1; + CARD16 pad2 B16; +} xXF86MiscSetGrabKeysStateReq; +#define sz_xXF86MiscSetGrabKeysStateReq 8 + +typedef struct { + BYTE type; + BOOL pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 status B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; + CARD32 pad6 B32; +} xXF86MiscSetGrabKeysStateReply; +#define sz_xXF86MiscSetGrabKeysStateReply 32 + +typedef struct _XF86MiscSetClientVersion { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; + CARD16 length B16; + CARD16 major B16; + CARD16 minor B16; +} xXF86MiscSetClientVersionReq; +#define sz_xXF86MiscSetClientVersionReq 8 + +typedef struct _XF86MiscGetFilePaths { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscGetFilePaths */ + CARD16 length B16; +} xXF86MiscGetFilePathsReq; +#define sz_xXF86MiscGetFilePathsReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + BOOL pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD16 configlen B16; + CARD16 modulelen B16; + CARD16 loglen B16; + CARD16 pad2 B16; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; + CARD32 pad6 B32; +} xXF86MiscGetFilePathsReply; +#define sz_xXF86MiscGetFilePathsReply 32 + +#endif /* _XF86MISCSTR_H_ */ -- cgit v1.2.3 -- cgit v1.2.3 From 020b11346dd9664f3f592ad1dce16394e27a703d Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Tue, 25 Nov 2003 19:28:02 +0000 Subject: XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks --- xf86misc.h | 11 ++++++++++- xf86mscstr.h | 30 ++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/xf86misc.h b/xf86misc.h index 3cdd2d7..ba1db79 100644 --- a/xf86misc.h +++ b/xf86misc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86misc.h,v 3.16 2002/11/20 04:04:56 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86misc.h,v 3.17 2003/04/03 16:15:46 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc @@ -23,6 +23,7 @@ #define X_XF86MiscSetGrabKeysState 7 #define X_XF86MiscSetClientVersion 8 #define X_XF86MiscGetFilePaths 9 +#define X_XF86MiscPassMessage 10 #define XF86MiscNumberEvents 0 @@ -156,6 +157,14 @@ Status XF86MiscGetFilePaths( XF86MiscFilePaths* /* file paths/locations */ ); +Status XF86MiscPassMessage( + Display* /* dpy */, + int /* screen */, + const char* /* message name/type */, + const char* /* message contents/value */, + char ** /* returned message */ +); + _XFUNCPROTOEND #endif diff --git a/xf86mscstr.h b/xf86mscstr.h index 70904aa..e514740 100644 --- a/xf86mscstr.h +++ b/xf86mscstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.12 2002/11/20 04:04:56 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.13 2003/04/03 16:15:46 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc @@ -14,7 +14,7 @@ #define XF86MISCNAME "XFree86-Misc" #define XF86MISC_MAJOR_VERSION 0 /* current version numbers */ -#define XF86MISC_MINOR_VERSION 7 +#define XF86MISC_MINOR_VERSION 8 typedef struct _XF86MiscQueryVersion { CARD8 reqType; /* always XF86MiscReqCode */ @@ -209,4 +209,30 @@ typedef struct { } xXF86MiscGetFilePathsReply; #define sz_xXF86MiscGetFilePathsReply 32 +typedef struct _XF86MiscPassMessage { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscPassMessage */ + CARD16 length B16; + CARD16 typelen B16; + CARD16 vallen B16; + CARD16 screen B16; + CARD16 pad B16; +} xXF86MiscPassMessageReq; +#define sz_xXF86MiscPassMessageReq 12 + +typedef struct { + BYTE type; /* X_Reply */ + BYTE pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD16 mesglen B16; + CARD16 pad2 B16; + CARD32 status B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; + CARD32 pad6 B32; +} xXF86MiscPassMessageReply; +#define sz_xXF86MiscPassMessageReply 32 + #endif /* _XF86MISCSTR_H_ */ -- cgit v1.2.3 From e015688e22b1040093cefc3f595d7b460e543c4d Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 26 Feb 2004 09:22:28 +0000 Subject: Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 --- xf86misc.h | 2 +- xf86mscstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xf86misc.h b/xf86misc.h index ba1db79..5a9ca45 100644 --- a/xf86misc.h +++ b/xf86misc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86misc.h,v 3.17 2003/04/03 16:15:46 dawes Exp $ */ +/* $XFree86$ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc diff --git a/xf86mscstr.h b/xf86mscstr.h index e514740..cbde1ac 100644 --- a/xf86mscstr.h +++ b/xf86mscstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.13 2003/04/03 16:15:46 dawes Exp $ */ +/* $XFree86$ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc -- cgit v1.2.3 From 5ab4fef0fdf25f5abcb8093ba9636d0dc11b9dec Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 26 Feb 2004 13:35:14 +0000 Subject: readding XFree86's cvs IDs --- xf86misc.h | 2 +- xf86mscstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xf86misc.h b/xf86misc.h index 5a9ca45..ba1db79 100644 --- a/xf86misc.h +++ b/xf86misc.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/include/extensions/xf86misc.h,v 3.17 2003/04/03 16:15:46 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc diff --git a/xf86mscstr.h b/xf86mscstr.h index cbde1ac..e514740 100644 --- a/xf86mscstr.h +++ b/xf86mscstr.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.13 2003/04/03 16:15:46 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc -- cgit v1.2.3 From d37bdeb7fa2ad258478041f908be29aa177d5378 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 3 Mar 2004 12:10:54 +0000 Subject: Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 --- xf86misc.h | 2 +- xf86mscstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xf86misc.h b/xf86misc.h index ba1db79..f5d7a56 100644 --- a/xf86misc.h +++ b/xf86misc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86misc.h,v 3.17 2003/04/03 16:15:46 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86misc.h,v 3.16 2002/11/20 04:04:56 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc diff --git a/xf86mscstr.h b/xf86mscstr.h index e514740..4e527b8 100644 --- a/xf86mscstr.h +++ b/xf86mscstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.13 2003/04/03 16:15:46 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.12 2002/11/20 04:04:56 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc -- cgit v1.2.3 From 186ca3a9e37a23c639a0661f06d014b6dbb82eea Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Sun, 14 Mar 2004 08:31:36 +0000 Subject: Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 --- xf86misc.h | 2 +- xf86mscstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xf86misc.h b/xf86misc.h index f5d7a56..ba1db79 100644 --- a/xf86misc.h +++ b/xf86misc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86misc.h,v 3.16 2002/11/20 04:04:56 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86misc.h,v 3.17 2003/04/03 16:15:46 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc diff --git a/xf86mscstr.h b/xf86mscstr.h index 4e527b8..e514740 100644 --- a/xf86mscstr.h +++ b/xf86mscstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.12 2002/11/20 04:04:56 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.13 2003/04/03 16:15:46 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc -- cgit v1.2.3 From 495c71ddaaeeebab3efe7d3d73d7c5168e3803c5 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 23 Apr 2004 18:43:06 +0000 Subject: Merging XORG-CURRENT into trunk --- xf86misc.h | 2 +- xf86mscstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xf86misc.h b/xf86misc.h index ba1db79..f5d7a56 100644 --- a/xf86misc.h +++ b/xf86misc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86misc.h,v 3.17 2003/04/03 16:15:46 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86misc.h,v 3.16 2002/11/20 04:04:56 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc diff --git a/xf86mscstr.h b/xf86mscstr.h index e514740..4e527b8 100644 --- a/xf86mscstr.h +++ b/xf86mscstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.13 2003/04/03 16:15:46 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.12 2002/11/20 04:04:56 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc -- cgit v1.2.3 From a7b4efb5eaba1f8d5220622b721120cb37984442 Mon Sep 17 00:00:00 2001 From: Thomas Winischhofer Date: Wed, 15 Dec 2004 00:34:34 +0000 Subject: Make MISC extension's PassMessage() actually work and fix memory leaks (Increase minor version to 9 to indicate that PassMessage() is usable) --- xf86mscstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xf86mscstr.h b/xf86mscstr.h index 4e527b8..637d3a5 100644 --- a/xf86mscstr.h +++ b/xf86mscstr.h @@ -14,7 +14,7 @@ #define XF86MISCNAME "XFree86-Misc" #define XF86MISC_MAJOR_VERSION 0 /* current version numbers */ -#define XF86MISC_MINOR_VERSION 8 +#define XF86MISC_MINOR_VERSION 9 typedef struct _XF86MiscQueryVersion { CARD8 reqType; /* always XF86MiscReqCode */ -- cgit v1.2.3 From 872ca18bd982ae1771244ed5bc2c75aa88c89ce7 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Fri, 6 May 2005 01:46:32 +0000 Subject: Initial build system files for proto module. --- Makefile.am | 9 +++++++++ autogen.sh | 12 ++++++++++++ configure.ac | 6 ++++++ xf86miscext.pc.in | 9 +++++++++ 4 files changed, 36 insertions(+) create mode 100644 Makefile.am create mode 100755 autogen.sh create mode 100644 configure.ac create mode 100644 xf86miscext.pc.in diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..0496615 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,9 @@ +xf86miscdir = $(includedir)/X11/extensions +xf86misc_HEADERS = \ + xf86misc.h \ + xf86mscstr.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = xf86miscext.pc + +EXTRA_DIST = autogen.sh xf86miscext.pc.in diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..904cd67 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,12 @@ +#! /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 --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..d92247f --- /dev/null +++ b/configure.ac @@ -0,0 +1,6 @@ +AC_PREREQ([2.57]) +AC_INIT([XF86MiscExt], [7.0], [xorg@lists.freedesktop.org]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) + +AC_OUTPUT([Makefile + xf86miscext.pc]) diff --git a/xf86miscext.pc.in b/xf86miscext.pc.in new file mode 100644 index 0000000..6a90eb8 --- /dev/null +++ b/xf86miscext.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: XF86MiscExt +Description: XF86Misc extension headers +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} -- cgit v1.2.3 From 1008673c584d1e24b2805e8a046a659ada625acf Mon Sep 17 00:00:00 2001 From: Søren Sandmann Pedersen Date: Mon, 9 May 2005 18:20:07 +0000 Subject: Change all the protonames from Ext to Proto. --- Makefile.am | 4 ++-- configure.ac | 4 ++-- xf86miscext.pc.in | 9 --------- xf86miscproto.pc.in | 9 +++++++++ 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 xf86miscext.pc.in create mode 100644 xf86miscproto.pc.in diff --git a/Makefile.am b/Makefile.am index 0496615..df7781d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,6 @@ xf86misc_HEADERS = \ xf86mscstr.h pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = xf86miscext.pc +pkgconfig_DATA = xf86miscproto.pc -EXTRA_DIST = autogen.sh xf86miscext.pc.in +EXTRA_DIST = autogen.sh xf86miscproto.pc.in diff --git a/configure.ac b/configure.ac index d92247f..28c8bd4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) -AC_INIT([XF86MiscExt], [7.0], [xorg@lists.freedesktop.org]) +AC_INIT([XF86MiscProto], [7.0], [xorg@lists.freedesktop.org]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile - xf86miscext.pc]) + xf86miscproto.pc]) diff --git a/xf86miscext.pc.in b/xf86miscext.pc.in deleted file mode 100644 index 6a90eb8..0000000 --- a/xf86miscext.pc.in +++ /dev/null @@ -1,9 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: XF86MiscExt -Description: XF86Misc extension headers -Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} diff --git a/xf86miscproto.pc.in b/xf86miscproto.pc.in new file mode 100644 index 0000000..eb72923 --- /dev/null +++ b/xf86miscproto.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: XF86MiscProto +Description: XF86Misc extension headers +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} -- cgit v1.2.3 From 0c18b93340024fccb0f113635b53e5ecf95e7964 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Wed, 18 May 2005 07:39:06 +0000 Subject: Add COPYING file for XF86Misc; assumed to be under the XFree86 catch-all license. --- COPYING | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..9f1e999 --- /dev/null +++ b/COPYING @@ -0,0 +1,20 @@ +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, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +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 +XFREE86 PROJECT 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 XFree86 Project 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 XFree86 Project. -- cgit v1.2.3 From cfd303bbaa90ea4348707ceb0e06a2463855750a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 19 May 2005 00:10:20 +0000 Subject: Require automake 1.7 in AM_INIT_AUTOMAKE --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 28c8bd4..0c3b466 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) AC_INIT([XF86MiscProto], [7.0], [xorg@lists.freedesktop.org]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_INIT_AUTOMAKE([1.7], [foreign dist-bzip2]) AC_OUTPUT([Makefile xf86miscproto.pc]) -- cgit v1.2.3 From e075aa9aff1861b0275f5800d9de0d6ae4c870f7 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 19 May 2005 00:22:41 +0000 Subject: revert last change, didn't do right thing at all, sorry for the noise --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0c3b466..28c8bd4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) AC_INIT([XF86MiscProto], [7.0], [xorg@lists.freedesktop.org]) -AM_INIT_AUTOMAKE([1.7], [foreign dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile xf86miscproto.pc]) -- cgit v1.2.3 From e7aaf0f2b8324cd0b8e0c117b37e923ca52a8f89 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sat, 21 May 2005 04:56:11 +0000 Subject: Set version to 0.9. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 28c8bd4..24c72db 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XF86MiscProto], [7.0], [xorg@lists.freedesktop.org]) +AC_INIT([XF86MiscProto], [0.9], [xorg@lists.freedesktop.org]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile -- cgit v1.2.3 From b3d547ee35269da703bb212deb755e24dc230c62 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Fri, 29 Jul 2005 21:22:57 +0000 Subject: 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 --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 24c72db..4a83163 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,8 @@ AC_PREREQ([2.57]) -AC_INIT([XF86MiscProto], [0.9], [xorg@lists.freedesktop.org]) +AC_INIT([XF86MiscProto], [0.9], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) - + +XORG_RELEASE_VERSION + AC_OUTPUT([Makefile xf86miscproto.pc]) -- cgit v1.2.3 From c33f553594d98492604f78272901a22d7e709f86 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 2 Aug 2005 19:19:40 +0000 Subject: Add basic .cvsignore files for proto modules. --- .cvsignore | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .cvsignore diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..abd4035 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,10 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure +install-sh +missing +xf86miscproto.pc -- cgit v1.2.3 From 5944d8aafbd7081ab6638c736f81cd87162d090c Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Wed, 19 Oct 2005 02:48:16 +0000 Subject: Update package version number for RC1 release. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4a83163..3eb46d2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XF86MiscProto], [0.9], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XF86MiscProto], [0.9.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION -- cgit v1.2.3 From 00d954080f86c9ccdfa03935e668d181db8d603c Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Thu, 15 Dec 2005 00:24:39 +0000 Subject: Update package version number for final X11R7 release candidate. --- ChangeLog | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..c722b51 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,4 @@ +2005-12-14 Kevin E. Martin + + * configure.ac: + Update package version number for final X11R7 release candidate. diff --git a/configure.ac b/configure.ac index 3eb46d2..7bd8bbc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XF86MiscProto], [0.9.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XF86MiscProto], [0.9.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION -- cgit v1.2.3 From 21a60a7b9347fa77680893219a4e69353377fae7 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 14 Jul 2006 18:56:47 -0700 Subject: renamed: .cvsignore -> .gitignore --- .cvsignore | 10 ---------- .gitignore | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index abd4035..0000000 --- a/.cvsignore +++ /dev/null @@ -1,10 +0,0 @@ -Makefile -Makefile.in -aclocal.m4 -autom4te.cache -config.log -config.status -configure -install-sh -missing -xf86miscproto.pc diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..abd4035 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure +install-sh +missing +xf86miscproto.pc -- cgit v1.2.3 From 0c4674418127e206486464decf11d6ac4bf0400a Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 3 Sep 2007 05:54:30 -0400 Subject: Add *~ to .gitignore to skip patch/emacs droppings --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index abd4035..86cc086 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ configure install-sh missing xf86miscproto.pc +*~ -- cgit v1.2.3 From caee025000e3e9ea5ca0eb47411ebef9dea8481d Mon Sep 17 00:00:00 2001 From: James Cloos Date: Thu, 6 Dec 2007 16:39:13 -0500 Subject: Replace static ChangeLog with dist-hook to generate from git log --- ChangeLog | 4 ---- Makefile.am | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index c722b51..0000000 --- a/ChangeLog +++ /dev/null @@ -1,4 +0,0 @@ -2005-12-14 Kevin E. Martin - - * configure.ac: - Update package version number for final X11R7 release candidate. diff --git a/Makefile.am b/Makefile.am index df7781d..541b39b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,3 +7,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xf86miscproto.pc EXTRA_DIST = autogen.sh xf86miscproto.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 -- cgit v1.2.3 From e31076f71177062f481b9f83f925e68b608b2ff9 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Tue, 27 Jan 2009 20:06:28 -0200 Subject: Janitor: Correct make distcheck and dont distribute autogen.sh --- .gitignore | 3 +++ Makefile.am | 4 ++-- configure.ac | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 86cc086..5974617 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ install-sh missing xf86miscproto.pc *~ +xf86miscproto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 541b39b..f4ffe05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ xf86misc_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xf86miscproto.pc -EXTRA_DIST = autogen.sh xf86miscproto.pc.in +EXTRA_DIST = xf86miscproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -14,6 +14,6 @@ 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 diff --git a/configure.ac b/configure.ac index 7bd8bbc..bac1841 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([XF86MiscProto], [0.9.2], [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 xf86miscproto.pc]) -- cgit v1.2.3 From 2e7a5733e310c18381ce7a7ec664fab9215cc8b4 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 10 Oct 2009 15:57:20 -0700 Subject: Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS Signed-off-by: Alan Coopersmith --- configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index bac1841..46c9919 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([XF86MiscProto], [0.9.2], [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 +# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AC_OUTPUT([Makefile xf86miscproto.pc]) -- cgit v1.2.3 From ae859017a1bf5842c9f3f861f7d47ff464e4c2f1 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 10 Oct 2009 16:04:01 -0700 Subject: Add README with pointers to mailing list, bugzilla & git repos Signed-off-by: Alan Coopersmith --- README | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 README diff --git a/README b/README new file mode 100644 index 0000000..20a12ef --- /dev/null +++ b/README @@ -0,0 +1,28 @@ +This package includes the protocol definitions of the "XFree86-Misc" +extension to the X11 protocol. The "XFree86-Misc" extension is +supported by the XFree86 X server and versions of the Xorg X server +prior to Xorg 1.6. + +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/proto/xf86miscproto + + http://cgit.freedesktop.org/xorg/proto/xf86miscproto + +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 + -- cgit v1.2.3 From 92eba87e3783665e7de9867a3787bb7a07ac14ee Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 10 Oct 2009 16:06:04 -0700 Subject: xf86miscproto 0.9.3 Signed-off-by: Alan Coopersmith --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 46c9919..f77ae17 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XF86MiscProto], [0.9.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XF86MiscProto], [0.9.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS -- cgit v1.2.3 From ec6676000a76bdbf994b43598da12c4a9c383845 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sat, 14 Nov 2009 18:26:47 -0500 Subject: .gitignore: use common defaults with custom section # 24239 Using common defaults will reduce errors and maintenance. Only the very small or inexistent custom section need periodic maintenance when the structure of the component changes. Do not edit defaults. --- .gitignore | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 71 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5974617..c9bacc5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,78 @@ -Makefile -Makefile.in +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) aclocal.m4 -autom4te.cache +autom4te.cache/ +autoscan.log +ChangeLog +compile +config.guess +config.h +config.h.in config.log +config-ml.in +config.py config.status +config.status.lineno +config.sub configure +configure.scan +depcomp +.deps/ +INSTALL install-sh +.libs/ +libtool +libtool.m4 +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh missing -xf86miscproto.pc +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ -xf86miscproto-*.tar.* -ChangeLog -tags +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for xf86miscproto +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# -- cgit v1.2.3 From 473821146a0a2ac075fd1c8c9fba8b833389d3fc Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 13:55:25 -0500 Subject: configure.ac: AM_MAINTAINER_MODE missing #24238 This turns off maintainer mode build rules in tarballs. Works in conjunction with autogen.sh --enable-maintainer-mode --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index f77ae17..a6ed5c9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ AC_PREREQ([2.57]) AC_INIT([XF86MiscProto], [0.9.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE # Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], -- cgit v1.2.3 From b16af4d89fd01e85b5821d5f1ecad51e2391c5f9 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 18:11:36 -0500 Subject: configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242 This macro aggregate a number of existing macros that sets commmon X.Org components configuration options. It shields the configuration file from future changes. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index a6ed5c9..6f5dd54 100644 --- a/configure.ac +++ b/configure.ac @@ -3,9 +3,9 @@ AC_INIT([XF86MiscProto], [0.9.3], [https://bugs.freedesktop.org/enter_bug.cgi?pr AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.3) XORG_DEFAULT_OPTIONS -- cgit v1.2.3 From e96389c8bd5a05db7074f2acefa9fa6e0b62a5cd Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 18:31:29 -0500 Subject: Makefile.am: INSTALL file is missing or incorrect #24206 The standard GNU file on building/installing tarball is copied using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS Add INSTALL target --- Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index f4ffe05..8ff9eb6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,9 +11,12 @@ EXTRA_DIST = xf86miscproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL -- cgit v1.2.3 From 14f88c07dc6ba66d834df8dc691b5c1fa23c5b64 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 19:45:27 -0500 Subject: Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 ChangeLog filename is known to Automake and requires no further coding in the makefile. --- Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8ff9eb6..a9a31ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,9 +8,6 @@ pkgconfig_DATA = xf86miscproto.pc EXTRA_DIST = xf86miscproto.pc.in -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog - .PHONY: ChangeLog INSTALL INSTALL: -- cgit v1.2.3 From 3289a674e0a80adb644a7184893726a2c54f282b Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 22 Nov 2009 19:24:48 -0500 Subject: Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index a9a31ad..5a11549 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,8 @@ pkgconfig_DATA = xf86miscproto.pc EXTRA_DIST = xf86miscproto.pc.in +MAINTAINERCLEANFILES = ChangeLog INSTALL + .PHONY: ChangeLog INSTALL INSTALL: -- cgit v1.2.3 From 3f1ee1742fef81e763291571e6d410391b252ddd Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 15 Jan 2013 14:01:10 -0500 Subject: configure: Remove AM_MAINTAINER_MODE Signed-off-by: Adam Jackson --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6f5dd54..12e963d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,6 @@ AC_PREREQ([2.57]) AC_INIT([XF86MiscProto], [0.9.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], -- cgit v1.2.3 From dfc102af65775466ae4cb61e8425500bc37afdd4 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 4 Jan 2012 17:37:06 -0500 Subject: autogen.sh: Implement GNOME Build API http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson --- autogen.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 904cd67..fc34bd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +if test -z "$NOCONFIGURE"; then + $srcdir/configure "$@" +fi -- cgit v1.2.3