components/x11/xorg-server/patches/02-sun-paths.patch

   1 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
   2 index 486752b..c2cfc90 100644
   3 --- a/hw/xfree86/common/xf86Config.c
   4 +++ b/hw/xfree86/common/xf86Config.c
   5 @@ -74,9 +74,9 @@
   6   */
   7  #ifndef ALL_CONFIGPATH
   8  #define ALL_CONFIGPATH "%A," "%R," \
   9 -                       "/etc/X11/%R," "%P/etc/X11/%R," \
  10 +                       "/etc/X11/%R," "%P/lib/X11/%R," \
  11                         "%E," "%F," \
  12 -                       "/etc/X11/%F," "%P/etc/X11/%F," \
  13 +                       "/etc/X11/%F," "%P/lib/X11/%F," \
  14                         "/etc/X11/%X," "/etc/%X," \
  15                         "%P/etc/X11/%X.%H," \
  16                         "%P/etc/X11/%X," \
  17 @@ -84,8 +84,8 @@
  18                         "%P/lib/X11/%X"
  19  #endif
  20  #ifndef RESTRICTED_CONFIGPATH
  21 -#define RESTRICTED_CONFIGPATH  "/etc/X11/%S," "%P/etc/X11/%S," \
  22 -                       "/etc/X11/%G," "%P/etc/X11/%G," \
  23 +#define RESTRICTED_CONFIGPATH  "/etc/X11/%S," "%P/lib/X11/%S," \
  24 +                       "/etc/X11/%G," "%P/lib/X11/%G," \
  25                         "/etc/X11/%X," "/etc/%X," \
  26                         "%P/etc/X11/%X.%H," \
  27                         "%P/etc/X11/%X," \
  28 diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
  29 index 7df7a80..74e503c 100644
  30 --- a/hw/xfree86/common/xf86Globals.c
  31 +++ b/hw/xfree86/common/xf86Globals.c
  32 @@ -141,7 +141,8 @@ xf86InfoRec xf86Info = {
  33
  34  const char *xf86ConfigFile = NULL;
  35  const char *xf86ConfigDir = NULL;
  36 -const char *xf86ModulePath = DEFAULT_MODULE_PATH;
  37 +/* Sun: add old module path for compatibility with out-of-tree driver packages */
  38 +const char *xf86ModulePath = DEFAULT_MODULE_PATH ",/usr/X11/lib/modules/";
  39  MessageType xf86ModPathFrom = X_DEFAULT;
  40  const char *xf86LogFile = DEFAULT_LOGPREFIX;
  41  MessageType xf86LogFileFrom = X_DEFAULT;
  42 diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
  43 index 5d92bbe..2b5a8f6 100644
  44 --- a/hw/xfree86/man/xorg.conf.man
  45 +++ b/hw/xfree86/man/xorg.conf.man
  46 @@ -36,9 +36,9 @@ server is started as a normal user:
  47  .RS 4
  48  .nf
  49  .IR /etc/X11/ <cmdline>
  50 -.IR __projectroot__/etc/X11/ <cmdline>
  51 +.IR __projectroot__/lib/X11/ <cmdline>
  52  .IB /etc/X11/ $XORGCONFIG
  53 -.IB __projectroot__/etc/X11/ $XORGCONFIG
  54 +.IB __projectroot__/lib/X11/ $XORGCONFIG
  55  .I /etc/X11/xorg.conf
  56  .I /etc/xorg.conf
  57  .IR __projectroot__/etc/X11/xorg.conf. <hostname>
  58 @@ -67,10 +67,10 @@ search locations are as follows:
  59  .nf
  60  <cmdline>
  61  .IR /etc/X11/ <cmdline>
  62 -.IR __projectroot__/etc/X11/ <cmdline>
  63 +.IR __projectroot__/lib/X11/ <cmdline>
  64  .B $XORGCONFIG
  65  .IB /etc/X11/ $XORGCONFIG
  66 -.IB __projectroot__/etc/X11/ $XORGCONFIG
  67 +.IB __projectroot__/lib/X11/ $XORGCONFIG
  68  .I /etc/X11/xorg.conf
  69  .I /etc/xorg.conf
  70  .IR __projectroot__/etc/X11/xorg.conf. <hostname>
  71 diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
  72 index 81935be..9473e34 100644
  73 --- a/include/xorg-server.h.in
  74 +++ b/include/xorg-server.h.in
  75 @@ -208,6 +208,7 @@
  76  /* Have X server platform bus support */
  77  #undef XSERVER_PLATFORM_BUS
  78
  79 +#include <sys/isa_defs.h> /* Ensure _LP64 is defined when needed on Solaris */
  80  #ifdef _LP64
  81  #define _XSERVER64 1
  82  #endif