components/desktop/firefox/patches/firefox31-97-ycbcr2.patch
changeset 5255 cea0e462549a
equal deleted inserted replaced
5252:947514442d05 5255:cea0e462549a
       
     1 For studio. We can remove if we don't care about studio. 
       
     2 
       
     3 EMMS() is not in sparc. 
       
     4 
       
     5 --- mozilla-esr31/gfx/ycbcr/chromium_types.h.orig	2015-06-04 17:42:52.382798534 -0700
       
     6 +++ mozilla-esr31/gfx/ycbcr/chromium_types.h	2015-06-04 17:42:52.407116949 -0700
       
     7 @@ -10,7 +10,7 @@
       
     8  // On Windows, protypes.h is #included, which defines these types.  This sucks!
       
     9  #ifndef PROTYPES_H
       
    10  typedef uint8_t uint8;
       
    11 -typedef int8_t int8;
       
    12 +//typedef int8_t int8;
       
    13  typedef int16_t int16;
       
    14  typedef uint16_t uint16;
       
    15  typedef uint32_t uint32;
       
    16 --- mozilla-esr31/gfx/ycbcr/moz.build.orig	2015-06-04 17:42:52.388097037 -0700
       
    17 +++ mozilla-esr31/gfx/ycbcr/moz.build	2015-06-04 17:42:52.407236264 -0700
       
    18 @@ -34,7 +34,8 @@
       
    19              ]
       
    20      else:
       
    21          SOURCES += ['yuv_convert_mmx.cpp']
       
    22 -        SOURCES['yuv_convert_mmx.cpp'].flags += CONFIG['MMX_FLAGS']
       
    23 +        if CONFIG['GNU_CC']:
       
    24 +            SOURCES['yuv_convert_mmx.cpp'].flags += CONFIG['MMX_FLAGS']
       
    25  
       
    26  if CONFIG['_MSC_VER']:
       
    27      if CONFIG['OS_TEST'] == 'x86_64':
       
    28 --- mozilla-esr31/gfx/ycbcr/yuv_convert.cpp.orig	2015-06-04 17:42:52.393413194 -0700
       
    29 +++ mozilla-esr31/gfx/ycbcr/yuv_convert.cpp	2015-06-04 17:42:52.407392523 -0700
       
    30 @@ -105,9 +105,11 @@
       
    31      }
       
    32    }
       
    33  
       
    34 +#ifdef ARCH_CPU_X86_FAMILY
       
    35    // MMX used for FastConvertYUVToRGB32Row requires emms instruction.
       
    36    if (has_sse)
       
    37      EMMS();
       
    38 +#endif
       
    39  }
       
    40  
       
    41  // C version does 8 at a time to mimic MMX code
       
    42 @@ -348,9 +350,12 @@
       
    43  #endif
       
    44      }
       
    45    }
       
    46 +
       
    47 +#ifdef ARCH_CPU_X86_FAMILY
       
    48    // MMX used for FastConvertYUVToRGB32Row and FilterRows requires emms.
       
    49    if (has_mmx)
       
    50      EMMS();
       
    51 +#endif
       
    52  }
       
    53  
       
    54  }  // namespace gfx