dix: use one single function to register fpe fonts
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 <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
a68a101a73
commit
75536ee805
|
@ -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
|
||||
|
|
|
@ -1924,9 +1924,7 @@ InitFonts (void)
|
|||
{
|
||||
patternCache = MakeFontPatternCache();
|
||||
|
||||
BuiltinRegisterFpeFunctions();
|
||||
FontFileRegisterFpeFunctions();
|
||||
fs_register_fpe_functions();
|
||||
register_fpe_functions();
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue
Block a user