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.

167 lines
8.1 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/blindcoder/libsdl/SDL-1.2.8-gcc4-1.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
  20. Date: 2005-08-26
  21. Initial Package Version: 1.2.8
  22. Upstream Status: Unknown
  23. Origin: Submitted to the BLFS-Dev mailing list by Andrew Benton
  24. Rediffed to fix a fuzz issue by Randy McMurchy
  25. Description: Fixes compilation issues using GCC-4
  26. diff -Naur SDL-1.2.8-orig/src/hermes/HeadMMX.h SDL-1.2.8/src/hermes/HeadMMX.h
  27. --- SDL-1.2.8-orig/src/hermes/HeadMMX.h 2001-04-26 16:45:45.000000000
  28. 0000
  29. +++ SDL-1.2.8/src/hermes/HeadMMX.h 2005-08-26 17:59:46.000000000 +0000
  30. @@ -50,21 +50,19 @@
  31. extern "C" {
  32. #endif
  33. - void ConvertMMX(HermesConverterInterface *) __attribute__ ((alias ("_ConvertMMX")));
  34. -#if 0
  35. - void ClearMMX_32(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_32")));
  36. - void ClearMMX_24(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_24")));
  37. - void ClearMMX_16(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_16")));
  38. - void ClearMMX_8(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_8")));
  39. -
  40. - void ConvertMMXp32_16RGB555() __attribute__ ((alias ("_ConvertMMXp32_16RGB555")));
  41. -#endif
  42. -
  43. - void ConvertMMXpII32_24RGB888() __attribute__ ((alias ("_ConvertMMXpII32_24RGB888")));
  44. - void ConvertMMXpII32_16RGB565() __attribute__ ((alias ("_ConvertMMXpII32_16RGB565")));
  45. - void ConvertMMXpII32_16BGR565() __attribute__ ((alias ("_ConvertMMXpII32_16BGR565")));
  46. - void ConvertMMXpII32_16RGB555() __attribute__ ((alias ("_ConvertMMXpII32_16RGB555")));
  47. - void ConvertMMXpII32_16BGR555() __attribute__ ((alias ("_ConvertMMXpII32_16BGR555")));
  48. + extern void _ConvertMMX(HermesConverterInterface *);
  49. + extern void _ConvertMMXpII32_24RGB888();
  50. + extern void _ConvertMMXpII32_16RGB565();
  51. + extern void _ConvertMMXpII32_16BGR565();
  52. + extern void _ConvertMMXpII32_16RGB555();
  53. + extern void _ConvertMMXpII32_16BGR555();
  54. +
  55. + #define ConvertMMX _ConvertMMX
  56. + #define ConvertMMXpII32_24RGB888 _ConvertMMXpII32_24RGB888
  57. + #define ConvertMMXpII32_16RGB565 _ConvertMMXpII32_16RGB565
  58. + #define ConvertMMXpII32_16BGR565 _ConvertMMXpII32_16BGR565
  59. + #define ConvertMMXpII32_16RGB555 _ConvertMMXpII32_16RGB555
  60. + #define ConvertMMXpII32_16BGR555 _ConvertMMXpII32_16BGR555
  61. #ifdef __cplusplus
  62. }
  63. diff -Naur SDL-1.2.8-orig/src/hermes/HeadX86.h SDL-1.2.8/src/hermes/HeadX86.h
  64. --- SDL-1.2.8-orig/src/hermes/HeadX86.h 2002-06-08 17:45:39.000000000
  65. 0000
  66. +++ SDL-1.2.8/src/hermes/HeadX86.h 2005-08-26 17:59:46.000000000 +0000
  67. @@ -79,56 +79,47 @@
  68. extern "C" {
  69. #endif
  70. - int Hermes_X86_CPU() __attribute__ ((alias ("_Hermes_X86_CPU")));
  71. + extern int _Hermes_X86_CPU();
  72. - void ConvertX86(HermesConverterInterface *) __attribute__ ((alias ("_ConvertX86")));
  73. + extern void _ConvertX86(HermesConverterInterface *);
  74. +
  75. + extern void _ConvertX86p32_32BGR888();
  76. + extern void _ConvertX86p32_32RGBA888();
  77. + extern void _ConvertX86p32_32BGRA888();
  78. + extern void _ConvertX86p32_24RGB888();
  79. + extern void _ConvertX86p32_24BGR888();
  80. + extern void _ConvertX86p32_16RGB565();
  81. + extern void _ConvertX86p32_16BGR565();
  82. + extern void _ConvertX86p32_16RGB555();
  83. + extern void _ConvertX86p32_16BGR555();
  84. + extern void _ConvertX86p32_8RGB332();
  85. +
  86. + extern void _ConvertX86p16_16BGR565();
  87. + extern void _ConvertX86p16_16RGB555();
  88. + extern void _ConvertX86p16_16BGR555();
  89. + extern void _ConvertX86p16_8RGB332();
  90. +
  91. +
  92. + #define Hermes_X86_CPU _Hermes_X86_CPU
  93. +
  94. + #define ConvertX86 _ConvertX86
  95. +
  96. + #define ConvertX86p32_32BGR888 _ConvertX86p32_32BGR888
  97. + #define ConvertX86p32_32RGBA888 _ConvertX86p32_32RGBA888
  98. + #define ConvertX86p32_32BGRA888 _ConvertX86p32_32BGRA888
  99. + #define ConvertX86p32_24RGB888 _ConvertX86p32_24RGB888
  100. + #define ConvertX86p32_24BGR888 _ConvertX86p32_24BGR888
  101. + #define ConvertX86p32_16RGB565 _ConvertX86p32_16RGB565
  102. + #define ConvertX86p32_16BGR565 _ConvertX86p32_16BGR565
  103. + #define ConvertX86p32_16RGB555 _ConvertX86p32_16RGB555
  104. + #define ConvertX86p32_16BGR555 _ConvertX86p32_16BGR555
  105. + #define ConvertX86p32_8RGB332 _ConvertX86p32_8RGB332
  106. +
  107. + #define ConvertX86p16_16BGR565 _ConvertX86p16_16BGR565
  108. + #define ConvertX86p16_16RGB555 _ConvertX86p16_16RGB555
  109. + #define ConvertX86p16_16BGR555 _ConvertX86p16_16BGR555
  110. + #define ConvertX86p16_8RGB332 _ConvertX86p16_8RGB332
  111. -#if 0
  112. - void ClearX86_32(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_32")));
  113. - void ClearX86_24(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_24")));
  114. - void ClearX86_16(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_16")));
  115. - void ClearX86_8(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_8")));
  116. -#endif
  117. -
  118. - void ConvertX86p32_32BGR888() __attribute__ ((alias ("_ConvertX86p32_32BGR888")));
  119. - void ConvertX86p32_32RGBA888() __attribute__ ((alias ("_ConvertX86p32_32RGBA888")));
  120. - void ConvertX86p32_32BGRA888() __attribute__ ((alias ("_ConvertX86p32_32BGRA888")));
  121. - void ConvertX86p32_24RGB888() __attribute__ ((alias ("_ConvertX86p32_24RGB888")));
  122. - void ConvertX86p32_24BGR888() __attribute__ ((alias ("_ConvertX86p32_24BGR888")));
  123. - void ConvertX86p32_16RGB565() __attribute__ ((alias ("_ConvertX86p32_16RGB565")));
  124. - void ConvertX86p32_16BGR565() __attribute__ ((alias ("_ConvertX86p32_16BGR565")));
  125. - void ConvertX86p32_16RGB555() __attribute__ ((alias ("_ConvertX86p32_16RGB555")));
  126. - void ConvertX86p32_16BGR555() __attribute__ ((alias ("_ConvertX86p32_16BGR555")));
  127. - void ConvertX86p32_8RGB332() __attribute__ ((alias ("_ConvertX86p32_8RGB332")));
  128. -
  129. -#if 0
  130. - void ConvertX86p16_32RGB888() __attribute__ ((alias ("_ConvertX86p16_32RGB888")));
  131. - void ConvertX86p16_32BGR888() __attribute__ ((alias ("_ConvertX86p16_32BGR888")));
  132. - void ConvertX86p16_32RGBA888() __attribute__ ((alias ("_ConvertX86p16_32RGBA888")));
  133. - void ConvertX86p16_32BGRA888() __attribute__ ((alias ("_ConvertX86p16_32BGRA888")));
  134. - void ConvertX86p16_24RGB888() __attribute__ ((alias ("_ConvertX86p16_24RGB888")));
  135. - void ConvertX86p16_24BGR888() __attribute__ ((alias ("_ConvertX86p16_24BGR888")));
  136. -#endif
  137. - void ConvertX86p16_16BGR565() __attribute__ ((alias ("_ConvertX86p16_16BGR565")));
  138. - void ConvertX86p16_16RGB555() __attribute__ ((alias ("_ConvertX86p16_16RGB555")));
  139. - void ConvertX86p16_16BGR555() __attribute__ ((alias ("_ConvertX86p16_16BGR555")));
  140. - void ConvertX86p16_8RGB332() __attribute__ ((alias ("_ConvertX86p16_8RGB332")));
  141. -
  142. -#if 0
  143. - void CopyX86p_4byte() __attribute__ ((alias ("_CopyX86p_4byte")));
  144. - void CopyX86p_3byte() __attribute__ ((alias ("_CopyX86p_3byte")));
  145. - void CopyX86p_2byte() __attribute__ ((alias ("_CopyX86p_2byte")));
  146. - void CopyX86p_1byte() __attribute__ ((alias ("_CopyX86p_1byte")));
  147. -
  148. - void ConvertX86pI8_32() __attribute__ ((alias ("_ConvertX86pI8_32")));
  149. - void ConvertX86pI8_24() __attribute__ ((alias ("_ConvertX86pI8_24")));
  150. - void ConvertX86pI8_16() __attribute__ ((alias ("_ConvertX86pI8_16")));
  151. -
  152. - extern int ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGB888_LUT_X86")));
  153. - extern int ConvertX86p16_32BGR888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGR888_LUT_X86")));
  154. - extern int ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGBA888_LUT_X86")));
  155. - extern int ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86")));
  156. -#endif
  157. #ifdef __cplusplus
  158. }