svn merge "^/branches/released" .

3 files changed, 10 insertions, 15 deletions

diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 2b611b8ed..21ad15e4c 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -794,9 +794,6 @@ APPLEWMPROTO="applewmproto >= 1.4"
 

 dnl Core modules for most extensions, et al.

 SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.0.99.3] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"

-REQUIRED_MODULES="[fixesproto >= 4.1] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"

-REQUIRED_LIBS="xfont xau"

-

 # Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc

 AC_SUBST(SDK_REQUIRED_MODULES)

 

@@ -807,6 +804,7 @@ LIBDRI="dri >= 7.8.0"
 LIBDRM="libdrm >= 2.3.0"

 LIBGL="gl >= 7.1.0"

 LIBXEXT="xext >= 1.0.99.4"

+LIBXFONT="xfont >= 1.4.2"

 LIBXI="xi >= 1.2.99.1"

 LIBXTST="xtst >= 1.0.99.2"

 LIBPCIACCESS="pciaccess >= 0.8.0"

@@ -819,7 +817,9 @@ LIBPIXMAN="pixman-1 >= 0.15.20"
 dnl Pixman is always required, but we separate it out so we can link

 dnl specific modules against it

 PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)

-REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN"

+REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"

+

+REQUIRED_MODULES="[fixesproto >= 4.1] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"

 

 if test "x$CONFIG_UDEV" = xyes &&

  { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then

@@ -1515,7 +1515,7 @@ fi
 

 dnl Xnest DDX

 

-PKG_CHECK_MODULES(XNESTMODULES, [xfont $LIBXEXT x11 xau $XDMCP_MODULES], [have_xnest=yes], [have_xnest=no])

+PKG_CHECK_MODULES(XNESTMODULES, [$LIBXEXT x11 xau $XDMCP_MODULES], [have_xnest=yes], [have_xnest=no])

 AC_MSG_CHECKING([whether to build Xnest DDX])

 if test "x$XNEST" = xauto; then

 	XNEST="$have_xnest"

@@ -1867,7 +1867,7 @@ if test "x$XWIN" = xyes; then
 	AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])

 	AC_CHECK_TOOL(WINDRES, windres)

 

-	PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont])

+	PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau])

 

 	if test "x$WINDOWSWM" = xauto; then

 		PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no])

@@ -1956,7 +1956,7 @@ AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes])
 dnl DMX DDX

 PKG_CHECK_MODULES(

 	[DMXMODULES],

-	[xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES],

+	[xmuu $LIBXEXT x11 xrender xfixes $LIBXI $DMXPROTO xau $XDMCP_MODULES],

 	[PKG_CHECK_MODULES(

 		[XDMXCONFIG_DEP],

 		[xaw7 xmu xt xpm x11],

@@ -2061,7 +2061,7 @@ if test "$KDRIVE" = yes; then
        AC_DEFINE(KDRIVE_MOUSE, 1, [Enable KDrive mouse driver])

     fi

 

-    XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xfont xau xdmcp"

+    XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xau xdmcp"

     if test "x$XV" = xyes; then

         XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv"

     fi

diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c
index 1cc5a9161..3f4baf6cb 100644
--- a/xorg-server/dix/dixfonts.c
+++ b/xorg-server/dix/dixfonts.c
@@ -1926,9 +1926,7 @@ InitFonts (void)
 {

     patternCache = MakeFontPatternCache();

 

-    BuiltinRegisterFpeFunctions();

-    FontFileRegisterFpeFunctions();

-    fs_register_fpe_functions();

+    register_fpe_functions();

 }

 

 int

diff --git a/xorg-server/include/dixfont.h b/xorg-server/include/dixfont.h
index 4e23da845..7ed29cfba 100644
--- a/xorg-server/include/dixfont.h
+++ b/xorg-server/include/dixfont.h
@@ -141,10 +141,7 @@ extern _X_EXPORT void InitGlyphCaching(void);
 

 extern _X_EXPORT void SetGlyphCachingMode(int /*newmode*/);

 

-/*

- * libXfont/src/builtins/builtin.h

- */

-extern _X_EXPORT void BuiltinRegisterFpeFunctions(void);

+extern _X_EXPORT void register_fpe_functions(void);

 

 /*

  * libXfont stubs.