Bug 750867 - Rip out libjpeg from libxul; r=khuey

Landing on a CLOSED TREE

layout/media/Makefile.in

@@ -108,6 +108,12 @@ SHARED_LIBRARY_LIBS 	+= \
 	$(NULL)
 endif
 
+ifndef MOZ_NATIVE_JPEG
+SHARED_LIBRARY_LIBS 	+= \
+	$(DEPTH)/media/libjpeg/$(LIB_PREFIX)mozjpeg.$(LIB_SUFFIX) \
+	$(NULL)
+endif
+
 SHARED_LIBRARY_LIBS 	+= \
 	$(DEPTH)/gfx/angle/$(LIB_PREFIX)angle.$(LIB_SUFFIX) \
 	$(NULL)

layout/media/symbols.def.in

@@ -167,3 +167,27 @@ MOZ_PNG_write_end
 MOZ_PNG_write_info
 MOZ_PNG_write_row
 #endif
+#ifndef MOZ_NATIVE_JPEG
+jpeg_calc_output_dimensions
+jpeg_consume_input
+jpeg_CreateCompress
+jpeg_CreateDecompress
+jpeg_destroy_compress
+jpeg_destroy_decompress
+jpeg_finish_compress
+jpeg_finish_decompress
+jpeg_finish_output
+jpeg_has_multiple_scans
+jpeg_input_complete
+jpeg_read_header
+jpeg_read_scanlines
+jpeg_resync_to_restart
+jpeg_save_markers
+jpeg_set_defaults
+jpeg_set_quality
+jpeg_start_compress
+jpeg_start_decompress
+jpeg_start_output
+jpeg_std_error
+jpeg_write_scanlines
+#endif

media/libjpeg/Makefile.in

@@ -48,11 +48,9 @@ MODULE		= jpeg
 LIBRARY_NAME	= mozjpeg
 
 ifeq ($(OS_ARCH),WINNT)
-LIBRARY_NAME	= jpeg32$(VERSION_NUMBER)
+VISIBILITY_FLAGS	=
 endif
 
-GRE_MODULE	= 1
-
 CSRCS		= \
 		jcomapi.c \
 		jdapimin.c \

toolkit/library/Makefile.in

@@ -333,7 +333,6 @@ endif
 
 EXTRA_DSO_LDOPTS += \
   $(LIBS_DIR) \
-  $(JPEG_LIBS) \
   $(QCMS_LIBS) \
   $(MOZ_JS_LIBS) \
   $(NSS_LIBS) \
@@ -343,6 +342,10 @@ EXTRA_DSO_LDOPTS += \
   $(SQLITE_LIBS) \
   $(NULL)
 
+ifdef MOZ_NATIVE_JPEG
+EXTRA_DSO_LDOPTS += $(JPEG_LIBS)
+endif
+
 ifdef MOZ_NATIVE_PNG
 EXTRA_DSO_LDOPTS += $(PNG_LIBS)
 endif