Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 513681 - part 2 - remove support for the MOZ_IMG_DECODERS build option.r=joe,khuey.a=blocker

Browse Source
This commit is contained in:
Bobby Holley 2010-08-11 20:12:24 -04:00
parent 3166c2ffde
commit 1efcc45c3a
10 changed files with 10 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/autoconf.mk.in
View File

@ -99,7 +99,6 @@ MOZ_DEBUG_DISABLE_DEFS = @MOZ_DEBUG_DISABLE_DEFS@
MOZ_DEBUG_FLAGS = @MOZ_DEBUG_FLAGS@
MOZ_DEBUG_LDFLAGS=@MOZ_DEBUG_LDFLAGS@
MOZ_EXTENSIONS = @MOZ_EXTENSIONS@
MOZ_IMG_DECODERS= @MOZ_IMG_DECODERS@
MOZ_IMG_ENCODERS= @MOZ_IMG_ENCODERS@
MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@
MOZ_IPC = @MOZ_IPC@

38
configure.in
View File

@ -4876,7 +4876,6 @@ MOZ_ACTIVEX_SCRIPTING_SUPPORT=
MOZ_BRANDING_DIRECTORY=
MOZ_OFFICIAL_BRANDING=
MOZ_FEEDS=1
MOZ_IMG_DECODERS_DEFAULT="png gif jpeg bmp icon"
MOZ_IMG_ENCODERS_DEFAULT="png jpeg"
MOZ_INSTALLER=1
MOZ_IPC=1
@ -6309,41 +6308,6 @@ for extension in $MOZ_EXTENSIONS; do
fi
done
dnl ========================================================
dnl Image decoders
dnl ========================================================
case "$MOZ_WIDGET_TOOLKIT" in
beos|windows|os2|mac|cocoa)
;;
*)
if test -z "$MOZ_ENABLE_GTK2" -a -z "$MOZ_ENABLE_QT"; then
MOZ_IMG_DECODERS_DEFAULT=`echo $MOZ_IMG_DECODERS_DEFAULT | sed -e 's|icon||'`
fi
;;
esac
MOZ_ARG_ENABLE_STRING(image-decoders,
[ --enable-image-decoders[={mod1,mod2,default,all,none}]
Enable specific image decoders],
[ for option in `echo $enableval | sed 's/,/ /g'`; do
if test "$option" = "yes" -o "$option" = "all"; then
MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS $MOZ_IMG_DECODERS_DEFAULT"
elif test "$option" = "no" -o "$option" = "none"; then
MOZ_IMG_DECODERS=""
elif test "$option" = "default"; then
MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS $MOZ_IMG_DECODERS_DEFAULT"
elif test `echo "$option" | grep -c \^-` != 0; then
option=`echo $option | sed 's/^-//'`
MOZ_IMG_DECODERS=`echo "$MOZ_IMG_DECODERS" | sed "s/ ${option}//"`
else
MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS $option"
fi
done],
MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS_DEFAULT")
dnl Dupes are removed in the encoder section because it will also add decoders
dnl ========================================================
dnl Image encoders
dnl ========================================================
@ -6369,7 +6333,6 @@ done],
MOZ_IMG_ENCODERS="$MOZ_IMG_ENCODERS_DEFAULT")
dnl Remove dupes
MOZ_IMG_DECODERS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_IMG_DECODERS}`
MOZ_IMG_ENCODERS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_IMG_ENCODERS}`
dnl ========================================================
@ -8726,7 +8689,6 @@ AC_SUBST(MOZ_DEBUG_FLAGS)
AC_SUBST(MOZ_DEBUG_LDFLAGS)
AC_SUBST(WARNINGS_AS_ERRORS)
AC_SUBST(MOZ_EXTENSIONS)
AC_SUBST(MOZ_IMG_DECODERS)
AC_SUBST(MOZ_IMG_ENCODERS)
AC_SUBST(MOZ_JSDEBUGGER)
AC_SUBST(MOZ_PLUGINS)

1
js/src/config/autoconf.mk.in
View File

@ -83,7 +83,6 @@ MOZ_DEBUG_DISABLE_DEFS = @MOZ_DEBUG_DISABLE_DEFS@
MOZ_DEBUG_FLAGS = @MOZ_DEBUG_FLAGS@
MOZ_DEBUG_LDFLAGS=@MOZ_DEBUG_LDFLAGS@
MOZ_EXTENSIONS = @MOZ_EXTENSIONS@
MOZ_IMG_DECODERS= @MOZ_IMG_DECODERS@
MOZ_IMG_ENCODERS= @MOZ_IMG_ENCODERS@
MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@
MOZ_LEAKY = @MOZ_LEAKY@

2
modules/libimg/png/Makefile.in
View File

@ -67,7 +67,6 @@ CSRCS = \
$(NULL)
# These files enable support for reading PNGs
ifneq (,$(filter png,$(MOZ_IMG_DECODERS)))
CSRCS += \
pngpread.c \
pngread.c \
@ -77,7 +76,6 @@ CSRCS += \
$(NULL)
DEFINES += -DMOZ_PNG_READ
endif
# These files enable support for writing PNGs
ifneq (,$(filter png,$(MOZ_IMG_ENCODERS)))

6
modules/libpr0n/Makefile.in
View File

@ -44,11 +44,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = imglib2
DIRS = public src
ifdef MOZ_IMG_DECODERS
DIRS += decoders
endif
DIRS = public src decoders
ifdef MOZ_IMG_ENCODERS
DIRS += encoders

7
modules/libpr0n/build/Makefile.in
View File

@ -50,6 +50,7 @@ MODULE_NAME = nsImageLib2Module
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
DECODERS = png gif jpeg bmp
CPPSRCS = \
nsImageModule.cpp \
@ -58,7 +59,7 @@ CPPSRCS = \
LOCAL_INCLUDES = \
-I. \
-I$(srcdir)/../src \
$(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \
$(foreach d,$(filter-out icon,$(DECODERS)), \
-I$(srcdir)/../decoders/${d}) \
$(foreach d,$(MOZ_IMG_ENCODERS), \
-I$(srcdir)/../encoders/${d}) \
@ -66,7 +67,7 @@ LOCAL_INCLUDES = \
SHARED_LIBRARY_LIBS = \
../src/$(LIB_PREFIX)imglib2_s.$(LIB_SUFFIX) \
$(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \
$(foreach d,$(filter-out icon,$(DECODERS)), \
../decoders/${d}/$(LIB_PREFIX)img${d}_s.$(LIB_SUFFIX))\
$(foreach d,$(MOZ_IMG_ENCODERS), \
../encoders/${d}/$(LIB_PREFIX)img${d}e_s.$(LIB_SUFFIX))\
@ -92,7 +93,7 @@ GARBAGE += _img_list nsImgBuildDefines.h
export::
{ \
$(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \
$(foreach d,$(filter-out icon,$(DECODERS)), \
echo "#define IMG_BUILD_DECODER_${d}" ; ) \
$(foreach d,$(MOZ_IMG_ENCODERS), \
echo "#define IMG_BUILD_ENCODER_${d}" ; ) \

6
modules/libpr0n/decoders/Makefile.in
View File

@ -42,7 +42,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifneq (,$(filter icon,$(MOZ_IMG_DECODERS)))
DECODERS = png gif jpeg bmp
ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
DIRS = icon/gtk icon
endif
@ -61,9 +62,8 @@ endif
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
DIRS = icon/mac icon
endif
endif # icon
DIRS += $(filter-out icon,$(MOZ_IMG_DECODERS))
DIRS += $(DECODERS)
include $(topsrcdir)/config/rules.mk

2
modules/libpr0n/decoders/png/Makefile.in
View File

@ -56,9 +56,7 @@ ifneq (,$(filter png,$(MOZ_IMG_ENCODERS)))
DEFINES += -DMOZ_PNG_WRITE
endif
ifneq (,$(filter png,$(MOZ_IMG_DECODERS)))
DEFINES += -DMOZ_PNG_READ
endif
# nsPNGDecoder.cpp includes RasterImage.h
LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/src/

2
modules/libpr0n/encoders/png/Makefile.in
View File

@ -53,9 +53,7 @@ ifneq (,$(filter png,$(MOZ_IMG_ENCODERS)))
DEFINES += -DMOZ_PNG_WRITE
endif
ifneq (,$(filter png,$(MOZ_IMG_DECODERS)))
DEFINES += -DMOZ_PNG_READ
endif
CPPSRCS = nsPNGEncoder.cpp

3
toolkit/library/libxul-config.mk
View File

@ -293,7 +293,8 @@ STATIC_LIBS += gtkxtbin
endif
endif
ifneq (,$(filter icon,$(MOZ_IMG_DECODERS)))
# Platform-specific icon channel stuff - supported mostly-everywhere
ifneq (,$(filter beos windows os2 mac cocoa gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
DEFINES += -DICON_DECODER
COMPONENT_LIBS += imgicon
endif