From 408ada0589b76e0041f4c23ef92955b60ef215ef Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Fri, 14 Nov 2003 16:48:43 +0000 Subject: Initial revision --- xf86bigfont.h | 37 ++++++++++++++++++++++++ xf86bigfstr.h | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 xf86bigfont.h create mode 100644 xf86bigfstr.h diff --git a/xf86bigfont.h b/xf86bigfont.h new file mode 100644 index 0000000..7d6d163 --- /dev/null +++ b/xf86bigfont.h @@ -0,0 +1,37 @@ +/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ +/* + * Declarations for the BIGFONT extension. + * + * Copyright (c) 1999-2000 Bruno Haible + * Copyright (c) 1999-2000 The XFree86 Project, Inc. + */ + +/* THIS IS NOT AN X CONSORTIUM STANDARD */ + +#ifndef _XF86BIGFONT_H_ +#define _XF86BIGFONT_H_ + +#include + +#define X_XF86BigfontQueryVersion 0 +#define X_XF86BigfontQueryFont 1 + +#define XF86BigfontNumberEvents 0 + +#define XF86BigfontNumberErrors 0 + +#ifdef _XF86BIGFONT_SERVER_ + +_XFUNCPROTOBEGIN + +#include "font.h" + +extern void XFree86BigfontExtensionInit(void); +extern void XF86BigfontFreeFontShm(FontPtr); +extern void XF86BigfontCleanup(void); + +_XFUNCPROTOEND + +#endif /* _XF86BIGFONT_SERVER_ */ + +#endif /* _XF86BIGFONT_H_ */ diff --git a/xf86bigfstr.h b/xf86bigfstr.h new file mode 100644 index 0000000..9fce90b --- /dev/null +++ b/xf86bigfstr.h @@ -0,0 +1,93 @@ +/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.3 2001/08/01 00:44:35 tsi Exp $ */ +/* + * Declarations of request structures for the BIGFONT extension. + * + * Copyright (c) 1999-2000 Bruno Haible + * Copyright (c) 1999-2000 The XFree86 Project, Inc. + */ + +/* THIS IS NOT AN X CONSORTIUM STANDARD */ + +#ifndef _XF86BIGFSTR_H_ +#define _XF86BIGFSTR_H_ + +#include + +#define XF86BIGFONTNAME "XFree86-Bigfont" + +#define XF86BIGFONT_MAJOR_VERSION 1 /* current version numbers */ +#define XF86BIGFONT_MINOR_VERSION 1 + +typedef struct _XF86BigfontQueryVersion { + CARD8 reqType; /* always XF86BigfontReqCode */ + CARD8 xf86bigfontReqType; /* always X_XF86BigfontQueryVersion */ + CARD16 length B16; +} xXF86BigfontQueryVersionReq; +#define sz_xXF86BigfontQueryVersionReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + CARD8 capabilities; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD16 majorVersion B16; /* major version of XFree86-Bigfont */ + CARD16 minorVersion B16; /* minor version of XFree86-Bigfont */ + CARD32 uid B32; + CARD32 gid B32; + CARD32 signature B32; + CARD32 pad1 B32; + CARD32 pad2 B32; +} xXF86BigfontQueryVersionReply; +#define sz_xXF86BigfontQueryVersionReply 32 + +/* Bit masks that can be set in the capabilities */ +#define XF86Bigfont_CAP_LocalShm 1 + +typedef struct _XF86BigfontQueryFont { + CARD8 reqType; /* always XF86BigfontReqCode */ + CARD8 xf86bigfontReqType; /* always X_XF86BigfontQueryFont */ + CARD16 length B16; + CARD32 id B32; + CARD32 flags B32; +} xXF86BigfontQueryFontReq; +#define sz_xXF86BigfontQueryFontReq 12 + +typedef struct { + BYTE type; /* X_Reply */ + CARD8 pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + xCharInfo minBounds; +#ifndef WORD64 + CARD32 walign1 B32; +#endif + xCharInfo maxBounds; +#ifndef WORD64 + CARD32 walign2 B32; +#endif + CARD16 minCharOrByte2 B16; + CARD16 maxCharOrByte2 B16; + CARD16 defaultChar B16; + CARD16 nFontProps B16; + CARD8 drawDirection; + CARD8 minByte1; + CARD8 maxByte1; + BOOL allCharsExist; + INT16 fontAscent B16; + INT16 fontDescent B16; + CARD32 nCharInfos B32; + CARD32 nUniqCharInfos B32; + CARD32 shmid B32; + CARD32 shmsegoffset B32; + /* followed by nFontProps xFontProp structures */ + /* and if nCharInfos > 0 && shmid == -1, + followed by nUniqCharInfos xCharInfo structures + and then by nCharInfos CARD16 indices (each >= 0, < nUniqCharInfos) + and then, if nCharInfos is odd, one more CARD16 for padding. */ +} xXF86BigfontQueryFontReply; +#define sz_xXF86BigfontQueryFontReply 72 + +/* Bit masks that can be set in the flags */ +#define XF86Bigfont_FLAGS_Shm 1 + +#endif /* _XF86BIGFSTR_H_ */ -- cgit v1.2.3 -- cgit v1.2.3 From b12d799f50028d9fb7e0e279230178ab2486d311 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 26 Feb 2004 09:22:28 +0000 Subject: Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 --- xf86bigfont.h | 2 +- xf86bigfstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xf86bigfont.h b/xf86bigfont.h index 7d6d163..888a5cf 100644 --- a/xf86bigfont.h +++ b/xf86bigfont.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86$ */ /* * Declarations for the BIGFONT extension. * diff --git a/xf86bigfstr.h b/xf86bigfstr.h index 9fce90b..b62889d 100644 --- a/xf86bigfstr.h +++ b/xf86bigfstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.3 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86$ */ /* * Declarations of request structures for the BIGFONT extension. * -- cgit v1.2.3 From 76d42aac39d68c5ad128e3d22bfcab8b777890f8 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 26 Feb 2004 13:35:14 +0000 Subject: readding XFree86's cvs IDs --- xf86bigfont.h | 2 +- xf86bigfstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xf86bigfont.h b/xf86bigfont.h index 888a5cf..7d6d163 100644 --- a/xf86bigfont.h +++ b/xf86bigfont.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ /* * Declarations for the BIGFONT extension. * diff --git a/xf86bigfstr.h b/xf86bigfstr.h index b62889d..9fce90b 100644 --- a/xf86bigfstr.h +++ b/xf86bigfstr.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.3 2001/08/01 00:44:35 tsi Exp $ */ /* * Declarations of request structures for the BIGFONT extension. * -- cgit v1.2.3 From 304c9c7f8dc88530f7ebbb1a37517dad45f6c778 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 3 Mar 2004 12:10:54 +0000 Subject: Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 --- xf86bigfont.h | 2 +- xf86bigfstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xf86bigfont.h b/xf86bigfont.h index 7d6d163..9c47996 100644 --- a/xf86bigfont.h +++ b/xf86bigfont.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.1 2000/02/08 17:18:25 dawes Exp $ */ /* * Declarations for the BIGFONT extension. * diff --git a/xf86bigfstr.h b/xf86bigfstr.h index 9fce90b..7ba199b 100644 --- a/xf86bigfstr.h +++ b/xf86bigfstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.3 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.2 2000/02/29 03:09:00 dawes Exp $ */ /* * Declarations of request structures for the BIGFONT extension. * -- cgit v1.2.3 From 5c59f9c5f6733894c39fc928892d0c81bc32ad6d Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Sun, 14 Mar 2004 08:31:36 +0000 Subject: Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 --- xf86bigfont.h | 2 +- xf86bigfstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xf86bigfont.h b/xf86bigfont.h index 9c47996..7d6d163 100644 --- a/xf86bigfont.h +++ b/xf86bigfont.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.1 2000/02/08 17:18:25 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ /* * Declarations for the BIGFONT extension. * diff --git a/xf86bigfstr.h b/xf86bigfstr.h index 7ba199b..9fce90b 100644 --- a/xf86bigfstr.h +++ b/xf86bigfstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.2 2000/02/29 03:09:00 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.3 2001/08/01 00:44:35 tsi Exp $ */ /* * Declarations of request structures for the BIGFONT extension. * -- cgit v1.2.3 From 3a1efe7f2752739fdc4a4eb3f947b95cdda32f5e Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 23 Apr 2004 18:43:06 +0000 Subject: Merging XORG-CURRENT into trunk --- xf86bigfont.h | 2 +- xf86bigfstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xf86bigfont.h b/xf86bigfont.h index 7d6d163..9c47996 100644 --- a/xf86bigfont.h +++ b/xf86bigfont.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.1 2000/02/08 17:18:25 dawes Exp $ */ /* * Declarations for the BIGFONT extension. * diff --git a/xf86bigfstr.h b/xf86bigfstr.h index 9fce90b..7ba199b 100644 --- a/xf86bigfstr.h +++ b/xf86bigfstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.3 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.2 2000/02/29 03:09:00 dawes Exp $ */ /* * Declarations of request structures for the BIGFONT extension. * -- cgit v1.2.3 From 38587b109077cbe56b74f4324a6f9338b1a66df9 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Fri, 6 May 2005 01:46:32 +0000 Subject: Initial build system files for proto module. --- Makefile.am | 9 +++++++++ autogen.sh | 12 ++++++++++++ configure.ac | 6 ++++++ xf86bigfontext.pc.in | 9 +++++++++ 4 files changed, 36 insertions(+) create mode 100644 Makefile.am create mode 100755 autogen.sh create mode 100644 configure.ac create mode 100644 xf86bigfontext.pc.in diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..d576eb5 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,9 @@ +xf86bigfontdir = $(includedir)/X11/extensions +xf86bigfont_HEADERS = \ + xf86bigfont.h \ + xf86bigfstr.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = xf86bigfontext.pc + +EXTRA_DIST = autogen.sh xf86bigfontext.pc.in diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..904cd67 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..0187358 --- /dev/null +++ b/configure.ac @@ -0,0 +1,6 @@ +AC_PREREQ([2.57]) +AC_INIT([XF86BigFontExt], [7.0], [xorg@lists.freedesktop.org]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) + +AC_OUTPUT([Makefile + xf86bigfontext.pc]) diff --git a/xf86bigfontext.pc.in b/xf86bigfontext.pc.in new file mode 100644 index 0000000..b2b1f54 --- /dev/null +++ b/xf86bigfontext.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: XF86BigFontExt +Description: XF86BigFont extension headers +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} -- cgit v1.2.3 From 9f9835c828a2d8d51c099a829f7819a83f8a6f85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Mon, 9 May 2005 18:20:07 +0000 Subject: Change all the protonames from Ext to Proto. --- Makefile.am | 4 ++-- configure.ac | 4 ++-- xf86bigfontext.pc.in | 9 --------- xf86bigfontproto.pc.in | 9 +++++++++ 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 xf86bigfontext.pc.in create mode 100644 xf86bigfontproto.pc.in diff --git a/Makefile.am b/Makefile.am index d576eb5..1d07e50 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,6 @@ xf86bigfont_HEADERS = \ xf86bigfstr.h pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = xf86bigfontext.pc +pkgconfig_DATA = xf86bigfontproto.pc -EXTRA_DIST = autogen.sh xf86bigfontext.pc.in +EXTRA_DIST = autogen.sh xf86bigfontproto.pc.in diff --git a/configure.ac b/configure.ac index 0187358..3d4ffb4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) -AC_INIT([XF86BigFontExt], [7.0], [xorg@lists.freedesktop.org]) +AC_INIT([XF86BigFontProto], [7.0], [xorg@lists.freedesktop.org]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile - xf86bigfontext.pc]) + xf86bigfontproto.pc]) diff --git a/xf86bigfontext.pc.in b/xf86bigfontext.pc.in deleted file mode 100644 index b2b1f54..0000000 --- a/xf86bigfontext.pc.in +++ /dev/null @@ -1,9 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: XF86BigFontExt -Description: XF86BigFont extension headers -Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} diff --git a/xf86bigfontproto.pc.in b/xf86bigfontproto.pc.in new file mode 100644 index 0000000..0db8c18 --- /dev/null +++ b/xf86bigfontproto.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: XF86BigFontProto +Description: XF86BigFont extension headers +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} -- cgit v1.2.3 From 760d1a6e003e73b17539ee0dffc260d9cd282fcb Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Wed, 18 May 2005 07:38:46 +0000 Subject: Add COPYING file for XF86BigFont; assumed to be under the XFree86 catch-all license. --- COPYING | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..9f1e999 --- /dev/null +++ b/COPYING @@ -0,0 +1,20 @@ +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 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 +XFREE86 PROJECT 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 XFree86 Project 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 XFree86 Project. -- cgit v1.2.3 From 74f2a736c54d85c4c6d98134a74859e748ee5046 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 19 May 2005 00:10:20 +0000 Subject: Require automake 1.7 in AM_INIT_AUTOMAKE --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3d4ffb4..623be98 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) AC_INIT([XF86BigFontProto], [7.0], [xorg@lists.freedesktop.org]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_INIT_AUTOMAKE([1.7], [foreign dist-bzip2]) AC_OUTPUT([Makefile xf86bigfontproto.pc]) -- cgit v1.2.3 From 2547b35e1f21a90ade799f0545b4fb50f9753337 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 19 May 2005 00:22:40 +0000 Subject: revert last change, didn't do right thing at all, sorry for the noise --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 623be98..3d4ffb4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) AC_INIT([XF86BigFontProto], [7.0], [xorg@lists.freedesktop.org]) -AM_INIT_AUTOMAKE([1.7], [foreign dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile xf86bigfontproto.pc]) -- cgit v1.2.3 From b7d38e63461b3063362d0c5c9716c40e8b643e43 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sat, 21 May 2005 04:54:25 +0000 Subject: Set version to 1.1. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3d4ffb4..da9d629 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XF86BigFontProto], [7.0], [xorg@lists.freedesktop.org]) +AC_INIT([XF86BigFontProto], [1.1], [xorg@lists.freedesktop.org]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile -- cgit v1.2.3 From 9626de7ff9aef3ab7652e5a7a5f967b7a1dd5307 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sun, 3 Jul 2005 07:13:11 +0000 Subject: Change include path to . --- xf86bigfont.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xf86bigfont.h b/xf86bigfont.h index 9c47996..654cc40 100644 --- a/xf86bigfont.h +++ b/xf86bigfont.h @@ -24,7 +24,7 @@ _XFUNCPROTOBEGIN -#include "font.h" +#include extern void XFree86BigfontExtensionInit(void); extern void XF86BigfontFreeFontShm(FontPtr); -- cgit v1.2.3 From 39818ff31644cbd2029365f7ef5ea9555b8cb147 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Fri, 29 Jul 2005 21:22:57 +0000 Subject: Various changes preparing packages for RC0: - Verify and update package version numbers as needed - Implement versioning scheme - Change bug address to point to bugzilla bug entry form - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to reenable it) - Fix makedepend to use pkgconfig and pass distcheck - Update build script to build macros first - Update modular Xorg version --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index da9d629..691fa6a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,8 @@ AC_PREREQ([2.57]) -AC_INIT([XF86BigFontProto], [1.1], [xorg@lists.freedesktop.org]) +AC_INIT([XF86BigFontProto], [1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) - + +XORG_RELEASE_VERSION + AC_OUTPUT([Makefile xf86bigfontproto.pc]) -- cgit v1.2.3 From 238ef28dfd19be8f2937e5ed80c66a0844ec07a4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 2 Aug 2005 19:19:40 +0000 Subject: Add basic .cvsignore files for proto modules. --- .cvsignore | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .cvsignore diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..18bc491 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,10 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure +install-sh +missing +xf86bigfontproto.pc -- cgit v1.2.3 From bc637a1d3a5e4b0cc4094987ffc0afd719193979 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Wed, 19 Oct 2005 02:48:16 +0000 Subject: Update package version number for RC1 release. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 691fa6a..d8b123b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XF86BigFontProto], [1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XF86BigFontProto], [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION -- cgit v1.2.3 From dc91454a65edc305e6181368cfb06775f9622158 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Thu, 15 Dec 2005 00:24:39 +0000 Subject: Update package version number for final X11R7 release candidate. --- ChangeLog | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..c722b51 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,4 @@ +2005-12-14 Kevin E. Martin + + * configure.ac: + Update package version number for final X11R7 release candidate. diff --git a/configure.ac b/configure.ac index d8b123b..765b761 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XF86BigFontProto], [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XF86BigFontProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION -- cgit v1.2.3 From d1b1b7356e077dd238ecccb99cde406605284c2d Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 14 Jul 2006 18:56:43 -0700 Subject: renamed: .cvsignore -> .gitignore --- .cvsignore | 10 ---------- .gitignore | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 18bc491..0000000 --- a/.cvsignore +++ /dev/null @@ -1,10 +0,0 @@ -Makefile -Makefile.in -aclocal.m4 -autom4te.cache -config.log -config.status -configure -install-sh -missing -xf86bigfontproto.pc diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..18bc491 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure +install-sh +missing +xf86bigfontproto.pc -- cgit v1.2.3 From 505cd9e0c6d8e7d4ea916d3f1453bbeb7925c3a1 Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 3 Sep 2007 05:54:26 -0400 Subject: Add *~ to .gitignore to skip patch/emacs droppings --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 18bc491..793e65e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ configure install-sh missing xf86bigfontproto.pc +*~ -- cgit v1.2.3 From 0c40374c853c83ecc0a74b4fc34cdc3140b1c3ca Mon Sep 17 00:00:00 2001 From: James Cloos Date: Thu, 6 Dec 2007 16:39:11 -0500 Subject: Replace static ChangeLog with dist-hook to generate from git log --- ChangeLog | 4 ---- Makefile.am | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index c722b51..0000000 --- a/ChangeLog +++ /dev/null @@ -1,4 +0,0 @@ -2005-12-14 Kevin E. Martin - - * configure.ac: - Update package version number for final X11R7 release candidate. diff --git a/Makefile.am b/Makefile.am index 1d07e50..74fd36e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,3 +7,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xf86bigfontproto.pc EXTRA_DIST = autogen.sh xf86bigfontproto.pc.in + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog -- cgit v1.2.3 From b9f44fb9fdfdc623311774afdd0b7a819ba9ffec Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Tue, 27 Jan 2009 20:06:28 -0200 Subject: Janitor: Correct make distcheck and dont distribute autogen.sh --- .gitignore | 3 +++ Makefile.am | 4 ++-- configure.ac | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 793e65e..5d5ba9f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ install-sh missing xf86bigfontproto.pc *~ +xf86bigfontproto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 74fd36e..491e87c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ xf86bigfont_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xf86bigfontproto.pc -EXTRA_DIST = autogen.sh xf86bigfontproto.pc.in +EXTRA_DIST = xf86bigfontproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -14,6 +14,6 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 765b761..37f58c2 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([XF86BigFontProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +# Require xorg-macros: XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile xf86bigfontproto.pc]) -- cgit v1.2.3 From d405a7201f4de2121530b67f7628f95d2e0467b1 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 26 Aug 2009 14:58:08 +1000 Subject: Rename xf86bigfstr.h to xf86bigfproto.h for consistency with other modules. Leaving a stub xf86bigfstr.h in place to avoid clients breaking. Signed-off-by: Peter Hutterer --- Makefile.am | 1 + xf86bigfproto.h | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ xf86bigfstr.h | 96 ++------------------------------------------------------- 3 files changed, 97 insertions(+), 93 deletions(-) create mode 100644 xf86bigfproto.h diff --git a/Makefile.am b/Makefile.am index 491e87c..bc0af80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ xf86bigfontdir = $(includedir)/X11/extensions xf86bigfont_HEADERS = \ xf86bigfont.h \ + xf86bigfproto.h \ xf86bigfstr.h pkgconfigdir = $(libdir)/pkgconfig diff --git a/xf86bigfproto.h b/xf86bigfproto.h new file mode 100644 index 0000000..14f5ac4 --- /dev/null +++ b/xf86bigfproto.h @@ -0,0 +1,93 @@ +/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.2 2000/02/29 03:09:00 dawes Exp $ */ +/* + * Declarations of request structures for the BIGFONT extension. + * + * Copyright (c) 1999-2000 Bruno Haible + * Copyright (c) 1999-2000 The XFree86 Project, Inc. + */ + +/* THIS IS NOT AN X CONSORTIUM STANDARD */ + +#ifndef _XF86BIGFPROTO_H_ +#define _XF86BIGFPROTO_H_ + +#include + +#define XF86BIGFONTNAME "XFree86-Bigfont" + +#define XF86BIGFONT_MAJOR_VERSION 1 /* current version numbers */ +#define XF86BIGFONT_MINOR_VERSION 1 + +typedef struct _XF86BigfontQueryVersion { + CARD8 reqType; /* always XF86BigfontReqCode */ + CARD8 xf86bigfontReqType; /* always X_XF86BigfontQueryVersion */ + CARD16 length B16; +} xXF86BigfontQueryVersionReq; +#define sz_xXF86BigfontQueryVersionReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + CARD8 capabilities; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD16 majorVersion B16; /* major version of XFree86-Bigfont */ + CARD16 minorVersion B16; /* minor version of XFree86-Bigfont */ + CARD32 uid B32; + CARD32 gid B32; + CARD32 signature B32; + CARD32 pad1 B32; + CARD32 pad2 B32; +} xXF86BigfontQueryVersionReply; +#define sz_xXF86BigfontQueryVersionReply 32 + +/* Bit masks that can be set in the capabilities */ +#define XF86Bigfont_CAP_LocalShm 1 + +typedef struct _XF86BigfontQueryFont { + CARD8 reqType; /* always XF86BigfontReqCode */ + CARD8 xf86bigfontReqType; /* always X_XF86BigfontQueryFont */ + CARD16 length B16; + CARD32 id B32; + CARD32 flags B32; +} xXF86BigfontQueryFontReq; +#define sz_xXF86BigfontQueryFontReq 12 + +typedef struct { + BYTE type; /* X_Reply */ + CARD8 pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + xCharInfo minBounds; +#ifndef WORD64 + CARD32 walign1 B32; +#endif + xCharInfo maxBounds; +#ifndef WORD64 + CARD32 walign2 B32; +#endif + CARD16 minCharOrByte2 B16; + CARD16 maxCharOrByte2 B16; + CARD16 defaultChar B16; + CARD16 nFontProps B16; + CARD8 drawDirection; + CARD8 minByte1; + CARD8 maxByte1; + BOOL allCharsExist; + INT16 fontAscent B16; + INT16 fontDescent B16; + CARD32 nCharInfos B32; + CARD32 nUniqCharInfos B32; + CARD32 shmid B32; + CARD32 shmsegoffset B32; + /* followed by nFontProps xFontProp structures */ + /* and if nCharInfos > 0 && shmid == -1, + followed by nUniqCharInfos xCharInfo structures + and then by nCharInfos CARD16 indices (each >= 0, < nUniqCharInfos) + and then, if nCharInfos is odd, one more CARD16 for padding. */ +} xXF86BigfontQueryFontReply; +#define sz_xXF86BigfontQueryFontReply 72 + +/* Bit masks that can be set in the flags */ +#define XF86Bigfont_FLAGS_Shm 1 + +#endif /* _XF86BIGFPROTO_H_ */ diff --git a/xf86bigfstr.h b/xf86bigfstr.h index 7ba199b..cf6735d 100644 --- a/xf86bigfstr.h +++ b/xf86bigfstr.h @@ -1,93 +1,3 @@ -/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.2 2000/02/29 03:09:00 dawes Exp $ */ -/* - * Declarations of request structures for the BIGFONT extension. - * - * Copyright (c) 1999-2000 Bruno Haible - * Copyright (c) 1999-2000 The XFree86 Project, Inc. - */ - -/* THIS IS NOT AN X CONSORTIUM STANDARD */ - -#ifndef _XF86BIGFSTR_H_ -#define _XF86BIGFSTR_H_ - -#include - -#define XF86BIGFONTNAME "XFree86-Bigfont" - -#define XF86BIGFONT_MAJOR_VERSION 1 /* current version numbers */ -#define XF86BIGFONT_MINOR_VERSION 1 - -typedef struct _XF86BigfontQueryVersion { - CARD8 reqType; /* always XF86BigfontReqCode */ - CARD8 xf86bigfontReqType; /* always X_XF86BigfontQueryVersion */ - CARD16 length B16; -} xXF86BigfontQueryVersionReq; -#define sz_xXF86BigfontQueryVersionReq 4 - -typedef struct { - BYTE type; /* X_Reply */ - CARD8 capabilities; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of XFree86-Bigfont */ - CARD16 minorVersion B16; /* minor version of XFree86-Bigfont */ - CARD32 uid B32; - CARD32 gid B32; - CARD32 signature B32; - CARD32 pad1 B32; - CARD32 pad2 B32; -} xXF86BigfontQueryVersionReply; -#define sz_xXF86BigfontQueryVersionReply 32 - -/* Bit masks that can be set in the capabilities */ -#define XF86Bigfont_CAP_LocalShm 1 - -typedef struct _XF86BigfontQueryFont { - CARD8 reqType; /* always XF86BigfontReqCode */ - CARD8 xf86bigfontReqType; /* always X_XF86BigfontQueryFont */ - CARD16 length B16; - CARD32 id B32; - CARD32 flags B32; -} xXF86BigfontQueryFontReq; -#define sz_xXF86BigfontQueryFontReq 12 - -typedef struct { - BYTE type; /* X_Reply */ - CARD8 pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - xCharInfo minBounds; -#ifndef WORD64 - CARD32 walign1 B32; -#endif - xCharInfo maxBounds; -#ifndef WORD64 - CARD32 walign2 B32; -#endif - CARD16 minCharOrByte2 B16; - CARD16 maxCharOrByte2 B16; - CARD16 defaultChar B16; - CARD16 nFontProps B16; - CARD8 drawDirection; - CARD8 minByte1; - CARD8 maxByte1; - BOOL allCharsExist; - INT16 fontAscent B16; - INT16 fontDescent B16; - CARD32 nCharInfos B32; - CARD32 nUniqCharInfos B32; - CARD32 shmid B32; - CARD32 shmsegoffset B32; - /* followed by nFontProps xFontProp structures */ - /* and if nCharInfos > 0 && shmid == -1, - followed by nUniqCharInfos xCharInfo structures - and then by nCharInfos CARD16 indices (each >= 0, < nUniqCharInfos) - and then, if nCharInfos is odd, one more CARD16 for padding. */ -} xXF86BigfontQueryFontReply; -#define sz_xXF86BigfontQueryFontReply 72 - -/* Bit masks that can be set in the flags */ -#define XF86Bigfont_FLAGS_Shm 1 - -#endif /* _XF86BIGFSTR_H_ */ +#warning "xf86bigfstr.h is obsolete and may be removed in the future." +#warning "include for the protocol defines." +#include -- cgit v1.2.3 From 606268163c99ca8996399a9f99d240ac8253c7f3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 26 Aug 2009 14:59:47 +1000 Subject: Remove RCS tags Signed-off-by: Peter Hutterer --- xf86bigfont.h | 1 - xf86bigfproto.h | 1 - 2 files changed, 2 deletions(-) diff --git a/xf86bigfont.h b/xf86bigfont.h index 654cc40..c39f43b 100644 --- a/xf86bigfont.h +++ b/xf86bigfont.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.1 2000/02/08 17:18:25 dawes Exp $ */ /* * Declarations for the BIGFONT extension. * diff --git a/xf86bigfproto.h b/xf86bigfproto.h index 14f5ac4..c041c9a 100644 --- a/xf86bigfproto.h +++ b/xf86bigfproto.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.2 2000/02/29 03:09:00 dawes Exp $ */ /* * Declarations of request structures for the BIGFONT extension. * -- cgit v1.2.3 From ba8d972415ab6b45aa1ba31eae8706f92d60c2af Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 26 Aug 2009 15:23:12 +1000 Subject: Remove server-specific declarations. --- xf86bigfont.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/xf86bigfont.h b/xf86bigfont.h index c39f43b..1bf47e9 100644 --- a/xf86bigfont.h +++ b/xf86bigfont.h @@ -10,8 +10,6 @@ #ifndef _XF86BIGFONT_H_ #define _XF86BIGFONT_H_ -#include - #define X_XF86BigfontQueryVersion 0 #define X_XF86BigfontQueryFont 1 @@ -19,18 +17,4 @@ #define XF86BigfontNumberErrors 0 -#ifdef _XF86BIGFONT_SERVER_ - -_XFUNCPROTOBEGIN - -#include - -extern void XFree86BigfontExtensionInit(void); -extern void XF86BigfontFreeFontShm(FontPtr); -extern void XF86BigfontCleanup(void); - -_XFUNCPROTOEND - -#endif /* _XF86BIGFONT_SERVER_ */ - #endif /* _XF86BIGFONT_H_ */ -- cgit v1.2.3 From 059880bf0f9292b90a139d1eebe3bf18390d0a83 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 26 Aug 2009 15:25:15 +1000 Subject: xf86bigfontproto 1.2.0 Signed-off-by: Peter Hutterer --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 37f58c2..2ad3435 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XF86BigFontProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XF86BigFontProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_CHANGELOG -- cgit v1.2.3 From cd90529a14b2fc2c04e89e546232570d87d15d6c Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sat, 14 Nov 2009 18:26:47 -0500 Subject: .gitignore: use common defaults with custom section # 24239 Using common defaults will reduce errors and maintenance. Only the very small or inexistent custom section need periodic maintenance when the structure of the component changes. Do not edit defaults. --- .gitignore | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 71 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5d5ba9f..6318297 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,78 @@ -Makefile -Makefile.in +# +# 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 +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 -xf86bigfontproto.pc +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ -xf86bigfontproto-*.tar.* -ChangeLog -tags +*.[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 xf86bigfontproto +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# -- cgit v1.2.3 From d99db191f55e0cc11e9c4bcf2eebea5148a2df7f Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 13:55:25 -0500 Subject: configure.ac: AM_MAINTAINER_MODE missing #24238 This turns off maintainer mode build rules in tarballs. Works in conjunction with autogen.sh --enable-maintainer-mode --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 2ad3435..b843af3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ AC_PREREQ([2.57]) AC_INIT([XF86BigFontProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE # Require xorg-macros: XORG_CHANGELOG m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -- cgit v1.2.3 From 6ea1e170b8f7bfd277ae73aae1a45ea41fbd6684 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 18:11:36 -0500 Subject: configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242 This macro aggregate a number of existing macros that sets commmon X.Org components configuration options. It shields the configuration file from future changes. --- configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index b843af3..7ec485a 100644 --- a/configure.ac +++ b/configure.ac @@ -3,11 +3,11 @@ AC_INIT([XF86BigFontProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) -XORG_RELEASE_VERSION -XORG_CHANGELOG +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AC_OUTPUT([Makefile xf86bigfontproto.pc]) -- cgit v1.2.3 From 63fe565b82f5779d2750e2b718ae31e3e3119964 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 18:31:29 -0500 Subject: Makefile.am: INSTALL file is missing or incorrect #24206 The standard GNU file on building/installing tarball is copied using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS Add INSTALL target --- Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index bc0af80..e43d84c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,9 +12,12 @@ EXTRA_DIST = xf86bigfontproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL -- cgit v1.2.3 From 7fa7c96097516f31a3114e6ddc4be7087da5f1a2 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 19:45:27 -0500 Subject: Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 ChangeLog filename is known to Automake and requires no further coding in the makefile. --- Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index e43d84c..2253edd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,9 +9,6 @@ pkgconfig_DATA = xf86bigfontproto.pc EXTRA_DIST = xf86bigfontproto.pc.in -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog - .PHONY: ChangeLog INSTALL INSTALL: -- cgit v1.2.3 From 8cf0424b80b22938a6c713bd4d06e5416d03fc06 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Mon, 16 Nov 2009 11:13:30 -0500 Subject: README: file created or updated #24206 Contains a set of URLs to freedesktop.org. --- README | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 README diff --git a/README b/README new file mode 100644 index 0000000..734fa73 --- /dev/null +++ b/README @@ -0,0 +1,27 @@ + XFree86 Bigfont Extension + +Extension name: XFree86-Bigfont + +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/proto/xf86bigfontproto + + http://cgit.freedesktop.org/xorg/proto/xf86bigfontproto + +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 + -- cgit v1.2.3 From 77b683e208ba95280829fb670aabcfa4dc2fb87a Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 22 Nov 2009 19:24:48 -0500 Subject: Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2253edd..e45230a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,8 @@ pkgconfig_DATA = xf86bigfontproto.pc EXTRA_DIST = xf86bigfontproto.pc.in +MAINTAINERCLEANFILES = ChangeLog INSTALL + .PHONY: ChangeLog INSTALL INSTALL: -- cgit v1.2.3 From d672fc9bcb27018f10049552428b205f48c59d00 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 28 Mar 2010 19:00:31 -0400 Subject: config: remove the pkgconfig pc.in file from EXTRA_DIST Automake always includes it in the tarball. Signed-off-by: Gaetan Nadon --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index e45230a..194214d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,6 @@ xf86bigfont_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xf86bigfontproto.pc -EXTRA_DIST = xf86bigfontproto.pc.in MAINTAINERCLEANFILES = ChangeLog INSTALL -- cgit v1.2.3 From ed32d712ec9befdc40fb22d34152bae976be0823 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 28 Mar 2010 19:25:52 -0400 Subject: config: update AC_PREREQ statement to 2.60 Unrelated to the previous patches, the new value simply reflects the reality that the minimum level for autoconf to configure all x.org modules is 2.60 dated June 2006. ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz Signed-off-by: Gaetan Nadon --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7ec485a..2f31d52 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) AC_INIT([XF86BigFontProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -- cgit v1.2.3 From 442308a06bf4f7b64142eedc054f28dc842c10a6 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 15 Jan 2013 14:01:10 -0500 Subject: configure: Remove AM_MAINTAINER_MODE Signed-off-by: Adam Jackson --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2f31d52..cd98438 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,6 @@ AC_PREREQ([2.60]) AC_INIT([XF86BigFontProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], -- cgit v1.2.3 From f805b328b2195de384c0fb6b82ef5f88c179b2c0 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 4 Jan 2012 17:37:06 -0500 Subject: autogen.sh: Implement GNOME Build API http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson --- autogen.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 904cd67..fc34bd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +if test -z "$NOCONFIGURE"; then + $srcdir/configure "$@" +fi -- cgit v1.2.3 From b7640197a0086e7c96a20bbe7ff221a8258342d3 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sat, 26 Oct 2013 09:42:05 -0400 Subject: config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES Fix Automake warning: AC_OUTPUT should be used without arguments. www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files Signed-off-by: Gaetan Nadon --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index cd98438..d289bdd 100644 --- a/configure.ac +++ b/configure.ac @@ -8,5 +8,6 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.3) XORG_DEFAULT_OPTIONS -AC_OUTPUT([Makefile +AC_CONFIG_FILES([Makefile xf86bigfontproto.pc]) +AC_OUTPUT -- cgit v1.2.3 From 73dd51cfb48463890ed72db44adaba65ca44af17 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 24 Jan 2017 10:32:07 +1000 Subject: autogen.sh: use exec instead of waiting for configure to finish Syncs the invocation of configure with the one from the server. Signed-off-by: Peter Hutterer --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index fc34bd5..fd9c59a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,5 +10,5 @@ autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? if test -z "$NOCONFIGURE"; then - $srcdir/configure "$@" + exec $srcdir/configure "$@" fi -- cgit v1.2.3 From a20112f8dfa09eb0967766674bd53c5beac7fb1b Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 9 Mar 2015 12:00:52 +0000 Subject: autogen.sh: use quoted string variables Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent fall-outs, when they contain space. Signed-off-by: Emil Velikov Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- autogen.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index fd9c59a..0006de8 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,14 +1,14 @@ #! /bin/sh -srcdir=`dirname $0` +srcdir=`dirname "$0"` test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` -cd $srcdir +cd "$srcdir" autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? +cd "$ORIGDIR" || exit $? if test -z "$NOCONFIGURE"; then - exec $srcdir/configure "$@" + exec "$srcdir"/configure "$@" fi -- cgit v1.2.3 From 6f0e61b46289f4f07126fd9b95d35ff91637a44c Mon Sep 17 00:00:00 2001 From: Mihail Konev Date: Thu, 26 Jan 2017 13:52:49 +1000 Subject: autogen: add default patch prefix Signed-off-by: Mihail Konev --- autogen.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/autogen.sh b/autogen.sh index 0006de8..49d73de 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,6 +9,9 @@ cd "$srcdir" autoreconf -v --install || exit 1 cd "$ORIGDIR" || exit $? +git config --local --get format.subjectPrefix >/dev/null 2>&1 || + git config --local format.subjectPrefix "PATCH xf86bigfontproto" + if test -z "$NOCONFIGURE"; then exec "$srcdir"/configure "$@" fi -- cgit v1.2.3