thunderbird3-22-use-system-theora-and-sqlite.diff revision 16846
16846N/A--- a/mozilla/layout/build/Makefile.in Mon May 25 18:35:12 2009
16846N/A+++ b/mozilla/layout/build/Makefile.in Mon May 25 18:37:44 2009
16846N/A@@ -150,11 +150,8 @@
16846N/A ifdef MOZ_OGG
16846N/A SHARED_LIBRARY_LIBS += \
16846N/A $(DEPTH)/media/libfishsound/src/libfishsound/$(LIB_PREFIX)fishsound.$(LIB_SUFFIX) \
16846N/A- $(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
16846N/A $(DEPTH)/media/liboggplay/src/liboggplay/$(LIB_PREFIX)oggplay.$(LIB_SUFFIX) \
16846N/A $(DEPTH)/media/liboggz/src/liboggz/$(LIB_PREFIX)oggz.$(LIB_SUFFIX) \
16846N/A- $(DEPTH)/media/libtheora/lib/$(LIB_PREFIX)theora.$(LIB_SUFFIX) \
16846N/A- $(DEPTH)/media/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
16846N/A $(NULL)
16846N/A endif
16846N/A
16846N/A--- a/mozilla/toolkit/library/Makefile.in Mon May 25 18:35:06 2009
16846N/A+++ b/mozilla/toolkit/library/Makefile.in Mon May 25 18:37:44 2009
16846N/A@@ -248,7 +248,7 @@
16846N/A endif
16846N/A
16846N/A ifeq ($(OS_ARCH),SunOS)
16846N/A-EXTRA_DSO_LDOPTS += -lelf -ldemangle -lCstd
16846N/A+EXTRA_DSO_LDOPTS += -lvorbis -ltheora -logg -lelf -ldemangle -lCstd
16846N/A endif
16846N/A
16846N/A ifeq ($(OS_ARCH),WINNT)
16846N/A--- a/mozilla/toolkit/toolkit-tiers.mk Mon May 25 18:37:31 2009
16846N/A+++ b/mozilla/toolkit/toolkit-tiers.mk Mon May 25 18:37:44 2009
16846N/A@@ -115,11 +115,8 @@
16846N/A ifdef MOZ_OGG
16846N/A tier_gecko_dirs += \
16846N/A media/libfishsound \
16846N/A- media/libogg \
16846N/A media/liboggplay \
16846N/A media/liboggz \
16846N/A- media/libtheora \
16846N/A- media/libvorbis \
16846N/A $(NULL)
16846N/A endif
16846N/A
16846N/A--- a/mozilla/toolkit/toolkit-tiers.mk Mon May 25 13:53:16 2009
16846N/A+++ a/mozilla/toolkit/toolkit-tiers.mk Fri May 22 21:01:02 2009
16846N/A@@ -115,11 +115,8 @@
16846N/A ifdef MOZ_OGG
16846N/A tier_gecko_dirs += \
16846N/A media/libfishsound \
16846N/A- media/libogg \
16846N/A media/liboggplay \
16846N/A media/liboggz \
16846N/A- media/libtheora \
16846N/A- media/libvorbis \
16846N/A $(NULL)
16846N/A endif
16846N/A
16846N/A--- a/mail/app/Makefile.in Mon May 25 18:32:25 2009
16846N/A+++ b/mail/app/Makefile.in Mon May 25 18:32:56 2009
16846N/A@@ -137,7 +137,18 @@
16846N/A $(STATIC_COMPONENTS_LINKER_PATH) \
16846N/A $(MOZ_JS_LIBS) \
16846N/A $(EXTRA_DSO_LIBS) \
16846N/A- $(APP_XPCOM_LIBS) \
16846N/A+ $(APP_XPCOM_LIBS)
16846N/A+
16846N/A+ifdef BUILD_STATIC_LIBS
16846N/A+ifdef MOZ_STORAGE
16846N/A+ifeq ($(OS_ARCH),SunOS)
16846N/A+LIBS += \
16846N/A+ $(SQLITE_LIBS)
16846N/A+endif
16846N/A+endif
16846N/A+endif
16846N/A+
16846N/A+LIBS += \
16846N/A $(NSPR_LIBS) \
16846N/A $(TK_LIBS) \
16846N/A $(NULL)
16846N/A@@ -204,6 +215,12 @@
16846N/A RCFLAGS += -DMOZ_STATIC_BUILD
16846N/A endif
16846N/A endif
16846N/A+
16846N/A+ifeq ($(OS_ARCH),SunOS)
16846N/A+ifdef BUILD_STATIC_LIBS
16846N/A+OS_LIBS += -lvorbis -ltheora -logg
16846N/A+endif
16846N/A+endif
16846N/A
16846N/A ifeq ($(OS_ARCH),BeOS)
16846N/A ifdef BUILD_STATIC_LIBS