From ed4e7cf65fb8370b0c14dfc220cec01d6af51f98 Mon Sep 17 00:00:00 2001 From: jinzhimin369 Date: Sat, 29 Aug 2020 10:29:50 +0800 Subject: [PATCH] add xf86misc.h and xf86mscstr.h to solve build err --- libXxf86misc.spec | 32 ++++++- xf86misc.h | 172 +++++++++++++++++++++++++++++++++ xf86mscstr.h | 238 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 440 insertions(+), 2 deletions(-) create mode 100644 xf86misc.h create mode 100644 xf86mscstr.h diff --git a/libXxf86misc.spec b/libXxf86misc.spec index 5115bcd..b069f46 100644 --- a/libXxf86misc.spec +++ b/libXxf86misc.spec @@ -1,28 +1,40 @@ +%bcond_with devel Name: libXxf86misc Version: 1.0.4 -Release: 4 +Release: 5 Summary: Extension library for the XFree86-Misc X extension License: MIT URL: https://www.x.org Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +Source1: xf86misc.h +Source2: xf86mscstr.h BuildRequires: autoconf automake libtool xorg-x11-util-macros -BuildRequires: pkgconfig(xproto) pkgconfig(xext) +BuildRequires: pkgconfig(xproto) pkgconfig(xext) sed + +%if !%{with devel} +Obsoletes: libXxf86misc-devel <= 1.0.4-4 +%endif %description Extension library for the XFree86-Misc X extension. +%if %{with devel} %package devel Summary: Development package for libXxf86misc Requires: %{name} = %{version}-%{release} %description devel The development package for libXxf86misc. +%endif %package_help %prep %autosetup -n %{name}-%{version} -p1 +sed -i s/xf86miscproto// configure.ac +mkdir -p src/X11/extensions/ +cp %{SOURCE1} %{SOURCE2} src/X11/extensions/ %build autoreconf -vif @@ -33,6 +45,15 @@ autoreconf -vif %make_install %delete_la +%if %{with devel} +mkdir -p $RPM_BUILD_ROOT%{_includedir}/X11/extensions +install -m 0644 -p %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/X11/extensions +%else +rm -f $RPM_BUILD_ROOT%{_libdir}/*.so +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig +%endif + %ldconfig_scriptlets %files @@ -40,10 +61,12 @@ autoreconf -vif %{_libdir}/*.so.* %doc COPYING README +%if %{with devel} %files devel %defattr(-,root,root) %{_libdir}/{*.a,*.so} %{_libdir}/*/*.pc +%endif %files help %defattr(-,root,root) @@ -51,6 +74,11 @@ autoreconf -vif %doc ChangeLog %changelog +* Sat Aug 29 2020 jinzhimin - 1.0.4-5 +- Type: bugfix +- ID: NA +- SUG: NA +- DESC: add xf86misc.h and xf86mscstr.h to solve build err * Mon Sep 02 2019 openEuler Buildteam - 1.0.4-4 - Type: enhancement diff --git a/xf86misc.h b/xf86misc.h new file mode 100644 index 0000000..611871d --- /dev/null +++ b/xf86misc.h @@ -0,0 +1,172 @@ +/* $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 X_XF86MiscPassMessage 10 + +#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 removal/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 */ +); + +Status XF86MiscPassMessage( + Display* /* dpy */, + int /* screen */, + const char* /* message name/type */, + const char* /* message contents/value */, + char ** /* returned message */ +); + +_XFUNCPROTOEND + +#endif + +#endif diff --git a/xf86mscstr.h b/xf86mscstr.h new file mode 100644 index 0000000..cc0f0cf --- /dev/null +++ b/xf86mscstr.h @@ -0,0 +1,238 @@ +/* $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 9 + +typedef struct _XF86MiscQueryVersion { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscQueryVersion */ + CARD16 length; +} xXF86MiscQueryVersionReq; +#define sz_xXF86MiscQueryVersionReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + BOOL pad1; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of XFree86-Misc */ + CARD16 minorVersion; /* minor version of XFree86-Misc */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; +} xXF86MiscQueryVersionReply; +#define sz_xXF86MiscQueryVersionReply 32 + +#ifdef _XF86MISC_SAVER_COMPAT_ +typedef struct _XF86MiscGetSaver { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscGetSaver */ + CARD16 length; + CARD16 screen; + CARD16 pad; +} xXF86MiscGetSaverReq; +#define sz_xXF86MiscGetSaverReq 8 + +typedef struct _XF86MiscSetSaver { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscSetSaver */ + CARD16 length; + CARD16 screen; + CARD16 pad; + CARD32 suspendTime; + CARD32 offTime; +} xXF86MiscSetSaverReq; +#define sz_xXF86MiscSetSaverReq 16 + +typedef struct { + BYTE type; + BOOL pad1; + CARD16 sequenceNumber; + CARD32 length; + CARD32 suspendTime; + CARD32 offTime; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; +} xXF86MiscGetSaverReply; +#define sz_xXF86MiscGetSaverReply 32 +#endif + +typedef struct _XF86MiscGetMouseSettings { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscGetMouseSettings */ + CARD16 length; +} xXF86MiscGetMouseSettingsReq; +#define sz_xXF86MiscGetMouseSettingsReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + BOOL pad1; + CARD16 sequenceNumber; + CARD32 length; + CARD32 mousetype; + CARD32 baudrate; + CARD32 samplerate; + CARD32 resolution; + CARD32 buttons; + BOOL emulate3buttons; + BOOL chordmiddle; + CARD16 pad2; + CARD32 emulate3timeout; + CARD32 flags; + CARD32 devnamelen; /* strlen(device)+1 */ +} xXF86MiscGetMouseSettingsReply; +#define sz_xXF86MiscGetMouseSettingsReply 44 + +typedef struct _XF86MiscGetKbdSettings { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscGetKbdSettings */ + CARD16 length; +} xXF86MiscGetKbdSettingsReq; +#define sz_xXF86MiscGetKbdSettingsReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + BOOL pad1; + CARD16 sequenceNumber; + CARD32 length; + CARD32 kbdtype; + CARD32 rate; + CARD32 delay; + BOOL servnumlock; + BOOL pad2; + CARD16 pad3; + CARD32 pad4; + CARD32 pad5; +} xXF86MiscGetKbdSettingsReply; +#define sz_xXF86MiscGetKbdSettingsReply 32 + +typedef struct _XF86MiscSetMouseSettings { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscSetMouseSettings */ + CARD16 length; + CARD32 mousetype; + CARD32 baudrate; + CARD32 samplerate; + CARD32 resolution; + CARD32 buttons; + BOOL emulate3buttons; + BOOL chordmiddle; + CARD16 devnamelen; + CARD32 emulate3timeout; + CARD32 flags; +} xXF86MiscSetMouseSettingsReq; +#define sz_xXF86MiscSetMouseSettingsReq 36 + +typedef struct _XF86MiscSetKbdSettings { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscSetKbdSettings */ + CARD16 length; + CARD32 kbdtype; + CARD32 rate; + CARD32 delay; + BOOL servnumlock; + BOOL pad1; + CARD16 pad2; +} xXF86MiscSetKbdSettingsReq; +#define sz_xXF86MiscSetKbdSettingsReq 20 + +typedef struct _XF86MiscSetGrabKeysState { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscSetKbdSettings */ + CARD16 length; + BOOL enable; + BOOL pad1; + CARD16 pad2; +} xXF86MiscSetGrabKeysStateReq; +#define sz_xXF86MiscSetGrabKeysStateReq 8 + +typedef struct { + BYTE type; + BOOL pad1; + CARD16 sequenceNumber; + CARD32 length; + CARD32 status; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; +} xXF86MiscSetGrabKeysStateReply; +#define sz_xXF86MiscSetGrabKeysStateReply 32 + +typedef struct _XF86MiscSetClientVersion { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; + CARD16 length; + CARD16 major; + CARD16 minor; +} xXF86MiscSetClientVersionReq; +#define sz_xXF86MiscSetClientVersionReq 8 + +typedef struct _XF86MiscGetFilePaths { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscGetFilePaths */ + CARD16 length; +} xXF86MiscGetFilePathsReq; +#define sz_xXF86MiscGetFilePathsReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + BOOL pad1; + CARD16 sequenceNumber; + CARD32 length; + CARD16 configlen; + CARD16 modulelen; + CARD16 loglen; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; +} xXF86MiscGetFilePathsReply; +#define sz_xXF86MiscGetFilePathsReply 32 + +typedef struct _XF86MiscPassMessage { + CARD8 reqType; /* always XF86MiscReqCode */ + CARD8 xf86miscReqType; /* always X_XF86MiscPassMessage */ + CARD16 length; + CARD16 typelen; + CARD16 vallen; + CARD16 screen; + CARD16 pad; +} xXF86MiscPassMessageReq; +#define sz_xXF86MiscPassMessageReq 12 + +typedef struct { + BYTE type; /* X_Reply */ + BYTE pad1; + CARD16 sequenceNumber; + CARD32 length; + CARD16 mesglen; + CARD16 pad2; + CARD32 status; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; +} xXF86MiscPassMessageReply; +#define sz_xXF86MiscPassMessageReply 32 + +#endif /* _XF86MISCSTR_H_ */ -- Gitee