Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xine-lib/patches/xine-lib-1.1.4-pic.patch

    Contents of /trunk/xine-lib/patches/xine-lib-1.1.4-pic.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (show annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
    File size: 6679 byte(s) 
    -import
    1 diff -Naur xine-lib-1.1.4/src/libffmpeg/libavcodec/i386/dsputil_mmx_avg.h xine-lib-1.1.4-fixed/src/libffmpeg/libavcodec/i386/dsputil_mmx_avg.h
    2 --- xine-lib-1.1.4/src/libffmpeg/libavcodec/i386/dsputil_mmx_avg.h 2006-12-04 23:25:25.000000000 +0100
    3 +++ xine-lib-1.1.4-fixed/src/libffmpeg/libavcodec/i386/dsputil_mmx_avg.h 2007-04-04 23:40:15.000000000 +0200
    4 @@ -96,7 +96,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 @@ -143,7 +143,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 @@ -213,7 +213,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 @@ -268,7 +268,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 @@ -320,7 +320,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 @@ -408,7 +408,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 @@ -462,7 +462,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 @@ -535,7 +535,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 -Naur xine-lib-1.1.4/src/libffmpeg/libavcodec/i386/dsputil_mmx.c xine-lib-1.1.4-fixed/src/libffmpeg/libavcodec/i386/dsputil_mmx.c
    77 --- xine-lib-1.1.4/src/libffmpeg/libavcodec/i386/dsputil_mmx.c 2006-12-04 23:25:25.000000000 +0100
    78 +++ xine-lib-1.1.4-fixed/src/libffmpeg/libavcodec/i386/dsputil_mmx.c 2007-04-04 23:40:44.000000000 +0200
    79 @@ -75,7 +75,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 diff -Naur xine-lib-1.1.4/src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h xine-lib-1.1.4-fixed/src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h
    89 --- xine-lib-1.1.4/src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h 2006-12-04 23:25:25.000000000 +0100
    90 +++ xine-lib-1.1.4-fixed/src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h 2007-04-04 23:41:05.000000000 +0200
    91 @@ -98,7 +98,7 @@
    92 "add %5, %3 \n\t"
    93 "subl $4, %0 \n\t"
    94 "jnz 1b \n\t"
    95 -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    96 +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    97 :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    98 #else
    99 :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    100 @@ -193,7 +193,7 @@
    101 "add $32, %2 \n\t"
    102 "subl $2, %0 \n\t"
    103 "jnz 1b \n\t"
    104 -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    105 +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    106 :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    107 #else
    108 :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    109 diff -Naur xine-lib-1.1.4/src/libffmpeg/libavcodec/msmpeg4.c xine-lib-1.1.4-fixed/src/libffmpeg/libavcodec/msmpeg4.c
    110 --- xine-lib-1.1.4/src/libffmpeg/libavcodec/msmpeg4.c 2006-12-04 23:25:20.000000000 +0100
    111 +++ xine-lib-1.1.4-fixed/src/libffmpeg/libavcodec/msmpeg4.c 2007-04-04 23:42:10.000000000 +0200
    112 @@ -659,7 +659,7 @@
    113 necessitate to modify mpegvideo.c. The problem comes from the
    114 fact they decided to store the quantized DC (which would lead
    115 to problems if Q could vary !) */
    116 -#if (defined(ARCH_X86)) && !defined PIC
    117 +#if (defined(ARCH_X86)) && !defined __PIC__
    118 asm volatile(
    119 "movl %3, %%eax \n\t"
    120 "shrl $1, %%eax \n\t"