Annotation of /trunk/xine-lib/patches/xine-lib-1.1.0-pic.patch
Parent Directory | Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 5 months ago) by niro
File size: 6412 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 5 months ago) by niro
File size: 6412 byte(s)
-import
1 | niro | 153 | diff -ur xine-lib-1.1.0/src/libffmpeg/libavcodec/i386/dsputil_mmx_avg.h xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386/dsputil_mmx_avg.h |
2 | --- xine-lib-1.1.0/src/libffmpeg/libavcodec/i386/dsputil_mmx_avg.h 2005-04-19 07:17:50.000000000 +0200 | ||
3 | +++ xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386/dsputil_mmx_avg.h 2005-08-07 12:01:13.000000000 +0200 | ||
4 | @@ -94,7 +94,7 @@ | ||
5 | "add $16, %2 \n\t" | ||
6 | "subl $4, %0 \n\t" | ||
7 | "jnz 1b \n\t" | ||
8 | -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
9 | +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
10 | :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
11 | #else | ||
12 | :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
13 | @@ -141,7 +141,7 @@ | ||
14 | "add $32, %2 \n\t" | ||
15 | "subl $4, %0 \n\t" | ||
16 | "jnz 1b \n\t" | ||
17 | -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
18 | +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
19 | :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
20 | #else | ||
21 | :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
22 | @@ -211,7 +211,7 @@ | ||
23 | "add $32, %2 \n\t" | ||
24 | "subl $4, %0 \n\t" | ||
25 | "jnz 1b \n\t" | ||
26 | -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
27 | +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
28 | :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
29 | #else | ||
30 | :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
31 | @@ -266,7 +266,7 @@ | ||
32 | "add $16, %2 \n\t" | ||
33 | "subl $4, %0 \n\t" | ||
34 | "jnz 1b \n\t" | ||
35 | -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
36 | +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
37 | :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
38 | #else | ||
39 | :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
40 | @@ -318,7 +318,7 @@ | ||
41 | "add $32, %2 \n\t" | ||
42 | "subl $4, %0 \n\t" | ||
43 | "jnz 1b \n\t" | ||
44 | -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
45 | +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
46 | :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
47 | #else | ||
48 | :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
49 | @@ -406,7 +406,7 @@ | ||
50 | "add $32, %2 \n\t" | ||
51 | "subl $2, %0 \n\t" | ||
52 | "jnz 1b \n\t" | ||
53 | -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
54 | +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
55 | :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
56 | #else | ||
57 | :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
58 | @@ -460,7 +460,7 @@ | ||
59 | "add $32, %2 \n\t" | ||
60 | "subl $2, %0 \n\t" | ||
61 | "jnz 1b \n\t" | ||
62 | -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
63 | +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
64 | :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
65 | #else | ||
66 | :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
67 | @@ -533,7 +533,7 @@ | ||
68 | "add $32, %2 \n\t" | ||
69 | "subl $2, %0 \n\t" | ||
70 | "jnz 1b \n\t" | ||
71 | -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
72 | +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
73 | :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
74 | #else | ||
75 | :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
76 | diff -ur xine-lib-1.1.0/src/libffmpeg/libavcodec/i386/dsputil_mmx.c xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386/dsputil_mmx.c | ||
77 | --- xine-lib-1.1.0/src/libffmpeg/libavcodec/i386/dsputil_mmx.c 2005-07-19 22:31:09.000000000 +0200 | ||
78 | +++ xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386/dsputil_mmx.c 2005-08-07 11:59:46.000000000 +0200 | ||
79 | @@ -62,7 +62,7 @@ | ||
80 | "pcmpeqd %%" #regd ", %%" #regd " \n\t"\ | ||
81 | "paddb %%" #regd ", %%" #regd " \n\t" ::) | ||
82 | |||
83 | -#ifndef PIC | ||
84 | +#ifndef __PIC__ | ||
85 | #define MOVQ_BONE(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_bone)) | ||
86 | #define MOVQ_WTWO(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_wtwo)) | ||
87 | #else | ||
88 | Only in xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386: dsputil_mmx.c.orig | ||
89 | diff -ur xine-lib-1.1.0/src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h | ||
90 | --- xine-lib-1.1.0/src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h 2005-04-19 07:17:50.000000000 +0200 | ||
91 | +++ xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h 2005-08-07 11:59:46.000000000 +0200 | ||
92 | @@ -96,7 +96,7 @@ | ||
93 | "add %5, %3 \n\t" | ||
94 | "subl $4, %0 \n\t" | ||
95 | "jnz 1b \n\t" | ||
96 | -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
97 | +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
98 | :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
99 | #else | ||
100 | :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
101 | @@ -191,7 +191,7 @@ | ||
102 | "add $32, %2 \n\t" | ||
103 | "subl $2, %0 \n\t" | ||
104 | "jnz 1b \n\t" | ||
105 | -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
106 | +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used | ||
107 | :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
108 | #else | ||
109 | :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst) | ||
110 | Only in xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/i386: dsputil_mmx_rnd.h.orig | ||
111 | diff -ur xine-lib-1.1.0/src/libffmpeg/libavcodec/msmpeg4.c xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/msmpeg4.c | ||
112 | --- xine-lib-1.1.0/src/libffmpeg/libavcodec/msmpeg4.c 2005-05-15 01:34:59.000000000 +0200 | ||
113 | +++ xine-lib-1.1.0-pic/src/libffmpeg/libavcodec/msmpeg4.c 2005-08-07 12:00:49.000000000 +0200 | ||
114 | @@ -849,7 +849,7 @@ | ||
115 | necessitate to modify mpegvideo.c. The problem comes from the | ||
116 | fact they decided to store the quantized DC (which would lead | ||
117 | to problems if Q could vary !) */ | ||
118 | -#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined PIC | ||
119 | +#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined __PIC__ | ||
120 | asm volatile( | ||
121 | "movl %3, %%eax \n\t" | ||
122 | "shrl $1, %%eax \n\t" | ||
123 | diff -ur xine-lib-1.1.0/src/xine-utils/cpu_accel.c xine-lib-1.1.0-pic/src/xine-utils/cpu_accel.c | ||
124 | --- xine-lib-1.1.0/src/xine-utils/cpu_accel.c 2004-07-05 10:33:53.000000000 +0200 | ||
125 | +++ xine-lib-1.1.0-pic/src/xine-utils/cpu_accel.c 2005-08-07 11:59:46.000000000 +0200 | ||
126 | @@ -63,7 +63,7 @@ | ||
127 | int AMD; | ||
128 | |||
129 | caps = 0; | ||
130 | -#ifndef PIC | ||
131 | +#ifndef __PIC__ | ||
132 | #define cpuid(op,eax,ebx,ecx,edx) \ | ||
133 | __asm__ ("cpuid" \ | ||
134 | : "=a" (eax), \ |