libxxf86dga: Changes to 'debian-unstable'
.gitignore | 73 +++++++++++++---
COPYING | 22 ++++
ChangeLog | 178 ++++++++++++++++++++++++++++++++++++++++
Makefile.am | 10 +-
configure.ac | 16 ++-
debian/changelog | 13 ++
debian/control | 4
debian/copyright | 22 ++++
debian/rules | 2
man/Makefile.am | 125 +++++++++++-----------------
man/XDGA.man | 1
man/XDGAChangePixmapMode.man | 1
man/XDGACloseFramebuffer.man | 1
man/XDGACopyArea.man | 1
man/XDGACopyTransparentArea.man | 1
man/XDGACreateColormap.man | 1
man/XDGAFillRectangle.man | 1
man/XDGAGetViewportStatus.man | 1
man/XDGAInstallColormap.man | 1
man/XDGAKeyEventToXKeyEvent.man | 1
man/XDGAOpenFramebuffer.man | 1
man/XDGAQueryExtension.man | 1
man/XDGAQueryModes.man | 1
man/XDGAQueryVersion.man | 1
man/XDGASelectInput.man | 1
man/XDGASetClientVersion.man | 1
man/XDGASetMode.man | 1
man/XDGASetViewport.man | 1
man/XDGASync.man | 1
man/XF86DGA.man | 1
man/XFree86-DGA.man | 1
src/Makefile.am | 6 -
src/XF86DGA.c | 3
src/XF86DGA2.c | 3
34 files changed, 377 insertions(+), 121 deletions(-)
New commits:
commit 399081d0e2cadbb1259755716d0a1bead32e946b
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 12:00:40 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 1e2c784..9d76d04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxxf86dga (2:1.1.2-1) UNRELEASED; urgency=low
+libxxf86dga (2:1.1.2-1) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -13,7 +13,7 @@ libxxf86dga (2:1.1.2-1) UNRELEASED; urgency=low
* Exclude libXxf86dga.la from dh_install accordingly.
* Add myself to Uploaders.
- -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 11:50:01 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 12:00:34 +0100
libxxf86dga (2:1.1.1-2) unstable; urgency=low
commit 390f6e5da42ccbc7f5bf9da462d4ede7677f1236
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 12:00:23 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index bf129b1..1e2c784 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ libxxf86dga (2:1.1.2-1) UNRELEASED; urgency=low
* Bump xutils-dev build-dep for new macros.
* Switch from --list-missing to --fail-missing for additional safety.
* Exclude libXxf86dga.la from dh_install accordingly.
+ * Add myself to Uploaders.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 11:50:01 +0100
diff --git a/debian/control b/debian/control
index ea21345..0f02b5e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxxf86dga
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
libx11-dev (>= 1:0.99.2),
commit 60366fef66ff54febf0e9859dcbeb56730b7d61a
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 11:59:46 2010 +0100
Exclude libXxf86dga.la from dh_install accordingly.
diff --git a/debian/changelog b/debian/changelog
index e838067..bf129b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ libxxf86dga (2:1.1.2-1) UNRELEASED; urgency=low
* Update debian/copyright from upstream COPYING.
* Bump xutils-dev build-dep for new macros.
* Switch from --list-missing to --fail-missing for additional safety.
+ * Exclude libXxf86dga.la from dh_install accordingly.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 11:50:01 +0100
diff --git a/debian/rules b/debian/rules
index 23b348b..c0203c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --fail-missing
+ dh_install --sourcedir=debian/tmp --fail-missing -XlibXxf86dga.la
dh_installchangelogs ChangeLog
dh_link
dh_strip --dbg-package=$(PACKAGE)-dbg
commit 7840ffaa478b2dcd36a26b2ae8ba185675b2b724
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 11:53:41 2010 +0100
Switch from --list-missing to --fail-missing for additional safety.
diff --git a/debian/changelog b/debian/changelog
index a0a129b..e838067 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ libxxf86dga (2:1.1.2-1) UNRELEASED; urgency=low
* New upstream release.
* Update debian/copyright from upstream COPYING.
* Bump xutils-dev build-dep for new macros.
+ * Switch from --list-missing to --fail-missing for additional safety.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 11:50:01 +0100
diff --git a/debian/rules b/debian/rules
index f48c1ec..23b348b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --fail-missing
dh_installchangelogs ChangeLog
dh_link
dh_strip --dbg-package=$(PACKAGE)-dbg
commit 7875d56a6adc7740af4e7a32208da140fe42ba18
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 11:52:58 2010 +0100
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index e8ae220..a0a129b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libxxf86dga (2:1.1.2-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstream release.
* Update debian/copyright from upstream COPYING.
+ * Bump xutils-dev build-dep for new macros.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 11:50:01 +0100
diff --git a/debian/control b/debian/control
index 19ca20d..ea21345 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
quilt,
automake,
libtool,
- xutils-dev (>= 1:7.5~1)
+ xutils-dev (>= 1:7.5+4),
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxxf86dga
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxxf86dga.git
commit dbf6683b4d359eed7250996774c3d2974457f6ba
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 11:51:50 2010 +0100
Update debian/copyright from upstream COPYING.
diff --git a/debian/changelog b/debian/changelog
index e3bf1e5..e8ae220 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libxxf86dga (2:1.1.2-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstream release.
+ * Update debian/copyright from upstream COPYING.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 11:50:01 +0100
diff --git a/debian/copyright b/debian/copyright
index 26a5b9b..04e979c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,10 +6,24 @@ Copyright (c) 1995, 1996 The XFree86 Project, Inc
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, sublicence, 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:
+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 fur-
+nished 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 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.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS 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 CON-
+NECTION 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.
+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 deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
commit 6cce5fce5cb03f3812839c0a0bb8e8958d1cb5ab
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 11:50:15 2010 +0100
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index b2c9b03..fe0a013 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,181 @@
+commit 3eb0d49a8d673c79ba9714d027f1ee056cf4b0b9
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 29 18:00:17 2010 -0700
+
+ libXxf86dga 1.1.2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 967c47b8e431e1b4a25b3436ba4e130cc7eee5b5
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 29 17:58:37 2010 -0700
+
+ Sun's copyrights now belong to Oracle
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a9cad8418292ee2291004d2c9ada7547120b53fd
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:30:04 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a8a764e1c41a8f261f768e9ac2ef24e23ba6eedd
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Aug 17 14:37:23 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 <memsize@videotron.ca>
+
+commit 7395fb5197549ce048b9e759eb27cd7f4f284c66
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jul 8 15:28:39 2010 -0700
+
+ Use make rules instead of shell for loops to generate shadow man pages
+
+ Allows parallel make and simpler build logs/error reporting
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 30a8e2d18fe6dc9fac599e2570360ebb27207811
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jul 8 15:26:35 2010 -0700
+
+ 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
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 86ece63cf0d038eb36e80cc4836eb387c407b773
+Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
+Date: Thu Jul 1 07:08:11 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 5c9d042d4450d28c50258895885836253fbf5e61
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Mar 29 16:50:34 2010 -0400
+
+ 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 <memsize@videotron.ca>
+
+commit e8483875af8417918ce99fac61982167f96acf17
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Mar 29 14:53:49 2010 -0400
+
+ config: remove the pkgconfig pc.in file from EXTRA_DIST
+
+ Automake always includes it in the tarball.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1ad4c147bbaf1523adba2e9f4b289c0fb4360097
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Feb 16 10:37:21 2010 -0500
+
+ config: move CWARNFLAGS from configure.ac to Makefile.am
+
+ Compiler warning flags should be explicitly set in the makefile
+ rather than being merged with other packages compiler flags.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 253089a20d1496ef4102d06d603f1755e5e6e746
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jan 14 10:37:36 2010 -0500
+
+ COPYING: fix copyright notice format
+
+ Newlines and spaces.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 639c859ee3b74088a50bc0402f99261bd5c0f3e9
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jan 14 20:56:48 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit cc8610353912c7002da001365cb9a27e1e02091a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Nov 27 20:56:04 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 6631f7b26574e665dfec6003ecc8d0bf77151ab4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:09:10 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit 7c8e098dece92f8ac824c8e2eb3e737cacee57e7
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Oct 27 15:07:26 2009 -0400
+
+ 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.
+
+commit 8255d46aafed7f7527360b7b1dbf2333ad41444a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Oct 26 22:08:43 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit efd0fb6f31ee88887e16e98dca89473ff2bb56a1
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 12:34:19 2009 -0400
+
+ .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.
+
commit 990b19154368d9a1733636367d6a99d863d558ee
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 6 16:14:45 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index 3f28134..e3bf1e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-libxxf86dga (2:1.1.1-3) UNRELEASED; urgency=low
+libxxf86dga (2:1.1.2-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
- -- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:39 +0000
+ [ Cyril Brulebois ]
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 11:50:01 +0100
libxxf86dga (2:1.1.1-2) unstable; urgency=low
commit 3eb0d49a8d673c79ba9714d027f1ee056cf4b0b9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 18:00:17 2010 -0700
libXxf86dga 1.1.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 677ef6a..9ac50b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,8 @@
AC_PREREQ([2.60])
-AC_INIT(libXxf86dga, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
+AC_INIT([libXxf86dga], [1.1.2],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [libXxf86dga])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 967c47b8e431e1b4a25b3436ba4e130cc7eee5b5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 17:58:37 2010 -0700
Sun's copyrights now belong to Oracle
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 624b17c..7b12599 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# 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"),
@@ -19,7 +19,7 @@
# 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)
commit a9cad8418292ee2291004d2c9ada7547120b53fd
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:30:04 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/XDGA.man b/man/XDGA.man
index 9c7beef..5bff838 100644
--- a/man/XDGA.man
+++ b/man/XDGA.man
@@ -1,4 +1,3 @@
-.\" $XFree86$
.\"
.TH XDGA 3 __vendorversion__
.SH NAME
diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
index 2fd09a5..d241ff7 100644
--- a/src/XF86DGA2.c
+++ b/src/XF86DGA2.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/Xxf86dga/XF86DGA2.c,v 1.23 2003/05/05 20:42:30 tsi Exp $ */
/*
Copyright (c) 1995 Jon Tombs
commit a8a764e1c41a8f261f768e9ac2ef24e23ba6eedd
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Aug 17 14:37:23 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 <memsize@videotron.ca>
diff --git a/man/Makefile.am b/man/Makefile.am
index 457ac58..624b17c 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -23,47 +23,39 @@
libmandir = $(LIB_MAN_DIR)
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-
-libman_PRE = XDGA.man
-
-BUILT_SOURCES = $(XDGA_shadowmen)
+libman_PRE = \
+ XDGA.man \
+ $(XDGA_shadows:=.man)
+
+XDGA_functions = \
+ XDGAQueryExtension \
+ XDGAQueryVersion \
+ XDGAQueryModes \
+ XDGASetMode \
+ XDGAOpenFramebuffer \
+ XDGACloseFramebuffer \
+ XDGASetViewport \
+ XDGAInstallColormap \
+ XDGACreateColormap \
+ XDGASelectInput \
+ XDGAFillRectangle \
+ XDGACopyArea \
+ XDGACopyTransparentArea \
+ XDGAGetViewportStatus \
+ XDGASync \
+ XDGASetClientVersion \
+ XDGAChangePixmapMode \
+ XDGAKeyEventToXKeyEvent
+
+XDGA_shadows = XF86DGA XFree86-DGA $(XDGA_functions)
EXTRA_DIST = $(libman_PRE)
+CLEANFILES = $(libman_DATA)
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(XDGA_shadowmen)
+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(LIB_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-DGAFUNCS = XDGAQueryExtension \
- XDGAQueryVersion \
- XDGAQueryModes \
- XDGASetMode \
- XDGAOpenFramebuffer \
- XDGACloseFramebuffer \
- XDGASetViewport \
- XDGAInstallColormap \
- XDGACreateColormap \
- XDGASelectInput \
- XDGAFillRectangle \
- XDGACopyArea \
- XDGACopyTransparentArea \
- XDGAGetViewportStatus \
- XDGASync \
- XDGASetClientVersion \
- XDGAChangePixmapMode \
- XDGAKeyEventToXKeyEvent
-
-XDGA_shadows = XF86DGA XFree86-DGA $(DGAFUNCS)
-
-XDGA_shadowmen = $(XDGA_shadows:=.@LIB_MAN_SUFFIX@)
-$(XDGA_shadowmen):
- $(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/XDGA.$(LIB_MAN_SUFFIX)" > $@
diff --git a/man/XDGAChangePixmapMode.man b/man/XDGAChangePixmapMode.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGAChangePixmapMode.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGACloseFramebuffer.man b/man/XDGACloseFramebuffer.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGACloseFramebuffer.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGACopyArea.man b/man/XDGACopyArea.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGACopyArea.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGACopyTransparentArea.man b/man/XDGACopyTransparentArea.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGACopyTransparentArea.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGACreateColormap.man b/man/XDGACreateColormap.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGACreateColormap.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGAFillRectangle.man b/man/XDGAFillRectangle.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGAFillRectangle.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGAGetViewportStatus.man b/man/XDGAGetViewportStatus.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGAGetViewportStatus.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGAInstallColormap.man b/man/XDGAInstallColormap.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGAInstallColormap.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGAKeyEventToXKeyEvent.man b/man/XDGAKeyEventToXKeyEvent.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGAKeyEventToXKeyEvent.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGAOpenFramebuffer.man b/man/XDGAOpenFramebuffer.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGAOpenFramebuffer.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGAQueryExtension.man b/man/XDGAQueryExtension.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGAQueryExtension.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGAQueryModes.man b/man/XDGAQueryModes.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGAQueryModes.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGAQueryVersion.man b/man/XDGAQueryVersion.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGAQueryVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGASelectInput.man b/man/XDGASelectInput.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGASelectInput.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGASetClientVersion.man b/man/XDGASetClientVersion.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGASetClientVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGASetMode.man b/man/XDGASetMode.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGASetMode.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGASetViewport.man b/man/XDGASetViewport.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGASetViewport.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XDGASync.man b/man/XDGASync.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XDGASync.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XF86DGA.man b/man/XF86DGA.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XF86DGA.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
diff --git a/man/XFree86-DGA.man b/man/XFree86-DGA.man
new file mode 100644
index 0000000..7cab59e
--- /dev/null
+++ b/man/XFree86-DGA.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__libmansuffix__
commit 7395fb5197549ce048b9e759eb27cd7f4f284c66
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 8 15:28:39 2010 -0700
Use make rules instead of shell for loops to generate shadow man pages
Allows parallel make and simpler build logs/error reporting
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index fcdbaf2..457ac58 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,14 +27,14 @@ LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
libman_PRE = XDGA.man
-BUILT_SOURCES = shadows.DONE
+BUILT_SOURCES = $(XDGA_shadowmen)
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(XDGA_shadows:=.@LIB_MAN_SUFFIX@)
+ $(XDGA_shadowmen)
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
@@ -64,8 +64,6 @@ DGAFUNCS = XDGAQueryExtension \
XDGA_shadows = XF86DGA XFree86-DGA $(DGAFUNCS)
-shadows.DONE:
- -rm -f $(XDGA_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(XDGA_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/XDGA.$(LIB_MAN_SUFFIX) > $$i; \
- done)
+XDGA_shadowmen = $(XDGA_shadows:=.@LIB_MAN_SUFFIX@)
+$(XDGA_shadowmen):
+ $(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/XDGA.$(LIB_MAN_SUFFIX)" > $@
commit 30a8e2d18fe6dc9fac599e2570360ebb27207811
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 8 15:26:35 2010 -0700
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
The existing statement can now be removed from the configuration file.
Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
Enables silent rule and use platform appropriate version of sed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index c456aa1..677ef6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,10 +4,10 @@ AC_INIT(libXxf86dga, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=
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.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(src/config.h)
diff --git a/man/Makefile.am b/man/Makefile.am
index 25c68a8..fcdbaf2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -36,23 +36,11 @@ CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
$(XDGA_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/__xservername__/Xorg/g' \
- -e 's/__appmansuffix__/$(APP_MAN_SUFFIX)/g' \
- -e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g'
-
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)
DGAFUNCS = XDGAQueryExtension \
commit 86ece63cf0d038eb36e80cc4836eb387c407b773
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Thu Jul 1 07:08:11 2010 -0300
Purge macros NEED_EVENTS and NEED_REPLIES
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/XF86DGA.c b/src/XF86DGA.c
index a6e66a4..4effcaf 100644
--- a/src/XF86DGA.c
+++ b/src/XF86DGA.c
@@ -58,9 +58,6 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
#undef _SC_PAGESIZE
#endif
-
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/extensions/Xxf86dga.h>
#include <X11/extensions/xf86dgaproto.h>
diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
index 8425faa..2fd09a5 100644
--- a/src/XF86DGA2.c
+++ b/src/XF86DGA2.c
@@ -15,8 +15,6 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
#include <os2.h>
#endif
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/extensions/Xxf86dga.h>
#include <X11/extensions/xf86dgaproto.h>
commit 5c9d042d4450d28c50258895885836253fbf5e61
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 16:50:34 2010 -0400
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 <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index af1c0b6..c456aa1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT(libXxf86dga, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit e8483875af8417918ce99fac61982167f96acf17
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 14:53:49 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index c020b27..420a225 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xxf86dga.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xxf86dga.pc.in
.PHONY: ChangeLog INSTALL
commit 1ad4c147bbaf1523adba2e9f4b289c0fb4360097
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Feb 16 10:37:21 2010 -0500
config: move CWARNFLAGS from configure.ac to Makefile.am
Compiler warning flags should be explicitly set in the makefile
rather than being merged with other packages compiler flags.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index c04c1cb..af1c0b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,6 @@ AC_PROG_LIBTOOL
# Checks for pkg-config packages
PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >= 2.0.99.2])
-XXF86DGA_CFLAGS="$CWARNFLAGS $XXF86DGA_CFLAGS"
XORG_CHECK_MALLOC_ZERO
diff --git a/src/Makefile.am b/src/Makefile.am
index f6517bd..edfb90a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,10 @@ lib_LTLIBRARIES = libXxf86dga.la
libXxf86dga_la_SOURCES = XF86DGA.c XF86DGA2.c
-AM_CFLAGS = -I $(top_srcdir)/include \
- $(XXF86DGA_CFLAGS) $(MALLOC_ZERO_CFLAGS)
Reply to: