xserver-xorg-video-dummy: Changes to 'upstream-experimental'
.gitignore | 70 ++++++++++++++++++++++++++++++++++++++++++++++++-----
COPYING | 12 ---------
ChangeLog | 52 ---------------------------------------
Makefile.am | 9 ++++++
README | 20 +++++++++++++++
configure.ac | 19 ++++++--------
src/.gitignore | 6 ----
src/Makefile.am | 3 ++
src/dummy_driver.c | 52 +++++++++++----------------------------
9 files changed, 119 insertions(+), 124 deletions(-)
New commits:
commit 51642de730f264fdfaf1c78f68a767a9347e1520
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 5 12:05:40 2010 +1000
dummy 0.3.4
diff --git a/configure.ac b/configure.ac
index 62666c6..d793a52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-dummy],
- 0.3.3,
+ 0.3.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-dummy)
commit 77ae177fd77e90a6eaeebde9df88911256264329
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri Jun 4 16:09:34 2010 -0700
Use new server API to find the root window.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index e32c1c7..804e41e 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -779,7 +779,11 @@ DUMMYCreateWindow(WindowPtr pWin)
return(ret);
if(dPtr->prop == FALSE) {
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 8
pWinRoot = WindowTable[DUMMYScrn->pScreen->myNum];
+#else
+ pWinRoot = DUMMYScrn->pScreen->root;
+#endif
if (! ValidAtom(VFB_PROP))
VFB_PROP = MakeAtom(VFB_PROP_NAME, strlen(VFB_PROP_NAME), 1);
commit 2503a68673c6012a0bf2abba58aa5060654965f9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Jun 12 15:39:03 2010 -0400
COPYING: replace stub file with actual Copyright notice
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index 7f33cbf..3c1ef48 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,2 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 2002, SuSE Linux AG, Author: Egbert Eich
-Please submit updated COPYING files to the Xorg bugzilla:
-
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
commit c4134a6cb6bf3d9364fd2374e79647859dbd57c3
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Feb 8 20:08:52 2010 -0500
config: move compiler flags from configure.ac to Makefile.am
CFLAGS is an automake defined variable that should not be set
by the module. It should not be AC_SUBST either, it already is.
Use AM_CFLAGS in Makefile.am. This will allow the user to override
the flags as they will be in the right order.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index f2329a0..62666c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,9 +62,6 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
-CFLAGS="$CFLAGS $XORG_CFLAGS "
-AC_SUBST([CFLAGS])
-
# Checks for libraries.
# Checks for header files.
diff --git a/src/Makefile.am b/src/Makefile.am
index 8cf4f1f..6705742 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,9 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+
+AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS)
+
dummy_drv_la_LTLIBRARIES = dummy_drv.la
dummy_drv_la_LDFLAGS = -module -avoid-version
dummy_drv_ladir = @moduledir@/drivers
commit 3370539eea599ff51a556507ec16a1570b8ed076
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Feb 8 19:07:22 2010 -0500
config: remove unrequired '-I$(top_srcdir)/src'
The current dir is already included by default in the makefile
top_builddir = ..
DEFAULT_INCLUDES = -I. -I$(top_builddir)
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 35abfbf..f2329a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
+CFLAGS="$CFLAGS $XORG_CFLAGS "
AC_SUBST([CFLAGS])
# Checks for libraries.
commit ea7cc253b0f4ea97a197ec36b3ac06279b0b95f6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Feb 8 18:42:52 2010 -0500
config: remove unused INCLUDES='-I$(top_srcdir)/src'
This statement is redundant and not used in the makefile
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 23ea18d..35abfbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,9 +63,7 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-INCLUDES='-I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
-AC_SUBST([INCLUDES])
# Checks for libraries.
commit bff6fc2f25648df0bbc0ea0723636260df987d34
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Feb 8 17:45:42 2010 -0500
config: remove unused variable XORG_INCS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d85184a..23ea18d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,7 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
+INCLUDES='-I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])
commit 17f6ec36df36a8999a95fd86e17013b1c44a7a2e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 20:59:46 2009 -0500
configure.ac: sdkdir usage duplicates the sdk include dir
The sdkdir variable provides a duplicate copy of the include/xorg
directory. The statement is removed as this was it's only used.
In the Makefile, there is now only one instance of the -I sdkdir
The sdkdir is provided in XORG_CFLAGS.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 426acfb..d85184a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,10 +61,9 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])
commit 86a7baa4156dc9569b7dde51b3042b7fd8093821
Author: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Thu Dec 10 14:53:50 2009 -0500
configure.ac: remove wrong include path. #24675
Don't use $(prefix)/include as include path. It can break things
when cross-compiling with DESTDIR and prefix=/usr
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index c9857f7..426acfb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])
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);
commit ecf513ae11399c5778ff7d988e838a2b6211a88b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:08:25 2009 -0400
dummy 0.3.2
diff --git a/configure.ac b/configure.ac
index b365f8d..b81b504 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-dummy],
- 0.3.1,
+ 0.3.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-dummy)
commit 8fe24e48acc7ec03972ee0acb5d7ab205ecbf7e0
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 14:54:17 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 1f44d7e..6f4b562 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -125,30 +125,6 @@ static const OptionInfoRec DUMMYOptions[] = {
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
-
-/*
- * List of symbols from other modules that this module references. This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.
- */
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(dummySetup);
@@ -188,11 +164,6 @@ dummySetup(pointer module, pointer opts, int *errmaj, int *errmin)
*/
/*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(fbSymbols, ramdacSymbols, NULL);
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -470,12 +441,10 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags)
if (xf86LoadSubModule(pScrn, "fb") == NULL) {
RETURN;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
if (!dPtr->swCursor) {
if (!xf86LoadSubModule(pScrn, "ramdac"))
RETURN;
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* We have no contiguous physical fb in physical memory */
commit 17885c5cb1dbcfb48ee593260bcd1b1ff2887989
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 20:38:25 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..917276a
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+xf86-video-dummy - virtual/offscreen frame buffer driver for the Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-dummy
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-dummy
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
Reply to: