configure.ac | 13 ++++----- man/.gitignore | 3 -- man/Makefile.am | 39 ++++----------------------- man/XCompositeCreateRegionFromBorderClip.man | 1 man/XCompositeGetOverlayWindow.man | 1 man/XCompositeNameWindowPixmap.man | 1 man/XCompositeQueryExtension.man | 1 man/XCompositeQueryVersion.man | 1 man/XCompositeRedirectSubwindows.man | 1 man/XCompositeRedirectWindow.man | 1 man/XCompositeReleaseOverlayWindow.man | 1 man/XCompositeUnredirectSubwindows.man | 1 man/XCompositeUnredirectWindow.man | 1 man/XCompositeVersion.man | 1 src/Makefile.am | 4 +- src/xcompositeint.h | 2 - xcomposite.pc.in | 6 ++-- 17 files changed, 30 insertions(+), 48 deletions(-)
New commits: commit 8898782b98457292057d249ab9e40cfc2fed7d8d Author: Alan Coopersmith <[email protected]> Date: Wed Oct 27 22:40:32 2010 -0700 libXcomposite 0.4.3 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 56c180d..cd3f60a 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ dnl that 'revision' number appears in Xcomposite.h and has to be manually dnl synchronized. dnl AC_INIT(libXcomposite, - 0.4.2, + [0.4.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXcomposite) AM_INIT_AUTOMAKE([foreign dist-bzip2]) commit 206af895a90d5582a8078c86a33a0ba5888b7e27 Author: Gaetan Nadon <[email protected]> Date: Sun Aug 15 10:41:17 2010 -0400 man: list files to install only once Newer versions of autoconf detect that error. Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/man/Makefile.am b/man/Makefile.am index 0a0b7d1..cbed2eb 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -19,8 +19,7 @@ Xcomposite_shadows = \ XCompositeReleaseOverlayWindow if INSTALL_MANPAGES -libman_DATA = $(libman_PRE:m...@lib_man_suffix@) \ - $(Xcomposite_shadows:=...@lib_man_suffix@) +libman_DATA = $(libman_PRE:m...@lib_man_suffix@) endif EXTRA_DIST = $(libman_PRE) $(libman_xml) commit 542ff68e43a33a5c1849f9a88d2d5cc6d0827d04 Author: Gaetan Nadon <[email protected]> Date: Sat Aug 14 20:12:57 2010 -0400 man: store shadow man pages in git rather than generating them Simplify the build process and the makefile. Local fix in CVS for bug 5628 is not required as the problem has been fixed in util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/man/Makefile.am b/man/Makefile.am index b768742..0a0b7d1 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,12 +1,11 @@ libmandir = $(LIB_MAN_DIR) -LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) - libman_xml = Xcomposite.xml -libman_PRE = $(libman_xml:xml=man) +libman_PRE = $(libman_xml:xml=man) \ + $(Xcomposite_shadows:=.man) -Xcomposite_man_aliases = \ +Xcomposite_shadows = \ XCompositeQueryExtension \ XCompositeQueryVersion \ XCompositeVersion \ @@ -19,22 +18,16 @@ Xcomposite_man_aliases = \ XCompositeGetOverlayWindow \ XCompositeReleaseOverlayWindow -Xcomposite_shadowmen = $(Xcomposite_man_aliases:=...@lib_man_suffix@) - if INSTALL_MANPAGES libman_DATA = $(libman_PRE:m...@lib_man_suffix@) \ - $(Xcomposite_shadowmen) + $(Xcomposite_shadows:=...@lib_man_suffix@) endif EXTRA_DIST = $(libman_PRE) $(libman_xml) CLEANFILES = $(libman_DATA) -MAINTAINERCLEANFILES = $(libman_PRE) - -# Generate man page shadow files (Replaces InstallManPageAliases from Imake) -$(Xcomposite_shadowmen): - $(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $@ +MAINTAINERCLEANFILES = $(libman_xml:xml=man) SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml diff --git a/man/XCompositeCreateRegionFromBorderClip.man b/man/XCompositeCreateRegionFromBorderClip.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeCreateRegionFromBorderClip.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeGetOverlayWindow.man b/man/XCompositeGetOverlayWindow.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeGetOverlayWindow.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeNameWindowPixmap.man b/man/XCompositeNameWindowPixmap.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeNameWindowPixmap.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeQueryExtension.man b/man/XCompositeQueryExtension.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeQueryExtension.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeQueryVersion.man b/man/XCompositeQueryVersion.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeQueryVersion.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeRedirectSubwindows.man b/man/XCompositeRedirectSubwindows.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeRedirectSubwindows.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeRedirectWindow.man b/man/XCompositeRedirectWindow.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeRedirectWindow.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeReleaseOverlayWindow.man b/man/XCompositeReleaseOverlayWindow.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeReleaseOverlayWindow.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeUnredirectSubwindows.man b/man/XCompositeUnredirectSubwindows.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeUnredirectSubwindows.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeUnredirectWindow.man b/man/XCompositeUnredirectWindow.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeUnredirectWindow.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeVersion.man b/man/XCompositeVersion.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeVersion.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ commit 976db8a67a3e0462d0a675e2bfb2fe715e715bae Author: Gaetan Nadon <[email protected]> Date: Sat Aug 14 19:58:14 2010 -0400 config: upgrade to util-macros 1.8 for additional man page support Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS The value of MAN_SUBST is the same for all X.Org packages. Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index e63ef8f..56c180d 100644 --- a/configure.ac +++ b/configure.ac @@ -39,10 +39,10 @@ AC_INIT(libXcomposite, AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# 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.6 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.6) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) AM_CONFIG_HEADER(config.h) # Check for progs diff --git a/man/.gitignore b/man/.gitignore index c459112..6726abf 100644 --- a/man/.gitignore +++ b/man/.gitignore @@ -1,3 +1,2 @@ -# Add & Override for this directory and it's subdirectories +# Xcomposite.man is generated by xmlto from Xcomposite.xml Xcomposite.man -shadows.DONE diff --git a/man/Makefile.am b/man/Makefile.am index 54eb624..b768742 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -36,28 +36,11 @@ MAINTAINERCLEANFILES = $(libman_PRE) $(Xcomposite_shadowmen): $(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $@ -# Substitute system-specific values in man pages - -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|"__vendorversion__"|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(LIB_MAN_SUFFIX): - $(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ # Generate nroff sources from DocBook/xml commit dc0afc177521014462baa966359b45d7a40a0c63 Author: Fernando Carrijo <[email protected]> Date: Thu Jul 1 06:52:10 2010 -0300 Purge macros NEED_EVENTS and NEED_REPLIES Signed-off-by: Fernando Carrijo <[email protected]> Acked-by: Tiago Vignatti <[email protected]> Reviewed-by: Alan Coopersmith <[email protected]> diff --git a/src/xcompositeint.h b/src/xcompositeint.h index 57e876d..f9f1b46 100644 --- a/src/xcompositeint.h +++ b/src/xcompositeint.h @@ -45,8 +45,6 @@ #ifndef _XCOMPOSITEINT_H_ #define _XCOMPOSITEINT_H_ -#define NEED_EVENTS -#define NEED_REPLIES #include <stdio.h> #include <X11/Xlib.h> #include <X11/Xlibint.h> commit 219e4de3666e3a7dda42c64ab1539a4cc5adbee4 Author: Alan Coopersmith <[email protected]> Date: Wed Jun 30 22:49:26 2010 -0700 Remove unneeded dependencies from configure.ac & xcomposite.pc We only need Xfixes headers for the XserverRegion definition, don't need to link against it directly or require clients link against it, so only use CFLAGS from it in the Makefile, and only list it in Requires.private in the .pc file. Don't need libXext at all - no headers or functions from it are used. Also clean up some extra appearances of *_CFLAGS & *_LIBS that aren't needed. Signed-off-by: Alan Coopersmith <[email protected]> Reviewed-by: Dan Nicholson <[email protected]> Acked-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 3f44a9d..e63ef8f 100644 --- a/configure.ac +++ b/configure.ac @@ -65,9 +65,8 @@ if test "$VERSION" = "" ; then fi COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] AC_SUBST(COMPOSITEEXT_VERSION) -PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11 xfixes xext fixesproto) -AC_SUBST(XCOMPOSITE_CFLAGS) -AC_SUBST(XCOMPOSITE_LIBS) +PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11) +PKG_CHECK_MODULES(XFIXES, xfixes) AC_OUTPUT([Makefile src/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index e7b9db8..456bb88 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libXcomposite.la @@ -28,7 +28,7 @@ libXcomposite_la_SOURCES = \ xcompositeint.h \ Xcomposite.c -libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS) $(X_LIBS) $(XCOMPOSITE_LIBS) +libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS) libXcomposite_la_LDFLAGS = -version-number 1:0:0 -no-undefined diff --git a/xcomposite.pc.in b/xcomposite.pc.in index 18c2a12..bed1f29 100644 --- a/xcomposite.pc.in +++ b/xcomposite.pc.in @@ -4,9 +4,9 @@ libd...@libdir@ included...@includedir@ Name: Xcomposite -Description: X Composite Library +Description: X Composite Extension Library Version: @PACKAGE_VERSION@ -Requires: xproto compositeproto >= @COMPOSITEEXT_VERSION@ xfixes -Requires.private: x11 xfixes xext +Requires: xproto compositeproto >= @COMPOSITEEXT_VERSION@ +Requires.private: x11 xfixes Cflags: -I${includedir} Libs: -L${libdir} -lXcomposite -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
