X server doesn't need to understand fpe internals, so use register_fpe_functions from libXfont.
It's required to get new version of libXfont, therefore adjust it to be passed to autoconf. Signed-off-by: Tiago Vignatti <[email protected]> Reviewed-by: Mikhail Gusarov <[email protected]> Reviewed-by: Alex Deucher <[email protected]> --- changes from v1: - squashed autoconf bits within the actual code changes. configure.ac | 8 ++++++-- dix/dixfonts.c | 4 +--- include/dixfont.h | 5 +---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index c8b49de..a9fd97f 100644 --- a/configure.ac +++ b/configure.ac @@ -794,7 +794,7 @@ APPLEWMPROTO="applewmproto >= 1.4" dnl Core modules for most extensions, et al. REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.11] [fixesproto >= 4.1] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xextproto >= 7.0.99.3] [xproto >= 7.0.17] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] fontsproto [inputproto >= 1.9.99.902] [kbproto >= 1.0.3]" -REQUIRED_LIBS="xfont xau [pixman-1 >= 0.15.20]" +REQUIRED_LIBS="xau [pixman-1 >= 0.15.20]" dnl List of libraries that require a specific version LIBAPPLEWM="applewm >= 1.4" @@ -803,6 +803,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" @@ -810,6 +811,9 @@ LIBGLIB="glib-2.0 >= 2.16" LIBUDEV="libudev >= 143" LIBSELINUX="libselinux >= 2.0.86" +PKG_CHECK_MODULES([XFONT], $LIBXFONT) +REQUIRED_LIBS="$REQUIRED_LIBS $LIBXFONT" + if test "x$CONFIG_UDEV" = xyes && { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then AC_MSG_ERROR([Hotplugging through both libudev and dbus/hal not allowed]) @@ -2147,7 +2151,7 @@ AC_SUBST([BUILD_DATE]) BUILD_TIME="`date +'1%H%M%S'`" AC_SUBST([BUILD_TIME]) -DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS" +DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS $XFONT_CFLAGS" AC_SUBST([DIX_CFLAGS]) diff --git a/dix/dixfonts.c b/dix/dixfonts.c index e321177..85c9b2b 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1924,9 +1924,7 @@ InitFonts (void) { patternCache = MakeFontPatternCache(); - BuiltinRegisterFpeFunctions(); - FontFileRegisterFpeFunctions(); - fs_register_fpe_functions(); + register_fpe_functions(); } int diff --git a/include/dixfont.h b/include/dixfont.h index cf86f54..617b94a 100644 --- a/include/dixfont.h +++ b/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. -- 1.7.1.226.g770c5 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
