rpms/xulrunner/devel mozilla-system-jpeg.patch, NONE, 1.1 xulrunner.spec, 1.59, 1.60

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16148

Modified Files:
	xulrunner.spec 
Added Files:
	mozilla-system-jpeg.patch 
Log Message:
* Tue Jan 29 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.beta2.15
- Add temporary patch to build --with-system-jpeg.
  See https://bugzilla.mozilla.org/show_bug.cgi?id=412753#c14 and later


mozilla-system-jpeg.patch:

--- NEW FILE mozilla-system-jpeg.patch ---
Index: mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
===================================================================
RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp,v
retrieving revision 1.89
diff -u -8 -p -r1.89 nsJPEGDecoder.cpp
--- mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp	30 Jan 2008 06:22:24 -0000	1.89
+++ mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp	30 Jan 2008 11:06:41 -0000
@@ -53,17 +53,24 @@
 #include "gfxColor.h"
 
 #include "jerror.h"
 
 #include "gfxPlatform.h"
 
 extern "C" {
 #include "iccjpeg.h"
-#include "jpegint.h"
+
+/* Colorspace conversion (copied from jpegint.h) */
+struct jpeg_color_deconverter {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
+				JSAMPIMAGE input_buf, JDIMENSION input_row,
+				JSAMPARRAY output_buf, int num_rows));
+};
 
 METHODDEF(void)
 ycc_rgb_convert_argb (j_decompress_ptr cinfo,
                  JSAMPIMAGE input_buf, JDIMENSION input_row,
                  JSAMPARRAY output_buf, int num_rows);
 }
 
 NS_IMPL_ISUPPORTS1(nsJPEGDecoder, imgIDecoder)
@@ -1202,16 +1209,38 @@ const int Cb_g_tab[(MAXJSAMPLE+1) * size
   0xffde15d8UL, 0xffddbdbeUL, 0xffdd65a4UL, 0xffdd0d8aUL, 0xffdcb570UL, 0xffdc5d56UL,
   0xffdc053cUL, 0xffdbad22UL, 0xffdb5508UL, 0xffdafceeUL, 0xffdaa4d4UL, 0xffda4cbaUL,
   0xffd9f4a0UL, 0xffd99c86UL, 0xffd9446cUL, 0xffd8ec52UL, 0xffd89438UL, 0xffd83c1eUL,
   0xffd7e404UL, 0xffd78beaUL, 0xffd733d0UL, 0xffd6dbb6UL, 0xffd6839cUL, 0xffd62b82UL,
   0xffd5d368UL, 0xffd57b4eUL, 0xffd52334UL, 0xffd4cb1aUL
  };
 
 
+/* We assume that right shift corresponds to signed division by 2 with
+ * rounding towards minus infinity.  This is correct for typical "arithmetic
+ * shift" instructions that shift in copies of the sign bit.  But some
+ * C compilers implement >> with an unsigned shift.  For these machines you
+ * must define RIGHT_SHIFT_IS_UNSIGNED.
+ * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity.
+ * It is only applied with constant shift counts.  SHIFT_TEMPS must be
+ * included in the variables of any routine using RIGHT_SHIFT.
+ */
+
+#ifdef RIGHT_SHIFT_IS_UNSIGNED
+#define SHIFT_TEMPS	INT32 shift_temp;
+#define RIGHT_SHIFT(x,shft)  \
+	((shift_temp = (x)) < 0 ? \
+	 (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \
+	 (shift_temp >> (shft)))
+#else
+#define SHIFT_TEMPS
+#define RIGHT_SHIFT(x,shft)	((x) >> (shft))
+#endif
+
+
 METHODDEF(void)
 ycc_rgb_convert_argb (j_decompress_ptr cinfo,
                  JSAMPIMAGE input_buf, JDIMENSION input_row,
                  JSAMPARRAY output_buf, int num_rows)
 {
   JDIMENSION num_cols = cinfo->output_width;
   JSAMPLE * range_limit = cinfo->sample_range_limit;
 


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- xulrunner.spec	30 Jan 2008 15:25:14 -0000	1.59
+++ xulrunner.spec	30 Jan 2008 18:52:03 -0000	1.60
@@ -29,6 +29,7 @@
 Patch4:         mozilla-build.patch
 Patch5:         xulrunner-path.patch
 Patch6:         xulrunner-version.patch
+Patch7:         mozilla-system-jpeg.patch
 
 # customization patches
 Patch21:        firefox-0.7.3-psfonts.patch
@@ -112,6 +113,7 @@
 %patch4   -p1
 %patch5   -p1
 %patch6   -p1 -b .ver
+%patch7   -p1 -b .system-jpeg
 
 %patch107 -p1 -b .pk