mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

93 lines
2.4 KiB

  1. --- ./xc.patch.orig 2004-09-13 06:45:46.143510936 +0200
  2. +++ ./xc.patch 2004-09-13 06:46:03.017945632 +0200
  3. @@ -8,11 +8,11 @@
  4. + XCOMM
  5. + XCOMM X VNC server
  6. + XCOMM
  7. -+ MFBDIR = mfb
  8. -+ CFB8DIR = cfb
  9. -+ CFB16DIR = cfb16
  10. -+ CFB24DIR = cfb24
  11. -+ CFB32DIR = cfb32
  12. ++ MFBSUBDIR = mfb
  13. ++ CFB8SUBDIR = cfb
  14. ++ CFB16SUBDIR = cfb16
  15. ++ CFB24SUBDIR = cfb24
  16. ++ CFB32SUBDIR = cfb32
  17. + XVNCDDXDIR = vnc/Xvnc
  18. + XVNCDIRS = $(STDDIRS) $(MFBDIR) \
  19. + $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
  20. @@ -116,60 +116,6 @@
  21. ! nlwMiddle >>= 3; \
  22. while (h--) { \
  23. srcpix = psrc[srcy]; \
  24. -*** xc/programs/Xserver/cfb/cfbglblt8.c.orig Fri Dec 14 19:59:23 2001
  25. ---- xc/programs/Xserver/cfb/cfbglblt8.c Tue Aug 12 10:05:57 2003
  26. -***************
  27. -*** 284,288 ****
  28. - register glyphPointer glyphBits;
  29. - register int xoff;
  30. -! #if defined(USE_LEFT_BITS) || (!defined(STIPPLE) && !defined(USE_STIPPLE_CODE))
  31. - register CfbBits *dst;
  32. - #endif
  33. ---- 284,288 ----
  34. - register glyphPointer glyphBits;
  35. - register int xoff;
  36. -! #if defined(USE_LEFTBITS) || (!defined(STIPPLE) && !defined(USE_STIPPLE_CODE))
  37. - register CfbBits *dst;
  38. - #endif
  39. -***************
  40. -*** 292,296 ****
  41. - CfbBits *dstLine;
  42. - CfbBits *pdstBase;
  43. -! #ifdef USE_LEFT_BITS
  44. - CARD32 *cTmp;
  45. - #endif
  46. ---- 292,296 ----
  47. - CfbBits *dstLine;
  48. - CfbBits *pdstBase;
  49. -! #ifdef USE_LEFTBITS
  50. - CARD32 *cTmp;
  51. - #endif
  52. -***************
  53. -*** 399,403 ****
  54. - } while (--hTmp);
  55. - break;
  56. -! #else /* !USE_LEFT_BITS */
  57. - {
  58. - int h;
  59. ---- 399,403 ----
  60. - } while (--hTmp);
  61. - break;
  62. -! #else /* !USE_LEFTBITS */
  63. - {
  64. - int h;
  65. -***************
  66. -*** 412,416 ****
  67. - glyphBits = clips;
  68. - /* fall through */
  69. -! #endif /* USE_LEFT_BITS */
  70. - case rgnIN:
  71. - #ifdef STIPPLE
  72. ---- 412,416 ----
  73. - glyphBits = clips;
  74. - /* fall through */
  75. -! #endif /* USE_LEFTBITS */
  76. - case rgnIN:
  77. - #ifdef STIPPLE
  78. *** xc/programs/Xserver/cfb/cfbcppl.c.orig Fri Dec 14 19:59:22 2001
  79. --- xc/programs/Xserver/cfb/cfbcppl.c Sun Apr 18 12:53:36 2004
  80. ***************
  81. --- ./xc/config/cf/vnc.def.orig 2004-09-13 06:50:23.325849986 +0200
  82. +++ ./xc/config/cf/vnc.def 2004-09-13 06:51:52.378509287 +0200
  83. @@ -6,7 +6,8 @@
  84. #define BuildNls NO
  85. #define BuildXIE NO
  86. #define BuildGlxExt NO
  87. -#define XnestServer NO
  88. +#define XnestServer YES
  89. +#define XF86Server NO
  90. #define XprtServer NO
  91. #ifdef SunArchitecture