debrix ChangeLog, 1.3, 1.4 Makefile.am, 1.1, 1.2 configure.ac, 1.4,
1.5 debrix.pc.in, 1.1, 1.2
Daniel Stone
xserver-commit at pdx.freedesktop.org
Thu Jul 1 10:49:51 PDT 2004
Committed by: daniel
Update of /cvs/xserver/debrix
In directory pdx:/tmp/cvs-serv31934
Modified Files:
ChangeLog Makefile.am configure.ac debrix.pc.in
Log Message:
2004-06-29 Daniel Stone <daniel at freedesktop.org>
* configure.ac:
Made CFLAGS a little less embarassingly large; fix it so the script
actually runs and works fine (no more sed errors); remove XF86keysym.h
check, which probably never actually worked. Get rid of INCLUDES;
merge it into CFLAGS.
* */Makefile.am:
Sanitise INCLUDES/CFLAGS usage to radically decrease length of gcc
lines.
* include/Makefile.am:
Make debrix.h depend on config.h, so they stay in sync. Oops.
* hw/xorg/int10/xf86int10module.c:
Change int10VersRec declaration from static, so debrixInit can see it.
* hw/xorg/common/xf86KbdLnx.c:
* hw/xorg/os-support/linux/lnx_KbdMap.c:
Axe unused DECkeysym.h header dep.
* hw/xorg/include/X11/extensions/Makefile.am:
Finally fix the ext_HEADERS debacle.
* hw/xorg/loader/dlloader.c:
* hw/xorg/loader/loader.c:
dlopen() NULL at startup, and include it in dlsym() searches, so we
can find symbols included in the main binary with the standard module
search.
* hw/xorg/loader/loader.c:
* hw/xorg/loader/loadmod.c:
* hw/xorg/loader/xf86sym.c:
* hw/xorg/common/xf86Init.c:
Change loader API to introduce a new 'builtin' class, which doesn't
actually load a module, but goes through all the motions; get rid of
baseModules list for the time being (we don't want bitmap, and pcidata
is already loaded). Explicitly add all ModuleData objects being loaded
to xf86sym.c, so they don't get 'optimised' out.
* hw/xorg/common/debrixInit.c:
* hw/xorg/common/xf86Init.c:
Add new debrixInit() function, which adds a few modules as builtins.
* hw/xorg/loader/xf86sym.c:
* hw/xorg/os-support/linux/Makefile.am:
Re-enable a few missing os-support functions (xf86UDelay, xf86IODelay,
xf86BusToMem, xf86MemToBus, xf86LoadKernelModule).
* configure.ac:
* fb/Makefile.am:
* miext/shadow/Makefile.am:
Make fb and shadow modular once more.
* fb/fb.h:
* render/filter.c:
* render/picture.c:
* include/picturestr.h:
Rolled back to X.Org versions until I can figure out why pictures
don't actually display in most cases.
The following two are thanks to Jabuk Piotr C?apa.
* os/xdmauth.c:
"Xdmcp.h" -> <X11/Xdmcp.h>
* hw/xorg/os-support/shared/drm/kernel/drm.h:
Guard linux/config.h inclusion with #ifdef __KERNEL__.
Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/debrix/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog 28 Jun 2004 02:43:34 -0000 1.3
+++ ChangeLog 1 Jul 2004 17:49:47 -0000 1.4
@@ -1,3 +1,72 @@
+2004-06-29 Daniel Stone <daniel at freedesktop.org>
+
+ * configure.ac:
+ Made CFLAGS a little less embarassingly large; fix it so the script
+ actually runs and works fine (no more sed errors); remove XF86keysym.h
+ check, which probably never actually worked. Get rid of INCLUDES;
+ merge it into CFLAGS.
+
+ * */Makefile.am:
+ Sanitise INCLUDES/CFLAGS usage to radically decrease length of gcc
+ lines.
+
+ * include/Makefile.am:
+ Make debrix.h depend on config.h, so they stay in sync. Oops.
+
+ * hw/xorg/int10/xf86int10module.c:
+ Change int10VersRec declaration from static, so debrixInit can see it.
+
+ * hw/xorg/common/xf86KbdLnx.c:
+ * hw/xorg/os-support/linux/lnx_KbdMap.c:
+ Axe unused DECkeysym.h header dep.
+
+ * hw/xorg/include/X11/extensions/Makefile.am:
+ Finally fix the ext_HEADERS debacle.
+
+ * hw/xorg/loader/dlloader.c:
+ * hw/xorg/loader/loader.c:
+ dlopen() NULL at startup, and include it in dlsym() searches, so we
+ can find symbols included in the main binary with the standard module
+ search.
+
+ * hw/xorg/loader/loader.c:
+ * hw/xorg/loader/loadmod.c:
+ * hw/xorg/loader/xf86sym.c:
+ * hw/xorg/common/xf86Init.c:
+ Change loader API to introduce a new 'builtin' class, which doesn't
+ actually load a module, but goes through all the motions; get rid of
+ baseModules list for the time being (we don't want bitmap, and pcidata
+ is already loaded). Explicitly add all ModuleData objects being loaded
+ to xf86sym.c, so they don't get 'optimised' out.
+
+ * hw/xorg/common/debrixInit.c:
+ * hw/xorg/common/xf86Init.c:
+ Add new debrixInit() function, which adds a few modules as builtins.
+
+ * hw/xorg/loader/xf86sym.c:
+ * hw/xorg/os-support/linux/Makefile.am:
+ Re-enable a few missing os-support functions (xf86UDelay, xf86IODelay,
+ xf86BusToMem, xf86MemToBus, xf86LoadKernelModule).
+
+ * configure.ac:
+ * fb/Makefile.am:
+ * miext/shadow/Makefile.am:
+ Make fb and shadow modular once more.
+
+ * fb/fb.h:
+ * render/filter.c:
+ * render/picture.c:
+ * include/picturestr.h:
+ Rolled back to X.Org versions until I can figure out why pictures
+ don't actually display in most cases.
+
+ The following two are thanks to Jabuk Piotr C?apa.
+ * os/xdmauth.c:
+ "Xdmcp.h" -> <X11/Xdmcp.h>
+
+ * hw/xorg/os-support/shared/drm/kernel/drm.h:
+ Guard linux/config.h inclusion with #ifdef __KERNEL__.
+
2004-06-28 Adam Jackson <ajax at freedesktop.org>
* hw/xorg/xf8_16bpp/, hw/xorg/xf8_32bpp/, hw/xorg/xf8_32/:
Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/debrix/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am 10 Jun 2004 19:11:15 -0000 1.1
+++ Makefile.am 1 Jul 2004 17:49:47 -0000 1.2
@@ -17,13 +17,9 @@
Xi \
mfb \
xkb \
- damageext \
- xfixes \
$(COMPOSITE_DIR) \
hw
-AM_CFLAGS = $(XORG_CFLAGS)
-
pkgconfigdir=$(libdir)/pkgconfig
pkgconfig_DATA = debrix.pc
EXTRA_DIST = debrix.pc.in
Index: configure.ac
===================================================================
RCS file: /cvs/xserver/debrix/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure.ac 28 Jun 2004 02:43:34 -0000 1.4
+++ configure.ac 1 Jul 2004 17:49:47 -0000 1.5
@@ -89,6 +89,7 @@
DEFAULT_VENDOR_WEB="http://wiki.x.org"
EXTENSION_LIBS='$(top_builddir)/Xext/libXext.a'
EXTENSION_INCS='-I$(top_srcdir)/Xext'
+AC_DEFINE(DEBRIX, 1, [Build Debrix server])
AC_ARG_ENABLE(werror, [ --enable-werror ],[WERROR=$enableval],[WERROR=no])
AC_ARG_ENABLE(xv, [ --disable-xv ],[XV=$enableval],[XV=yes])
@@ -143,7 +144,7 @@
[ BUILDERADDR="xorg at freedesktop.org" ])
AC_SUBST([driverdir])
sdkdir="$includedir/xorg"
-extdir="$sdkdir/X11/extensions"
+extdir="$includedir/X11/extensions"
AC_SUBST([sdkdir])
AC_SUBST([extdir])
@@ -201,7 +202,6 @@
AC_DEFINE(_XORGDRI_SERVER_,1,[XORGDRI internal define])
fi
AC_DEFINE(XINPUT,1,[Support X Input extension])
-EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/Xi'
EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/Xi/libXi.a'
AM_CONDITIONAL(XINERAMA, [test x$XINERAMA = xyes])
@@ -312,16 +312,16 @@
AC_DEFINE(XCMISC,1,[Support XCMisc extension])
AC_DEFINE(BIGREQS,1,[Support BigRequests extension])
AC_DEFINE(PIXPRIV,1,[Support pixmap privates])
-AC_DEFINE(XFIXES,1,[Support XFixes extension])
+#AC_DEFINE(XFIXES,1,[Support XFixes extension])
AC_DEFINE(XF86VIDMODE,1,[Support XFree86 Video Mode extension])
AC_DEFINE(XF86MISC,1,[Support XFree86 miscellaneous extensions])
# must come first as it uses stuff in Shape -d
-EXTENSION_LIBS='$(top_builddir)/xfixes/libxfixes.a'" $EXTENSION_LIBS"
+#EXTENSION_LIBS='$(top_builddir)/xfixes/libxfixes.a'" $EXTENSION_LIBS"
EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/xfixes'
-AC_DEFINE(DAMAGEEXT,1,[Support Damage extension])
-EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/damageext/libdamageext.a'
-EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/damageext'
+#AC_DEFINE(DAMAGEEXT,1,[Support Damage extension])
+#EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/damageext/libdamageext.a'
+#EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/damageext'
if test "$COMPOSITE" = yes; then
EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/composite/libcomposite.a'
@@ -333,13 +333,12 @@
MI_LIB='$(top_builddir)/mi/libmi.a'
MI_EXT_LIB='$(top_builddir)/mi/libmiext.a'
MI_INC='-I$(top_srcdir)/mi'
-# modular these days -d
-#FB_LIB='$(top_builddir)/fb/libfb.a'
-#FB_INC='-I$(top_srcdir)/fb'
+FB_LIB='$(top_builddir)/fb/libfb.a'
+FB_INC='-I$(top_srcdir)/fb'
DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.a'
DAMAGE_INC='-I$(top_srcdir)/miext/damage'
-#SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.a'
-#SHADOW_INC='-I$(top_srcdir)/miext/shadow'
+SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.a'
+SHADOW_INC='-I$(top_srcdir)/miext/shadow'
XPSTUBS_LIB='$(top_builddir)/dix/libxpstubs.a'
XSERVER_LIBS="${XSERVER_LIBS} -lm -lz"
XKB_LIB='$(top_builddir)/xkb/libxkb.a'
@@ -348,21 +347,11 @@
PKG_CHECK_MODULES(XSERVER, $REQUIRED_MODULES)
-XORG_LIBS=
-XORG_INCS=
-XORG_OS=
-XORG_INC='-I$(top_srcdir)/hw/xorg/include \\\
--I$(top_srcdir)/hw/xorg/common \\\
--I$(top_srcdir)/hw/xorg/os-support \\\
--I$(top_srcdir)/include \\\
--I$(top_srcdir)/os \\\
--I$(top_srcdir)/hw/xorg/os-support/bus'
XORG_CORE_LIBS="$DIX_LIB"
-XORG_LIBS="$FB_LIB $MI_LIB $XI_LIB $XKB_LIB $COMPOSITE_LIB \
- $EXTENSION_LIBS $DAMAGE_LIB $XPSTUBS_LIB \
- $OS_LIB"
-XORG_INCS="$XORG_INC $EXTENSION_INCS $MI_INC $DAMAGE_INC \
- $SHADOW_INC $FB_INC $XSERVER_CFLAGS $XI_INC"
+XORG_LIBS="$FB_LIB $MI_LIB $XI_LIB $XKB_LIB $COMPOSITE_LIB $EXTENSION_LIBS $DAMAGE_LIB $XPSTUBS_LIB $OS_LIB $SHADOW_LIB"
+XORG_DDXINCS='-I$(top_srcdir)/hw/xorg/include -I$(top_srcdir)/hw/xorg/common'
+XORG_OSINCS='-I$(top_srcdir)/hw/xorg/os-support -I$(top_srcdir)/hw/xorg/os-support/bus -I$(top_srcdir)/os'
+XORG_INCS="$EXTENSION_INCS $MI_INC $DAMAGE_INC $SHADOW_INC $FB_INC $XI_INC $XORG_DDXINCS $XORG_OSINCS"
if test "$WORDS_BIGENDIAN" = yes; then
ENDIAN="X_BIG_ENDIAN"
else
@@ -416,7 +405,6 @@
AC_SUBST([XORG_CORE_LIBS])
AC_SUBST([XORG_LIBS])
AC_SUBST([XORG_INCS])
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([XORG_OS])
AC_SUBST([XORG_OS_SUBDIR])
AM_CONDITIONAL([XORG_BUS_SBUS], [test "x$xorg_bus_sbus" = xyes])
@@ -428,6 +416,7 @@
AC_DEFINE(XFree86Server,1,[Building XFree86 server])
AC_DEFINE(XFree86LOADER,1,[Building XFree86 loader])
AC_DEFINE(XF86BIGFONT,1,[Build XFree86 BigFont extension])
+AC_DEFINE(XResExtension,1,[Build XRes extension])
AC_DEFINE(DPMSExtension,1,[Build DPMS extension])
AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT,[XF86_VERSION_NUMERIC($VERSION_STRING)],[Current Xorg version])
AC_DEFINE(NEED_XF86_TYPES,1,[Need XFree86 typedefs])
@@ -438,29 +427,28 @@
AC_DEFINE(DRIVERS,{},[Built-in output drivers])
AC_DEFINE(IDRIVERS,{},[Built-in input drivers])
-AC_CHECK_HEADERS([X11/XF86keysym.h],,,${XSERVER_CFLAGS})
-
if test "x$GCC" = "xyes"; then
- GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations \
- -Wnested-externs -fno-strict-aliasing"
+ GCC_WARNINGS1="-Wall -Wpointer-arith -Wstrict-prototypes"
+ GCC_WARNINGS2="-Wmissing-prototypes -Wmissing-declarations"
+ GCC_WARNINGS3="-Wnested-externs -fno-strict-aliasing"
+ GCC_WARNINGS="$GCC_WARNINGS1 $GCC_WARNINGS2 $GCC_WARNINGS3"
if test "x$WERROR" = "xyes"; then
GCC_WARNINGS="${GCC_WARNINGS} -Werror"
fi
XSERVER_CFLAGS="$GCC_WARNINGS $XSERVER_CFLAGS"
fi
-# These can't be in AC_DEFINE_UNQUOTED as they expand to strings with stuff like
-# ${prefix} in them.
+dnl These can't be in AC_DEFINE_UNQUOTED as they expand to strings with stuff
+dnl like ${prefix} in them.
CONFIGFILE="$sysconfdir/xorg.conf"
-XORG_CFLAGS="$XORG_CFLAGS -DXF86CONFIGFILE=\\\"$CONFIGFILE\\\" \
- -DDEFAULT_MODULE_PATH=\\\"$driverdir\\\" \
- -DDEFAULT_LOGPREFIX=\\\"$localstatedir/log/Xorg.\\\""
+XORG_MODPATH="-DDEFAULT_MODULE_PATH=\\\"$driverdir\\\""
+XORG_LOGPATH="-DDEFAULT_LOGPREFIX=\\\"$localstatedir/log/Xorg.\\\""
+XORG_CONFPATH="-DXF86CONFIGFILE=\\\"$CONFIGFILE\\\""
+XORG_CFLAGS="$XORG_CFLAGS $XSERVER_CFLAGS $XORG_MODPATH $XORG_LOGPATH $XORG_CONFPATH"
+AC_SUBST([XORG_CFLAGS])
-CFLAGS="$XORG_CFLAGS $XSERVER_CFLAGS "'-I${top_srcdir}/include -I${top_srcdir}/Xext'" $CFLAGS"
+CFLAGS="$XORG_CFLAGS $CFLAGS"
AC_SUBST([CFLAGS])
-INCLUDES="$XORG_INCS"
-AC_SUBST([INCLUDES])
AC_MSG_CHECKING(if unaligned word accesses behave as expected)
AC_TRY_RUN([
Index: debrix.pc.in
===================================================================
RCS file: /cvs/xserver/debrix/debrix.pc.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debrix.pc.in 10 Jun 2004 19:11:15 -0000 1.1
+++ debrix.pc.in 1 Jul 2004 17:49:47 -0000 1.2
@@ -10,4 +10,4 @@
Version: @PACKAGE_VERSION@
Requires: xfont
Libs: -L${libdir}
-Cflags: -I${includedir}
+Cflags: -I${sdkdir}
More information about the xserver-commit
mailing list