xserver-xorg-video-dummy: Changes to 'upstream-unstable'
.gitignore | 70 ++++++++++++++++++++++++++++++++++++++++++++++++-----
ChangeLog | 52 ---------------------------------------
Makefile.am | 9 ++++++
configure.ac | 13 ++++++---
src/.gitignore | 6 ----
src/dummy_driver.c | 17 ++++++++----
6 files changed, 91 insertions(+), 76 deletions(-)
New commits:
commit 483db0376d08be806c9bd51646f226f9510a4e48
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 1 10:51:30 2009 -0500
dummy 0.3.3
Signed-off-by: Adam Jackson <ajax@redhat.com>
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 <ajax@redhat.com>
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 <ajax@redhat.com>
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 <memsize@videotron.ca>
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 <memsize@videotron.ca>
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 <memsize@videotron.ca>
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 <memsize@videotron.ca>
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 <ajax@freedesktop.org>
-
- * 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 <ajax@freedesktop.org>
-
- * 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 <memsize@videotron.ca>
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 <memsize@videotron.ca>
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 <ajax@redhat.com>
Date: Wed Nov 18 09:37:49 2009 -0500
Canonically re-wrap too.
Signed-off-by: Adam Jackson <ajax@redhat.com>
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 <ajax@redhat.com>
Date: Wed Nov 18 09:36:34 2009 -0500
Compile fix.
Signed-off-by: Adam Jackson <ajax@redhat.com>
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 <ajax@redhat.com>
Date: Tue Nov 17 13:46:27 2009 -0500
Add support for HW_SKIP_CONSOLE
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
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;
commit a8366277a70797a7fa9c8c0b739a5fdac066816f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 17 13:36:30 2009 -0500
Properly un/rewrap CreateWindow
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 6f4b562..560b9b5 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -759,20 +759,20 @@ dummyModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
return(TRUE);
}
-
Atom VFB_PROP = 0;
#define VFB_PROP_NAME "VFB_IDENT"
-
-
static Bool
DUMMYCreateWindow(WindowPtr pWin)
{
DUMMYPtr dPtr = DUMMYPTR(DUMMYScrn);
WindowPtr pWinRoot;
int ret;
-
+
+ pScreen->CreateWindow = dPtr->CreateWindow;
ret = dPtr->CreateWindow(pWin);
+ pScreen->CreateWindow = DUMMYCreateWindow;
+
if(ret != TRUE)
return(ret);
Reply to: