Hello community,
here is the log from the commit of package xorg-x11-proto-devel
checked in at Tue Jul 10 14:10:49 CEST 2007.
--------
--- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2007-07-04 21:32:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2007-07-05 15:40:02.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jul 5 15:39:35 CEST 2007 - sndirsch@suse.de
+
+- inputproto 1.4.2:
+ * Just a little fix to stop compilation errors.
+
+-------------------------------------------------------------------
Old:
----
inputproto-X11R7.0-1.3.2.tar.bz2
New:
----
inputproto-1.4.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-proto-devel.spec ++++++
--- /var/tmp/diff_new_pack.f30329/_old 2007-07-10 14:08:20.000000000 +0200
+++ /var/tmp/diff_new_pack.f30329/_new 2007-07-10 14:08:20.000000000 +0200
@@ -13,7 +13,7 @@
Name: xorg-x11-proto-devel
Url: http://xorg.freedesktop.org/
Version: 7.2
-Release: 46
+Release: 48
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/X11
@@ -27,7 +27,7 @@
Source6: fontcacheproto-X11R7.0-0.1.2.tar.bz2
Source7: fontsproto-X11R7.0-2.0.2.tar.bz2
Source8: glproto-1.4.8.tar.bz2
-Source9: inputproto-X11R7.0-1.3.2.tar.bz2
+Source9: inputproto-1.4.2.tar.bz2
Source10: kbproto-1.0.3.tar.bz2
Source11: printproto-X11R7.0-1.0.3.tar.bz2
Source12: randrproto-1.2.1.tar.bz2
@@ -131,6 +131,9 @@
/usr/share/xcb/
%changelog
+* Thu Jul 05 2007 - sndirsch@suse.de
+- inputproto 1.4.2:
+ * Just a little fix to stop compilation errors.
* Wed Jul 04 2007 - sndirsch@suse.de
- compositeproto 0.4
* Tue May 01 2007 - sndirsch@suse.de
++++++ inputproto-X11R7.0-1.3.2.tar.bz2 -> inputproto-1.4.2.tar.bz2 ++++++
++++ 2688 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/inputproto-X11R7.0-1.3.2/configure.ac new/inputproto-1.4.2/configure.ac
--- old/inputproto-X11R7.0-1.3.2/configure.ac 2005-12-15 01:24:37.000000000 +0100
+++ new/inputproto-1.4.2/configure.ac 2007-04-26 01:58:32.000000000 +0200
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.3.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.4.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/inputproto-X11R7.0-1.3.2/missing new/inputproto-1.4.2/missing
--- old/inputproto-X11R7.0-1.3.2/missing 2005-12-21 07:55:39.000000000 +0100
+++ new/inputproto-1.4.2/missing 2006-12-05 10:12:52.000000000 +0100
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2003-09-02.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -38,12 +42,23 @@
configure_ac=configure.in
fi
+msg="missing on your system"
+
case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
esac
@@ -74,11 +89,13 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
;;
-*)
@@ -94,7 +111,7 @@
fi
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -108,7 +125,7 @@
fi
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -122,7 +139,7 @@
fi
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -146,7 +163,7 @@
fi
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -162,8 +179,8 @@
fi
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
@@ -185,7 +202,7 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
@@ -215,7 +232,7 @@
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
@@ -243,7 +260,7 @@
fi
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
@@ -268,7 +285,7 @@
fi
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
@@ -323,8 +340,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +351,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/inputproto-X11R7.0-1.3.2/XI.h new/inputproto-1.4.2/XI.h
--- old/inputproto-X11R7.0-1.3.2/XI.h 2004-04-23 20:43:06.000000000 +0200
+++ new/inputproto-1.4.2/XI.h 2007-04-24 14:40:11.000000000 +0200
@@ -137,6 +137,7 @@
#define XInput_Add_XDeviceBell 2
#define XInput_Add_XSetDeviceValuators 3
#define XInput_Add_XChangeDeviceControl 4
+#define XInput_Add_DevicePresenceNotify 5
#define XI_Absent 0
#define XI_Present 1
@@ -153,7 +154,14 @@
#define XI_Add_XChangeDeviceControl_Major 1
#define XI_Add_XChangeDeviceControl_Minor 3
+#define XI_Add_DevicePresenceNotify_Major 1
+#define XI_Add_DevicePresenceNotify_Minor 4
+
#define DEVICE_RESOLUTION 1
+#define DEVICE_ABS_CALIB 2
+#define DEVICE_CORE 3
+#define DEVICE_ENABLE 4
+#define DEVICE_ABS_AREA 5
#define NoSuchExtension 1
@@ -171,6 +179,8 @@
#define IsXPointer 0
#define IsXKeyboard 1
#define IsXExtensionDevice 2
+#define IsXExtensionKeyboard 3
+#define IsXExtensionPointer 4
#define AsyncThisDevice 0
#define SyncThisDevice 1
@@ -204,12 +214,6 @@
#define DeviceMode (1L << 0)
#define Relative 0
#define Absolute 1
-/* Merged from Metrolink tree for XINPUT stuff */
-#define TS_Raw 57
-#define TS_Scaled 58
-#define SendCoreEvents 59
-#define DontSendCoreEvents 60
-/* End of merged section */
#define ProximityState (1L << 1)
#define InProximity (0L << 1)
@@ -244,6 +248,14 @@
#define _deviceOwnerGrabButton 8
#define _noExtensionEvent 9
+#define _devicePresence 0
+
+#define DeviceAdded 0
+#define DeviceRemoved 1
+#define DeviceEnabled 2
+#define DeviceDisabled 3
+#define DeviceUnrecoverable 4
+
#define XI_BadDevice 0
#define XI_BadEvent 1
#define XI_BadMode 2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/inputproto-X11R7.0-1.3.2/XInput.h new/inputproto-1.4.2/XInput.h
--- old/inputproto-X11R7.0-1.3.2/XInput.h 2004-04-23 20:43:06.000000000 +0200
+++ new/inputproto-1.4.2/XInput.h 2007-02-14 01:34:20.000000000 +0100
@@ -149,6 +149,13 @@
#define NoExtensionEvent(d,type,_class) \
{ _class = ((XDevice *) d)->device_id << 8 | _noExtensionEvent;}
+#define DevicePresence(dpy, type, _class) \
+ { \
+ extern int _XiGetDevicePresenceNotifyEvent(Display *); \
+ type = _XiGetDevicePresenceNotifyEvent(dpy); \
+ _class = (0x10000 | _devicePresence); \
+ }
+
#define BadDevice(dpy,error) _xibaddevice(dpy, &error)
#define BadClass(dpy,error) _xibadclass(dpy, &error)
@@ -418,6 +425,31 @@
/*******************************************************************
*
+ * DevicePresenceNotify event. This event is sent when the list of
+ * input devices changes, in which case devchange will be false, and
+ * no information about the change will be contained in the event;
+ * the client should use XListInputDevices() to learn what has changed.
+ *
+ * If devchange is true, an attribute that the server believes is
+ * important has changed on a device, and the client should use
+ * XGetDeviceControl to examine the device. If control is non-zero,
+ * then that control has changed meaningfully.
+ */
+
+typedef struct {
+ int type;
+ unsigned long serial; /* # of last request processed by server */
+ Bool send_event; /* true if this came from a SendEvent request */
+ Display *display; /* Display the event was read from */
+ Window window; /* unused */
+ Time time;
+ Bool devchange;
+ XID deviceid;
+ XID control;
+} XDevicePresenceNotifyEvent;
+
+/*******************************************************************
+ *
* Control structures for input devices that support input class
* Feedback. These are used by the XGetFeedbackControl and
* XChangeFeedbackControl functions.
@@ -632,6 +664,49 @@
int *max_resolutions;
} XDeviceResolutionState;
+typedef struct {
+ XID control;
+ int length;
+ int min_x;
+ int max_x;
+ int min_y;
+ int max_y;
+ int flip_x;
+ int flip_y;
+ int rotation;
+ int button_threshold;
+} XDeviceAbsCalibControl, XDeviceAbsCalibState;
+
+typedef struct {
+ XID control;
+ int length;
+ int offset_x;
+ int offset_y;
+ int width;
+ int height;
+ int screen;
+ XID following;
+} XDeviceAbsAreaControl, XDeviceAbsAreaState;
+
+typedef struct {
+ XID control;
+ int length;
+ int status;
+} XDeviceCoreControl;
+
+typedef struct {
+ XID control;
+ int length;
+ int status;
+ int iscore;
+} XDeviceCoreState;
+
+typedef struct {
+ XID control;
+ int length;
+ int enable;
+} XDeviceEnableControl, XDeviceEnableState;
+
/*******************************************************************
*
* An array of XDeviceList structures is returned by the
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/inputproto-X11R7.0-1.3.2/XIproto.h new/inputproto-1.4.2/XIproto.h
--- old/inputproto-X11R7.0-1.3.2/XIproto.h 2004-04-23 20:43:06.000000000 +0200
+++ new/inputproto-1.4.2/XIproto.h 2007-04-24 13:46:15.000000000 +0200
@@ -72,7 +72,7 @@
#define numInputClasses 7
-#define IEVENTS 15
+#define IEVENTS 16
#define IERRORS 5
#define CLIENT_REQ 1
@@ -113,6 +113,7 @@
#define XI_ChangeDeviceNotify 12
#define XI_DeviceKeystateNotify 13
#define XI_DeviceButtonstateNotify 14
+#define XI_DevicePresenceNotify 15
/*********************************************************
*
@@ -1290,6 +1291,46 @@
CARD32 num_valuators B32; /* number of valuators */
} xDeviceResolutionState;
+typedef struct {
+ CARD16 control B16;
+ CARD16 length B16;
+ INT32 min_x B32;
+ INT32 max_x B32;
+ INT32 min_y B32;
+ INT32 max_y B32;
+ CARD32 flip_x B32;
+ CARD32 flip_y B32;
+ CARD32 rotation B32;
+ CARD32 button_threshold B32;
+} xDeviceAbsCalibState;
+
+typedef struct {
+ CARD16 control B16;
+ CARD16 length B16;
+ CARD32 offset_x B32;
+ CARD32 offset_y B32;
+ CARD32 width B32;
+ CARD32 height B32;
+ CARD32 screen B32;
+ CARD32 following B32;
+} xDeviceAbsAreaState;
+
+typedef struct {
+ CARD16 control B16; /* control type */
+ CARD16 length B16; /* control length */
+ CARD8 status;
+ CARD8 iscore;
+ CARD16 pad1 B16;
+} xDeviceCoreState;
+
+typedef struct {
+ CARD16 control B16; /* control type */
+ CARD16 length B16; /* control length */
+ CARD8 enable;
+ CARD8 pad0;
+ CARD16 pad1 B16;
+} xDeviceEnableState;
+
/*********************************************************
*
* ChangeDeviceControl.
@@ -1332,21 +1373,45 @@
CARD8 pad1,pad2;
} xDeviceResolutionCtl;
-
-/* Merged from Metrolink tree for XINPUT stuff */
-
typedef struct {
- CARD16 control;
- CARD16 length;
- CARD32 min_x;
- CARD32 max_x;
- CARD32 min_y;
- CARD32 max_y;
+ CARD16 control B16;
+ CARD16 length B16;
+ INT32 min_x;
+ INT32 max_x;
+ INT32 min_y;
+ INT32 max_y;
+ CARD32 flip_x;
+ CARD32 flip_y;
+ CARD32 rotation;
CARD32 button_threshold;
-} xDeviceTSCalibrationCtl;
-
-/* End of merged section */
+} xDeviceAbsCalibCtl;
+typedef struct {
+ CARD16 control B16;
+ CARD16 length B16;
+ CARD32 offset_x;
+ CARD32 offset_y;
+ INT32 width;
+ INT32 height;
+ INT32 screen;
+ CARD32 following;
+} xDeviceAbsAreaCtl;
+
+typedef struct {
+ CARD16 control B16;
+ CARD16 length B16;
+ CARD8 status;
+ CARD8 pad0;
+ CARD16 pad1 B16;
+} xDeviceCoreCtl;
+
+typedef struct {
+ CARD16 control B16;
+ CARD16 length B16;
+ CARD8 enable;
+ CARD8 pad0;
+ CARD16 pad1 B16;
+} xDeviceEnableCtl;
/**********************************************************
*
@@ -1523,6 +1588,28 @@
CARD32 pad04 B32;
} changeDeviceNotify;
+/**********************************************************
+ *
+ * devicePresenceNotify.
+ *
+ */
+
+typedef struct
+ {
+ BYTE type;
+ BYTE pad00;
+ CARD16 sequenceNumber B16;
+ Time time B32;
+ BYTE devchange; /* Device{Added|Removed|Enabled|Disabled} */
+ BYTE deviceid;
+ CARD16 control B16;
+ CARD32 pad02 B32;
+ CARD32 pad03 B32;
+ CARD32 pad04 B32;
+ CARD32 pad05 B32;
+ CARD32 pad06 B32;
+ } devicePresenceNotify;
+
#undef Window
#undef Time
#undef KeyCode
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org