frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add necessary *CONFIG_H declarations and a force-off of XF86* extensions in 

miinitext in the XGL case. Prevents mismatched structure sizes on my
    _XSERVER64 machine. At this point, with the uncommitted render/ diffs,
    Xglx starts up but displays badly.
This commit is contained in:
Eric Anholt 2005-12-29 00:19:33 +00:00
parent 3664c3ebf3
commit d6646307f0
5 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ChangeLog
View File

@ -1,25 +1,13 @@
2005-12-28 Luc Verhaegen <libv@skynet.be> 2005-12-28 Eric Anholt <anholt@FreeBSD.org>
* configure.ac: * hw/xgl/Makefile.am:
* hw/xfree86/common/xf86Config.c: (GenerateDriverlist), * hw/xgl/egl/Makefile.am:
(configMonitor), (configExtensions), (xf86HandleConfigFile): * hw/xgl/glx/Makefile.am:
* hw/xfree86/common/xf86Mode.c: (xf86ModeStatusToString), * mi/miinitext.c:
(xf86CheckModeForMonitor): Add necessary *CONFIG_H declarations and a force-off of XF86* extensions
* hw/xfree86/common/xf86str.h: in miinitext in the XGL case. Prevents mismatched structure sizes on my
* hw/xfree86/utils/Makefile.am: _XSERVER64 machine. At this point, with the uncommitted render/ diffs,
* hw/xfree86/utils/cvt/Makefile.am: Xglx starts up but displays badly.
* hw/xfree86/utils/cvt/cvt.c: (add), (PrintModeline),
(xf86CVTMode), (xf86CVTCheckStandard), (PrintUsage),
(PrintComment), (main):
* hw/xfree86/utils/cvt/cvt.man.pre:
Bug #5153: standalone CVT modeline generator.
- add hw/xfree86/utils/cvt/, cvt.c, cvt.man.pre and Makefile.am.
- Adjust configure.ac and hw/xfree86/utils/Makefile.am for cvt.
- Add MonPtr->reducedblanking and Option "ReducedBlanking" to the
Monitor section.
- Check for reduced blanking in xf86CheckModeForMonitor and disallow
modes with less than 25% blanking otherwise.
- Fix some warnings in hw/xfree86/common/xf86Config.c.
2005-12-28 Eric Anholt <anholt@FreeBSD.org> 2005-12-28 Eric Anholt <anholt@FreeBSD.org>

2
hw/xgl/Makefile.am
View File

@ -18,6 +18,8 @@ SUBDIRS = \
AM_CFLAGS = \ AM_CFLAGS = \
@SERVER_DEFINES@ \ @SERVER_DEFINES@ \
-DHAVE_XGL_CONFIG_H \
-DHAVE_DIX_CONFIG_H \
$(XGLMODULES_CFLAGS) $(XGLMODULES_CFLAGS)
noinst_LIBRARIES = libxgl.a noinst_LIBRARIES = libxgl.a

2
hw/xgl/egl/Makefile.am
View File

@ -8,6 +8,8 @@ SUBDIRS = \
AM_CFLAGS = \ AM_CFLAGS = \
@SERVER_DEFINES@ \ @SERVER_DEFINES@ \
-DHAVE_XGL_CONFIG_H \
-DHAVE_DIX_CONFIG_H \
$(XEGLMODULES_CFLAGS) $(XEGLMODULES_CFLAGS)
noinst_LTLIBRARIES = libxegl.la noinst_LTLIBRARIES = libxegl.la

2
hw/xgl/glx/Makefile.am
View File

@ -9,6 +9,8 @@ SUBDIRS = \
AM_CFLAGS = \ AM_CFLAGS = \
-I$(srcdir)/.. \ -I$(srcdir)/.. \
@SERVER_DEFINES@ \ @SERVER_DEFINES@ \
-DHAVE_XGL_CONFIG_H \
-DHAVE_DIX_CONFIG_H \
$(XGLXMODULES_CFLAGS) $(XGLXMODULES_CFLAGS)
noinst_LTLIBRARIES = libxglx.la noinst_LTLIBRARIES = libxglx.la

10
mi/miinitext.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.26 2005/07/16 03:49:59 kem Exp $ */ /* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.27 2005/12/28 10:02:53 ajax Exp $ */
/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
/*********************************************************** /***********************************************************
@ -74,6 +74,14 @@ SOFTWARE.
#undef XF86VIDMODE #undef XF86VIDMODE
#endif #endif
#ifdef HAVE_XGL_CONFIG_H
#include <xgl-config.h>
#undef XF86MISC
#undef XFreeXDGA
#undef XF86DRI
#undef XF86VIDMODE
#endif
#include "misc.h" #include "misc.h"
#include "extension.h" #include "extension.h"
#include "micmap.h" #include "micmap.h"