firefox-15-use-system-theora.diff revision 20814
20814N/Adiff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
20814N/Aindex 8f7a321..7f7a248 100644
20814N/A--- a/layout/build/Makefile.in
20814N/A+++ b/layout/build/Makefile.in
20814N/A@@ -155,15 +155,12 @@ endif
20814N/A
20814N/A ifdef MOZ_VORBIS
20814N/A SHARED_LIBRARY_LIBS += \
20814N/A- $(DEPTH)/media/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
20814N/A- $(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
20814N/A $(NULL)
20814N/A endif
20814N/A
20814N/A ifdef MOZ_TREMOR
20814N/A SHARED_LIBRARY_LIBS += \
20814N/A $(DEPTH)/media/libtremor/lib/$(LIB_PREFIX)tremor.$(LIB_SUFFIX) \
20814N/A- $(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
20814N/A $(NULL)
20814N/A endif
20814N/A
20814N/A@@ -175,7 +172,6 @@ endif
20814N/A
20814N/A ifdef MOZ_OGG
20814N/A SHARED_LIBRARY_LIBS += \
20814N/A- $(DEPTH)/media/libtheora/lib/$(LIB_PREFIX)theora.$(LIB_SUFFIX) \
20814N/A $(DEPTH)/content/media/ogg/$(LIB_PREFIX)gkconogg_s.$(LIB_SUFFIX) \
20814N/A $(NULL)
20814N/A endif
20814N/Adiff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
20814N/Aindex afdcb02..e5204b9 100644
20814N/A--- a/toolkit/library/Makefile.in
20814N/A+++ b/toolkit/library/Makefile.in
20814N/A@@ -240,6 +240,10 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker
20814N/A endif
20814N/A
20814N/A ifeq ($(OS_ARCH),SunOS)
20814N/A+EXTRA_DSO_LDOPTS += -lvorbis -ltheora -logg
20814N/A+endif
20814N/A+
20814N/A+ifeq ($(OS_ARCH),SunOS)
20814N/A ifdef GNU_CC
20814N/A EXTRA_DSO_LDOPTS += -lelf
20814N/A else
20814N/Adiff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
20814N/Aindex 5c381a2..58d900a 100644
20814N/A--- a/toolkit/toolkit-tiers.mk
20814N/A+++ b/toolkit/toolkit-tiers.mk
20814N/A@@ -144,7 +144,6 @@ endif
20814N/A
20814N/A ifdef MOZ_VORBIS
20814N/A tier_platform_dirs += \
20814N/A- media/libvorbis \
20814N/A $(NULL)
20814N/A endif
20814N/A
20814N/A@@ -163,8 +162,6 @@ endif
20814N/A
20814N/A ifdef MOZ_OGG
20814N/A tier_platform_dirs += \
20814N/A- media/libogg \
20814N/A- media/libtheora \
20814N/A $(NULL)
20814N/A endif
20814N/A