Backout changeset e58855b90cf6 (bug 750747) because of build bustage of a CLOSED TREE

This commit is contained in:
Ehsan Akhgari 2012-05-02 10:04:33 -04:00
parent 1a47114977
commit c40417ceb5
4 changed files with 3 additions and 64 deletions

View File

@ -102,12 +102,6 @@ SHARED_LIBRARY_LIBS += \
$(NULL)
endif
ifndef MOZ_NATIVE_PNG
SHARED_LIBRARY_LIBS += \
$(DEPTH)/media/libpng/$(LIB_PREFIX)mozpng.$(LIB_SUFFIX) \
$(NULL)
endif
ifndef MOZ_NATIVE_JPEG
SHARED_LIBRARY_LIBS += \
$(DEPTH)/media/libjpeg/$(LIB_PREFIX)mozjpeg.$(LIB_SUFFIX) \

View File

@ -115,58 +115,6 @@ ShGetInfo
ShConstructCompiler
ShGetActiveAttrib
ShGetActiveUniform
#ifndef MOZ_NATIVE_PNG
MOZ_APNG_get_first_frame_is_hidden
MOZ_APNG_get_next_frame_blend_op
MOZ_APNG_get_next_frame_delay_den
MOZ_APNG_get_next_frame_delay_num
MOZ_APNG_get_next_frame_dispose_op
MOZ_APNG_set_prog_frame_fn
MOZ_APNG_get_next_frame_height
MOZ_APNG_get_next_frame_width
MOZ_APNG_get_next_frame_x_offset
MOZ_APNG_get_next_frame_y_offset
MOZ_APNG_set_acTL
MOZ_APNG_set_first_frame_is_hidden
MOZ_APNG_set_num_plays
MOZ_APNG_write_frame_head
MOZ_APNG_write_frame_tail
MOZ_PNG_cr_info_str
MOZ_PNG_cr_read_str
MOZ_PNG_cr_write_str
MOZ_PNG_dest_read_str
MOZ_PNG_dest_write_str
MOZ_PNG_free_data
MOZ_PNG_get_channels
MOZ_PNG_get_cHRM
MOZ_PNG_get_gAMA
MOZ_PNG_get_IHDR
MOZ_PNG_get_iCCP
MOZ_PNG_get_io_ptr
MOZ_PNG_get_progressive_ptr
MOZ_PNG_get_sRGB
MOZ_PNG_get_tRNS
MOZ_PNG_get_valid
MOZ_PNG_longjmp
MOZ_PNG_process_data
MOZ_PNG_progressive_combine_row
MOZ_PNG_read_update_info
MOZ_PNG_set_cHRM
MOZ_PNG_set_crc_action
MOZ_PNG_set_gAMA
MOZ_PNG_set_gamma
MOZ_PNG_set_gray_to_rgb
MOZ_PNG_set_expand
MOZ_PNG_set_IHDR
MOZ_PNG_set_interlace_handling
MOZ_PNG_set_longjmp_fn
MOZ_PNG_set_progressive_read_fn
MOZ_PNG_set_scale_16
MOZ_PNG_set_write_fn
MOZ_PNG_write_end
MOZ_PNG_write_info
MOZ_PNG_write_row
#endif
#ifndef MOZ_NATIVE_JPEG
jpeg_calc_output_dimensions
jpeg_consume_input

View File

@ -44,10 +44,10 @@ include $(DEPTH)/config/autoconf.mk
MODULE = png
LIBRARY_NAME = mozpng
FORCE_STATIC_LIB= 1
ifeq ($(OS_ARCH),WINNT)
VISIBILITY_FLAGS=
LIBRARY_NAME = png
endif
LIBXUL_LIBRARY = 1
CSRCS = \

View File

@ -333,6 +333,7 @@ endif
EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \
$(PNG_LIBS) \
$(QCMS_LIBS) \
$(MOZ_JS_LIBS) \
$(NSS_LIBS) \
@ -346,10 +347,6 @@ ifdef MOZ_NATIVE_JPEG
EXTRA_DSO_LDOPTS += $(JPEG_LIBS)
endif
ifdef MOZ_NATIVE_PNG
EXTRA_DSO_LDOPTS += $(PNG_LIBS)
endif
ifdef MOZ_NATIVE_ZLIB
EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
else