libxxf86vm: Changes to 'debian-unstable'
COPYING | 6 +--
ChangeLog | 61 +++++++++++++++++++++++++++++++++++++
configure.ac | 32 ++++++++++---------
debian/changelog | 6 +++
include/X11/extensions/xf86vmode.h | 10 +++---
man/XF86VM.man | 8 ++--
src/XF86VMode.c | 50 +++++++++++++++---------------
7 files changed, 121 insertions(+), 52 deletions(-)
New commits:
commit 97899348d9d1f6fa61ea563ad48f976e7b6140cb
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Thu Mar 8 22:49:23 2012 -0500
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index b0cbc19..08a7e98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,64 @@
+commit a0bd361fe688590b7d62ffb3ad1c1648a22096d4
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Mar 7 21:39:46 2012 -0800
+
+ libXxf86vm 1.1.2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 2bac2e232f56836faeab016ab44fe45a3f055fd0
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Nov 10 21:51:52 2011 -0800
+
+ Fix gcc -Wwrite-strings warning
+
+commit 78b0baf7872234c7e0e5753be76a662e34d87984
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Sep 16 22:58:12 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>
+
+commit ad5a4792e35b63c5b193f09303bcc41b322750d0
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Feb 2 11:43:45 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
+
+commit 97d7aa6c8108800d3ccd30ce907ef32e769370a9
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jan 28 19:41:38 2011 -0500
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 353b988717d474a77322a541a6ab56661cc0bedb
+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>
+
commit 6f22da39b65983a582d2055e9e43f5dbc0412f1f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 18:04:50 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index e3570c6..2f08bc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxxf86vm (1:1.1.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Robert Hooker <sarvatt@ubuntu.com> Thu, 08 Mar 2012 22:48:16 -0500
+
libxxf86vm (1:1.1.1-2) unstable; urgency=low
* Team upload.
commit a0bd361fe688590b7d62ffb3ad1c1648a22096d4
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Mar 7 21:39:46 2012 -0800
libXxf86vm 1.1.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index a02451e..e9cfa1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXxf86vm], [1.1.1],
+AC_INIT([libXxf86vm], [1.1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXxf86vm])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS(src/config.h)
commit 2bac2e232f56836faeab016ab44fe45a3f055fd0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 10 21:51:52 2011 -0800
Fix gcc -Wwrite-strings warning
diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index 99a0073..4f19cf3 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -46,7 +46,7 @@ from Kaleb S. KEITHLEY.
static XExtensionInfo _xf86vidmode_info_data;
static XExtensionInfo *xf86vidmode_info = &_xf86vidmode_info_data;
-static char *xf86vidmode_extension_name = XF86VIDMODENAME;
+static const char *xf86vidmode_extension_name = XF86VIDMODENAME;
#define XF86VidModeCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, xf86vidmode_extension_name, val)
commit 78b0baf7872234c7e0e5753be76a662e34d87984
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 16 22:58:12 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/COPYING b/COPYING
index ef81e65..4ea858b 100644
--- a/COPYING
+++ b/COPYING
@@ -14,12 +14,12 @@ 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 Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
+IN NO EVENT SHALL Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
+Except as contained in this notice, the name of Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
or other dealings in this Software without prior written authorization
from Kaleb S. KEITHLEY.
diff --git a/include/X11/extensions/xf86vmode.h b/include/X11/extensions/xf86vmode.h
index 136ce9c..a7a3c5d 100644
--- a/include/X11/extensions/xf86vmode.h
+++ b/include/X11/extensions/xf86vmode.h
@@ -16,13 +16,13 @@ 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 Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
+IN NO EVENT SHALL Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
+Except as contained in this notice, the name of Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
or other dealings in this Software without prior written authorization
from Kaleb S. KEITHLEY
@@ -120,7 +120,7 @@ typedef struct {
unsigned char nvsync;
XF86VidModeSyncRange* vsync;
} XF86VidModeMonitor;
-
+
typedef struct {
int type; /* of event */
unsigned long serial; /* # of last request processed by server */
@@ -264,7 +264,7 @@ Bool XF86VidModeSetGamma(
Bool XF86VidModeSetGammaRamp(
Display* /* dpy */,
int /* screen */,
- int /* size */,
+ int /* size */,
unsigned short* /* red array */,
unsigned short* /* green array */,
unsigned short* /* blue array */
diff --git a/man/XF86VM.man b/man/XF86VM.man
index 63fb76c..97431b1 100644
--- a/man/XF86VM.man
+++ b/man/XF86VM.man
@@ -1,6 +1,6 @@
.\"
.\" Copyright (c) 1996 Joe Moss, The XFree86 Project
-.\"
+.\"
.de ZN
.ie t \fB\^\\$1\^\fR\\$2
.el \fI\^\\$1\^\fP\\$2
@@ -252,7 +252,7 @@ Applications that use these functions must be linked with
The
.ZN XF86VidModeGetModeLine
function is used to query the settings for the currently selected
-video mode. The calling program should pass a pointer to a
+video mode. The calling program should pass a pointer to a
.ZN XF86VidModeModeLine
structure that it has already allocated. The function fills in
the fields of the structure.
@@ -346,13 +346,13 @@ or
functions or from one of the mode switch key sequences.
.PP
.RB Note:
-Because of the asynchronous nature of the X protocol, a call to
+Because of the asynchronous nature of the X protocol, a call to
.ZN XFlush
is needed if the application wants to see the mode change immediately.
To be informed of the execution status of the request, a
custom error handler should be installed using
.ZN XSetErrorHandler
-before calling the mode switching function.
+before calling the mode switching function.
.SS "MONITOR FUNCTIONS"
Information known to the server about the monitor is returned by the
.ZN XF86VidModeGetMonitor
diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index d924e2a..99a0073 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -16,13 +16,13 @@ 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 Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
+IN NO EVENT SHALL Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
+Except as contained in this notice, the name of Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
or other dealings in this Software without prior written authorization
from Kaleb S. KEITHLEY.
@@ -72,9 +72,9 @@ static /* const */ XExtensionHooks xf86vidmode_extension_hooks = {
NULL, /* error_string */
};
-static XEXT_GENERATE_FIND_DISPLAY (find_display, xf86vidmode_info,
- xf86vidmode_extension_name,
- &xf86vidmode_extension_hooks,
+static XEXT_GENERATE_FIND_DISPLAY (find_display, xf86vidmode_info,
+ xf86vidmode_extension_name,
+ &xf86vidmode_extension_hooks,
0, NULL)
static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86vidmode_info)
@@ -212,9 +212,9 @@ XF86VidModeGetModeLine(Display* dpy, int screen, int* dotclock,
req->reqType = info->codes->major_opcode;
req->xf86vidmodeReqType = X_XF86VidModeGetModeLine;
req->screen = screen;
-
+
if (majorVersion < 2) {
- if (!_XReply(dpy, (xReply *)&oldrep,
+ if (!_XReply(dpy, (xReply *)&oldrep,
(SIZEOF(xXF86OldVidModeGetModeLineReply) - SIZEOF(xReply)) >> 2, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
@@ -233,7 +233,7 @@ XF86VidModeGetModeLine(Display* dpy, int screen, int* dotclock,
modeline->flags = oldrep.flags;
modeline->privsize = oldrep.privsize;
} else {
- if (!_XReply(dpy, (xReply *)&rep,
+ if (!_XReply(dpy, (xReply *)&rep,
(SIZEOF(xXF86VidModeGetModeLineReply) - SIZEOF(xReply)) >> 2, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
@@ -252,7 +252,7 @@ XF86VidModeGetModeLine(Display* dpy, int screen, int* dotclock,
modeline->flags = rep.flags;
modeline->privsize = rep.privsize;
}
-
+
if (modeline->privsize > 0) {
if (!(modeline->private = Xcalloc(modeline->privsize, sizeof(INT32)))) {
_XEatData(dpy, (modeline->privsize) * sizeof(INT32));
@@ -299,13 +299,13 @@ XF86VidModeGetAllModeLines(Display* dpy, int screen, int* modecount,
minorVersion);
#endif
}
-
+
LockDisplay(dpy);
GetReq(XF86VidModeGetAllModeLines, req);
req->reqType = info->codes->major_opcode;
req->xf86vidmodeReqType = X_XF86VidModeGetAllModeLines;
req->screen = screen;
- if (!_XReply(dpy, (xReply *)&rep,
+ if (!_XReply(dpy, (xReply *)&rep,
(SIZEOF(xXF86VidModeGetAllModeLinesReply) - SIZEOF(xReply)) >> 2, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
@@ -746,7 +746,7 @@ XF86VidModeSwitchMode(Display* dpy, int screen, int zoom)
SyncHandle();
return True;
}
-
+
Bool
XF86VidModeSwitchToMode(Display* dpy, int screen, XF86VidModeModeInfo* modeline)
{
@@ -774,7 +774,7 @@ XF86VidModeSwitchToMode(Display* dpy, int screen, XF86VidModeModeInfo* modeline)
minorVersion);
#endif
}
-
+
LockDisplay(dpy);
if (majorVersion < 2) {
GetOldReq(XF86VidModeSwitchToMode, XF86OldVidModeSwitchToMode, oldreq);
@@ -832,7 +832,7 @@ XF86VidModeSwitchToMode(Display* dpy, int screen, XF86VidModeModeInfo* modeline)
SyncHandle();
return True;
}
-
+
Bool
XF86VidModeLockModeSwitch(Display* dpy, int screen, int lock)
{
@@ -851,7 +851,7 @@ XF86VidModeLockModeSwitch(Display* dpy, int screen, int lock)
SyncHandle();
return True;
}
-
+
Bool
XF86VidModeGetMonitor(Display* dpy, int screen, XF86VidModeMonitor* monitor)
{
@@ -901,7 +901,7 @@ XF86VidModeGetMonitor(Display* dpy, int screen, XF86VidModeMonitor* monitor)
if (!(monitor->hsync = Xcalloc(rep.nhsync, sizeof(XF86VidModeSyncRange)))) {
_XEatData(dpy, (rep.nhsync + rep.nvsync) * 4 +
((rep.vendorLength+3) & ~3) + ((rep.modelLength+3) & ~3));
-
+
if (monitor->vendor)
Xfree(monitor->vendor);
if (monitor->model)
@@ -932,7 +932,7 @@ XF86VidModeGetMonitor(Display* dpy, int screen, XF86VidModeMonitor* monitor)
_XReadPad(dpy, monitor->vendor, rep.vendorLength);
if (rep.modelLength)
_XReadPad(dpy, monitor->model, rep.modelLength);
-
+
UnlockDisplay(dpy);
SyncHandle();
return True;
@@ -1026,7 +1026,7 @@ XF86VidModeGetDotClocks(Display* dpy, int screen, int *flagsPtr,
req->reqType = info->codes->major_opcode;
req->xf86vidmodeReqType = X_XF86VidModeGetDotClocks;
req->screen = screen;
- if (!_XReply(dpy, (xReply *)&rep,
+ if (!_XReply(dpy, (xReply *)&rep,
(SIZEOF(xXF86VidModeGetDotClocksReply) - SIZEOF(xReply)) >> 2, xFalse))
{
UnlockDisplay(dpy);
@@ -1097,7 +1097,7 @@ XF86VidModeGetGammaRamp (
XExtDisplayInfo *info = find_display (dpy);
xXF86VidModeGetGammaRampReq *req;
xXF86VidModeGetGammaRampReply rep;
-
+
XF86VidModeCheckExtension (dpy, info, False);
LockDisplay(dpy);
@@ -1131,7 +1131,7 @@ Bool XF86VidModeGetGammaRampSize(
XExtDisplayInfo *info = find_display (dpy);
xXF86VidModeGetGammaRampSizeReq *req;
xXF86VidModeGetGammaRampSizeReply rep;
-
+
*size = 0;
XF86VidModeCheckExtension (dpy, info, False);
@@ -1144,7 +1144,7 @@ Bool XF86VidModeGetGammaRampSize(
if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
UnlockDisplay (dpy);
SyncHandle ();
- return False;
+ return False;
}
*size = rep.size;
UnlockDisplay(dpy);
@@ -1161,7 +1161,7 @@ Bool XF86VidModeGetPermissions(
XExtDisplayInfo *info = find_display (dpy);
xXF86VidModeGetPermissionsReq *req;
xXF86VidModeGetPermissionsReply rep;
-
+
*permissions = 0;
XF86VidModeCheckExtension (dpy, info, False);
@@ -1174,7 +1174,7 @@ Bool XF86VidModeGetPermissions(
if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
UnlockDisplay (dpy);
SyncHandle ();
- return False;
+ return False;
}
*permissions = rep.permissions;
UnlockDisplay(dpy);
commit ad5a4792e35b63c5b193f09303bcc41b322750d0
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Feb 2 11:43:45 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 6578e7b..a02451e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,27 +1,30 @@
-AC_PREREQ([2.60])
+# Initialize Autoconf
+AC_PREREQ([2.60])
AC_INIT([libXxf86vm], [1.1.1],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- [libXxf86vm])
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXxf86vm])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS(src/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(src/config.h)
-
-# Check for progs
-AC_PROG_LIBTOOL
+XORG_CHECK_MALLOC_ZERO
-# Checks for pkg-config packages
+# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XXF86VM, xproto x11 xextproto xext [xf86vidmodeproto >= 2.2.99.1])
-XORG_CHECK_MALLOC_ZERO
-
-AC_OUTPUT([Makefile
- src/Makefile
- man/Makefile
- xxf86vm.pc])
+AC_CONFIG_FILES([Makefile
+ src/Makefile
+ man/Makefile
+ xxf86vm.pc])
+AC_OUTPUT
commit 97d7aa6c8108800d3ccd30ce907ef32e769370a9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 28 19:41:38 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 ec45707..6578e7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,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(src/config.h)
+AC_CONFIG_HEADERS(src/config.h)
# Check for progs
AC_PROG_LIBTOOL
commit 353b988717d474a77322a541a6ab56661cc0bedb
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 f84ec81..ec45707 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,6 @@ XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(src/config.h)
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
# Checks for pkg-config packages
Reply to: