.gitignore | 69 +++++++++++++++++++++++++++++-- ChangeLog | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 9 +++- configure.ac | 13 +++-- debian/changelog | 9 +++- debian/control | 2 src/.gitignore | 6 -- src/dummy_driver.c | 17 +++++-- 8 files changed, 213 insertions(+), 27 deletions(-)
New commits: commit b229ad98ae65c512955bf453a345eba80d65cf0e Author: Cyril Brulebois <[email protected]> Date: Tue Apr 6 04:42:10 2010 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 3b7e3b8..31b6e8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-dummy (1:0.3.3-1) UNRELEASED; urgency=low +xserver-xorg-video-dummy (1:0.3.3-1) unstable; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no @@ -9,7 +9,7 @@ xserver-xorg-video-dummy (1:0.3.3-1) UNRELEASED; urgency=low * New upstream release. * Add myself to Uploaders. - -- Cyril Brulebois <[email protected]> Tue, 06 Apr 2010 04:35:46 +0200 + -- Cyril Brulebois <[email protected]> Tue, 06 Apr 2010 04:41:45 +0200 xserver-xorg-video-dummy (1:0.3.2-1) experimental; urgency=low commit 081cabdd17d1814791a867361e4fe2bd8f4f989e Author: Cyril Brulebois <[email protected]> Date: Tue Apr 6 04:39:13 2010 +0200 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index df82c9e..3b7e3b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ xserver-xorg-video-dummy (1:0.3.3-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * New upstream release. + * Add myself to Uploaders. -- Cyril Brulebois <[email protected]> Tue, 06 Apr 2010 04:35:46 +0200 diff --git a/debian/control b/debian/control index f3d64fe..a0e826d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-dummy Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]> +Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]>, Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 5.0.0), pkg-config, commit 5ec5e5ad3a3d16a2b6b3eeb2c990cb403160377e Author: Cyril Brulebois <[email protected]> Date: Tue Apr 6 04:37:50 2010 +0200 Update ChangeLog (and remove it from .gitignore). diff --git a/.gitignore b/.gitignore index 537929d..f35100a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ aclocal.m4 autom4te.cache/ autoscan.log -ChangeLog compile config.guess config.h diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..39733e3 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,416 @@ +commit 483db0376d08be806c9bd51646f226f9510a4e48 +Author: Adam Jackson <[email protected]> +Date: Tue Dec 1 10:51:30 2009 -0500 + + dummy 0.3.3 + + Signed-off-by: Adam Jackson <[email protected]> + +commit 1ea8367691e69b289c2b5ca67d8ace39994347f8 +Author: Adam Jackson <[email protected]> +Date: Tue Dec 1 10:36:35 2009 -0500 + + Don't try to make an INSTALL file + + INSTALL_CMD is empty. This breaks make distcheck. I don't know why, + but I also don't care. + + Signed-off-by: Adam Jackson <[email protected]> + +commit 84b8dac3e6d869aa7e7b012add892fad9c3ce136 +Author: Gaetan Nadon <[email protected]> +Date: Mon Nov 23 09:25:05 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit be0e614859c5754a18dc7c8ad2dd55090ab166c7 +Author: Gaetan Nadon <[email protected]> +Date: Wed Oct 28 14:41:41 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Automake 'foreign' option is specified in configure.ac. + Remove from Makefile.am + +commit 2fc665b979a56faaac388b065c4cd91e0d2994d3 +Author: Gaetan Nadon <[email protected]> +Date: Wed Oct 28 14:09:09 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 27946998e6ec8537e7137fd453e229d81c092f54 +Author: Gaetan Nadon <[email protected]> +Date: Mon Oct 26 12:54:21 2009 -0400 + + Several driver modules do not have a ChangeLog target in Makefile.am #23814 + + The git generated ChangeLog replaces the hand written one. + Update configure.ac to xorg-macros level 1.3. + Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros + Update Makefile.am to add ChangeLog target if missing + Remove ChangeLog from EXTRA_DIST or *CLEAN variables + This is a pre-req for the INSTALL_CMD + +commit 50b546f499ae1cafbdf8e890234616733e2e6633 +Author: Gaetan Nadon <[email protected]> +Date: Thu Oct 22 13:00:42 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 7aefb53beeaac7de52c44be0032a5a699706b74b +Author: Gaetan Nadon <[email protected]> +Date: Thu Oct 22 12:34:16 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 4d4e41812e21490e39da34ac123b2c66bf20598c +Author: Adam Jackson <[email protected]> +Date: Wed Nov 18 09:37:49 2009 -0500 + + Canonically re-wrap too. + + Signed-off-by: Adam Jackson <[email protected]> + +commit b5983dbbd5f0cb4416b0e484fb43c80208feca25 +Author: Adam Jackson <[email protected]> +Date: Wed Nov 18 09:36:34 2009 -0500 + + Compile fix. + + Signed-off-by: Adam Jackson <[email protected]> + +commit e39d9a265572c273915f1803a729e7211d7b247b +Author: Adam Jackson <[email protected]> +Date: Tue Nov 17 13:46:27 2009 -0500 + + Add support for HW_SKIP_CONSOLE + + Acked-by: Aaron Plattner <[email protected]> + Signed-off-by: Adam Jackson <[email protected]> + +commit a8366277a70797a7fa9c8c0b739a5fdac066816f +Author: Adam Jackson <[email protected]> +Date: Tue Nov 17 13:36:30 2009 -0500 + + Properly un/rewrap CreateWindow + + Acked-by: Aaron Plattner <[email protected]> + Signed-off-by: Adam Jackson <[email protected]> + +commit ecf513ae11399c5778ff7d988e838a2b6211a88b +Author: Adam Jackson <[email protected]> +Date: Thu Jul 2 11:08:25 2009 -0400 + + dummy 0.3.2 + +commit 8fe24e48acc7ec03972ee0acb5d7ab205ecbf7e0 +Author: Adam Jackson <[email protected]> +Date: Thu May 28 14:54:17 2009 -0400 + + Remove useless loader symbol lists. + +commit 17885c5cb1dbcfb48ee593260bcd1b1ff2887989 +Author: Alan Coopersmith <[email protected]> +Date: Fri Jan 30 20:38:25 2009 -0800 + + Add README with pointers to mailing list, bugzilla & git repos + +commit d876e719969e9d33e7e4502448a544f12eb0fab8 +Author: Julien Cristau <[email protected]> +Date: Sun Jan 25 23:25:33 2009 +0100 + + dummy 0.3.1 + +commit 33e86171bd1815a23f35bb992a91c02785c22402 +Author: Adam Jackson <[email protected]> +Date: Fri Aug 15 14:05:04 2008 -0400 + + Uninclude xf86Version.h + +commit 0dcdce106d01aa6ff611436c3f8374241e7a8da8 +Author: Adam Jackson <[email protected]> +Date: Wed Mar 19 17:31:28 2008 -0400 + + dummy 0.3.0 + +commit ba7ab1d468e9a5ba37c064b3b128fa3bbb721044 +Author: Adam Jackson <[email protected]> +Date: Wed Mar 19 17:26:51 2008 -0400 + + Death to RCS tags. + +commit 2aeec40b3d48705bc1de9da3f06deac365c25895 +Author: James Cloos <[email protected]> +Date: Mon Sep 3 05:52:30 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 1874204e0c807c1686c28782d5eef62bd49fab04 +Author: James Cloos <[email protected]> +Date: Thu Aug 23 19:25:48 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 345de2bd048fcc7b177a3b504522fe100b34f1e0 +Author: Brice Goglin <[email protected]> +Date: Tue Aug 7 10:50:06 2007 +0200 + + Define DUMMY_*_VERSION* using PACKAGE_VERSION_* + +commit 22e38bed8cd2d1e54c47d0763436012eeccb2d32 +Author: Adam Jackson <[email protected]> +Date: Fri Apr 7 18:59:48 2006 +0000 + + VERSION -> DUMMY_VERSION + +commit 7432eaf48b70437bd55e5cc98833cce224d9e131 +Author: Adam Jackson <[email protected]> +Date: Fri Apr 7 18:50:19 2006 +0000 + + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + +commit 474af880791908da7e006c4d500bc7318107bbd1 +Author: Kevin E Martin <[email protected]> +Date: Wed Dec 21 02:29:59 2005 +0000 + + Update package version for X11R7 release. + +commit 9b9ea496e698e4d078c67b8f5674fd6479e3b2bb +Author: Adam Jackson <[email protected]> +Date: Mon Dec 19 16:25:53 2005 +0000 + + Stub COPYING files + +commit d2cff58c1e7ff03109bd17c5f8247b9b166b71f2 +Author: Kevin E Martin <[email protected]> +Date: Thu Dec 15 00:24:17 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 39f1e4449acb3e5da96aaaaa86e2544e9be968b1 +Author: Kevin E Martin <[email protected]> +Date: Sat Dec 3 05:49:33 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 1b47f2e8f47501122a3b613b95ea5de99f76a8c2 +Author: Kevin E Martin <[email protected]> +Date: Fri Dec 2 02:16:08 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit c2c245b18409db7013dee0b0b4b7176daae7e290 +Author: Adam Jackson <[email protected]> +Date: Tue Nov 29 23:29:58 2005 +0000 + + Only build dlloader modules by default. + +commit e6887d858e8b837c29c7833ab4b55034b736c6d8 +Author: Eric Anholt <[email protected]> +Date: Mon Nov 21 10:49:12 2005 +0000 + + Add .cvsignores for drivers. + +commit ec562722d0ae21f82a0dcc1a4a3e45ed52592aed +Author: Kevin E Martin <[email protected]> +Date: Tue Nov 15 05:42:03 2005 +0000 + + Add check for DGA extension to fix issues when building with separate build + roots. + +commit 1073cc5a2bd62b6972fcda4d4d9ccbe43f2506d4 +Author: Kevin E Martin <[email protected]> +Date: Wed Nov 9 21:15:14 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 5ced29a35f7571899f281af094fbd1f242f95e7d +Author: Kevin E Martin <[email protected]> +Date: Tue Nov 1 15:08:52 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit ffa97f23462ff045834b4abae33cf645ed6c3517 +Author: Kevin E Martin <[email protected]> +Date: Wed Oct 19 02:48:02 2005 +0000 + + Update package version number for RC1 release. + +commit 4bb6048d8d0d87f3d91a93fef737882434702bb0 +Author: Alan Coopersmith <[email protected]> +Date: Mon Oct 17 00:09:02 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit f586bde47b9ed6561b5350c03b088acfe2e227f6 +Author: Daniel Stone <[email protected]> +Date: Thu Aug 18 09:03:46 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit d43c40d00ab34ae85e4684cc3860f641b0bea65c +Author: Søren Sandmann Pedersen <[email protected]> +Date: Wed Aug 10 14:07:24 2005 +0000 + + Don\'t lose existing CFLAGS in all the input drivers and some of the video + drivers + +commit ef552d7e1765386c652748a97df67f4ba00beef0 +Author: Kevin E Martin <[email protected]> +Date: Fri Jul 29 21:22:43 2005 +0000 + + 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 + +commit c5f63f703d838cfae54269c595e14a06ea04f243 +Author: Søren Sandmann Pedersen <[email protected]> +Date: Wed Jul 13 21:52:24 2005 +0000 + + Add Makefile.am here. Also, for the record, CVS needs a bullet through its + head + +commit 30a2cce4b61e2b0e550479ee87f25c895cbca513 +Author: Søren Sandmann Pedersen <[email protected]> +Date: Wed Jul 13 21:45:21 2005 +0000 + + Build system for dummy video driver + +commit ec9e85771609d6ec8a94b777fc784db4d1026f20 +Author: Adam Jackson <[email protected]> +Date: Mon Jul 11 02:29:47 2005 +0000 + + Prep for modular builds by adding guarded #include "config.h" everywhere. + +commit 7b856f1c89ceae998c2133fcd9bba2c1493744e0 +Author: Adam Jackson <[email protected]> +Date: Sat Jun 25 21:16:54 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit a467602c6c419bd7288d80ad50a6fa62aeff3ec8 +Author: Daniel Stone <[email protected]> +Date: Wed Apr 20 12:25:23 2005 +0000 + + Fix includes right throughout the Xserver tree: + change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h; + change "foo.h", "extensions/foo.h" and "X11/foo.h" to + <X11/extensions/foo.h> for extension headers, e.g. Xv.h; + change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files. + +commit 53407449153e20f7529ed9b403cee5aab25880d0 +Author: Adam Jackson <[email protected]> +Date: Fri Feb 25 16:38:34 2005 +0000 + + Bug #2605: Make the cyrix, dummy, glint, neomagic, tga, and trident drivers + build when BuildXF86DGA NO. + (also fix some datestamps in the changelog) + +commit 73816949f2a28a0b8fe39108a8e493f9e47f7718 +Author: Egbert Eich <[email protected]> +Date: Fri Jan 28 16:12:59 2005 +0000 + + Modifying X.Org Xserver DDX to allow to run X with ordinary user + permissions when no access to HW registers is required. For API changes + which mostly involve the modifications to make the RRFunc (introduced + with 6.8) more flexible please check Bugzilla #2407. NOTE: This patch + applies changes to OS specific files for other OSes which I cannot + test. + +commit 720c9b05f47c3529aa2561ab4c88319322893780 +Author: Markus Kuhn <[email protected]> +Date: Sat Dec 4 00:43:05 2004 +0000 + + Encoding of numerous files changed to UTF-8 + +commit b227226476ae94d094376c561d77e85589592fe6 +Author: Stuart Kreitman <[email protected]> +Date: Fri Oct 15 21:09:00 2004 +0000 + + Bugzilla #1644: Attach an atom "VFB" to root window of dummy driver. + Committing in Head. + Modified Files: dummy.h dummy_driver.c + +commit a571d5efb53cfe793d61d1b48c2bddc8d337d381 +Author: Eric Anholt <[email protected]> +Date: Wed Jun 16 09:23:03 2004 +0000 + + DRI XFree86-4_3_99_12-merge import + +commit 289ef4abc51e6ba8e902db4093cb5380721cbfe7 +Author: Egbert Eich <[email protected]> +Date: Wed May 26 16:24:08 2004 +0000 + + Fixing setting of physical framebuffer base for several drivers. C&T + driver: Fixed setting of minimal clocks for HiQV chipsets. Neomagic + driver: improved support for lowres double scan modes. + +commit 5d8038b2977b7c0ab0ea17e263b3720cef83db59 +Author: Egbert Eich <[email protected]> +Date: Fri Apr 23 19:30:15 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit f8e1ff3e00a773139aa1ab0ae72c83dc7792c175 +Author: Egbert Eich <[email protected]> +Date: Sun Mar 14 08:33:20 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit d268ada4b7e5c48cf48825a632af7f0faeaff6d0 +Author: Egbert Eich <[email protected]> +Date: Wed Mar 3 12:12:18 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 2ba39037fa8840a654432f032cc97b6830946cf9 +Author: Egbert Eich <[email protected]> +Date: Thu Feb 26 13:35:52 2004 +0000 + + readding XFree86's cvs IDs + +commit f352d52a2a89e4c55689a90db83a9f7e03e562c1 +Author: Egbert Eich <[email protected]> +Date: Thu Feb 26 09:23:18 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 77748634e71f2c42d03d708515e65351f0b755cb +Author: Kaleb Keithley <[email protected]> +Date: Tue Nov 25 19:28:36 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 106069b23188837f06b1057e03db24cad2018ea3 +Author: Kaleb Keithley <[email protected]> +Date: Fri Nov 14 16:48:55 2003 +0000 + + XFree86 4.3.0.1 + +commit ca3b63783fc4aa1df725dbd0e560a446dcc17913 +Author: Kaleb Keithley <[email protected]> +Date: Fri Nov 14 16:48:55 2003 +0000 + + Initial revision commit bb0329c6b6822957ba4bfb76c2db887204d3f57d Author: Cyril Brulebois <[email protected]> Date: Tue Apr 6 04:36:11 2010 +0200 New upstream release: 0.3.3 diff --git a/debian/changelog b/debian/changelog index 08f1cfa..df82c9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -xserver-xorg-video-dummy (1:0.3.2-2) UNRELEASED; urgency=low +xserver-xorg-video-dummy (1:0.3.3-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 <[email protected]> Sat, 23 Jan 2010 02:02:36 +0100 + [ Cyril Brulebois ] + * New upstream release. + + -- Cyril Brulebois <[email protected]> Tue, 06 Apr 2010 04:35:46 +0200 xserver-xorg-video-dummy (1:0.3.2-1) experimental; urgency=low commit 483db0376d08be806c9bd51646f226f9510a4e48 Author: Adam Jackson <[email protected]> Date: Tue Dec 1 10:51:30 2009 -0500 dummy 0.3.3 Signed-off-by: Adam Jackson <[email protected]> diff --git a/configure.ac b/configure.ac index c565243..c9857f7 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-dummy], - 0.3.2, + 0.3.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-dummy) commit 1ea8367691e69b289c2b5ca67d8ace39994347f8 Author: Adam Jackson <[email protected]> Date: Tue Dec 1 10:36:35 2009 -0500 Don't try to make an INSTALL file INSTALL_CMD is empty. This breaks make distcheck. I don't know why, but I also don't care. Signed-off-by: Adam Jackson <[email protected]> diff --git a/Makefile.am b/Makefile.am index 40ad32b..af06d52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,14 +19,11 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SUBDIRS = src -MAINTAINERCLEANFILES = ChangeLog INSTALL +MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog INSTALL - -INSTALL: - $(INSTALL_CMD) +.PHONY: ChangeLog ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog INSTALL +dist-hook: ChangeLog commit 84b8dac3e6d869aa7e7b012add892fad9c3ce136 Author: Gaetan Nadon <[email protected]> Date: Mon Nov 23 09:25:05 2009 -0500 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. diff --git a/Makefile.am b/Makefile.am index 4f54c1b..40ad32b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SUBDIRS = src +MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL commit be0e614859c5754a18dc7c8ad2dd55090ab166c7 Author: Gaetan Nadon <[email protected]> Date: Wed Oct 28 14:41:41 2009 -0400 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 Automake 'foreign' option is specified in configure.ac. Remove from Makefile.am diff --git a/Makefile.am b/Makefile.am index 99e2179..4f54c1b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,6 @@ # 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. -AUTOMAKE_OPTIONS = foreign SUBDIRS = src .PHONY: ChangeLog INSTALL commit 2fc665b979a56faaac388b065c4cd91e0d2994d3 Author: Gaetan Nadon <[email protected]> Date: Wed Oct 28 14:09:09 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. diff --git a/Makefile.am b/Makefile.am index 09940ce..99e2179 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,9 +21,12 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index de86c3a..c565243 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 27946998e6ec8537e7137fd453e229d81c092f54 Author: Gaetan Nadon <[email protected]> Date: Mon Oct 26 12:54:21 2009 -0400 Several driver modules do not have a ChangeLog target in Makefile.am #23814 The git generated ChangeLog replaces the hand written one. Update configure.ac to xorg-macros level 1.3. Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros Update Makefile.am to add ChangeLog target if missing Remove ChangeLog from EXTRA_DIST or *CLEAN variables This is a pre-req for the INSTALL_CMD diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 89f15c8..0000000 --- a/ChangeLog +++ /dev/null @@ -1,52 +0,0 @@ -2006-04-06 Adam Jackson <[email protected]> - - * configure.ac: - * src/dummy.h: - * src/dummy_cursor.c: - * src/dummy_dga.c: - * src/dummy_driver.c: - Unlibcwrap. Bump server version requirement. Bump to 0.2.0. - - * src/dummy_driver.c: - VERSION -> DUMMY_VERSION - -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version for X11R7 release. - -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for final X11R7 release candidate. - -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for X11R7 RC3 release. - -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Remove extraneous AC_MSG_RESULT. - -2005-11-29 Adam Jackson <[email protected]> - - * configure.ac: - Only build dlloader modules by default. - -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Add check for DGA extension to fix issues when building with - separate build roots. - -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for X11R7 RC2 release. - -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. diff --git a/Makefile.am b/Makefile.am index 16f4412..09940ce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,3 +20,10 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index b81b504..de86c3a 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,12 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# 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 + # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL @@ -70,9 +76,6 @@ AC_HEADER_STDC DRIVER_NAME=dummy AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION - AC_OUTPUT([ Makefile src/Makefile commit 50b546f499ae1cafbdf8e890234616733e2e6633 Author: Gaetan Nadon <[email protected]> Date: Thu Oct 22 13:00:42 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. diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 9730646..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.la -*.lo commit 7aefb53beeaac7de52c44be0032a5a699706b74b Author: Gaetan Nadon <[email protected]> Date: Thu Oct 22 12:34:16 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. diff --git a/.gitignore b/.gitignore index 2df4a8d..537929d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,78 @@ -Makefile -Makefile.in -*.la -*.lo +# +# 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 -stamp-h1 +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 xf86-video-dummy +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# commit 4d4e41812e21490e39da34ac123b2c66bf20598c Author: Adam Jackson <[email protected]> Date: Wed Nov 18 09:37:49 2009 -0500 Canonically re-wrap too. Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/dummy_driver.c b/src/dummy_driver.c index a569fc7..e32c1c7 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -772,6 +772,7 @@ DUMMYCreateWindow(WindowPtr pWin) pScreen->CreateWindow = dPtr->CreateWindow; ret = pScreen->CreateWindow(pWin); + dPtr->CreateWindow = pScreen->CreateWindow; pScreen->CreateWindow = DUMMYCreateWindow; if(ret != TRUE) commit b5983dbbd5f0cb4416b0e484fb43c80208feca25 Author: Adam Jackson <[email protected]> Date: Wed Nov 18 09:36:34 2009 -0500 Compile fix. Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/dummy_driver.c b/src/dummy_driver.c index f68cfc9..a569fc7 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -765,12 +765,13 @@ Atom VFB_PROP = 0; static Bool DUMMYCreateWindow(WindowPtr pWin) { + ScreenPtr pScreen = pWin->drawable.pScreen; DUMMYPtr dPtr = DUMMYPTR(DUMMYScrn); WindowPtr pWinRoot; int ret; pScreen->CreateWindow = dPtr->CreateWindow; - ret = dPtr->CreateWindow(pWin); + ret = pScreen->CreateWindow(pWin); pScreen->CreateWindow = DUMMYCreateWindow; if(ret != TRUE) commit e39d9a265572c273915f1803a729e7211d7b247b Author: Adam Jackson <[email protected]> Date: Tue Nov 17 13:46:27 2009 -0500 Add support for HW_SKIP_CONSOLE Acked-by: Aaron Plattner <[email protected]> Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 560b9b5..f68cfc9 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -792,6 +792,9 @@ DUMMYCreateWindow(WindowPtr pWin) return TRUE; } +#ifndef HW_SKIP_CONSOLE +#define HW_SKIP_CONSOLE 4 +#endif static Bool dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr) @@ -801,7 +804,7 @@ dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr) switch (op) { case GET_REQUIRED_HW_INTERFACES: flag = (CARD32*)ptr; - (*flag) = 0; + (*flag) = HW_SKIP_CONSOLE; return TRUE; default: return FALSE; -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
