Magellan Linux

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

    Annotation of /trunk/xine-lib/patches/xine-lib-1.1.1-pic.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (hide annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
    File size: 6006 byte(s) 
    -import
    1 niro 153 Index: xine-lib-1.1.1/src/libffmpeg/libavcodec/i386/dsputil_mmx_avg.h
    2     ===================================================================
    3     --- xine-lib-1.1.1.orig/src/libffmpeg/libavcodec/i386/dsputil_mmx_avg.h
    4     +++ xine-lib-1.1.1/src/libffmpeg/libavcodec/i386/dsputil_mmx_avg.h
    5     @@ -94,7 +94,7 @@ static void DEF(put_pixels4_l2)(uint8_t
    6     "add $16, %2 \n\t"
    7     "subl $4, %0 \n\t"
    8     "jnz 1b \n\t"
    9     -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    10     +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    11     :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    12     #else
    13     :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    14     @@ -141,7 +141,7 @@ static void DEF(put_pixels8_l2)(uint8_t
    15     "add $32, %2 \n\t"
    16     "subl $4, %0 \n\t"
    17     "jnz 1b \n\t"
    18     -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    19     +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    20     :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    21     #else
    22     :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    23     @@ -211,7 +211,7 @@ static void DEF(put_no_rnd_pixels8_l2)(u
    24     "add $32, %2 \n\t"
    25     "subl $4, %0 \n\t"
    26     "jnz 1b \n\t"
    27     -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    28     +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    29     :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    30     #else
    31     :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    32     @@ -266,7 +266,7 @@ static void DEF(avg_pixels4_l2)(uint8_t
    33     "add $16, %2 \n\t"
    34     "subl $4, %0 \n\t"
    35     "jnz 1b \n\t"
    36     -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    37     +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    38     :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    39     #else
    40     :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    41     @@ -318,7 +318,7 @@ static void DEF(avg_pixels8_l2)(uint8_t
    42     "add $32, %2 \n\t"
    43     "subl $4, %0 \n\t"
    44     "jnz 1b \n\t"
    45     -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    46     +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    47     :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    48     #else
    49     :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    50     @@ -406,7 +406,7 @@ static void DEF(put_pixels16_l2)(uint8_t
    51     "add $32, %2 \n\t"
    52     "subl $2, %0 \n\t"
    53     "jnz 1b \n\t"
    54     -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    55     +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    56     :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    57     #else
    58     :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    59     @@ -460,7 +460,7 @@ static void DEF(avg_pixels16_l2)(uint8_t
    60     "add $32, %2 \n\t"
    61     "subl $2, %0 \n\t"
    62     "jnz 1b \n\t"
    63     -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    64     +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    65     :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    66     #else
    67     :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    68     @@ -533,7 +533,7 @@ static void DEF(put_no_rnd_pixels16_l2)(
    69     "add $32, %2 \n\t"
    70     "subl $2, %0 \n\t"
    71     "jnz 1b \n\t"
    72     -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    73     +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    74     :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    75     #else
    76     :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    77     Index: xine-lib-1.1.1/src/libffmpeg/libavcodec/i386/dsputil_mmx.c
    78     ===================================================================
    79     --- xine-lib-1.1.1.orig/src/libffmpeg/libavcodec/i386/dsputil_mmx.c
    80     +++ xine-lib-1.1.1/src/libffmpeg/libavcodec/i386/dsputil_mmx.c
    81     @@ -64,7 +64,7 @@ static const uint64_t ff_pb_FC attribute
    82     "pcmpeqd %%" #regd ", %%" #regd " \n\t"\
    83     "paddb %%" #regd ", %%" #regd " \n\t" ::)
    84    
    85     -#ifndef PIC
    86     +#ifndef __PIC__
    87     #define MOVQ_BONE(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_bone))
    88     #define MOVQ_WTWO(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_wtwo))
    89     #else
    90     Index: xine-lib-1.1.1/src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h
    91     ===================================================================
    92     --- xine-lib-1.1.1.orig/src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h
    93     +++ xine-lib-1.1.1/src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h
    94     @@ -96,7 +96,7 @@ static void attribute_unused DEF(put, pi
    95     "add %5, %3 \n\t"
    96     "subl $4, %0 \n\t"
    97     "jnz 1b \n\t"
    98     -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    99     +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    100     :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    101     #else
    102     :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    103     @@ -191,7 +191,7 @@ static void attribute_unused DEF(put, pi
    104     "add $32, %2 \n\t"
    105     "subl $2, %0 \n\t"
    106     "jnz 1b \n\t"
    107     -#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    108     +#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
    109     :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    110     #else
    111     :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
    112     Index: xine-lib-1.1.1/src/libffmpeg/libavcodec/msmpeg4.c
    113     ===================================================================
    114     --- xine-lib-1.1.1.orig/src/libffmpeg/libavcodec/msmpeg4.c
    115     +++ xine-lib-1.1.1/src/libffmpeg/libavcodec/msmpeg4.c
    116     @@ -725,7 +725,7 @@ static inline int msmpeg4_pred_dc(MpegEn
    117     necessitate to modify mpegvideo.c. The problem comes from the
    118     fact they decided to store the quantized DC (which would lead
    119     to problems if Q could vary !) */
    120     -#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined PIC
    121     +#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined __PIC__
    122     asm volatile(
    123     "movl %3, %%eax \n\t"
    124     "shrl $1, %%eax \n\t"