OpenSDE
/
rocklinux
mirror of https://github.com/amery/rocklinux.git
2
0
Fork 0
Code Releases Wiki Activity
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.
2423 Commits
1 Branch
0 Tags
34 MiB
Tree: 9aa3ae4af1
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '9aa3ae4af1'
${ noResults }
rocklinux/package/rene/avifile/gcc34.patch

226 lines
11 KiB
Raw Normal View History

Stefan Fiedler: patch avifile to compile with gcc 3.4, cleaned up version also fixes tail -n1 issue [2004062518121719447] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3484 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
20 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. diff -dur avifile-0.7-0.7.38/configure avifile-0.7-0.7.38-patched/configure
  2. --- avifile-0.7-0.7.38/configure 2003-07-10 13:40:59.000000000 +0000
  3. +++ avifile-0.7-0.7.38-patched/configure 2004-06-25 17:23:54.000000000 +0000
  4. @@ -13301,7 +13301,7 @@
  5. AMM_USE_ARTSC_FALSE=
  6. fi
  8. -last_cvs_update=`find . -name Entries -printf '%Ty%Tm%Td-%TH:%TM\n' | sort | tail -1`
  9. +last_cvs_update=`find . -name Entries -printf '%Ty%Tm%Td-%TH:%TM\n' | sort | tail -n1`
  10. if test $? -ne 0 -o -z "$last_cvs_update" ; then
  11. # probably no gnu date installed(?), use current date
  12. # or this is release
  13. diff -dur avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/dsputil_mmx.c avifile-0.7-0.7.38-patched/ffmpeg/libavcodec/i386/dsputil_mmx.c
  14. --- avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/dsputil_mmx.c 2003-06-23 18:52:34.000000000 +0000
  15. +++ avifile-0.7-0.7.38-patched/ffmpeg/libavcodec/i386/dsputil_mmx.c 2004-06-25 17:23:54.000000000 +0000
  16. @@ -29,8 +29,8 @@
  17. static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
  18. static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
  20. -static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
  21. -static const uint64_t ff_pw_3 __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
  22. +static const uint64_t ff_pw_20 __attribute__ ((used)) __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
  23. +static const uint64_t ff_pw_3 __attribute__ ((used)) __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
  24. static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
  25. static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
  27. diff -dur avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/motion_est_mmx.c avifile-0.7-0.7.38-patched/ffmpeg/libavcodec/i386/motion_est_mmx.c
  28. --- avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/motion_est_mmx.c 2003-03-03 17:07:35.000000000 +0000
  29. +++ avifile-0.7-0.7.38-patched/ffmpeg/libavcodec/i386/motion_est_mmx.c 2004-06-25 17:23:54.000000000 +0000
  30. @@ -26,7 +26,7 @@
  31. 0x0002000200020002,
  32. };
  34. -static __attribute__ ((aligned(8))) uint64_t bone= 0x0101010101010101LL;
  35. +static __attribute__ ((used)) __attribute__ ((aligned(8))) uint64_t bone= 0x0101010101010101LL;
  37. static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
  38. {
  39. diff -dur avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/simple_idct_mmx.c avifile-0.7-0.7.38-patched/ffmpeg/libavcodec/i386/simple_idct_mmx.c
  40. --- avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/simple_idct_mmx.c 2003-02-14 13:58:00.000000000 +0000
  41. +++ avifile-0.7-0.7.38-patched/ffmpeg/libavcodec/i386/simple_idct_mmx.c 2004-06-25 17:23:54.000000000 +0000
  42. @@ -45,8 +45,8 @@
  43. #define ROW_SHIFT 11
  44. #define COL_SHIFT 20 // 6
  46. -static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
  47. -static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
  48. +static const uint64_t __attribute__ ((used)) __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
  49. +static const uint64_t __attribute__ ((used)) __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
  50. static int16_t __attribute__((aligned(8))) temp[64];
  51. static int16_t __attribute__((aligned(8))) coeffs[]= {
  52. 1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,
  53. diff -dur avifile-0.7-0.7.38/ffmpeg/libavcodec/liba52/resample_mmx.c avifile-0.7-0.7.38-patched/ffmpeg/libavcodec/liba52/resample_mmx.c
  54. --- avifile-0.7-0.7.38/ffmpeg/libavcodec/liba52/resample_mmx.c 2003-04-16 20:03:07.000000000 +0000
  55. +++ avifile-0.7-0.7.38-patched/ffmpeg/libavcodec/liba52/resample_mmx.c 2004-06-25 17:23:54.000000000 +0000
  56. @@ -7,10 +7,11 @@
  57. and it would mean (C / MMX2 / MMX / 3DNOW) versions
  58. */
  60. -static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
  61. -static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
  62. -static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
  63. -static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
  64. +static uint64_t __attribute__((used)) __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
  65. +static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
  66. +static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
  67. +static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
  68. +
  70. static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){
  71. int32_t * f = (int32_t *) _f;
  72. diff -dur avifile-0.7-0.7.38/ffmpeg/libavcodec/libpostproc/postprocess.c avifile-0.7-0.7.38-patched/ffmpeg/libavcodec/libpostproc/postprocess.c
  73. --- avifile-0.7-0.7.38/ffmpeg/libavcodec/libpostproc/postprocess.c 2003-06-26 19:14:31.000000000 +0000
  74. +++ avifile-0.7-0.7.38-patched/ffmpeg/libavcodec/libpostproc/postprocess.c 2004-06-25 17:23:54.000000000 +0000
  75. @@ -104,8 +104,8 @@
  76. //#define NUM_BLOCKS_AT_ONCE 16 //not used yet
  78. #ifdef ARCH_X86
  79. -static uint64_t __attribute__((aligned(8))) w05= 0x0005000500050005LL;
  80. -static uint64_t __attribute__((aligned(8))) w20= 0x0020002000200020LL;
  81. +static uint64_t __attribute__ ((used)) __attribute__((aligned(8))) w05= 0x0005000500050005LL;
  82. +static uint64_t __attribute__ ((used)) __attribute__((aligned(8))) w20= 0x0020002000200020LL;
  83. static uint64_t __attribute__((aligned(8))) b00= 0x0000000000000000LL;
  84. static uint64_t __attribute__((aligned(8))) b01= 0x0101010101010101LL;
  85. static uint64_t __attribute__((aligned(8))) b02= 0x0202020202020202LL;
  86. diff -dur avifile-0.7-0.7.38/include/aviplay.h avifile-0.7-0.7.38-patched/include/aviplay.h
  87. --- avifile-0.7-0.7.38/include/aviplay.h 2003-05-24 22:51:30.000000000 +0000
  88. +++ avifile-0.7-0.7.38-patched/include/aviplay.h 2004-06-25 17:23:54.000000000 +0000
  89. @@ -12,8 +12,8 @@
  90. #include "image.h"
  91. #include "avm_args.h"
  93. -typedef void (*KILLHANDLER)(int, void* p = 0);
  94. -typedef int (*AUDIOFUNC)(void* srcdata, unsigned int size, void* p = 0);
  95. +typedef void (*KILLHANDLER)(int, void* p);
  96. +typedef int (*AUDIOFUNC)(void* srcdata, unsigned int size, void* p);
  98. AVM_BEGIN_NAMESPACE;
  100. diff -dur avifile-0.7-0.7.38/include/avm_map.h avifile-0.7-0.7.38-patched/include/avm_map.h
  101. --- avifile-0.7-0.7.38/include/avm_map.h 2003-03-27 01:01:22.000000000 +0000
  102. +++ avifile-0.7-0.7.38-patched/include/avm_map.h 2004-06-25 17:23:54.000000000 +0000
  103. @@ -198,7 +198,8 @@
  104. {
  105. // cast to the needed type - used to prevent internal compiler error
  106. // for old egcc
  107. - avm_map<Key, Value, Compare, Equal>::_Tnode* node = (avm_map<Key, Value, Compare, Equal>::_Tnode*) n;
  108. +// avm_map<Key, Value, Compare, Equal>::_Tnode* node = (avm_map<Key, Value, Compare, Equal>::_Tnode*) n;
  109. + binary_tree_node<Key,Value> * node = (binary_tree_node<Key,Value>*) n;
  111. if(node->entry)
  112. {
  113. diff -dur avifile-0.7-0.7.38/include/avm_stl.h avifile-0.7-0.7.38-patched/include/avm_stl.h
  114. --- avifile-0.7-0.7.38/include/avm_stl.h 2003-06-08 15:57:05.000000000 +0000
  115. +++ avifile-0.7-0.7.38-patched/include/avm_stl.h 2004-06-25 17:23:54.000000000 +0000
  116. @@ -149,7 +149,7 @@
  118. // disabled for now
  119. qring<Type>() {}
  120. - qring<Type>(const qring<Type>& t) {}
  121. +// qring<Type>(const qring<Type>& t) {}
  123. uint_t bpos() const { return (m_uiPos > 0) ? m_uiPos - 1 : m_uiCapacity - 1; }
  124. uint_t fpos() const { return (m_uiSize > m_uiPos) ? m_uiPos + m_uiCapacity - m_uiSize: m_uiPos - m_uiSize; }
  125. diff -dur avifile-0.7-0.7.38/lib/aviread/AsfNetworkInputStream.cpp avifile-0.7-0.7.38-patched/lib/aviread/AsfNetworkInputStream.cpp
  126. --- avifile-0.7-0.7.38/lib/aviread/AsfNetworkInputStream.cpp 2003-05-27 15:26:31.000000000 +0000
  127. +++ avifile-0.7-0.7.38-patched/lib/aviread/AsfNetworkInputStream.cpp 2004-06-25 17:26:02.000000000 +0000
  128. @@ -801,7 +801,8 @@
  129. int i = ::write(m_iSocket, buffer, wsize);
  130. if (i <= 0)
  131. return i;
  132. - (const char*)buffer += i;
  133. + const char* cbuffer = (const char*) buffer;
  134. + buffer = (void*) (cbuffer+i);
  135. wsize -= i;
  136. }
  137. return size;
  138. @@ -843,7 +844,8 @@
  139. int i = ::write(m_lfd, buffer, size);
  140. if (i < 0)
  141. return i;
  142. - (const char*)buffer += i;
  143. + const char* cbuffer = (const char*) buffer;
  144. + buffer = (void*) (cbuffer+i);
  145. size -= i;
  146. }
  147. fsync(m_lfd);
  148. Nur in avifile-0.7-0.7.38-patched/lib/aviread: AsfNetworkInputStream.cpp~.
  149. Nur in avifile-0.7-0.7.38-patched/lib/aviread: AsfNetworkInputStream.cpp.rej.
  150. diff -dur avifile-0.7-0.7.38/lib/common/image.cpp avifile-0.7-0.7.38-patched/lib/common/image.cpp
  151. --- avifile-0.7-0.7.38/lib/common/image.cpp 2003-05-24 23:00:58.000000000 +0000
  152. +++ avifile-0.7-0.7.38-patched/lib/common/image.cpp 2004-06-25 17:23:54.000000000 +0000
  153. @@ -954,7 +954,7 @@
  154. fillMembers();
  155. if (!copy)
  156. {
  157. - (const uint8_t*) m_pPlane[0] = data;
  158. + m_pPlane[0] = (unsigned char*) data;
  159. }
  160. else
  161. {
  162. diff -dur avifile-0.7-0.7.38/plugins/libmp3lame_audioenc/lame3.70/quantize-pvt.c avifile-0.7-0.7.38-patched/plugins/libmp3lame_audioenc/lame3.70/quantize-pvt.c
  163. --- avifile-0.7-0.7.38/plugins/libmp3lame_audioenc/lame3.70/quantize-pvt.c 2001-03-27 17:04:29.000000000 +0000
  164. +++ avifile-0.7-0.7.38-patched/plugins/libmp3lame_audioenc/lame3.70/quantize-pvt.c 2004-06-25 17:23:54.000000000 +0000
  165. @@ -1007,18 +1007,18 @@
  166. "dec %4\n\t"
  168. "movl %5, %%eax\n\t"
  169. - "movl 4+%5, %%ebx\n\t"
  170. + "movl 4+%5, %%ecx\n\t"
  171. "fxch %%st(1)\n\t"
  172. "fadd" F8type " (%2,%%eax," F8size ")\n\t"
  173. "fxch %%st(3)\n\t"
  174. - "fadd" F8type " (%2,%%ebx," F8size ")\n\t"
  175. + "fadd" F8type " (%2,%%ecx," F8size ")\n\t"
  177. "movl 8+%5, %%eax\n\t"
  178. - "movl 12+%5, %%ebx\n\t"
  179. + "movl 12+%5, %%ecx\n\t"
  180. "fxch %%st(2)\n\t"
  181. "fadd" F8type " (%2,%%eax," F8size ")\n\t"
  182. "fxch %%st(1)\n\t"
  183. - "fadd" F8type " (%2,%%ebx," F8size ")\n\t"
  184. + "fadd" F8type " (%2,%%ecx," F8size ")\n\t"
  186. "fxch %%st(3)\n\t"
  187. "fistpl -16(%3)\n\t"
  188. @@ -1030,7 +1030,7 @@
  189. "jnz loop1\n\n"
  190. : /* no outputs */
  191. : "t" (istep), "r" (xr), "r" (adj43asm), "r" (ix), "r" (576 / 4), "m" (rx)
  192. - : "%eax", "%ebx", "memory", "cc"
  193. + : "%eax", "%ecx", "memory", "cc"
  194. );
  195. }
  196. #elif defined (USE_MSC_ASM)
  197. diff -dur avifile-0.7-0.7.38/plugins/libvorbis/libvorbis.cpp avifile-0.7-0.7.38-patched/plugins/libvorbis/libvorbis.cpp
  198. --- avifile-0.7-0.7.38/plugins/libvorbis/libvorbis.cpp 2003-05-20 14:33:13.000000000 +0000
  199. +++ avifile-0.7-0.7.38-patched/plugins/libvorbis/libvorbis.cpp 2004-06-25 17:23:54.000000000 +0000
  200. @@ -96,7 +96,7 @@
  201. op.packet = NULL;
  202. op.b_o_s = 1; /* beginning of stream for first packet */
  203. op.bytes = hdrsizes[0];
  204. - (const void*) op.packet = vorbishdr;
  205. + op.packet = (unsigned char*) vorbishdr;
  206. vorbishdr += op.bytes;
  207. if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)
  208. {
  209. @@ -106,7 +106,7 @@
  211. op.b_o_s = 0;
  212. op.bytes = hdrsizes[1];
  213. - (const void*) op.packet = vorbishdr;
  214. + op.packet = (unsigned char*) vorbishdr;
  215. vorbishdr += op.bytes;
  216. if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)
  217. {
  218. @@ -115,7 +115,7 @@
  219. }
  221. op.bytes = hdrsizes[2];
  222. - (const void*) op.packet = vorbishdr;
  223. + op.packet = (unsigned char*) vorbishdr;
  224. vorbishdr += op.bytes;
  225. if (vorbis_synthesis_headerin(&vi, &vc, &op) < 0)
  226. {