xserver: Branch 'master' - 3 commits

[Alan Coopersmith]

 hw/xfree86/Makefile.am                    |    6 +++---
 hw/xfree86/common/xf86Init.c              |   16 ++++++++++++++++
 hw/xfree86/os-support/solaris/Makefile.am |   10 +++++-----
 include/xorg-server.h.in                  |    3 +++
 4 files changed, 27 insertions(+), 8 deletions(-)

New commits:
diff-tree c0e91777a9874fe2cd9a7e9180263f512c1e8f8d (from 6b4231e3b5b49b731c9a00930ae465fff8539831)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Jul 12 16:37:11 2007 -0700

    Add __SOL8__ to xorg-server.h.in since xf86-input-kbd needs it to build

diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 7b2a4d1..3c2ff47 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -233,6 +233,9 @@
 /* System is BSD-like */
 #undef CSRG_BASED
 
+/* Solaris 8 or later? */
+#undef __SOL8__
+
 /* System has PC console */
 #undef PCCONS_SUPPORT
 
diff-tree 6b4231e3b5b49b731c9a00930ae465fff8539831 (from 9fcb30ebf7b7b2137955f759e95c1d58c4f27a11)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Jul 12 16:36:27 2007 -0700

    Use kbd driver when xorg.conf specifies "keyboard" or "Keyboard" (bug #11301)
    
    X.Org Bug #11301 <https://bugs.freedesktop.org/show_bug.cgi?id=11301>
    Sun Bug #6560332 <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6560332>

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 8f3b23a..d20a271 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -979,6 +979,17 @@ InitInput(argc, argv)
     if (serverGeneration == 1) {
 	/* Call the PreInit function for each input device instance. */
 	for (pDev = xf86ConfigLayout.inputs; pDev && *pDev; pDev++) {
+	    /* Replace obsolete keyboard driver with kbd */
+	    if (!xf86NameCmp((*pDev)->driver, "keyboard")) {
+		xf86MsgVerb(X_WARNING, 0,
+			    "*** WARNING the legacy keyboard driver \"%s\" has been removed\n",
+			    (*pDev)->driver);
+		xf86MsgVerb(X_WARNING, 0,
+			    "*** Using the new \"kbd\" driver for \"%s\".\n",
+			    (*pDev)->identifier);
+		strcpy((*pDev)->driver, "kbd");
+            }
+
 	    if ((pDrv = xf86LookupInputDriver((*pDev)->driver)) == NULL) {
 		xf86Msg(X_ERROR, "No Input driver matching `%s'\n", (*pDev)->driver);
 		/* XXX For now, just continue. */
@@ -1834,6 +1845,11 @@ xf86LoadModules(char **list, pointer *op
 	if (name == NULL || *name == '\0')
 	    continue;
 
+	/* Replace obsolete keyboard driver with kbd */
+	if (!xf86NameCmp(name, "keyboard")) {
+	    strcpy(name, "kbd");
+	}
+
 	if (optlist)
 	    opt = optlist[i];
 	else
diff-tree 9fcb30ebf7b7b2137955f759e95c1d58c4f27a11 (from 7c0ca27f6dd0a800dc27429a33dbc8e133f9a9c1)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Jul 12 13:00:32 2007 -0700

    Make SOLARIS_INOUT_ARCH substitutions work better with automake-1.10

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 50aa673..cef6b5b 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -78,10 +78,10 @@ if SOLARIS_ASM_INLINE
 # Needs to be built before any files are compiled when using Sun compilers
 # so in*/out* inline definitions are properly processed.
 
-BUILT_SOURCES += os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il
+BUILT_SOURCES += os-support/solaris/solaris- at SOLARIS_INOUT_ARCH@.il
 
-os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il:
-	cd os-support/solaris ; make solaris-$(SOLARIS_INOUT_ARCH).il
+os-support/solaris/solaris- at SOLARIS_INOUT_ARCH@.il:
+	cd os-support/solaris ; make solaris- at SOLARIS_INOUT_ARCH@.il
 endif
 
 # do not use $(mkdir_p) if you want automake 1.7 to work
diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am
index d01e2e6..c027d9a 100644
--- a/hw/xfree86/os-support/solaris/Makefile.am
+++ b/hw/xfree86/os-support/solaris/Makefile.am
@@ -11,11 +11,11 @@ AGP_SRC = sun_agp.c
 #AGP_SRC = $(srcdir)/../shared/agp_noop.c
 #endif
 
-SOLARIS_INOUT_SRC = solaris-$(SOLARIS_INOUT_ARCH).S
-DISTCLEANFILES = solaris-$(SOLARIS_INOUT_ARCH).il
+SOLARIS_INOUT_SRC = solaris- at SOLARIS_INOUT_ARCH@.S
+DISTCLEANFILES = solaris- at SOLARIS_INOUT_ARCH@.il
 
-solaris-$(SOLARIS_INOUT_ARCH).il: solaris-${SOLARIS_INOUT_ARCH}.S
-	$(CPP) -P -DINLINE_ASM solaris-${SOLARIS_INOUT_ARCH}.S > $@
+solaris- at SOLARIS_INOUT_ARCH@.il: solaris- at SOLARIS_INOUT_ARCH@.S
+	$(CPP) -P -DINLINE_ASM solaris- at SOLARIS_INOUT_ARCH@.S > $@
 
 noinst_LTLIBRARIES = libsolaris.la
 libsolaris_la_SOURCES = sun_bios.c sun_init.c \
@@ -28,7 +28,7 @@ libsolaris_la_SOURCES = sun_bios.c sun_i
 nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
 
 sdk_HEADERS = agpgart.h
-nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il
+nodist_sdk_HEADERS = solaris- at SOLARIS_INOUT_ARCH@.il
 
 AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)