help wanted: get minimal xserver built
Enrico Weigelt
weigelt at metux.de
Thu Feb 16 13:37:47 PST 2006
Hi folks,
I'm trying to get an minimal xserver (just xfree86 server without
any extensions) built. I had to fix a lot of things, but I'm
not finished yet ... still got some trouble with unresolved
symbols at linking.
Please could anyone help a little bit ?
(attached my current status as patch)
thx
--
---------------------------------------------------------------------
Enrico Weigelt == metux IT service
phone: +49 36207 519931 www: http://www.metux.de/
fax: +49 36207 519932 email: contact at metux.de
---------------------------------------------------------------------
Realtime Forex/Stock Exchange trading powered by postgresSQL :))
http://www.fxignal.net/
---------------------------------------------------------------------
-------------- next part --------------
diff -ruN xorg-server-1.0.1.orig/Makefile.am xorg-server-1.0.1/Makefile.am
--- xorg-server-1.0.1.orig/Makefile.am Sat Dec 3 18:04:44 2005
+++ xorg-server-1.0.1/Makefile.am Thu Feb 16 03:48:17 2006
@@ -39,6 +39,23 @@
LBX_DIR=lbx
endif
+if RECORD
+RECORD_DIR=record
+endif
+
+if RANDR
+RANDR_DIR=randr
+endif
+
+if RENDER
+RENDER_DIR=render
+endif
+
+if DBE
+DBE_DIR=dbe
+endif
+
+
SUBDIRS = \
doc \
include \
@@ -48,18 +65,18 @@
Xext \
miext \
os \
- randr \
- render \
+ $(RANDR_DIR) \
+ $(RENDER_DIR) \
Xi \
xkb \
- dbe \
+ $(DBE_DIR) \
$(MFB_DIR) \
$(AFB_DIR) \
$(CFB_DIR) \
$(CFB16_DIR) \
$(CFB24_DIR) \
$(CFB32_DIR) \
- record \
+ $(RECORD_DIR) \
xfixes \
damageext \
$(XTRAP_DIR) \
diff -ruN xorg-server-1.0.1.orig/configure.ac xorg-server-1.0.1/configure.ac
--- xorg-server-1.0.1.orig/configure.ac Wed Dec 21 03:30:08 2005
+++ xorg-server-1.0.1/configure.ac Thu Feb 16 03:51:11 2006
@@ -365,6 +365,8 @@
[INSTALL_LIBXF86CONFIG=no])
dnl Extensions.
+AC_ARG_ENABLE(render, AS_HELP_STRING([--disable-render], [Build Render extension (default: enabled)]), [RENDER=$enableval], [RENDER=yes])
+AC_ARG_ENABLE(randr, AS_HELP_STRING([--disable-randr], [Build Randr extension (default: enabled)]), [RANDR=$enableval], [RANDR=yes])
AC_ARG_ENABLE(composite, AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes])
AC_ARG_ENABLE(mitshm, AS_HELP_STRING([--disable-shm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes])
AC_ARG_ENABLE(xres, AS_HELP_STRING([--disable-xres], [Build XRes extension (default: enabled)]), [RES=$enableval], [RES=yes])
@@ -629,13 +631,19 @@
REQUIRED_MODULES="$REQUIRED_MODULES printproto"
fi
-AC_DEFINE(RENDER, 1, [Support RENDER extension])
-RENDER_LIB='$(top_builddir)/render/librender.la'
-RENDER_INC='-I$(top_srcdir)/render'
-
-AC_DEFINE(RANDR, 1, [Support RANDR extension])
-RANDR_LIB='$(top_builddir)/randr/librandr.la'
-RANDR_INC='-I$(top_srcdir)/randr'
+AM_CONDITIONAL(RENDER, [test "x$RENDER" = xyes])
+if test "x$RENDER" = "xyes"; then
+ AC_DEFINE(RENDER, 1, [Support RENDER extension])
+ RENDER_LIB='$(top_builddir)/render/librender.la'
+ RENDER_INC='-I$(top_srcdir)/render'
+fi
+
+AM_CONDITIONAL(RANDR, [test "x$RANDR" = "xyes"])
+if test "x$RANDR" = "xyes"; then
+ AC_DEFINE(RANDR, 1, [Support RANDR extension])
+ RANDR_LIB='$(top_builddir)/randr/librandr.la'
+ RANDR_INC='-I$(top_srcdir)/randr'
+fi
AC_DEFINE(XFIXES,1,[Support XFixes extension])
FIXES_LIB='$(top_builddir)/xfixes/libxfixes.la'
@@ -1491,3 +1499,5 @@
XpConfig/en_US/Makefile
xorg-server.pc
])
+
+
diff -ruN xorg-server-1.0.1.orig/doc/Makefile.am xorg-server-1.0.1/doc/Makefile.am
--- xorg-server-1.0.1.orig/doc/Makefile.am Tue Dec 6 23:48:48 2005
+++ xorg-server-1.0.1/doc/Makefile.am Thu Feb 16 03:48:17 2006
@@ -5,7 +5,9 @@
appman_PROCESSED = $(appman_PRE:man.pre=man)
-appman_DATA = $(appman_PRE:man.pre=@APP_MAN_SUFFIX@)
+appman_DATA = $(appman_PRE:man.pre=1)
+
+APP_MAN_SUFFIX = 1
BUILT_SOURCES = $(appman_PROCESSED)
diff -ruN xorg-server-1.0.1.orig/configure.ac xorg-server-1.0.1/configure.ac
--- xorg-server-1.0.1.orig/configure.ac Thu Feb 16 04:04:58 2006
+++ xorg-server-1.0.1/configure.ac Thu Feb 16 04:07:05 2006
@@ -454,6 +454,8 @@
dnl Only build sgml docs when linuxdoc is available and
dnl def.ents has been installed
+AM_CONDITIONAL(BUILD_LINUXDOC, [test "$BUILD_LINUXDOC" = "yes"])
+AM_CONDITIONAL(BUILD_PDFDOC, [test "$BUILD_PDFDOC" = "yes"])
XORG_CHECK_LINUXDOC
dnl Handle installing libxf86config
diff -ruN xorg-server-1.0.1.orig/configure.ac xorg-server-1.0.1/configure.ac
--- xorg-server-1.0.1.orig/configure.ac Thu Feb 16 04:30:59 2006
+++ xorg-server-1.0.1/configure.ac Thu Feb 16 04:33:03 2006
@@ -473,11 +473,11 @@
REQUIRED_LIBS="xfont xau fontenc"
AM_CONDITIONAL(XV, [test "x$XV" = xyes])
+AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes])
if test "x$XV" = xyes; then
AC_DEFINE(XV, 1, [Support Xv extension])
AC_DEFINE(XvExtension, 1, [Build Xv extension])
REQUIRED_MODULES="$REQUIRED_MODULES videoproto"
- AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes])
if test "x$XVMC" = xyes; then
AC_DEFINE(XvMCExtension, 1, [Build XvMC extension])
fi
diff -ruN xorg-server-1.0.1.orig/hw/xfree86/dixmods/Makefile.am xorg-server-1.0.1/hw/xfree86/dixmods/Makefile.am
--- xorg-server-1.0.1.orig/hw/xfree86/dixmods/Makefile.am Thu Feb 16 05:17:36 2006
+++ xorg-server-1.0.1/hw/xfree86/dixmods/Makefile.am Thu Feb 16 05:28:39 2006
@@ -10,6 +10,10 @@
XTRAPMOD = libxtrap.la
endif
+if DBE
+DBEMOD = libdbe.la
+endif
+
# cfb24 is only used by xf8_32wid, which is only used by sunffb on SPARC
if BUILD_XF8_32WID
CFB24MOD = libcfb24.la
@@ -26,7 +30,7 @@
libshadow.la
extsmoduledir = $(moduledir)/extensions
-extsmodule_LTLIBRARIES = libdbe.la \
+extsmodule_LTLIBRARIES = $(DBEMOD) \
librecord.la \
$(GLXMODS) \
$(XTRAPMOD)
diff -ruN xorg-server-1.0.1.orig/hw/xfree86/dixmods/Makefile.am xorg-server-1.0.1/hw/xfree86/dixmods/Makefile.am
--- xorg-server-1.0.1.orig/hw/xfree86/dixmods/Makefile.am Thu Feb 16 05:38:19 2006
+++ xorg-server-1.0.1/hw/xfree86/dixmods/Makefile.am Thu Feb 16 05:40:43 2006
@@ -14,6 +14,10 @@
DBEMOD = libdbe.la
endif
+if RECORD
+RECORDMOD = librecord.la
+endif
+
# cfb24 is only used by xf8_32wid, which is only used by sunffb on SPARC
if BUILD_XF8_32WID
CFB24MOD = libcfb24.la
@@ -31,7 +35,7 @@
extsmoduledir = $(moduledir)/extensions
extsmodule_LTLIBRARIES = $(DBEMOD) \
- librecord.la \
+ $(RECORDMOD) \
$(GLXMODS) \
$(XTRAPMOD)
diff -ruN xorg-server-1.0.1.orig/Xprint/doc/Makefile.am xorg-server-1.0.1/Xprint/doc/Makefile.am
--- xorg-server-1.0.1.orig/Xprint/doc/Makefile.am Thu Feb 16 05:48:33 2006
+++ xorg-server-1.0.1/Xprint/doc/Makefile.am Thu Feb 16 05:50:25 2006
@@ -3,7 +3,9 @@
appmandir = $(APP_MAN_DIR)
appman_PRE = Xprt.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+appman_DATA = $(appman_PRE:man=1)
+
+APP_MAN_SUFFIX = 1
include $(top_srcdir)/cpprules.in
diff -ruN xorg-server-1.0.1.orig/hw/dmx/Makefile.am xorg-server-1.0.1/hw/dmx/Makefile.am
--- xorg-server-1.0.1.orig/hw/dmx/Makefile.am Thu Feb 16 05:48:33 2006
+++ xorg-server-1.0.1/hw/dmx/Makefile.am Thu Feb 16 05:50:55 2006
@@ -88,7 +88,9 @@
appmandir = $(APP_MAN_DIR)
appman_PRE = Xdmx.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+appman_DATA = $(appman_PRE:man=1)
+
+APP_MAN_SUFFIX = 1
CLEANFILES = $(appman_DATA)
diff -ruN xorg-server-1.0.1.orig/hw/dmx/config/Makefile.am xorg-server-1.0.1/hw/dmx/config/Makefile.am
--- xorg-server-1.0.1.orig/hw/dmx/config/Makefile.am Thu Feb 16 05:48:33 2006
+++ xorg-server-1.0.1/hw/dmx/config/Makefile.am Thu Feb 16 05:50:45 2006
@@ -51,7 +51,9 @@
appmandir = $(APP_MAN_DIR)
appman_PRE = xdmxconfig.man vdltodmx.man dmxtodmx.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+appman_DATA = $(appman_PRE:man=1)
+
+APP_MAN_SUFFIX = 1
CLEANFILES = $(appman_DATA)
diff -ruN xorg-server-1.0.1.orig/hw/vfb/Makefile.am xorg-server-1.0.1/hw/vfb/Makefile.am
--- xorg-server-1.0.1.orig/hw/vfb/Makefile.am Thu Feb 16 05:48:33 2006
+++ xorg-server-1.0.1/hw/vfb/Makefile.am Thu Feb 16 05:51:23 2006
@@ -30,7 +30,9 @@
appmandir = $(APP_MAN_DIR)
appman_PRE = Xvfb.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+appman_DATA = $(appman_PRE:man=1)
+
+APP_MAN_SUFFIX = 1
BUILT_SOURCES = $(appman_PRE)
CLEANFILES = $(appman_PRE) $(appman_DATA)
diff -ruN xorg-server-1.0.1.orig/hw/xfree86/getconfig/Makefile.am xorg-server-1.0.1/hw/xfree86/getconfig/Makefile.am
--- xorg-server-1.0.1.orig/hw/xfree86/getconfig/Makefile.am Thu Feb 16 05:48:33 2006
+++ xorg-server-1.0.1/hw/xfree86/getconfig/Makefile.am Thu Feb 16 05:51:38 2006
@@ -33,9 +33,11 @@
include $(top_srcdir)/cpprules.in
+APP_MAN_SUFFIX = 1
+
appmandir = $(APP_MAN_DIR)
appman_PRE = getconfig.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+appman_DATA = $(appman_PRE:man=1)
filemandir = $(FILE_MAN_DIR)
fileman_DATA = getconfig.$(FILE_MAN_SUFFIX)
diff -ruN xorg-server-1.0.1.orig/hw/xfree86/utils/gtf/Makefile.am xorg-server-1.0.1/hw/xfree86/utils/gtf/Makefile.am
--- xorg-server-1.0.1.orig/hw/xfree86/utils/gtf/Makefile.am Thu Feb 16 05:48:34 2006
+++ xorg-server-1.0.1/hw/xfree86/utils/gtf/Makefile.am Thu Feb 16 05:52:50 2006
@@ -34,8 +34,10 @@
appmandir = $(APP_MAN_DIR)
+APP_MAN_SUFFIX = 1
+
appman_PRE = gtf.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+appman_DATA = $(appman_PRE:man=1)
include $(top_srcdir)/cpprules.in
diff -ruN xorg-server-1.0.1.orig/hw/xnest/Makefile.am xorg-server-1.0.1/hw/xnest/Makefile.am
--- xorg-server-1.0.1.orig/hw/xnest/Makefile.am Thu Feb 16 05:48:33 2006
+++ xorg-server-1.0.1/hw/xnest/Makefile.am Thu Feb 16 05:51:10 2006
@@ -72,7 +72,9 @@
appmandir = $(APP_MAN_DIR)
appman_PRE = Xnest.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+appman_DATA = $(appman_PRE:man=1)
+
+APP_MAN_SUFFIX = 1
EXTRAMANDEFS = \
-D__XCONFIGFILE__=$(__XCONFIGFILE__) \
diff -ruN xorg-server-1.0.1.orig/hw/xfree86/utils/kbd_mode/Makefile.am xorg-server-1.0.1/hw/xfree86/utils/kbd_mode/Makefile.am
--- xorg-server-1.0.1.orig/hw/xfree86/utils/kbd_mode/Makefile.am Thu Feb 16 05:58:02 2006
+++ xorg-server-1.0.1/hw/xfree86/utils/kbd_mode/Makefile.am Thu Feb 16 05:59:53 2006
@@ -45,8 +45,11 @@
appmandir = $(APP_MAN_DIR)
+APP_MAN_SUFFIX = 1
+
appman_PRE = kbd_mode.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+appman_DATA = $(appman_PRE:man=1)
+
BUILT_SOURCES = $(appman_PRE)
CLEANFILES = $(appman_PRE) $(appman_DATA)
diff -ruN xorg-server-1.0.1.orig/hw/xfree86/utils/pcitweak/Makefile.am xorg-server-1.0.1/hw/xfree86/utils/pcitweak/Makefile.am
--- xorg-server-1.0.1.orig/hw/xfree86/utils/pcitweak/Makefile.am Thu Feb 16 05:58:02 2006
+++ xorg-server-1.0.1/hw/xfree86/utils/pcitweak/Makefile.am Thu Feb 16 05:59:21 2006
@@ -43,8 +43,10 @@
appmandir = $(APP_MAN_DIR)
+APP_MAN_SUFFIX = 1
+
appman_PRE = pcitweak.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+appman_DATA = $(appman_PRE:man=1)
include $(top_srcdir)/cpprules.in
diff -ruN xorg-server-1.0.1.orig/hw/xfree86/utils/scanpci/Makefile.am xorg-server-1.0.1/hw/xfree86/utils/scanpci/Makefile.am
--- xorg-server-1.0.1.orig/hw/xfree86/utils/scanpci/Makefile.am Thu Feb 16 05:58:02 2006
+++ xorg-server-1.0.1/hw/xfree86/utils/scanpci/Makefile.am Thu Feb 16 06:00:05 2006
@@ -45,8 +45,10 @@
appmandir = $(APP_MAN_DIR)
+APP_MAN_SUFFIX = 1
+
appman_PRE = scanpci.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+appman_DATA = $(appman_PRE:man=1)
include $(top_srcdir)/cpprules.in
diff -ruN xorg-server-1.0.1.orig/hw/xfree86/utils/xorgcfg/Makefile.am xorg-server-1.0.1/hw/xfree86/utils/xorgcfg/Makefile.am
--- xorg-server-1.0.1.orig/hw/xfree86/utils/xorgcfg/Makefile.am Thu Feb 16 05:58:02 2006
+++ xorg-server-1.0.1/hw/xfree86/utils/xorgcfg/Makefile.am Thu Feb 16 05:59:07 2006
@@ -140,8 +140,10 @@
# Man page
appmandir = $(APP_MAN_DIR)
+APP_MAN_SUFFIX = 1
+
appman_PRE = xorgcfg.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+appman_DATA = $(appman_PRE:man=1)
all-local: $(appman_PRE) $(appman_DATA)
diff -ruN xorg-server-1.0.1.orig/hw/xfree86/utils/xorgconfig/Makefile.am xorg-server-1.0.1/hw/xfree86/utils/xorgconfig/Makefile.am
--- xorg-server-1.0.1.orig/hw/xfree86/utils/xorgconfig/Makefile.am Thu Feb 16 05:58:02 2006
+++ xorg-server-1.0.1/hw/xfree86/utils/xorgconfig/Makefile.am Thu Feb 16 05:59:33 2006
@@ -49,8 +49,10 @@
appmandir = $(APP_MAN_DIR)
+APP_MAN_SUFFIX = 1
+
appman_PRE = xorgconfig.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+appman_DATA = $(appman_PRE:man=1)
EXTRAMANDEFS = \
-D__XCONFIGFILE__=$(__XCONFIGFILE__) \
diff -ruN xorg-server-1.0.1.orig/configure.ac xorg-server-1.0.1/configure.ac
--- xorg-server-1.0.1.orig/configure.ac Thu Feb 16 07:07:54 2006
+++ xorg-server-1.0.1/configure.ac Thu Feb 16 07:10:14 2006
@@ -265,13 +265,13 @@
AC_DEFINE_UNQUOTED(OSNAME, "$OSNAME",
[Define to OS Name string to display for build OS in Xorg log])
-DEFAULT_VENDOR_NAME="The X.Org Foundation"
+DEFAULT_VENDOR_NAME="The_X.Org_Foundation"
DEFAULT_VENDOR_NAME_SHORT="X.Org"
DEFAULT_VERSION_MAJOR=7
DEFAULT_VERSION_MINOR=0
DEFAULT_VERSION_PATCH=0
DEFAULT_VERSION_SNAP=0
-DEFAULT_RELEASE_DATE="21 December 2005"
+DEFAULT_RELEASE_DATE="21_December_2005"
DEFAULT_VENDOR_WEB="http://wiki.x.org"
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
diff -ruN xorg-server-1.0.1.orig/configure.ac xorg-server-1.0.1/configure.ac
--- xorg-server-1.0.1.orig/configure.ac Thu Feb 16 07:35:50 2006
+++ xorg-server-1.0.1/configure.ac Thu Feb 16 07:38:10 2006
@@ -273,6 +273,7 @@
DEFAULT_VERSION_SNAP=0
DEFAULT_RELEASE_DATE="21_December_2005"
DEFAULT_VENDOR_WEB="http://wiki.x.org"
+VENDOR_RELEASE="70000000"
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
@@ -715,7 +716,6 @@
AC_DEFINE(USE_RGB_BUILTIN, 1, [Use built-in RGB color database])
fi
-VENDOR_RELEASE="((($VERSION_MAJOR) * 10000000) + (($VERSION_MINOR) * 100000) + (($VERSION_PATCH) * 1000) + $VERSION_SNAP)"
if test $VERSION_SNAP = "0"; then
if test $VERSION_PATCH = "0"; then
-------------- next part --------------
diff -ruN xorg-server-1.0.1.orig/Xext/xtest1di.c xorg-server-1.0.1/Xext/xtest1di.c
--- xorg-server-1.0.1.orig/Xext/xtest1di.c Thu Feb 16 17:12:25 2006
+++ xorg-server-1.0.1/Xext/xtest1di.c Thu Feb 16 22:03:48 2006
@@ -66,6 +66,8 @@
#include <dix-config.h>
#endif
+#ifdef XTESTEXT1
+
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xproto.h>
@@ -952,3 +954,5 @@
}
}
}
+
+#endif
diff -ruN xorg-server-1.0.1.orig/fb/fb.h xorg-server-1.0.1/fb/fb.h
--- xorg-server-1.0.1.orig/fb/fb.h Thu Feb 16 17:12:26 2006
+++ xorg-server-1.0.1/fb/fb.h Thu Feb 16 17:36:54 2006
@@ -43,7 +43,7 @@
#ifdef RENDER
#include "picturestr.h"
#else
-#include "picture.h"
+#include "../render/picture.h"
#endif
/*
diff -ruN xorg-server-1.0.1.orig/fb/fbpseudocolor.c xorg-server-1.0.1/fb/fbpseudocolor.c
--- xorg-server-1.0.1.orig/fb/fbpseudocolor.c Thu Feb 16 17:12:26 2006
+++ xorg-server-1.0.1/fb/fbpseudocolor.c Thu Feb 16 17:40:30 2006
@@ -6,7 +6,7 @@
#include <X11/Xproto.h>
#include "scrnintstr.h"
#include "colormapst.h"
-#include "glyphstr.h"
+#include "../render/glyphstr.h"
#include "resource.h"
#include <X11/fonts/font.h>
#include "dixfontstr.h"
diff -ruN xorg-server-1.0.1.orig/hw/Makefile.am xorg-server-1.0.1/hw/Makefile.am
--- xorg-server-1.0.1.orig/hw/Makefile.am Thu Feb 16 17:12:26 2006
+++ xorg-server-1.0.1/hw/Makefile.am Thu Feb 16 22:22:21 2006
@@ -27,4 +27,5 @@
$(XNEST_SUBDIRS) \
$(DMX_SUBDIRS)
-DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin
+## FIXME: do not publish this patch ...
+DIST_SUBDIRS = xfree86
diff -ruN xorg-server-1.0.1.orig/hw/xfree86/Makefile.am xorg-server-1.0.1/hw/xfree86/Makefile.am
--- xorg-server-1.0.1.orig/hw/xfree86/Makefile.am Thu Feb 16 17:12:26 2006
+++ xorg-server-1.0.1/hw/xfree86/Makefile.am Thu Feb 16 20:55:04 2006
@@ -7,7 +7,7 @@
SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
xf8_32bpp xf8_32wid loader scanpci dixmods exa \
- $(DRI_SUBDIR) utils $(DOC_SUBDIR) getconfig
+ $(DRI_SUBDIR) $(DOC_SUBDIR) getconfig
DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \
@@ -37,6 +37,7 @@
$(OS_LIBS) \
dummylib/libdummy.a \
dixmods/libdixmods.la \
+ ../../fb/libfb.la \
@XORG_LIBS@
Xorg_LDADD = $(XORG_LIBS) \
diff -ruN xorg-server-1.0.1.orig/hw/xfree86/common/xf86RandR.c xorg-server-1.0.1/hw/xfree86/common/xf86RandR.c
--- xorg-server-1.0.1.orig/hw/xfree86/common/xf86RandR.c Thu Feb 16 17:12:26 2006
+++ xorg-server-1.0.1/hw/xfree86/common/xf86RandR.c Thu Feb 16 18:34:38 2006
@@ -27,6 +27,8 @@
#include <xorg-config.h>
#endif
+#ifdef RANDR
+
#include <X11/X.h>
#include "os.h"
#include "mibank.h"
@@ -436,3 +438,4 @@
}
+#endif
diff -ruN xorg-server-1.0.1.orig/hw/xfree86/exa/exa.h xorg-server-1.0.1/hw/xfree86/exa/exa.h
--- xorg-server-1.0.1.orig/hw/xfree86/exa/exa.h Thu Feb 16 17:12:26 2006
+++ xorg-server-1.0.1/hw/xfree86/exa/exa.h Thu Feb 16 19:04:02 2006
@@ -30,7 +30,12 @@
#include "pixmapstr.h"
#include "windowstr.h"
#include "gcstruct.h"
+
+#ifdef RENDER
#include "picturestr.h"
+#else
+#include "../render/picturestr.h"
+#endif
#define EXA_VERSION_MAJOR 0
#define EXA_VERSION_MINOR 2
diff -ruN xorg-server-1.0.1.orig/hw/xfree86/loader/xf86sym.c xorg-server-1.0.1/hw/xfree86/loader/xf86sym.c
--- xorg-server-1.0.1.orig/hw/xfree86/loader/xf86sym.c Thu Feb 16 17:12:26 2006
+++ xorg-server-1.0.1/hw/xfree86/loader/xf86sym.c Thu Feb 16 21:26:13 2006
@@ -475,7 +475,9 @@
SYMFUNC(xf86CommonSpecialKey)
SYMFUNC(xf86IsPc98)
SYMFUNC(xf86DisableRandR)
+#ifdef RENDER
SYMFUNC(xf86GetRotation)
+#endif
SYMFUNC(xf86GetVersion)
SYMFUNC(xf86GetModuleVersion)
SYMFUNC(xf86GetClocks)
@@ -620,6 +622,7 @@
#endif
/* xf86xv.c */
+#ifdef XV
SYMFUNC(xf86XVScreenInit)
SYMFUNC(xf86XVRegisterGenericAdaptorDriver)
SYMFUNC(xf86XVListGenericAdaptors)
@@ -631,11 +634,14 @@
SYMFUNC(xf86XVClipVideoHelper)
SYMFUNC(xf86XVCopyYUV12ToPacked)
SYMFUNC(xf86XVCopyPacked)
+#endif
/* xf86xvmc.c */
+#ifdef XVMC
SYMFUNC(xf86XvMCScreenInit)
SYMFUNC(xf86XvMCCreateAdaptorRec)
SYMFUNC(xf86XvMCDestroyAdaptorRec)
+#endif
/* xf86VidMode.c */
SYMFUNC(VidModeExtensionInit)
diff -ruN xorg-server-1.0.1.orig/hw/xfree86/xaa/xaaPict.c xorg-server-1.0.1/hw/xfree86/xaa/xaaPict.c
--- xorg-server-1.0.1.orig/hw/xfree86/xaa/xaaPict.c Thu Feb 16 17:12:26 2006
+++ xorg-server-1.0.1/hw/xfree86/xaa/xaaPict.c Thu Feb 16 18:51:31 2006
@@ -37,10 +37,10 @@
#include "windowstr.h"
#include "xf86str.h"
#include "mi.h"
-#include "picturestr.h"
-#include "glyphstr.h"
-#include "picture.h"
-#include "mipict.h"
+#include "../render/picturestr.h"
+#include "../render/glyphstr.h"
+#include "../render/picture.h"
+#include "../render/mipict.h"
#include "xaa.h"
#include "xaalocal.h"
#include "xaawrap.h"
@@ -180,6 +180,7 @@
(pDraw->type == DRAWABLE_WINDOW || \
(pDraw->type == DRAWABLE_PIXMAP && IS_OFFSCREEN_PIXMAP(pDraw)))
+#ifdef RENDER
Bool
XAADoComposite (
CARD8 op,
@@ -546,6 +547,7 @@
XAA_RENDER_EPILOGUE(pScreen, Composite, XAAComposite);
}
+
Bool
XAADoGlyphs (CARD8 op,
PicturePtr pSrc,
@@ -769,3 +771,5 @@
XAA_RENDER_EPILOGUE(pScreen, Glyphs, XAAGlyphs);
}
+
+#endif
diff -ruN xorg-server-1.0.1.orig/hw/xfree86/xaa/xaaWrapper.c xorg-server-1.0.1/hw/xfree86/xaa/xaaWrapper.c
--- xorg-server-1.0.1.orig/hw/xfree86/xaa/xaaWrapper.c Thu Feb 16 17:12:26 2006
+++ xorg-server-1.0.1/hw/xfree86/xaa/xaaWrapper.c Thu Feb 16 18:41:54 2006
@@ -6,11 +6,13 @@
#include <X11/Xproto.h>
#include "scrnintstr.h"
#include "gcstruct.h"
-#include "glyphstr.h"
+#include "../render/glyphstr.h"
#include "window.h"
#include "windowstr.h"
-#include "picture.h"
+#include "../render/picture.h"
+#ifdef RENDER
#include "picturestr.h"
+#endif
#include "colormapst.h"
#include "xaa.h"
#include "xaalocal.h"
diff -ruN xorg-server-1.0.1.orig/include/xorg-config.h xorg-server-1.0.1/include/xorg-config.h
--- xorg-server-1.0.1.orig/include/xorg-config.h Thu Feb 16 17:12:26 2006
+++ xorg-server-1.0.1/include/xorg-config.h Thu Jan 1 01:00:00 1970
@@ -1,110 +0,0 @@
-/* include/xorg-config.h. Generated by configure. */
-/* xorg-config.h.in: not at all generated. -*- c -*-
- *
- * This file differs from xorg-server.h.in in that -server is installed
- * with the rest of the SDK for external drivers/modules to use, whereas
- * -config is for internal use only (i.e. building the DDX).
- *
- */
-
-#ifndef _XORG_CONFIG_H_
-#define _XORG_CONFIG_H_
-
-#include <dix-config.h>
-#include <xkb-config.h>
-
-/* Building Xorg server. */
-#define XORGSERVER 1
-
-/* Current X.Org version. */
-#define XORG_VERSION_CURRENT (((7) * 10000000) + ((0) * 100000) + ((0) * 1000) + 0)
-
-/* Need XFree86 libc-replacement typedefs. */
-#define NEED_XF86_TYPES 1
-
-/* Need XFree86 libc-replacement functions. */
-#define NEED_XF86_PROTOTYPES 1
-
-/* Name of X server. */
-#define __XSERVERNAME__ "Xorg"
-
-/* URL to go to for support. */
-#define __VENDORDWEBSUPPORT__ "http://wiki.x.org"
-
-/* Prefer dlloader modules to elfloader */
-#define DLOPEN_HACK 1
-
-/* Use libdl-based loader. */
-#define DLOPEN_SUPPORT 1
-
-/* Built-in output drivers. */
-#define DRIVERS {}
-
-/* Built-in input drivers. */
-#define IDRIVERS {}
-
-/* Path to configuration file. */
-#define XF86CONFIGFILE "xorg.conf"
-
-/* Path to configuration file. */
-#define __XCONFIGFILE__ "xorg.conf"
-
-/* Path to loadable modules. */
-#define DEFAULT_MODULE_PATH "/opt/debrix/lib/xorg/modules"
-
-/* Path to server log file. */
-#define DEFAULT_LOGPREFIX "/opt/debrix/var/log/Xorg."
-
-/* Building DRI-capable DDX. */
-#define XF86DRI 1
-
-/* Solaris 8 or later? */
-/* #undef __SOL8__ */
-
-/* Whether to use pixmap privates */
-#define PIXPRIV 1
-
-/* Define to 1 if you have the `walkcontext' function (used on Solaris for
- xorg_backtrace in hw/xfree86/common/xf86Events.c */
-/* #undef HAVE_WALKCONTEXT */
-
-/* Define to 1 if unsigned long is 64 bits. */
-#define _XSERVER64 1
-
-/* Building vgahw module */
-#define WITH_VGAHW 1
-
-/* Define to 1 if NetBSD built-in MTRR support is available */
-/* #undef HAS_MTRR_BUILTIN */
-
-/* Define to 1 if BSD MTRR support is available */
-/* #undef HAS_MTRR_SUPPORT */
-
-/* NetBSD PIO alpha IO */
-/* #undef USE_ALPHA_PIO */
-
-/* BSD AMD64 iopl */
-/* #undef USE_AMD64_IOPL */
-
-/* BSD /dev/io */
-/* #undef USE_DEV_IO */
-
-/* BSD i386 iopl */
-/* #undef USE_I386_IOPL */
-
-/* System is BSD-like */
-/* #undef CSRG_BASED */
-
-/* System has PC console */
-/* #undef PCCONS_SUPPORT */
-
-/* System has PCVT console */
-/* #undef PCVT_SUPPORT */
-
-/* System has syscons console */
-/* #undef SYSCONS_SUPPORT */
-
-/* System has wscons console */
-/* #undef WSCONS_SUPPORT */
-
-#endif /* _XORG_CONFIG_H_ */
diff -ruN xorg-server-1.0.1.orig/include/xorg-server.h xorg-server-1.0.1/include/xorg-server.h
--- xorg-server-1.0.1.orig/include/xorg-server.h Thu Feb 16 17:12:26 2006
+++ xorg-server-1.0.1/include/xorg-server.h Thu Jan 1 01:00:00 1970
@@ -1,245 +0,0 @@
-/* include/xorg-server.h. Generated by configure. */
-/* xorg-server.h.in -*- c -*-
- *
- * This file is the template file for the xorg-server.h file which gets
- * installed as part of the SDK. The #defines in this file overlap
- * with those from config.h, but only for those options that we want
- * to export to external modules. Boilerplate autotool #defines such
- * as HAVE_STUFF and PACKAGE_NAME is kept in config.h
- *
- * It is still possible to update config.h.in using autoheader, since
- * autoheader only creates a .h.in file for the first
- * AM_CONFIG_HEADER() line, and thus does not overwrite this file.
- *
- * However, it should be kept in sync with this file.
- */
-
-#ifndef _XORG_SERVER_H_
-#define _XORG_SERVER_H_
-
-/* Support BigRequests extension */
-#define BIGREQS 1
-
-/* Default font path */
-#define COMPILEDDEFAULTFONTPATH "/opt/debrix/lib/X11/fonts/misc/,/opt/debrix/lib/X11/fonts/TTF/,/opt/debrix/lib/X11/fonts/OTF,/opt/debrix/lib/X11/fonts/Type1/,/opt/debrix/lib/X11/fonts/CID/,/opt/debrix/lib/X11/fonts/100dpi/,/opt/debrix/lib/X11/fonts/75dpi/"
-
-/* Support Composite Extension */
-#define COMPOSITE 1
-
-/* Use OsVendorInit */
-#define DDXOSINIT 1
-
-/* Prefer dlloader modules to elfloader */
-#define DLOPEN_HACK 1
-
-/* Building with libdl */
-#define DLOPEN_SUPPORT 1
-
-/* Build DPMS extension */
-#define DPMSExtension 1
-
-/* Built-in output drivers */
-#define DRIVERS {}
-
-/* Build GLX extension */
-#define GLXEXT 1
-
-/* Include handhelds.org h3600 touchscreen driver */
-/* #undef H3600_TS */
-
-/* Support XDM-AUTH*-1 */
-#define HASXDMAUTH 1
-
-/* Support SHM */
-#define HAS_SHM 1
-
-/* Built-in input drivers */
-#define IDRIVERS {}
-
-/* Support IPv6 for TCP connections */
-#define IPv6 1
-
-/* Support MIT Misc extension */
-#define MITMISC 1
-
-/* Support MIT-SHM Extension */
-#define MITSHM 1
-
-/* Disable some debugging code */
-#define NDEBUG 1
-
-/* Need XFree86 helper functions */
-#define NEED_XF86_PROTOTYPES 1
-
-/* Need XFree86 typedefs */
-#define NEED_XF86_TYPES 1
-
-/* Internal define for Xinerama */
-#define PANORAMIX 1
-
-/* Support pixmap privates */
-#define PIXPRIV 1
-
-/* Support RANDR extension */
-#define RANDR 1
-
-/* Support RENDER extension */
-#define RENDER 1
-
-/* Support X resource extension */
-#define RES 1
-
-/* Support MIT-SCREEN-SAVER extension */
-#define SCREENSAVER 1
-
-/* Use a lock to prevent multiple servers on a display */
-#define SERVER_LOCK 1
-
-/* Support SHAPE extension */
-#define SHAPE 1
-
-/* Include time-based scheduler */
-#define SMART_SCHEDULE 1
-
-/* Define to 1 on systems derived from System V Release 4 */
-/* #undef SVR4 */
-
-/* Support TCP socket connections */
-#define TCPCONN 1
-
-/* Enable touchscreen support */
-/* #undef TOUCHSCREEN */
-
-/* Support tslib touchscreen abstraction library */
-/* #undef TSLIB */
-
-/* Support UNIX socket connections */
-#define UNIXCONN 1
-
-/* Use builtin rgb color database */
-/* #undef USE_RGB_BUILTIN */
-
-/* Use rgb.txt directly */
-#define USE_RGB_TXT 1
-
-/* unaligned word accesses behave as expected */
-/* #undef WORKING_UNALIGNED_INT */
-
-/* Support XCMisc extension */
-#define XCMISC 1
-
-/* Support Xdmcp */
-#define XDMCP 1
-
-/* Build XFree86 BigFont extension */
-#define XF86BIGFONT 1
-
-/* Support XFree86 miscellaneous extensions */
-#define XF86MISC 1
-
-/* Support XFree86 Video Mode extension */
-#define XF86VIDMODE 1
-
-/* Build XDGA support */
-#define XFreeXDGA 1
-
-/* Support Xinerama extension */
-#define XINERAMA 1
-
-/* Support X Input extension */
-#define XINPUT 1
-
-/* Build XKB */
-#define XKB 1
-
-/* Enable XKB per default */
-#define XKB_DFLT_DISABLED 0
-
-/* Build XKB server */
-#define XKB_IN_SERVER 1
-
-/* Support loadable input and output drivers */
-/* #undef XLOADABLE */
-
-/* Build DRI extension */
-#define XF86DRI 1
-
-/* Build Xorg server */
-#define XORGSERVER 1
-
-/* Vendor release */
-#define XORG_RELEASE "Release 7.0"
-
-/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((7) * 10000000) + ((0) * 100000) + ((0) * 1000) + 0)
-
-/* Build Xv Extension */
-#define XvExtension 1
-
-/* Build XvMC Extension */
-#define XvMCExtension 1
-
-/* Build XRes extension */
-#define XResExtension 1
-
-/* Support XSync extension */
-#define XSYNC 1
-
-/* Support XTest extension */
-#define XTEST 1
-
-/* Support XTrap extension */
-#define XTRAP 1
-
-/* Support Xv Extension */
-#define XV 1
-
-/* Vendor name */
-#define XVENDORNAME "The X.Org Foundation"
-
-/* Endian order */
-#define X_BYTE_ORDER X_LITTLE_ENDIAN
-
-/* BSD-compliant source */
-#define _BSD_SOURCE 1
-
-/* POSIX-compliant source */
-#define _POSIX_SOURCE 1
-
-/* X/Open-compliant source */
-#define _XOPEN_SOURCE 500
-
-/* Vendor web address for support */
-#define __VENDORDWEBSUPPORT__ "http://wiki.x.org"
-
-/* Location of configuration file */
-#define __XCONFIGFILE__ "xorg.conf"
-
-/* XKB default rules */
-#define __XKBDEFRULES__ "xorg"
-
-/* Name of X server */
-#define __XSERVERNAME__ "Xorg"
-
-/* Define to 1 if unsigned long is 64 bits. */
-#define _XSERVER64 1
-
-/* Building vgahw module */
-#define WITH_VGAHW 1
-
-/* System is BSD-like */
-/* #undef CSRG_BASED */
-
-/* System has PC console */
-/* #undef PCCONS_SUPPORT */
-
-/* System has PCVT console */
-/* #undef PCVT_SUPPORT */
-
-/* System has syscons console */
-/* #undef SYSCONS_SUPPORT */
-
-/* System has wscons console */
-/* #undef WSCONS_SUPPORT */
-
-#endif /* _XORG_SERVER_H_ */
diff -ruN xorg-server-1.0.1.orig/miext/cw/cw.h xorg-server-1.0.1/miext/cw/cw.h
--- xorg-server-1.0.1.orig/miext/cw/cw.h Thu Feb 16 17:12:26 2006
+++ xorg-server-1.0.1/miext/cw/cw.h Thu Feb 16 19:05:39 2006
@@ -26,7 +26,12 @@
#endif
#include "gcstruct.h"
+
+#ifdef RENDER
#include "picturestr.h"
+#else
+#include "../render/picturestr.h"
+#endif
/*
* One of these structures is allocated per GC that gets used with a window with
diff -ruN xorg-server-1.0.1.orig/miext/layer/layerpict.c xorg-server-1.0.1/miext/layer/layerpict.c
--- xorg-server-1.0.1.orig/miext/layer/layerpict.c Thu Feb 16 17:12:26 2006
+++ xorg-server-1.0.1/miext/layer/layerpict.c Thu Feb 16 18:11:35 2006
@@ -26,6 +26,8 @@
#include <dix-config.h>
#endif
+#ifdef RENDER
+
#include "layerstr.h"
void
@@ -147,3 +149,5 @@
LayerWrap (ps, &pLayScr->kinds[LAYER_FB], CompositeRects, layerCompositeRects);
}
}
+
+#endif
More information about the xorg-modular
mailing list