.cvsignore | 17 ------------ .gear/rules | 2 ++ .gear/tags/list | 1 + .gitignore | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ ChangeLog | 59 ----------------------------------------- Makefile.am | 13 +++++++++- README | 25 ++++++++++++++++++ configure.ac | 21 ++++++++++----- libXxf86misc.spec | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ man/.cvsignore | 3 --- man/Makefile.am | 75 ++++++++++++++++++++-------------------------------- src/.cvsignore | 9 ------- src/Makefile.am | 2 +- src/XF86Misc.c | 42 ++++++++---------------------- 14 files changed, 251 insertions(+), 174 deletions(-) diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index b40641f..0000000 --- a/.cvsignore +++ /dev/null @@ -1,17 +0,0 @@ -aclocal.m4 -autom4te.cache -compile -config.guess -config.log -config.status -config.sub -configure -depcomp -install-sh -libtool -ltmain.sh -Makefile -Makefile.in -missing -mkinstalldirs -xxf86misc.pc diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..122290c --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: @name@-1_0_1:. +diff: @name@-1_0_1:. . diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..969e62d --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +a2ff41b5721803eda53ef54bc5c7e3593724be1e libXxf86misc-1_0_1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bd9cdc2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,78 @@ +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) +aclocal.m4 +autom4te.cache/ +autoscan.log +ChangeLog +compile +config.guess +config.h +config.h.in +config.log +config-ml.in +config.py +config.status +config.status.lineno +config.sub +configure +configure.scan +depcomp +.deps/ +INSTALL +install-sh +.libs/ +libtool +libtool.m4 +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh +missing +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute +*~ +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for libXxf86misc +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index a866050..0000000 --- a/ChangeLog +++ /dev/null @@ -1,59 +0,0 @@ -2006-04-26 Adam Jackson - - * configure.ac: - Bump to 1.0.1 - -2006-02-12 Alan Coopersmith - - * man/Makefile.am: - Bug #5628 - Shadow pages not created correctly when MANDIR & MANSUFFIX don't match. - -2005-12-14 Kevin E. Martin - - * configure.ac: - Update package version number for final X11R7 release candidate. - -2005-12-06 Kevin E. Martin - - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. - -2005-12-03 Kevin E. Martin - - * configure.ac: - Update package version number for X11R7 RC3 release. - -2005-12-02 Kevin E. Martin - - * configure.ac: - * src/Makefile.am: - Add check and cflags for malloc(0) returning NULL. - -2005-11-19 Kevin E. Martin - - * xxf86misc.pc.in: - Update pkgconfig files to separate library build-time dependencies - from application build-time dependencies. - -2005-10-18 Kevin E. Martin - - * configure.ac: - Update package version number for RC1 release. - -2005-10-11 Alan Coopersmith - - * configure.ac: - * man/Makefile.am: - Use sed to put version number in man page - Add shadow man pages for man pages that document multiple functions. - -2005-07-08 Keith Packard - - * .cvsignore: - * man/.cvsignore: - * src/.cvsignore: - * src/Makefile.am: - Add .cvsignore files - Switch _la_CFLAGS for AM_CFLAGS to clean up directory - diff --git a/Makefile.am b/Makefile.am index cdfbd95..87e54e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,4 +3,15 @@ SUBDIRS = src man pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xxf86misc.pc -EXTRA_DIST = xxf86misc.pc.in autogen.sh +MAINTAINERCLEANFILES = ChangeLog INSTALL +EXTRA_DIST = xxf86misc.pc.in + +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog INSTALL diff --git a/README b/README new file mode 100644 index 0000000..e5a7b3d --- /dev/null +++ b/README @@ -0,0 +1,25 @@ +libXxf86misc - Extension library for the XFree86-Misc X extension. + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/lib/libXxf86misc + + http://cgit.freedesktop.org/xorg/lib/libXxf86misc + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff --git a/configure.ac b/configure.ac index c821849..510f577 100644 --- a/configure.ac +++ b/configure.ac @@ -1,21 +1,30 @@ -AC_PREREQ([2.57]) +dnl Process this file with autoconf to create configure. -AC_INIT(libXxf86misc, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86misc) +# Initialize Autoconf +AC_PREREQ([2.60]) +AC_INIT([libXxf86misc], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + [libXxf86misc]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([src/config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AM_CONFIG_HEADER(src/config.h) +# 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 # Check for progs -AC_PROG_CC AC_PROG_LIBTOOL # Checks for pkg-config packages PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto) XORG_CHECK_MALLOC_ZERO -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION AC_OUTPUT([Makefile src/Makefile diff --git a/libXxf86misc.spec b/libXxf86misc.spec new file mode 100644 index 0000000..092b234 --- /dev/null +++ b/libXxf86misc.spec @@ -0,0 +1,78 @@ +Name: libXxf86misc +Version: 1.0.3 +Release: alt1.qa1 +Summary: XFree86 Misc Extension Library +License: MIT/X11 +Group: System/Libraries +Url: http://xorg.freedesktop.org +Packager: Valery Inozemtsev + +Source: %name-%version.tar +Patch: %name-%version-%release.patch + +BuildRequires: libX11-devel libXext-devel xorg-xf86miscproto-devel xorg-util-macros + +%description +XFree86 Misc Extension Library + +%package devel +Summary: XFree86 Misc Extension Library and Header Files +Group: Development/C +Requires: %name = %version-%release + +%description devel +%name-devel contains the libraries and header files needed to +develop programs which make use of %name + +%prep +%setup -q +%patch -p1 + +%build +%autoreconf +%configure \ + --disable-static +%make_build + +%install +%make DESTDIR=%buildroot install + +%files +%_libdir/*.so.* + +%files devel +%_libdir/*.so +%_pkgconfigdir/*.pc +%_man3dir/* + +%changelog +* Sun Apr 14 2013 Dmitry V. Levin (QA) 1.0.3-alt1.qa1 +- NMU: rebuilt for debuginfo. + +* Mon Nov 22 2010 Valery Inozemtsev 1.0.3-alt1 +- 1.0.3 + +* Tue Nov 02 2010 Valery Inozemtsev 1.0.1-alt4 +- devel: fixed pkg-config requires + +* Sun Sep 27 2009 Valery Inozemtsev 1.0.1-alt3 +- updated build dependencies + +* Sun Nov 23 2008 Valery Inozemtsev 1.0.1-alt2 +- removed obsolete %%post_ldconfig/%%postun_ldconfig calls + +* Thu Apr 27 2006 Valery Inozemtsev 1.0.1-alt1 +- 1.0.1 + +* Fri Jan 20 2006 Valery Inozemtsev 1.0.0-alt2 +- fixed requires for %name-devel + +* Mon Dec 26 2005 Valery Inozemtsev 1.0.0-alt1 +- Xorg-7.0 + +* Sun Dec 04 2005 Valery Inozemtsev 0.99.2-alt1 +- Xorg-7.0RC3 + +* Mon Nov 21 2005 Valery Inozemtsev 0.99.1-alt0.1 +- initial build + diff --git a/man/.cvsignore b/man/.cvsignore deleted file mode 100644 index 2d0f344..0000000 --- a/man/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in -*.3* diff --git a/man/Makefile.am b/man/Makefile.am index 262fb31..6171cb9 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,29 +1,25 @@ -# $Id$ # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# -# 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 copyright holders 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 copyright holders. -# +# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# +# 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, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. +# libmandir = $(LIB_MAN_DIR) @@ -31,32 +27,18 @@ LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) libman_PRE = XF86Misc.man -BUILT_SOURCES = shadows.DONE - EXTRA_DIST = $(libman_PRE) CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ - $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@) - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \ - -e 's/__xconfigfile__/xorg.conf/g' \ - -e 's/__appmansuffix__/$(APP_MAN_SUFFIX)/g' \ - -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' \ - -e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g' + $(XF86Misc_shadowmen) SUFFIXES = .$(LIB_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(LIB_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ # Generate man page shadow files (Replaces InstallManPageAliases from Imake) @@ -70,8 +52,7 @@ XF86Misc_shadows = \ XF86MiscGetKbdSettings \ XF86MiscSetKbdSettings -shadows.DONE: - -rm -f $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@) - (for i in $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@) ; do \ - echo .so man$(LIB_MAN_DIR_SUFFIX)/XF86Misc.$(LIB_MAN_SUFFIX) > $$i; \ - done) +XF86Misc_shadowmen = $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@) + +$(XF86Misc_shadowmen): + $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XF86Misc.$(LIB_MAN_SUFFIX) > $@ diff --git a/src/.cvsignore b/src/.cvsignore deleted file mode 100644 index 07e6fa2..0000000 --- a/src/.cvsignore +++ /dev/null @@ -1,9 +0,0 @@ -config.h -config.h.in -.deps -.libs -libXxf86misc.la -*.lo -Makefile -Makefile.in -stamp-h1 diff --git a/src/Makefile.am b/src/Makefile.am index 715b82d..4f5b3f3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,6 +2,6 @@ lib_LTLIBRARIES = libXxf86misc.la libXxf86misc_la_SOURCES = XF86Misc.c -AM_CFLAGS = $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS) libXxf86misc_la_LIBADD = $(XXF86MISC_LIBS) libXxf86misc_la_LDFLAGS = -version-number 1:1:0 diff --git a/src/XF86Misc.c b/src/XF86Misc.c index b0669d5..193224f 100644 --- a/src/XF86Misc.c +++ b/src/XF86Misc.c @@ -56,9 +56,7 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86misc_info) * * *****************************************************************************/ -Bool XF86MiscQueryExtension (dpy, event_basep, error_basep) - Display *dpy; - int *event_basep, *error_basep; +Bool XF86MiscQueryExtension (Display *dpy, int *event_basep, int *error_basep) { XExtDisplayInfo *info = find_display (dpy); @@ -71,10 +69,7 @@ Bool XF86MiscQueryExtension (dpy, event_basep, error_basep) } } -Bool XF86MiscQueryVersion(dpy, majorVersion, minorVersion) - Display* dpy; - int* majorVersion; - int* minorVersion; +Bool XF86MiscQueryVersion(Display* dpy, int* majorVersion, int* minorVersion) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscQueryVersionReply rep; @@ -119,9 +114,7 @@ XF86MiscSetClientVersion(Display *dpy) return True; } -Bool XF86MiscGetMouseSettings(dpy, mouseinfo) - Display* dpy; - XF86MiscMouseSettings *mouseinfo; +Bool XF86MiscGetMouseSettings(Display* dpy, XF86MiscMouseSettings *mouseinfo) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscGetMouseSettingsReply rep; @@ -165,9 +158,7 @@ Bool XF86MiscGetMouseSettings(dpy, mouseinfo) return True; } -Bool XF86MiscGetKbdSettings(dpy, kbdinfo) - Display* dpy; - XF86MiscKbdSettings *kbdinfo; +Bool XF86MiscGetKbdSettings(Display* dpy, XF86MiscKbdSettings *kbdinfo) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscGetKbdSettingsReply rep; @@ -195,9 +186,7 @@ Bool XF86MiscGetKbdSettings(dpy, kbdinfo) return True; } -Bool XF86MiscSetMouseSettings(dpy, mouseinfo) - Display* dpy; - XF86MiscMouseSettings *mouseinfo; +Bool XF86MiscSetMouseSettings(Display* dpy, XF86MiscMouseSettings *mouseinfo) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscSetMouseSettingsReq *req; @@ -235,9 +224,7 @@ Bool XF86MiscSetMouseSettings(dpy, mouseinfo) return True; } -Bool XF86MiscSetKbdSettings(dpy, kbdinfo) - Display* dpy; - XF86MiscKbdSettings *kbdinfo; +Bool XF86MiscSetKbdSettings(Display* dpy, XF86MiscKbdSettings *kbdinfo) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscSetKbdSettingsReq *req; @@ -258,9 +245,7 @@ Bool XF86MiscSetKbdSettings(dpy, kbdinfo) return True; } -int XF86MiscSetGrabKeysState(dpy, enable) - Display* dpy; - Bool enable; +int XF86MiscSetGrabKeysState(Display* dpy, Bool enable) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscSetGrabKeysStateReply rep; @@ -284,9 +269,7 @@ int XF86MiscSetGrabKeysState(dpy, enable) return rep.status; } -Bool XF86MiscGetFilePaths(dpy, filpaths) - Display* dpy; - XF86MiscFilePaths *filpaths; +Bool XF86MiscGetFilePaths(Display* dpy, XF86MiscFilePaths *filpaths) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscGetFilePathsReply rep; @@ -354,12 +337,9 @@ Bool XF86MiscGetFilePaths(dpy, filpaths) return True; } -Status XF86MiscPassMessage(dpy, screen, msgtype, msgval, retmsg) - Display* dpy; - int screen; - const char* msgtype; - const char* msgval; - char** retmsg; +Status XF86MiscPassMessage(Display* dpy, int screen, + const char* msgtype, const char* msgval, + char** retmsg) { XExtDisplayInfo *info = find_display (dpy); xXF86MiscPassMessageReply rep;