.gitignore | 4 ++ ChangeLog | 4 -- Makefile.am | 16 ++++++++--- Xinerama.h | 76 ------------------------------------------------------- configure.ac | 7 +++-- panoramiXext.h | 48 ---------------------------------- panoramiXproto.h | 5 ++- 7 files changed, 24 insertions(+), 136 deletions(-)
New commits: commit 216c573fa004c1b7ae2bd273a340127515e329a7 Author: Peter Hutterer <[email protected]> Date: Thu Oct 1 20:41:09 2009 +1000 xineramaproto 1.2 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 1c19b3c..cba10f8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XineramaProto], [1.1.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XineramaProto], [1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_DEFAULT_OPTIONS commit 489b2bf3698a3c4537ff1a473f9f080d8219cf07 Author: Peter Hutterer <[email protected]> Date: Thu Oct 1 20:34:09 2009 +1000 Require macros 1.3 for XORG_DEFAULT_OPTIONS Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 14c51ec..1c19b3c 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,10 @@ AC_PREREQ([2.57]) AC_INIT([XineramaProto], [1.1.99.1], [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: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AC_OUTPUT([Makefile xineramaproto.pc]) commit 419bcf5831b06a1ab9d01ef1188e53b1478e2860 Author: Peter Hutterer <[email protected]> Date: Thu Aug 27 11:39:16 2009 +1000 xineramaproto 1.1.99.1 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index ee2d35b..14c51ec 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XineramaProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XineramaProto], [1.1.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_CHANGELOG commit 21477147613c28c968b5e1eb9d8aea7017dd399d Author: Benjamin Close <[email protected]> Date: Fri Feb 13 14:46:11 2009 +1030 The major/minor protocol versions exist in the proto headers not the lib/libXinerma userspace headers Signed-off-by: Benjamin Close <[email protected]> Acked-by: Daniel Stone <[email protected]> Acked-by: Peter Hutterer <[email protected]> diff --git a/panoramiXproto.h b/panoramiXproto.h index 14aa6c5..6fd1a02 100644 --- a/panoramiXproto.h +++ b/panoramiXproto.h @@ -28,6 +28,9 @@ Equipment Corporation. #ifndef _PANORAMIXPROTO_H_ #define _PANORAMIXPROTO_H_ +#define PANORAMIX_MAJOR_VERSION 1 /* current version number */ +#define PANORAMIX_MINOR_VERSION 1 + #define PANORAMIX_PROTOCOL_NAME "XINERAMA" #define X_PanoramiXQueryVersion 0 commit b8b3878351a148e527df44ddf8886917f00d1a85 Author: Paulo Cesar Pereira de Andrade <[email protected]> Date: Tue Jan 27 20:06:28 2009 -0200 Janitor: Correct make distcheck and dont distribute autogen.sh diff --git a/.gitignore b/.gitignore index fa6f681..c4bb570 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ install-sh missing xineramaproto.pc *~ +xineramaproto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index d00df00..591a301 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ xinerama_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xineramaproto.pc -EXTRA_DIST = autogen.sh xineramaproto.pc.in +EXTRA_DIST = xineramaproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -13,6 +13,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 a1749c0..ee2d35b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([XineramaProto], [1.1.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 xineramaproto.pc]) commit e28d33b35a0a795aec7e3174b42a0f317c15a827 Author: Peter Hutterer <[email protected]> Date: Mon May 19 22:40:07 2008 +0930 Remove panoramiXext.h and Xinerama.h. Xlib headers and don't belong here. For furture amendmends to these files please refer to git://anongit.freedesktop.org/git/xorg/lib/libXinerama diff --git a/Makefile.am b/Makefile.am index 9254d26..d00df00 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,6 @@ xineramadir = $(includedir)/X11/extensions xinerama_HEADERS = \ - panoramiXext.h \ - panoramiXproto.h \ - Xinerama.h + panoramiXproto.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xineramaproto.pc diff --git a/Xinerama.h b/Xinerama.h deleted file mode 100644 index 666f52a..0000000 --- a/Xinerama.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - -Copyright 2003 The Open Group - -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 -OPEN GROUP 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 Open Group 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 Open Group. - -*/ - -#ifndef _Xinerama_h -#define _Xinerama_h - -#include <X11/Xlib.h> - -typedef struct { - int screen_number; - short x_org; - short y_org; - short width; - short height; -} XineramaScreenInfo; - -_XFUNCPROTOBEGIN - -Bool XineramaQueryExtension ( - Display *dpy, - int *event_base, - int *error_base -); - -Status XineramaQueryVersion( - Display *dpy, - int *major_versionp, - int *minor_versionp -); - -Bool XineramaIsActive(Display *dpy); - - -/* - Returns the number of heads and a pointer to an array of - structures describing the position and size of the individual - heads. Returns NULL and number = 0 if Xinerama is not active. - - Returned array should be freed with XFree(). -*/ - -XineramaScreenInfo * -XineramaQueryScreens( - Display *dpy, - int *number -); - -_XFUNCPROTOEND - -#endif /* _Xinerama_h */ - diff --git a/panoramiXext.h b/panoramiXext.h deleted file mode 100644 index 280efc5..0000000 --- a/panoramiXext.h +++ /dev/null @@ -1,46 +0,0 @@ -/***************************************************************** -Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. -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. - -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 -DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, -BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation -shall not be used in advertising or otherwise to promote the sale, use or other -dealings in this Software without prior written authorization from Digital -Equipment Corporation. -******************************************************************/ -/* - * PanoramiX definitions - */ - -/* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ - -#define PANORAMIX_MAJOR_VERSION 1 /* current version number */ -#define PANORAMIX_MINOR_VERSION 1 - -typedef struct { - Window window; /* PanoramiX window - may not exist */ - int screen; - int State; /* PanroamiXOff, PanoramiXOn */ - int width; /* width of this screen */ - int height; /* height of this screen */ - int ScreenCount; /* real physical number of screens */ - XID eventMask; /* selected events for this client */ -} XPanoramiXInfo; - -extern XPanoramiXInfo *XPanoramiXAllocInfo ( - void -); commit 47f0250dfcbc8edd3c0d0420f560e1316f5a444a Author: Peter Hutterer <[email protected]> Date: Mon May 19 22:36:31 2008 +0930 Nuke RCS tags. diff --git a/Xinerama.h b/Xinerama.h index 9ccc400..666f52a 100644 --- a/Xinerama.h +++ b/Xinerama.h @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/include/extensions/Xinerama.h,v 1.2 2004/04/23 18:43:06 eich Exp $ */ /* Copyright 2003 The Open Group @@ -24,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */ #ifndef _Xinerama_h #define _Xinerama_h diff --git a/panoramiXext.h b/panoramiXext.h index ad2f7e4..280efc5 100644 --- a/panoramiXext.h +++ b/panoramiXext.h @@ -1,4 +1,3 @@ -/* $Xorg: panoramiXext.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -26,7 +25,6 @@ Equipment Corporation. /* * PanoramiX definitions */ -/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/panoramiXproto.h b/panoramiXproto.h index 6b27c56..14aa6c5 100644 --- a/panoramiXproto.h +++ b/panoramiXproto.h @@ -1,4 +1,3 @@ -/* $Xorg: panoramiXproto.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -23,7 +22,6 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ commit 29a5de547f301b8b3af265d87889ba08ef3a5c8e Author: James Cloos <[email protected]> Date: Thu Dec 6 16:39:15 2007 -0500 Replace static ChangeLog with dist-hook to generate from git log 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 <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for final X11R7 release candidate. diff --git a/Makefile.am b/Makefile.am index 9320e38..9254d26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,3 +8,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xineramaproto.pc EXTRA_DIST = autogen.sh xineramaproto.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 commit b845eec55045df17af46fead628e4814af6c1945 Author: James Cloos <[email protected]> Date: Mon Sep 3 05:54:33 2007 -0400 Add *~ to .gitignore to skip patch/emacs droppings diff --git a/.gitignore b/.gitignore index 21cef1c..fa6f681 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ configure install-sh missing xineramaproto.pc +*~ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
