xserver: Branch 'server-1.2-branch' - 10 commits
Daniel Stone
daniels at kemper.freedesktop.org
Fri Dec 1 00:50:21 EET 2006
GL/glx/glxext.c | 2 +-
configure.ac | 9 +++++----
dix/ffs.c | 2 ++
hw/xfree86/Makefile.am | 1 -
hw/xfree86/common/xf86Config.c | 2 +-
hw/xfree86/common/xf86Init.c | 26 ++++++++++++++++++++++++++
hw/xfree86/dixmods/type1mod.c | 15 ---------------
hw/xfree86/doc/man/Xorg.man.pre | 6 ++++++
hw/xfree86/doc/man/xorg.conf.man.pre | 2 --
hw/xfree86/utils/cvt/Makefile.am | 2 +-
hw/xfree86/utils/ioport/Makefile.am | 2 +-
hw/xfree86/utils/pcitweak/Makefile.am | 2 +-
hw/xfree86/utils/scanpci/Makefile.am | 2 +-
hw/xfree86/utils/xorgcfg/text-mode.c | 2 +-
hw/xfree86/utils/xorgconfig/xorgconfig.c | 2 +-
hw/xfree86/xorgconf.cpp | 1 -
include/dix.h | 3 +++
include/xorg-config.h.in | 3 +++
os/WaitFor.c | 16 +++++++++-------
19 files changed, 62 insertions(+), 38 deletions(-)
New commits:
diff-tree 69820a10e33e4582c192360996e866007114639d (from 2efd6aca00180d9bbdbf1b7a64ef034fc07992a9)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Fri Dec 1 00:41:41 2006 +0200
remove CID support (bug #5553)
Remove CID from all our fontpaths.
diff --git a/configure.ac b/configure.ac
index 20c33b9..51c3d28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -370,7 +370,7 @@ AC_ARG_WITH(mesa-source, AS_HELP_STR
AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]),
[ FONTDIR="$withval" ],
[ FONTDIR="${libdir}/X11/fonts" ])
-DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/"
+DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/"
AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
[ FONTPATH="$withval" ],
[ FONTPATH="${DEFAULT_FONT_PATH}" ])
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 8491ff5..f05308d 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -92,7 +92,6 @@ CPP_FILES_FLAGS = \
-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \
-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
- -DCIDFONTPATH="\"$(BASE_FONT_PATH)/CID\"" \
-DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \
-DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \
-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
diff --git a/hw/xfree86/dixmods/type1mod.c b/hw/xfree86/dixmods/type1mod.c
index 48c1d04..3da53ea 100644
--- a/hw/xfree86/dixmods/type1mod.c
+++ b/hw/xfree86/dixmods/type1mod.c
@@ -57,9 +57,6 @@ static XF86ModuleVersionInfo VersRec =
_X_EXPORT XF86ModuleData type1ModuleData = { &VersRec, type1Setup, NULL };
extern void Type1RegisterFontFileFunctions(void);
-#ifdef BUILDCID
-extern void CIDRegisterFontFileFunctions(void);
-#endif
FontModule type1Module = {
Type1RegisterFontFileFunctions,
@@ -67,23 +64,11 @@ FontModule type1Module = {
NULL
};
-#ifdef BUILDCID
-FontModule CIDModule = {
- CIDRegisterFontFileFunctions,
- "CID",
- NULL
-};
-#endif
-
static pointer
type1Setup(pointer module, pointer opts, int *errmaj, int *errmin)
{
type1Module.module = module;
LoadFont(&type1Module);
-#ifdef BUILDCID
- CIDModule.module = module;
- LoadFont(&CIDModule);
-#endif
/* Need a non-NULL return */
return (pointer)1;
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index e94804c..e44b551 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -311,7 +311,6 @@ font path elements:
.I __projectroot__/lib/X11/fonts/misc/
.I __projectroot__/lib/X11/fonts/TTF/
.I __projectroot__/lib/X11/fonts/Type1/
-.I __projectroot__/lib/X11/fonts/CID/
.I __projectroot__/lib/X11/fonts/75dpi/
.I __projectroot__/lib/X11/fonts/100dpi/
.fi
@@ -326,7 +325,6 @@ The recommended font path contains the f
.I __projectroot__/lib/X11/fonts/75dpi/:unscaled
.I __projectroot__/lib/X11/fonts/100dpi/:unscaled
.I __projectroot__/lib/X11/fonts/Type1/
-.I __projectroot__/lib/X11/fonts/CID/
.I __projectroot__/lib/X11/fonts/Speedo/
.I __projectroot__/lib/X11/fonts/75dpi/
.I __projectroot__/lib/X11/fonts/100dpi/
diff --git a/hw/xfree86/xorgconf.cpp b/hw/xfree86/xorgconf.cpp
index 6c52213..86da92c 100644
--- a/hw/xfree86/xorgconf.cpp
+++ b/hw/xfree86/xorgconf.cpp
@@ -56,7 +56,6 @@ XCOMM command (or a combination of both
FontPath MISCFONTPATH
FontPath T1FONTPATH
FontPath TRUETYPEFONTPATH
- FontPath CIDFONTPATH
FontPath DPI75FONTPATH
FontPath DPI100FONTPATH
diff-tree 2efd6aca00180d9bbdbf1b7a64ef034fc07992a9 (from 69508dd98b55d38b9eec54d5ced275a6147f1cd7)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Fri Dec 1 00:11:51 2006 +0200
bump to 1.1.99.903
diff --git a/configure.ac b/configure.ac
index 3a63c52..20c33b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl Process this file with autoconf to c
AC_PREREQ(2.57)
dnl This is the not the Xorg version number, it's the server version number.
dnl Yes, that's weird.
-AC_INIT([xorg-server], 1.1.99.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.1.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
@@ -298,8 +298,8 @@ DEFAULT_VENDOR_NAME_SHORT="X.Org"
DEFAULT_VERSION_MAJOR=7
DEFAULT_VERSION_MINOR=1
DEFAULT_VERSION_PATCH=99
-DEFAULT_VERSION_SNAP=902
-DEFAULT_RELEASE_DATE="13 November 2006"
+DEFAULT_VERSION_SNAP=903
+DEFAULT_RELEASE_DATE="30 November 2006"
DEFAULT_VENDOR_WEB="http://wiki.x.org"
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
diff-tree 69508dd98b55d38b9eec54d5ced275a6147f1cd7 (from 9348662cc8acccfe2cf018d941c49cd725f52622)
Author: Jurij Smakov <jurij at wooyd.org>
Date: Sat Nov 11 14:09:15 2006 +0200
ffs: handle 0 argument (bug #8968)
Handle an argument of 0 in ffs(), instead of looping indefinitely.
Add an ffs prototype to dix.h, and add includes to ffs.c.
(cherry picked from 34164e551e4c3909322d50b09835ca4ac1d49d68 commit)
(cherry picked from acb5ff4c73ac4d52201d7c421f488e2ead5c8b9c commit)
diff --git a/dix/ffs.c b/dix/ffs.c
index e25d715..80fbcc8 100644
--- a/dix/ffs.c
+++ b/dix/ffs.c
@@ -30,6 +30,8 @@ int
ffs(int i)
{
int j;
+ if (i == 0)
+ return 0;
for (j = 1; (i & 1) == 0; j++)
i >>= 1;
return j;
diff --git a/include/dix.h b/include/dix.h
index f346b43..772d65e 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -815,4 +815,7 @@ typedef struct {
extern int xstrcasecmp(char *s1, char *s2);
#endif
+/* ffs.c */
+extern int ffs(int i);
+
#endif /* DIX_H */
diff-tree 9348662cc8acccfe2cf018d941c49cd725f52622 (from e88d09e75de37a6813ea353483ddd8139d10d4c9)
Author: Jeremy C. Reed <reed at glacier.reedmedia.net>
Date: Mon Nov 13 20:23:06 2006 -0600
On DragonFLy, default to /dev/sysmouse (just like on FreeBSD).
TODO: use autoconf to handle this so the code is not platform
based but feature based.
(cherry picked from 6facd958c2e7098cb68eac2810a88b8cd40f19c0 commit)
diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c
index 10f4b69..0430a54 100644
--- a/hw/xfree86/utils/xorgcfg/text-mode.c
+++ b/hw/xfree86/utils/xorgcfg/text-mode.c
@@ -551,7 +551,7 @@ MouseConfig(void)
if (str == NULL)
#ifdef WSCONS_SUPPORT
str = "/dev/wsmouse";
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
str = "/dev/sysmouse";
#elif defined(__UNIXOS2__)
str = "mouse$";
diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c
index f00eea0..091b2db 100644
--- a/hw/xfree86/utils/xorgconfig/xorgconfig.c
+++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c
@@ -490,7 +490,7 @@ struct {
#ifdef WSCONS_SUPPORT
# define DEF_MOUSEDEV "/dev/wsmouse";
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
# define DEF_MOUSEDEV "/dev/sysmouse";
#elif defined(__linux__)
# define DEF_MOUSEDEV "/dev/input/mice";
diff-tree e88d09e75de37a6813ea353483ddd8139d10d4c9 (from 51c78f5652149cd8defaee8d0d12351630bae604)
Author: Matthias Hopf <mhopf at suse.de>
Date: Tue Nov 28 18:57:13 2006 +0100
Fix potential NULL pointer access in timer code.
https://bugzilla.novell.com/show_bug.cgi?id=223718
(cherry picked from 834e4b079866594b50be64ae79f3cb2a5baa2070 commit)
diff --git a/os/WaitFor.c b/os/WaitFor.c
index 6109e34..ba227a3 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -205,15 +205,17 @@ WaitForSomething(int *pClientsReady)
if (timeout > 0 && timeout > timers->delta + 250) {
/* time has rewound. reset the timers. */
CheckAllTimers(now);
- timeout = timers->expires - now;
}
- if (timeout < 0)
- timeout = 0;
- waittime.tv_sec = timeout / MILLI_PER_SECOND;
- waittime.tv_usec = (timeout % MILLI_PER_SECOND) *
- (1000000 / MILLI_PER_SECOND);
- wt = &waittime;
+ if (timers) {
+ timeout = timers->expires - now;
+ if (timeout < 0)
+ timeout = 0;
+ waittime.tv_sec = timeout / MILLI_PER_SECOND;
+ waittime.tv_usec = (timeout % MILLI_PER_SECOND) *
+ (1000000 / MILLI_PER_SECOND);
+ wt = &waittime;
+ }
}
XFD_COPYSET(&AllSockets, &LastSelectMask);
#ifdef SMART_SCHEDULE
diff-tree 51c78f5652149cd8defaee8d0d12351630bae604 (from 11c260736f482131f7bbacbe4640420c82ca5614)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Wed Nov 29 12:01:43 2006 -0800
Add DIX_CFLAGS to util builds.
Fixes a build breakage when $(top_srcdir) != $(top_builddir) because
-I$(top_srcdir)/include is missing for the cvt, ioport, pcitweak, and scanpci
builds.
Signed-off-by: Adam Jackson <ajax at nwnk.net>
(cherry picked from ee9bdd3f4a14a42fb0747acc420966f0f669129b commit)
diff --git a/hw/xfree86/utils/cvt/Makefile.am b/hw/xfree86/utils/cvt/Makefile.am
index ff3c1f7..365c6cb 100644
--- a/hw/xfree86/utils/cvt/Makefile.am
+++ b/hw/xfree86/utils/cvt/Makefile.am
@@ -33,7 +33,7 @@ DUMMYLIB_SRCDIR = $(XFREE86_SRCDIR)/dumm
# gah
cvt_SOURCES = cvt.c $(top_srcdir)/hw/xfree86/common/xf86cvt.c
-cvt_CFLAGS = $(XORG_CFLAGS)
+cvt_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
cvt_LDADD = $(top_builddir)/hw/xfree86/dummylib/libdummy-nonserver.a
man1_MANS = cvt.man
diff --git a/hw/xfree86/utils/ioport/Makefile.am b/hw/xfree86/utils/ioport/Makefile.am
index e96681b..1839c9a 100644
--- a/hw/xfree86/utils/ioport/Makefile.am
+++ b/hw/xfree86/utils/ioport/Makefile.am
@@ -33,7 +33,7 @@ DUMMYLIB_SRCDIR = $(XFREE86_SRCDIR)/dumm
INCLUDES = $(XORG_INCS) -I$(DUMMYLIB_SRCDIR)
-ioport_CFLAGS = $(XORG_CFLAGS)
+ioport_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
ioport_LDADD = \
../../os-support/libxorgos.la \
../../dummylib/libdummy-nonserver.a \
diff --git a/hw/xfree86/utils/pcitweak/Makefile.am b/hw/xfree86/utils/pcitweak/Makefile.am
index 9a565ad..5c2a6eb 100644
--- a/hw/xfree86/utils/pcitweak/Makefile.am
+++ b/hw/xfree86/utils/pcitweak/Makefile.am
@@ -33,7 +33,7 @@ DUMMYLIB_SRCDIR = $(XFREE86_SRCDIR)/dumm
INCLUDES = $(XORG_INCS) -I$(DUMMYLIB_SRCDIR)
-pcitweak_CFLAGS = $(XORG_CFLAGS)
+pcitweak_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
pcitweak_LDADD = \
../../os-support/libxorgos.la \
../../dummylib/libdummy-nonserver.a \
diff --git a/hw/xfree86/utils/scanpci/Makefile.am b/hw/xfree86/utils/scanpci/Makefile.am
index f4e2cbb..6af8eae 100644
--- a/hw/xfree86/utils/scanpci/Makefile.am
+++ b/hw/xfree86/utils/scanpci/Makefile.am
@@ -34,7 +34,7 @@ DUMMYLIB_SRCDIR = $(XFREE86_SRCDIR)/dumm
INCLUDES = $(XORG_INCS) -I$(SCANPCI_SRCDIR) -I$(DUMMYLIB_SRCDIR)
-scanpci_CFLAGS = $(XORG_CFLAGS)
+scanpci_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
scanpci_LDADD = \
../../scanpci/libscanpci.la \
../../os-support/libxorgos.la \
diff-tree 11c260736f482131f7bbacbe4640420c82ca5614 (from 32e122466e9d5bbaddec9ad1a0dda00aa03c132b)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Wed Nov 22 14:46:51 2006 -0800
Add a -showDefaultLibPath option.
A corollary to the previous change, this option prints $libdir.
(cherry picked from 64de3baf85f6df274f71f736016f0848567cd9f6 commit)
diff --git a/configure.ac b/configure.ac
index 9820c65..3a63c52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1329,6 +1329,7 @@ int main () {
AC_DEFINE_DIR(__XCONFIGFILE__, XF86CONFIGFILE, [Name of configuration file])
AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file])
AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path])
+ AC_DEFINE_DIR(DEFAULT_LIBRARY_PATH, libdir, [Default library install path])
AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location])
AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 260884f..5546843 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -101,6 +101,7 @@
static void xf86PrintBanner(void);
static void xf86PrintMarkers(void);
static void xf86PrintDefaultModulePath(void);
+static void xf86PrintDefaultLibraryPath(void);
static void xf86RunVtInit(void);
#ifdef __UNIXOS2__
@@ -1494,6 +1495,11 @@ ddxProcessArgument(int argc, char **argv
xf86PrintDefaultModulePath();
exit(0);
}
+ if (!strcmp(argv[i],"-showDefaultLibPath"))
+ {
+ xf86PrintDefaultLibraryPath();
+ exit(0);
+ }
/* Notice the -fp flag, but allow it to pass to the dix layer */
if (!strcmp(argv[i], "-fp"))
{
@@ -1744,6 +1750,7 @@ ddxUseMsg()
ErrorF("-isolateDevice bus_id restrict device resets to bus_id (PCI only)\n");
ErrorF("-version show the server version\n");
ErrorF("-showDefaultModulePath show the server default module path\n");
+ ErrorF("-showDefaultLibPath show the server default library path\n");
/* OS-specific usage */
xf86UseMsg();
ErrorF("\n");
@@ -1873,6 +1880,12 @@ xf86PrintDefaultModulePath(void)
}
static void
+xf86PrintDefaultLibraryPath(void)
+{
+ ErrorF("%s\n", DEFAULT_LIBRARY_PATH);
+}
+
+static void
xf86RunVtInit(void)
{
int i;
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
index 5803100..8645732 100644
--- a/hw/xfree86/doc/man/Xorg.man.pre
+++ b/hw/xfree86/doc/man/Xorg.man.pre
@@ -429,6 +429,9 @@ support.
.B \-showDefaultModulePath
Print out the default module path the server was compiled with.
.TP 8
+.B \-showDefaultLibPath
+Print out the path libraries should be installed to.
+.TP 8
.BI \-config " file"
Read the server configuration from
.IR file .
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index 4a64522..b9643a2 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -45,6 +45,9 @@
/* Path to loadable modules. */
#undef DEFAULT_MODULE_PATH
+/* Path to installed libraries. */
+#undef DEFAULT_LIBRARY_PATH
+
/* Path to server log file. */
#undef DEFAULT_LOGPREFIX
diff-tree 32e122466e9d5bbaddec9ad1a0dda00aa03c132b (from 782166ac22ee854a4ccd9d00499085b92fb09a23)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Fri Nov 17 18:27:23 2006 -0800
Add a -showDefaultModulePath option.
As discussed on the mailing list, people would rather have an X command-line
option to print the module path so installers can know where to put modules,
rather than the installers using `pkg-config --variable=moduledir xorg-server`,
since some distros choose not to install xorg-server.pc.
(cherry picked from 0a2a6e4070718b90af7ca0e047f028e0cabdfb9d commit)
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 8f0a26d..260884f 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -100,6 +100,7 @@
static void xf86PrintBanner(void);
static void xf86PrintMarkers(void);
+static void xf86PrintDefaultModulePath(void);
static void xf86RunVtInit(void);
#ifdef __UNIXOS2__
@@ -1488,6 +1489,11 @@ ddxProcessArgument(int argc, char **argv
xf86PrintBanner();
exit(0);
}
+ if (!strcmp(argv[i],"-showDefaultModulePath"))
+ {
+ xf86PrintDefaultModulePath();
+ exit(0);
+ }
/* Notice the -fp flag, but allow it to pass to the dix layer */
if (!strcmp(argv[i], "-fp"))
{
@@ -1737,6 +1743,7 @@ ddxUseMsg()
ErrorF("-ignoreABI make module ABI mismatches non-fatal\n");
ErrorF("-isolateDevice bus_id restrict device resets to bus_id (PCI only)\n");
ErrorF("-version show the server version\n");
+ ErrorF("-showDefaultModulePath show the server default module path\n");
/* OS-specific usage */
xf86UseMsg();
ErrorF("\n");
@@ -1860,6 +1867,12 @@ xf86PrintMarkers()
}
static void
+xf86PrintDefaultModulePath(void)
+{
+ ErrorF("%s\n", DEFAULT_MODULE_PATH);
+}
+
+static void
xf86RunVtInit(void)
{
int i;
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
index b7fa990..5803100 100644
--- a/hw/xfree86/doc/man/Xorg.man.pre
+++ b/hw/xfree86/doc/man/Xorg.man.pre
@@ -426,6 +426,9 @@ Print out the server version, patchlevel
system/platform it was built on, and whether it includes module loader
support.
.TP 8
+.B \-showDefaultModulePath
+Print out the default module path the server was compiled with.
+.TP 8
.BI \-config " file"
Read the server configuration from
.IR file .
diff-tree 782166ac22ee854a4ccd9d00499085b92fb09a23 (from 3d513382d1d40019dda1e7b29b75ff04c7a1cae1)
Author: George Sapountzis <gsap7 at yahoo.gr>
Date: Thu Nov 16 02:18:03 2006 +0200
Fix GL context destruction with AIGLX.
The logic for freeing GL contexts introduced by "Fix AIGLX VT switching." is
inverted. As it is now, GL context destruction is deferred for glxDRIEnterVT().
(cherry picked from f17e3c34dfd1f1418440bdebf45764e4dbf550f0 commit)
diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c
index 11fb7fc..1f6c7f3 100644
--- a/GL/glx/glxext.c
+++ b/GL/glx/glxext.c
@@ -237,7 +237,7 @@ GLboolean __glXFreeContext(__GLXcontext
* __glXDispatch() or as a callback from the resource manager. In
* the latter case we need to lift the DRI lock manually. */
- if (glxBlockClients) {
+ if (!glxBlockClients) {
__glXleaveServer();
cx->destroy(cx);
__glXenterServer();
diff-tree 3d513382d1d40019dda1e7b29b75ff04c7a1cae1 (from 07b99b324301675ecd2f999752141238b24de022)
Author: Matthias Hopf <mhopf at suse.de>
Date: Tue Nov 14 15:33:07 2006 +0100
Bug #9023: Only check mice for "mouse" or "void" if identifier is != NULL.
(cherry picked from 26d2e45bdb0cf4d18ba7b0365425da49d60b3d5c commit)
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index f105592..396c55a 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1613,7 +1613,7 @@ checkCoreInputDevices(serverLayoutPtr se
* events, unless a 'void' section is found, in which case the user
* probably wants to run footless.
*/
- for (i = servlayoutp->inputs; i->driver; i++) {
+ for (i = servlayoutp->inputs; i->identifier && i->driver; i++) {
if (!strcmp(i->driver, "void") || !strcmp(i->driver, "mouse")) {
found = 1; break;
}
More information about the xorg-commit
mailing list