components/x11/xorg-server/patches/08-IA.patch

   1 diff --git a/Makefile.am b/Makefile.am
   2 index f0fa2d8..2127601 100644
   3 --- a/Makefile.am
   4 +++ b/Makefile.am
   5 @@ -58,6 +58,7 @@ SUBDIRS = \
   6         $(GLX_DIR) \
   7         $(PRESENT_DIR) \
   8         $(DRI3_DIR) \
   9 +       IA \
  10         exa \
  11         $(GLAMOR_DIR) \
  12         config \
  13 diff --git a/configure.ac b/configure.ac
  14 index c7379de..e09f020 100644
  15 --- a/configure.ac
  16 +++ b/configure.ac
  17 @@ -1421,6 +1421,10 @@ AC_DEFINE(XINPUT, 1, [Support X Input extension])
  18  XI_LIB='$(top_builddir)/Xi/libXi.la'
  19  XI_INC='-I$(top_srcdir)/Xi'
  20
  21 +# SolarisIA extension
  22 +IA_LIB='$(top_builddir)/IA/libIA.la'
  23 +XEXT_LIB="${XEXT_LIB} ${IA_LIB}"
  24 +
  25  AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
  26  AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes)
  27  AM_CONDITIONAL(VBE, test "x$VBE" = xyes)
  28 @@ -2636,3 +2640,6 @@ xserver.ent
  29  xorg-server.pc
  30  ])
  31  AC_OUTPUT
  32 +
  33 +# Add Sun IA extension
  34 +AC_OUTPUT([IA/Makefile])
  35 diff --git a/include/extinit.h b/include/extinit.h
  36 index fa5f293..62a0ab2 100644
  37 --- a/include/extinit.h
  38 +++ b/include/extinit.h
  39 @@ -121,6 +121,14 @@ extern _X_EXPORT Bool noMITShmExtension;
  40  extern void ShmExtensionInit(void);
  41  #endif
  42
  43 +#define SolarisIAExtension
  44 +
  45 +#ifdef SolarisIAExtension
  46 +#include <X11/extensions/interactive.h>
  47 +extern _X_EXPORT Bool noIAExtension;
  48 +extern void IAExtensionInit(void);
  49 +#endif
  50 +
  51  extern void SyncExtensionInit(void);
  52
  53  extern void XCMiscExtensionInit(void);
  54 diff --git a/mi/miinitext.c b/mi/miinitext.c
  55 index 5872bf5..a9a3826 100644
  56 --- a/mi/miinitext.c
  57 +++ b/mi/miinitext.c
  58 @@ -150,6 +150,9 @@ static ExtensionToggle ExtensionToggleList[] = {
  59  #ifdef XCSECURITY
  60      {"SECURITY", &noSecurityExtension},
  61  #endif
  62 +#ifdef SolarisIAExtension
  63 +    { IANAME /* "SolarisIA" */, &noIAExtension },
  64 +#endif
  65  #ifdef RES
  66      {"X-Resource", &noResExtension},
  67  #endif
  68 @@ -296,6 +299,9 @@ static const ExtensionModule staticExtensions[] = {
  69  #ifdef RES
  70      {ResExtensionInit, XRES_NAME, &noResExtension},
  71  #endif
  72 +#ifdef SolarisIAExtension
  73 +    {IAExtensionInit, IANAME, &noIAExtension},
  74 +#endif
  75  #ifdef XV
  76      {XvExtensionInit, XvName, &noXvExtension},
  77      {XvMCExtensionInit, XvMCName, &noXvExtension},
  78 diff --git a/os/utils.c b/os/utils.c
  79 index 1a070de..efaeef7 100644
  80 --- a/os/utils.c
  81 +++ b/os/utils.c
  82 @@ -184,6 +184,9 @@ Bool noXvExtension = FALSE;
  83  #ifdef DRI2
  84  Bool noDRI2Extension = FALSE;
  85  #endif
  86 +#ifdef SolarisIAExtension
  87 +Bool noIAExtension = FALSE;
  88 +#endif
  89
  90  Bool noGEExtension = FALSE;
  91