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.

148 lines
7.3 KiB

  1. Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
  2. Date: 2005-08-26
  3. Initial Package Version: 1.2.8
  4. Upstream Status: Unknown
  5. Origin: Submitted to the BLFS-Dev mailing list by Andrew Benton
  6. Rediffed to fix a fuzz issue by Randy McMurchy
  7. Description: Fixes compilation issues using GCC-4
  8. diff -Naur SDL-1.2.8-orig/src/hermes/HeadMMX.h SDL-1.2.8/src/hermes/HeadMMX.h
  9. --- SDL-1.2.8-orig/src/hermes/HeadMMX.h 2001-04-26 16:45:45.000000000
  10. 0000
  11. +++ SDL-1.2.8/src/hermes/HeadMMX.h 2005-08-26 17:59:46.000000000 +0000
  12. @@ -50,21 +50,19 @@
  13. extern "C" {
  14. #endif
  15. - void ConvertMMX(HermesConverterInterface *) __attribute__ ((alias ("_ConvertMMX")));
  16. -#if 0
  17. - void ClearMMX_32(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_32")));
  18. - void ClearMMX_24(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_24")));
  19. - void ClearMMX_16(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_16")));
  20. - void ClearMMX_8(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_8")));
  21. -
  22. - void ConvertMMXp32_16RGB555() __attribute__ ((alias ("_ConvertMMXp32_16RGB555")));
  23. -#endif
  24. -
  25. - void ConvertMMXpII32_24RGB888() __attribute__ ((alias ("_ConvertMMXpII32_24RGB888")));
  26. - void ConvertMMXpII32_16RGB565() __attribute__ ((alias ("_ConvertMMXpII32_16RGB565")));
  27. - void ConvertMMXpII32_16BGR565() __attribute__ ((alias ("_ConvertMMXpII32_16BGR565")));
  28. - void ConvertMMXpII32_16RGB555() __attribute__ ((alias ("_ConvertMMXpII32_16RGB555")));
  29. - void ConvertMMXpII32_16BGR555() __attribute__ ((alias ("_ConvertMMXpII32_16BGR555")));
  30. + extern void _ConvertMMX(HermesConverterInterface *);
  31. + extern void _ConvertMMXpII32_24RGB888();
  32. + extern void _ConvertMMXpII32_16RGB565();
  33. + extern void _ConvertMMXpII32_16BGR565();
  34. + extern void _ConvertMMXpII32_16RGB555();
  35. + extern void _ConvertMMXpII32_16BGR555();
  36. +
  37. + #define ConvertMMX _ConvertMMX
  38. + #define ConvertMMXpII32_24RGB888 _ConvertMMXpII32_24RGB888
  39. + #define ConvertMMXpII32_16RGB565 _ConvertMMXpII32_16RGB565
  40. + #define ConvertMMXpII32_16BGR565 _ConvertMMXpII32_16BGR565
  41. + #define ConvertMMXpII32_16RGB555 _ConvertMMXpII32_16RGB555
  42. + #define ConvertMMXpII32_16BGR555 _ConvertMMXpII32_16BGR555
  43. #ifdef __cplusplus
  44. }
  45. diff -Naur SDL-1.2.8-orig/src/hermes/HeadX86.h SDL-1.2.8/src/hermes/HeadX86.h
  46. --- SDL-1.2.8-orig/src/hermes/HeadX86.h 2002-06-08 17:45:39.000000000
  47. 0000
  48. +++ SDL-1.2.8/src/hermes/HeadX86.h 2005-08-26 17:59:46.000000000 +0000
  49. @@ -79,56 +79,47 @@
  50. extern "C" {
  51. #endif
  52. - int Hermes_X86_CPU() __attribute__ ((alias ("_Hermes_X86_CPU")));
  53. + extern int _Hermes_X86_CPU();
  54. - void ConvertX86(HermesConverterInterface *) __attribute__ ((alias ("_ConvertX86")));
  55. + extern void _ConvertX86(HermesConverterInterface *);
  56. +
  57. + extern void _ConvertX86p32_32BGR888();
  58. + extern void _ConvertX86p32_32RGBA888();
  59. + extern void _ConvertX86p32_32BGRA888();
  60. + extern void _ConvertX86p32_24RGB888();
  61. + extern void _ConvertX86p32_24BGR888();
  62. + extern void _ConvertX86p32_16RGB565();
  63. + extern void _ConvertX86p32_16BGR565();
  64. + extern void _ConvertX86p32_16RGB555();
  65. + extern void _ConvertX86p32_16BGR555();
  66. + extern void _ConvertX86p32_8RGB332();
  67. +
  68. + extern void _ConvertX86p16_16BGR565();
  69. + extern void _ConvertX86p16_16RGB555();
  70. + extern void _ConvertX86p16_16BGR555();
  71. + extern void _ConvertX86p16_8RGB332();
  72. +
  73. +
  74. + #define Hermes_X86_CPU _Hermes_X86_CPU
  75. +
  76. + #define ConvertX86 _ConvertX86
  77. +
  78. + #define ConvertX86p32_32BGR888 _ConvertX86p32_32BGR888
  79. + #define ConvertX86p32_32RGBA888 _ConvertX86p32_32RGBA888
  80. + #define ConvertX86p32_32BGRA888 _ConvertX86p32_32BGRA888
  81. + #define ConvertX86p32_24RGB888 _ConvertX86p32_24RGB888
  82. + #define ConvertX86p32_24BGR888 _ConvertX86p32_24BGR888
  83. + #define ConvertX86p32_16RGB565 _ConvertX86p32_16RGB565
  84. + #define ConvertX86p32_16BGR565 _ConvertX86p32_16BGR565
  85. + #define ConvertX86p32_16RGB555 _ConvertX86p32_16RGB555
  86. + #define ConvertX86p32_16BGR555 _ConvertX86p32_16BGR555
  87. + #define ConvertX86p32_8RGB332 _ConvertX86p32_8RGB332
  88. +
  89. + #define ConvertX86p16_16BGR565 _ConvertX86p16_16BGR565
  90. + #define ConvertX86p16_16RGB555 _ConvertX86p16_16RGB555
  91. + #define ConvertX86p16_16BGR555 _ConvertX86p16_16BGR555
  92. + #define ConvertX86p16_8RGB332 _ConvertX86p16_8RGB332
  93. -#if 0
  94. - void ClearX86_32(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_32")));
  95. - void ClearX86_24(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_24")));
  96. - void ClearX86_16(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_16")));
  97. - void ClearX86_8(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_8")));
  98. -#endif
  99. -
  100. - void ConvertX86p32_32BGR888() __attribute__ ((alias ("_ConvertX86p32_32BGR888")));
  101. - void ConvertX86p32_32RGBA888() __attribute__ ((alias ("_ConvertX86p32_32RGBA888")));
  102. - void ConvertX86p32_32BGRA888() __attribute__ ((alias ("_ConvertX86p32_32BGRA888")));
  103. - void ConvertX86p32_24RGB888() __attribute__ ((alias ("_ConvertX86p32_24RGB888")));
  104. - void ConvertX86p32_24BGR888() __attribute__ ((alias ("_ConvertX86p32_24BGR888")));
  105. - void ConvertX86p32_16RGB565() __attribute__ ((alias ("_ConvertX86p32_16RGB565")));
  106. - void ConvertX86p32_16BGR565() __attribute__ ((alias ("_ConvertX86p32_16BGR565")));
  107. - void ConvertX86p32_16RGB555() __attribute__ ((alias ("_ConvertX86p32_16RGB555")));
  108. - void ConvertX86p32_16BGR555() __attribute__ ((alias ("_ConvertX86p32_16BGR555")));
  109. - void ConvertX86p32_8RGB332() __attribute__ ((alias ("_ConvertX86p32_8RGB332")));
  110. -
  111. -#if 0
  112. - void ConvertX86p16_32RGB888() __attribute__ ((alias ("_ConvertX86p16_32RGB888")));
  113. - void ConvertX86p16_32BGR888() __attribute__ ((alias ("_ConvertX86p16_32BGR888")));
  114. - void ConvertX86p16_32RGBA888() __attribute__ ((alias ("_ConvertX86p16_32RGBA888")));
  115. - void ConvertX86p16_32BGRA888() __attribute__ ((alias ("_ConvertX86p16_32BGRA888")));
  116. - void ConvertX86p16_24RGB888() __attribute__ ((alias ("_ConvertX86p16_24RGB888")));
  117. - void ConvertX86p16_24BGR888() __attribute__ ((alias ("_ConvertX86p16_24BGR888")));
  118. -#endif
  119. - void ConvertX86p16_16BGR565() __attribute__ ((alias ("_ConvertX86p16_16BGR565")));
  120. - void ConvertX86p16_16RGB555() __attribute__ ((alias ("_ConvertX86p16_16RGB555")));
  121. - void ConvertX86p16_16BGR555() __attribute__ ((alias ("_ConvertX86p16_16BGR555")));
  122. - void ConvertX86p16_8RGB332() __attribute__ ((alias ("_ConvertX86p16_8RGB332")));
  123. -
  124. -#if 0
  125. - void CopyX86p_4byte() __attribute__ ((alias ("_CopyX86p_4byte")));
  126. - void CopyX86p_3byte() __attribute__ ((alias ("_CopyX86p_3byte")));
  127. - void CopyX86p_2byte() __attribute__ ((alias ("_CopyX86p_2byte")));
  128. - void CopyX86p_1byte() __attribute__ ((alias ("_CopyX86p_1byte")));
  129. -
  130. - void ConvertX86pI8_32() __attribute__ ((alias ("_ConvertX86pI8_32")));
  131. - void ConvertX86pI8_24() __attribute__ ((alias ("_ConvertX86pI8_24")));
  132. - void ConvertX86pI8_16() __attribute__ ((alias ("_ConvertX86pI8_16")));
  133. -
  134. - extern int ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGB888_LUT_X86")));
  135. - extern int ConvertX86p16_32BGR888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGR888_LUT_X86")));
  136. - extern int ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGBA888_LUT_X86")));
  137. - extern int ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86")));
  138. -#endif
  139. #ifdef __cplusplus
  140. }