Bug #7364: Require renderproto 0.9.3 on 64-bit, and fix build with it.
(cherry picked from commit 07630d897e
)
This commit is contained in:
parent
19256f6056
commit
643a263f2c
|
@ -629,7 +629,14 @@ PKG_CHECK_MODULES(PIXMAN, $PIXMAN)
|
||||||
AC_SUBST(PIXMAN_CFLAGS)
|
AC_SUBST(PIXMAN_CFLAGS)
|
||||||
|
|
||||||
dnl Core modules for most extensions, et al.
|
dnl Core modules for most extensions, et al.
|
||||||
REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.2] [kbproto >= 1.0.3]"
|
# Require updated renderproto for ABI sanity if we're 64-bit.
|
||||||
|
if test "$ac_cv_sizeof_unsigned_long" = 8; then
|
||||||
|
RENDERPROTO="[renderproto >= 0.9.3]"
|
||||||
|
else
|
||||||
|
RENDERPROTO="renderproto"
|
||||||
|
fi
|
||||||
|
|
||||||
|
REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.2] [kbproto >= 1.0.3]"
|
||||||
REQUIRED_LIBS="xfont xau fontenc $PIXMAN"
|
REQUIRED_LIBS="xfont xau fontenc $PIXMAN"
|
||||||
|
|
||||||
dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
|
dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
#ifndef _PICTURESTR_H_
|
#ifndef _PICTURESTR_H_
|
||||||
#define _PICTURESTR_H_
|
#define _PICTURESTR_H_
|
||||||
|
|
||||||
#include "glyphstr.h"
|
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
|
#include "glyphstr.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
|
||||||
typedef struct _DirectFormat {
|
typedef struct _DirectFormat {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user