libxinerama: Changes to 'upstream-unstable'
Makefile.am | 6 +-
configure.ac | 74 +++++++++++++++++-----------------
include/X11/extensions/Xinerama.h | 6 +-
include/X11/extensions/panoramiXext.h | 4 -
man/Xinerama.man | 24 +++++------
src/Xinerama.c | 8 +--
6 files changed, 61 insertions(+), 61 deletions(-)
New commits:
commit 34b66b71eeb04a50125a3e5c59fe0d22500ab679
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Mar 7 20:29:30 2012 -0800
libXinerama 1.1.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 8727719..545c946 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXinerama], [1.1.1],
+AC_INIT([libXinerama], [1.1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXinerama])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 2a6cc285b7f9c880d08de6e58b045a314fc1ff78
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 10 21:35:42 2011 -0800
Fix gcc -Wwrite-strings warning
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/Xinerama.c b/src/Xinerama.c
index 93b1a9f..7d7e4d8 100644
--- a/src/Xinerama.c
+++ b/src/Xinerama.c
@@ -34,7 +34,7 @@ Equipment Corporation.
static XExtensionInfo _panoramiX_ext_info_data;
static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data;
-static /* const */ char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;
+static const char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;
#define PanoramiXCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, panoramiX_extension_name, val)
commit 3e94f2d5fe0ee95f54faabbe253ac33327ef6d66
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 16 22:44:02 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/Makefile.am b/Makefile.am
index 037ef62..d744d0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-#
+#
# Copyright 2005 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
# the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@
# specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
-#
+#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/configure.ac b/configure.ac
index 04dfc9d..8727719 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto [xineramaproto >= 1.1.99.1])
# Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
LINT_FLAGS="${LINT_FLAGS} ${XINERAMA_CFLAGS}"
-
+
AC_CONFIG_FILES([Makefile
src/Makefile
man/Makefile
diff --git a/include/X11/extensions/Xinerama.h b/include/X11/extensions/Xinerama.h
index 666f52a..8c0f829 100644
--- a/include/X11/extensions/Xinerama.h
+++ b/include/X11/extensions/Xinerama.h
@@ -54,15 +54,15 @@ Status XineramaQueryVersion(
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 *
+XineramaScreenInfo *
XineramaQueryScreens(
Display *dpy,
int *number
diff --git a/include/X11/extensions/panoramiXext.h b/include/X11/extensions/panoramiXext.h
index 6b18d6d..8312a17 100644
--- a/include/X11/extensions/panoramiXext.h
+++ b/include/X11/extensions/panoramiXext.h
@@ -22,7 +22,7 @@ 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
*/
@@ -41,7 +41,7 @@ typedef struct {
int height; /* height of this screen */
int ScreenCount; /* real physical number of screens */
XID eventMask; /* selected events for this client */
-} XPanoramiXInfo;
+} XPanoramiXInfo;
_XFUNCPROTOBEGIN
diff --git a/man/Xinerama.man b/man/Xinerama.man
index 13abe06..3774131 100644
--- a/man/Xinerama.man
+++ b/man/Xinerama.man
@@ -25,14 +25,14 @@
.ns
.TP \\$1
..
-.TH XINERAMA __libmansuffix__ __vendorversion__
+.TH XINERAMA __libmansuffix__ __vendorversion__
.SH NAME
Xinerama \- API for Xinerama extension to X11 Protocol
.SH SYNOPSIS
\&#include <X11/extensions/Xinerama.h>
-.nf
+.nf
.sp
-Bool XineramaQueryExtension \^(\^Display *\fIdpy\fP,
+Bool XineramaQueryExtension \^(\^Display *\fIdpy\fP,
int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^);
.sp
Status XineramaQueryVersion \^(\^Display *\fIdpy\fP,
@@ -41,7 +41,7 @@ Status XineramaQueryVersion \^(\^Display *\fIdpy\fP,
.sp
Bool XineramaIsActive \^(\^Display *\fIdpy\fP\^);
.sp
-XineramaScreenInfo * XineramaQueryScreens \^(\^Display *\fIdpy\fP,
+XineramaScreenInfo * XineramaQueryScreens \^(\^Display *\fIdpy\fP,
int *\fInumber\fP\^);
.fi
.SH ARGUMENTS
@@ -59,7 +59,7 @@ Returns the minor version supported by the server
Returns the number of entries in the returned XineramaScreenInfo array.
.SH DESCRIPTION
.B Xinerama
-is a simple library designed to interface the Xinerama Extension for
+is a simple library designed to interface the Xinerama Extension for
retrieving information about physical output devices which may be combined
into a single logical X screen.
@@ -68,8 +68,8 @@ into a single logical X screen.
.SS \fBXineramaQueryExtension()\fR
.LP
-The XineramaQueryExtension function queries the Xserver to determine the
-availability of the Xinerama Extension. If the extension is available, the
+The XineramaQueryExtension function queries the Xserver to determine the
+availability of the Xinerama Extension. If the extension is available, the
return value is True, and event_base_return and error_base_return are set to
the base event number and base error number for the extension, respectively.
Otherwise, the return value is False, and the values of event_base_return and
@@ -82,7 +82,7 @@ error_base_return are undefined.
The XineramaQueryVersion function returns the version of the Xinerama extension
implemented by the Xserver. The version is returned in major_version_return
and minor_version_return. The major version will be incremented for protocol
-incompatible changes, and the minor version will be incremented for small,
+incompatible changes, and the minor version will be incremented for small,
upwardly compatible changes.
.LP
If the Xinerama library is compatible with the version returned by the
@@ -95,8 +95,8 @@ incompatible, it returns zero.
.SS \fBXineramaIsActive()\fR
.LP
-The XineramaIsActive function returns a Boolean operator used to determine if
-Xinerama is activated on the screen. Returns True for active and False for
+The XineramaIsActive function returns a Boolean operator used to determine if
+Xinerama is activated on the screen. Returns True for active and False for
not active.
.sp
@@ -107,10 +107,10 @@ The \fBXineramaQueryScreens()\fR function returns info about each
individual output device within the Xinerama Screen. The integer
pointed to by the \fInumber\fR argument is updated to the number of
output devices listed in the returned array of \fIXineramaScreenInfo\fR
-structures. \fBXineramaQueryScreens()\fR returns NULL and sets \fInumber\fR
+structures. \fBXineramaQueryScreens()\fR returns NULL and sets \fInumber\fR
to 0 if Xinerama is not active.
-The pointer returned should be released with XFree(__libmansuffix__)
+The pointer returned should be released with XFree(__libmansuffix__)
when no longer needed.
.sp
diff --git a/src/Xinerama.c b/src/Xinerama.c
index 9dbff36..93b1a9f 100644
--- a/src/Xinerama.c
+++ b/src/Xinerama.c
@@ -58,7 +58,7 @@ static /* const */ XExtensionHooks panoramiX_extension_hooks = {
};
static XEXT_GENERATE_FIND_DISPLAY (find_display, panoramiX_ext_info,
- panoramiX_extension_name,
+ panoramiX_extension_name,
&panoramiX_extension_hooks,
0, NULL)
@@ -201,7 +201,7 @@ Status XPanoramiXGetScreenSize (
req->reqType = info->codes->major_opcode;
req->panoramiXReqType = X_PanoramiXGetScreenSize;
req->window = drawable;
- req->screen = screen_num; /* need to define */
+ req->screen = screen_num; /* need to define */
if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
UnlockDisplay (dpy);
SyncHandle ();
@@ -263,7 +263,7 @@ Bool XineramaIsActive(Display *dpy)
return rep.state;
}
-XineramaScreenInfo *
+XineramaScreenInfo *
XineramaQueryScreens(
Display *dpy,
int *number
commit 22cd4cfdf1613d73cdd84eae805239f55c4265c2
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Feb 2 11:43:43 2011 -0500
config: comment, minor upgrade, quote and layout configure.ac
Group statements per section as per Autoconf standard layout
Quote statements where appropriate.
Autoconf recommends not using dnl instead of # for comments
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
Add AC_CONFIG_SRCDIR([Makefile.am])
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
diff --git a/configure.ac b/configure.ac
index 6aabd77..04dfc9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,53 +1,54 @@
-dnl Copyright 2005 Red Hat, Inc.
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation, and that the name of Red Hat not be used in
-dnl advertising or publicity pertaining to distribution of the software without
-dnl specific, written prior permission. Red Hat makes no
-dnl representations about the suitability of this software for any purpose. It
-dnl is provided "as is" without express or implied warranty.
-dnl
-dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-dnl PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Process this file with autoconf to create configure.
+# Copyright 2005 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
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of Red Hat not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission. Red Hat makes no
+# representations about the suitability of this software for any purpose. It
+# is provided "as is" without express or implied warranty.
+#
+# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL RED HAT BE LIABLE FOR 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.
+#
+# Initialize Autoconf
AC_PREREQ([2.60])
-
AC_INIT([libXinerama], [1.1.1],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- [libXinerama])
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXinerama])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Initialize libtool
+AC_PROG_LIBTOOL
+
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AC_CONFIG_HEADERS(config.h)
-
-# Check for progs
-AC_PROG_LIBTOOL
+XORG_CHECK_MALLOC_ZERO
-# Check for dependencies
+# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto [xineramaproto >= 1.1.99.1])
-dnl Allow checking code with lint, sparse, etc.
+# Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
LINT_FLAGS="${LINT_FLAGS} ${XINERAMA_CFLAGS}"
-XORG_CHECK_MALLOC_ZERO
-
-AC_OUTPUT([Makefile
- src/Makefile
- man/Makefile
- xinerama.pc])
+AC_CONFIG_FILES([Makefile
+ src/Makefile
+ man/Makefile
+ xinerama.pc])
+AC_OUTPUT
commit 6333852f00206cfb9320f4ddca685195a79341a9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 28 19:41:37 2011 -0500
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index c21f0dd..6aabd77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
# Check for progs
AC_PROG_LIBTOOL
commit 8dcc510ee404798a688574d57157eb9e1477ea44
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 27 18:50:15 2011 -0500
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index a91163c..c21f0dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,6 @@ XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
# Check for dependencies
Reply to: