Attachment #173799 for bug #211792

Lines 122-128 Link Here

(-)Mk/bsd.gecko.mk (-12 / +8 lines)
122	CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}	122	CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
123	MOZ_EXPORT+= ${CONFIGURE_ENV} \	123	MOZ_EXPORT+= ${CONFIGURE_ENV} \
124	PERL="${PERL}"	124	PERL="${PERL}"
125	MOZ_OPTIONS+= ${CONFIGURE_TARGET} --prefix="${PREFIX}"	125	MOZ_OPTIONS+= --target=${CONFIGURE_TARGET} --prefix="${PREFIX}"
126	MOZ_MK_OPTIONS+=MOZ_OBJDIR="${MOZ_OBJDIR}"	126	MOZ_MK_OPTIONS+=MOZ_OBJDIR="${MOZ_OBJDIR}"
127		127
128	CPPFLAGS+= -isystem${LOCALBASE}/include	128	CPPFLAGS+= -isystem${LOCALBASE}/include
Lines 131-137 Link Here
131		131
132	.if ${OPSYS} != DragonFly # XXX xpcshell crash during install	132	.if ${OPSYS} != DragonFly # XXX xpcshell crash during install
133	# use jemalloc 3.0.0 (4.0 for firefox 43+) API for stats/tuning	133	# use jemalloc 3.0.0 (4.0 for firefox 43+) API for stats/tuning
134	MOZ_EXPORT+= MOZ_JEMALLOC3=1 MOZ_JEMALLOC4=1	134	.if ${MOZILLA_VER:R:R} < 48
		135	MOZ_EXPORT+= MOZ_JEMALLOC3=1
		136	#MOZ_EXPORT+= MOZ_JEMALLOC3=1 MOZ_JEMALLOC4=1
		137	. endif
135	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100079	138	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100079
136	. if ${MOZILLA_VER:R:R} < 43	139	. if ${MOZILLA_VER:R:R} < 43
137	# system jemalloc 4.0.0 vs. bundled jemalloc 3.6.0-204-gb4acf73	140	# system jemalloc 4.0.0 vs. bundled jemalloc 3.6.0-204-gb4acf73
Lines 265-278 Link Here
265	# others	268	# others
266	MOZ_OPTIONS+= --with-system-zlib \	269	MOZ_OPTIONS+= --with-system-zlib \
267	--with-system-bz2 \	270	--with-system-bz2 \
268	--enable-unified-compilation \	271	--disable-debug-symbols
269	--disable-debug-symbols \
270	--disable-glibtest \
271	--disable-gtktest \
272	--disable-freetypetest \
273	--disable-installer \
274	--disable-updater \
275	--disable-pedantic
276		272
277	# API keys from www/chromium	273	# API keys from www/chromium
278	# http://www.chromium.org/developers/how-tos/api-keys	274	# http://www.chromium.org/developers/how-tos/api-keys
Lines 319-325 Link Here
319	libstartup-notification-1.so:x11/startup-notification	315	libstartup-notification-1.so:x11/startup-notification
320	MOZ_OPTIONS+= --enable-startup-notification	316	MOZ_OPTIONS+= --enable-startup-notification
321	.else	317	.else
322	MOZ_OPTIONS+= --disable-dbus --disable-libnotify	318	MOZ_OPTIONS+= --disable-dbus
323	.endif	319	.endif
324		320
325	.if ${PORT_OPTIONS:MFFMPEG}	321	.if ${PORT_OPTIONS:MFFMPEG}
Lines 331-337 Link Here
331	RUN_DEPENDS+= gstreamer1-libav>=1.2.4_1:multimedia/gstreamer1-libav	327	RUN_DEPENDS+= gstreamer1-libav>=1.2.4_1:multimedia/gstreamer1-libav
332	USE_GSTREAMER1?=good libav	328	USE_GSTREAMER1?=good libav
333	MOZ_OPTIONS+= --enable-gstreamer=1.0	329	MOZ_OPTIONS+= --enable-gstreamer=1.0
334	.else	330	.elif ${MOZILLA_VER:R:R} < 46
335	MOZ_OPTIONS+= --disable-gstreamer	331	MOZ_OPTIONS+= --disable-gstreamer
336	.endif	332	.endif
337		333




.elif ${gecko_ARGS:Mfirefox}

_GECKO_DEFAULT_VERSION=	45
_GECKO_VERSIONS=		45 48
_GECKO_TYPE=	firefox

# Dependence lines for different Firefox versions
45_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
48_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox

.if exists(${LOCALBASE}/bin/firefox)
_GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null




# $FreeBSD$

PORTNAME=	firefox
DISTVERSION=	48.0
PORTREVISION=	2
DISTVERSIONSUFFIX=.source
PORTEPOCH=	1
CATEGORIES=	www ipv6
MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source

MAINTAINER=	gecko@FreeBSD.org
COMMENT=	Web browser based on the browser portion of Mozilla

BUILD_DEPENDS=	nspr>=4.12:devel/nspr \
		nss>=3.24:security/nss \
		libevent2>=2.0.21_2:devel/libevent2 \
		soundtouch>=1.9.0:audio/soundtouch \
		harfbuzz>=1.2.6:print/harfbuzz \
		graphite2>=1.3.8:graphics/graphite2 \
		png>=1.6.21:graphics/png \
		libvorbis>=1.3.5,3:audio/libvorbis \
		libvpx>=1.5.0:multimedia/libvpx \
		sqlite3>=3.12.2:databases/sqlite3 \
		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
		v4l_compat>0:multimedia/v4l_compat \
		autoconf-2.13:devel/autoconf213 \

USE_GL=		gl
USES=		tar:xz

COMPILER_TYPE=	clang

FIREFOX_ICON=		${MOZILLA}.png
FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
MOZ_OPTIONS=	--enable-application=browser \
		--enable-application=browser \
		--enable-official-branding

OPTIONS_EXCLUDE=	GSTREAMER LOGGING

Lines 1-2 Link Here

(-)www/firefox/distinfo (-2 / +2 lines)
1	SHA256 (firefox-47.0.1.source.tar.xz) = 5ac36c3481dde80ef2e36237badef6cb8ec5fe7e3b5ac1728839477de0cc034c	1	SHA256 (firefox-48.0.source.tar.xz) = f474113a1ee75a01d43e270bf438ba78b9f7f2e397a66652b43603235fa76e21
2	SIZE (firefox-47.0.1.source.tar.xz) = 188695532	2	SIZE (firefox-48.0.source.tar.xz) = 188339876

Lines 11-18 Link Here

(-)www/firefox/files/patch-bug1013882 (-2 / +2 lines)
11	+endif	11	+endif
12	+	12	+
13	DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION)	13	DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION)
14	ifdef MOZ_NATIVE_ICU	14	ifdef MOZ_SYSTEM_ICU
15	DEFINES += -DMOZ_NATIVE_ICU	15	DEFINES += -DMOZ_SYSTEM_ICU
16	diff --git b2g/installer/package-manifest.in b2g/installer/package-manifest.in	16	diff --git b2g/installer/package-manifest.in b2g/installer/package-manifest.in
17	index 17d433c..0416187 100644	17	index 17d433c..0416187 100644
18	--- b2g/installer/package-manifest.in	18	--- b2g/installer/package-manifest.in




diff --git build/moz.configure/old.configure build/moz.configure/old.configure
index b95dd2b..4cbefd5 100644
--- build/moz.configure/old.configure
+++ build/moz.configure/old.configure
@@ -305,6 +305,7 @@ def old_configure_options(*options):
     '--with-nspr-prefix',
     '--with-nss-exec-prefix',
     '--with-nss-prefix',
+    '--with-oss',
     '--with-pthreads',
     '--with-qemu-exe',
     '--with-servo',
diff --git old-configure.in configure.in
index 48e60c0..ec08417 100644
--- old-configure.in

+if CONFIG['MOZ_OSS']:
+    OS_LIBS += CONFIG['MOZ_OSS_LIBS']
 
 if CONFIG['MOZ_SYSTEM_JPEG']:
     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
diff --git toolkit/library/moz.build toolkit/library/moz.build
index e191f13..4fb268a 100644
--- toolkit/library/moz.build
+++ toolkit/library/moz.build
@@ -234,8 +234,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
 if not CONFIG['MOZ_TREE_PIXMAN']:
     OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
 




# Allow building against system-wide graphite2/harfbuzz.

diff --git build/moz.configure/old.configure build/moz.configure/old.configure
index 4cbefd5..42ab554 100644
--- build/moz.configure/old.configure
+++ build/moz.configure/old.configure
@@ -312,6 +312,8 @@ def old_configure_options(*options):
     '--with-sixgill',
     '--with-soft-float',
     '--with-system-bz2',
+    '--with-system-graphite2',
+    '--with-system-harfbuzz',
     '--with-system-icu',
     '--with-system-jpeg',
     '--with-system-libevent',
diff --git config/Makefile.in config/Makefile.in
index 14bfc0d..5383399 100644
--- config/Makefile.in
+++ config/Makefile.in
@@ -49,6 +49,8 @@ export:: $(export-preqs)
 		-DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \
 		-DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \
 		-DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
+		-DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \
+		-DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \
 		$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
 	$(INSTALL) system_wrappers $(DIST)
 

 #endif
 libutil.h
 unwind.h
+#if MOZ_SYSTEM_GRAPHITE2==1
+graphite2/Font.h
+graphite2/Segment.h
+#endif
+#if MOZ_SYSTEM_HARFBUZZ==1
+harfbuzz/hb-ot.h
+harfbuzz/hb.h
+#endif

+
+MOZ_ARG_WITH_BOOL(system-harfbuzz,
+[  --with-system-harfbuzz  Use system harfbuzz (located with pkgconfig)],
+MOZ_SYSTEM_HARFBUZZ=1,
+MOZ_SYSTEM_HARFBUZZ=)
+
+if test -n "$MOZ_SYSTEM_HARFBUZZ"; then
+    PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 1.2.6)
+fi
+
+AC_SUBST(MOZ_SYSTEM_HARFBUZZ)
+
+dnl ========================================================
+dnl Check for graphite2

+
+MOZ_ARG_WITH_BOOL(system-graphite2,
+[  --with-system-graphite2 Use system graphite2 (located with pkgconfig)],
+MOZ_SYSTEM_GRAPHITE2=1,
+MOZ_SYSTEM_GRAPHITE2=)
+
+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
+    PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2)
+
+    dnl graphite2.pc has bogus version, check manually

+                   [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])])
+fi
+
+AC_SUBST(MOZ_SYSTEM_GRAPHITE2)
+
+dnl ========================================================
 dnl Check for pixman and cairo

     SOURCES += ['nsTextFragmentSSE2.cpp']
     SOURCES['nsTextFragmentSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
 
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+    SOURCES['nsContentUtils.cpp'].flags += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
 EXTRA_COMPONENTS += [

 if CONFIG['MOZ_TREE_CAIRO']:
     DIRS += ['cairo']
 
+if not CONFIG['MOZ_SYSTEM_GRAPHITE2']:
+    DIRS += ['graphite2/src' ]
+
+if not CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+    DIRS += ['harfbuzz/src']
+
 DIRS += [

         '-Wno-unused-private-field',
     ]
 
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):

         '-Wno-unused-private-field',
     ]
 
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):

 LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
 
-DEFINES['GRAPHITE2_STATIC'] = True
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
+    CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
+else:
+    DEFINES['GRAPHITE2_STATIC'] = True

     LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
     USE_LIBS += ['icu']
 
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
 DIST_INSTALL = True

     '/netwerk/base',
 ]
 
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '19':

index 67f0db9..d42137a 100644
--- toolkit/library/moz.build
+++ toolkit/library/moz.build
@@ -231,6 +231,12 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
 if not CONFIG['MOZ_TREE_PIXMAN']:
     OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
 
+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
+    OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
+
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+    OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
+
 if CONFIG['MOZ_OSS']:

Lines 4-10 Link Here

(-)www/firefox/files/patch-ijg-libjpeg (-2 / +2 lines)
4	index f0aeb5d..1c01010 100644	4	index f0aeb5d..1c01010 100644
5	--- old-configure.in	5	--- old-configure.in
6	+++ old-configure.in	6	+++ old-configure.in
7	@@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then	7	@@ -4027,11 +4027,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
8	#include <jpeglib.h> ],	8	#include <jpeglib.h> ],
9	[ #if JPEG_LIB_VERSION < $MOZJPEG	9	[ #if JPEG_LIB_VERSION < $MOZJPEG
10	#error "Insufficient JPEG library version ($MOZJPEG required)."	10	#error "Insufficient JPEG library version ($MOZJPEG required)."
Lines 14-20 Link Here
14	- #endif	14	- #endif
15	- ],	15	- ],
16	+ #endif ],	16	+ #endif ],
17	MOZ_NATIVE_JPEG=1,	17	MOZ_SYSTEM_JPEG=1,
18	AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))	18	AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
19	fi	19	fi
20	diff --git image/decoders/nsJPEGDecoder.cpp image/decoders/nsJPEGDecoder.cpp	20	diff --git image/decoders/nsJPEGDecoder.cpp image/decoders/nsJPEGDecoder.cpp




--- modules/libpref/init/all.js.orig	2016-07-25 20:22:05 UTC
+++ modules/libpref/init/all.js
@@ -4453,6 +4453,11 @@ pref("layers.max-active", -1);
 // if you change the tile size.
 pref("layers.tiles.adjust", true);
 
+#ifndef MOZ_TREE_CAIRO
+#ifdef MOZ_TREE_CAIRO
 pref("layers.offmainthreadcomposition.enabled", true);
+#else
+// Disable for system cairo on suspicion of causing random crashes
+pref("layers.offmainthreadcomposition.force-disabled", true);
+#endif
+
 // Compositor target frame rate. NOTE: If vsync is enabled the compositor
 // frame rate will still be capped.
 // -1 -> default (match layout.frame_rate or 60 FPS)




# Allow more config/external/ libs built against system-wide version.

diff --git build/moz.configure/old.configure build/moz.configure/old.configure
index 42ab554..c91df3d 100644
--- build/moz.configure/old.configure
+++ build/moz.configure/old.configure
@@ -320,7 +320,12 @@ def old_configure_options(*options):
     '--with-system-libvpx',
     '--with-system-nspr',
     '--with-system-nss',
+    '--with-system-ogg',
     '--with-system-png',
+    '--with-system-soundtouch',
+    '--with-system-theora',
+    '--with-system-tremor',
+    '--with-system-vorbis',
     '--with-system-zlib',
     '--with-thumb',
     '--with-thumb-interwork',
diff --git config/Makefile.in config/Makefile.in
index 5383399..0410004 100644
--- config/Makefile.in
+++ config/Makefile.in
@@ -77,6 +77,11 @@ export:: $(export-preqs)
 		-DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
 		-DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \
 		-DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \
+		-DMOZ_SYSTEM_OGG=$(MOZ_SYSTEM_OGG) \
+		-DMOZ_SYSTEM_THEORA=$(MOZ_SYSTEM_THEORA) \
+		-DMOZ_SYSTEM_VORBIS=$(MOZ_SYSTEM_VORBIS) \
+		-DMOZ_SYSTEM_TREMOR=$(MOZ_SYSTEM_TREMOR) \
+		-DMOZ_SYSTEM_SOUNDTOUCH=$(MOZ_SYSTEM_SOUNDTOUCH) \
 		$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
 	$(INSTALL) system_wrappers $(DIST)
 

 external_dirs += ['modules/brotli']
 
-if CONFIG['MOZ_VORBIS']:
+if not CONFIG['MOZ_SYSTEM_OGG']:
+    external_dirs += ['media/libogg']
+
+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_SYSTEM_VORBIS']:
     external_dirs += ['media/libvorbis']
 
-if CONFIG['MOZ_TREMOR']:
+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_SYSTEM_TREMOR']:
     external_dirs += ['media/libtremor']
 
+if not CONFIG['MOZ_SYSTEM_THEORA']:
+    external_dirs += ['media/libtheora']
+
+if not CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
+    external_dirs += ['media/libsoundtouch']
+
 if CONFIG['MOZ_WEBM_ENCODER']:

 harfbuzz/hb-ot.h
 harfbuzz/hb.h
 #endif
+#if MOZ_SYSTEM_OGG==1
+ogg/ogg.h
+ogg/os_types.h
+#endif
+#if MOZ_SYSTEM_THEORA==1
+theora/theoradec.h
+#endif
+#if MOZ_SYSTEM_VORBIS==1
+vorbis/codec.h
+vorbis/vorbisenc.h
+#endif
+#if MOZ_SYSTEM_TREMOR==1
+tremor/ivorbiscodec.h
+#endif
diff --git old-configure.in configure.in

+
+MOZ_ARG_WITH_BOOL(system-ogg,
+[  --with-system-ogg       Use system libogg (located with pkgconfig)],
+MOZ_SYSTEM_OGG=1,
+MOZ_SYSTEM_OGG=)
+
+if test -n "$MOZ_SYSTEM_OGG"; then
+    PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
+
+    _SAVE_LIBS=$LIBS

+    LIBS=$_SAVE_LIBS
+fi
+
+AC_SUBST(MOZ_SYSTEM_OGG)
+
+dnl ========================================================
+dnl Check for libvorbis

+
+MOZ_ARG_WITH_BOOL(system-vorbis,
+[  --with-system-vorbis    Use system libvorbis (located with pkgconfig)],
+MOZ_SYSTEM_VORBIS=1,
+MOZ_SYSTEM_VORBIS=)
+
+if test -n "$MOZ_SYSTEM_VORBIS"; then
+    PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)
+fi
+
+AC_SUBST(MOZ_SYSTEM_VORBIS)
+
+dnl ========================================================
+dnl Check for integer-only libvorbis aka tremor

+
+MOZ_ARG_WITH_BOOL(system-tremor,
+[  --with-system-tremor    Use system libtremor (located with pkgconfig)],
+MOZ_SYSTEM_TREMOR=1,
+MOZ_SYSTEM_TREMOR=)
+
+if test -n "$MOZ_SYSTEM_TREMOR"; then
+    PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1)
+fi
+
+AC_SUBST(MOZ_SYSTEM_TREMOR)
+
+dnl ========================================================
+dnl Check for libtheora

+
+MOZ_ARG_WITH_BOOL(system-theora,
+[  --with-system-theora    Use system libtheora (located with pkgconfig)],
+MOZ_SYSTEM_THEORA=1,
+MOZ_SYSTEM_THEORA=)
+
+if test -n "$MOZ_SYSTEM_THEORA"; then
+    PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2)
+fi
+
+AC_SUBST(MOZ_SYSTEM_THEORA)
+
+dnl ========================================================
+dnl Check for libSoundTouch

+
+MOZ_ARG_WITH_BOOL(system-soundtouch,
+[  --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)],
+MOZ_SYSTEM_SOUNDTOUCH=1,
+MOZ_SYSTEM_SOUNDTOUCH=)
+
+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then
+    PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0)
+
+    AC_LANG_SAVE

+    fi
+fi
+
+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then
+    AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH)
+fi
+AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH)
+
 dnl system libvpx Support
 dnl ========================================================

   , mOutChannels(0)
   , mWritten(0)
   , mAudioClock(this)
+#ifndef MOZ_SYSTEM_SOUNDTOUCH
   , mTimeStretcher(nullptr)
+#endif
   , mDumpFile(nullptr)

   if (mDumpFile) {
     fclose(mDumpFile);
   }
+#ifndef MOZ_SYSTEM_SOUNDTOUCH
   if (mTimeStretcher) {
     soundtouch::destroySoundTouchObj(mTimeStretcher);
   }

 {
   mMonitor.AssertCurrentThreadOwns();
   if (!mTimeStretcher) {
+#ifdef MOZ_SYSTEM_SOUNDTOUCH
+    mTimeStretcher = new soundtouch::SoundTouch();
+#else
     mTimeStretcher = soundtouch::createSoundTouchObj();

 #include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
 #include "CubebUtils.h"
+#ifdef MOZ_SYSTEM_SOUNDTOUCH
+#include "soundtouch/SoundTouch.h"
+#else
 #include "soundtouch/SoundTouchFactory.h"

   // Number of frames written to the buffers.
   int64_t mWritten;
   AudioClock mAudioClock;
+#ifdef MOZ_SYSTEM_SOUNDTOUCH
+  nsAutoPtr<soundtouch::SoundTouch> mTimeStretcher;
+#else
   soundtouch::SoundTouch* mTimeStretcher;

 
 DEFINES['MOZILLA_INTERNAL_API'] = True
 
+if CONFIG['MOZ_SYSTEM_OGG']:
+    CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS']
+
+if CONFIG['MOZ_SYSTEM_THEORA']:
+    CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS']
+
+if CONFIG['MOZ_SYSTEM_VORBIS']:
+    CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS']
+
+if CONFIG['MOZ_SYSTEM_TREMOR']:
+    CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS']
+
+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
+    CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']
+
 if CONFIG['OS_TARGET'] == 'WINNT':

 
 #pragma GCC visibility push(default)
 #include "SoundTouch.h"
+#ifndef MOZ_SYSTEM_SOUNDTOUCH
 #include "SoundTouchFactory.h"
+#endif
 #pragma GCC visibility pop

 # The encoder is currently not included.
 DEFINES['THEORA_DISABLE_ENCODE'] = True
 
+if CONFIG['MOZ_SYSTEM_OGG']:
+    CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
+
 # Suppress warnings in third-party code.

 
 DIRS += ['include/tremor', 'lib']
 
+if CONFIG['MOZ_SYSTEM_OGG']:
+    CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
diff --git media/libvorbis/README_MOZILLA media/libvorbis/README_MOZILLA
index 7c7454c..55baedd 100644

 if CONFIG['GNU_CC']:
     CFLAGS += ['-Wno-uninitialized']
+
+if CONFIG['MOZ_SYSTEM_OGG']:
+    CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
diff --git toolkit/library/moz.build toolkit/library/moz.build
index d42137a..695e75a8 100644
--- toolkit/library/moz.build
+++ toolkit/library/moz.build
@@ -178,6 +178,21 @@ if CONFIG['MOZ_SYSTEM_PNG']:
 if CONFIG['MOZ_SYSTEM_HUNSPELL']:
     OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
 
+if CONFIG['MOZ_SYSTEM_OGG']:
+    OS_LIBS += CONFIG['MOZ_OGG_LIBS']
+
+if CONFIG['MOZ_SYSTEM_THEORA']:
+    OS_LIBS += CONFIG['MOZ_THEORA_LIBS']
+
+if CONFIG['MOZ_SYSTEM_VORBIS']:
+    OS_LIBS += CONFIG['MOZ_VORBIS_LIBS']
+
+if CONFIG['MOZ_SYSTEM_TREMOR']:
+    OS_LIBS += CONFIG['MOZ_TREMOR_LIBS']
+
+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
+    OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS']
+
 if CONFIG['MOZ_SYSTEM_LIBEVENT']:
     OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
 
diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp




# $FreeBSD$

PORTNAME=	firefox-i18n
PORTVERSION=	48.0
CATEGORIES=	www
MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \
		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi
PKGNAMEPREFIX=
DISTFILES=	${FIREFOX_I18N_:S/$/.xpi/}
DIST_SUBDIR=	xpi/${DISTNAME}


EXTRACT_DEPENDS=	zip:archivers/zip

USES=		zip:infozip gecko:firefox,48,build
USE_XPI=	firefox

NO_ARCH=	yes




SHA256 (xpi/firefox-i18n-48.0/ach.xpi) = c1bcde1c4d61003f016a1934b8bb69481ae066c6096290bc1d502583d36e6256
SIZE (xpi/firefox-i18n-48.0/ach.xpi) = 433537
SHA256 (xpi/firefox-i18n-48.0/af.xpi) = 10edc281a7e1a6b45692eb82dfbcc5cc8f77f9d870301b959f3d6c88d4384c12
SIZE (xpi/firefox-i18n-48.0/af.xpi) = 438780
SHA256 (xpi/firefox-i18n-48.0/an.xpi) = e134d343802a8bdb72e02407ffad784085872e4cc4d967dc898425a246a25cee
SIZE (xpi/firefox-i18n-48.0/an.xpi) = 447344
SHA256 (xpi/firefox-i18n-48.0/ar.xpi) = 52934f57e6bb93c892007d4f4346d1687ed7bbe14d96d32d192e2864924631c9
SIZE (xpi/firefox-i18n-48.0/ar.xpi) = 473319
SHA256 (xpi/firefox-i18n-48.0/as.xpi) = 7bfdcf010f7b1a6a3b3f3588b981491a3d70b2aa9032b2b4a6fbf363bb1f0205
SIZE (xpi/firefox-i18n-48.0/as.xpi) = 486849
SHA256 (xpi/firefox-i18n-48.0/ast.xpi) = c529dd8ebc29fd25281b49cc608cad3fb126366ca45c7c049d4b40f742cf2095
SIZE (xpi/firefox-i18n-48.0/ast.xpi) = 464173
SHA256 (xpi/firefox-i18n-48.0/az.xpi) = 6ca39a5a4d37868c4789c0f4d2b1ff7cac320623c26eaa425481d38c8d959e8e
SIZE (xpi/firefox-i18n-48.0/az.xpi) = 457528
SHA256 (xpi/firefox-i18n-48.0/be.xpi) = 05683ba7249b5ea8848879279bf26bc3bd4e58f1e0d8597445d9754769250fd1
SIZE (xpi/firefox-i18n-48.0/be.xpi) = 450846
SHA256 (xpi/firefox-i18n-48.0/bg.xpi) = 61eb382206790e54d18fe26d1e547323844fd3953a45ffdf7f16135fcddc968d
SIZE (xpi/firefox-i18n-48.0/bg.xpi) = 498906
SHA256 (xpi/firefox-i18n-48.0/bn-BD.xpi) = ca7e5665bec693234166b1c8a24600926e326dc3bdf915ba4233aebb3acbe00f
SIZE (xpi/firefox-i18n-48.0/bn-BD.xpi) = 517250
SHA256 (xpi/firefox-i18n-48.0/bn-IN.xpi) = df0841eb0d3a02f21764daf567a6fa7dcc8d1732b753a210d0c489738d5de77f
SIZE (xpi/firefox-i18n-48.0/bn-IN.xpi) = 523101
SHA256 (xpi/firefox-i18n-48.0/br.xpi) = 604f84e9eb9fd9c8ba7d705ef7122c50f1f0d869c8a50dd524eba1efbd87d281
SIZE (xpi/firefox-i18n-48.0/br.xpi) = 434259
SHA256 (xpi/firefox-i18n-48.0/bs.xpi) = 6fea2e19bd9e2a927f76c397c35f8baa47977915f9b99490cf89669e200ba233
SIZE (xpi/firefox-i18n-48.0/bs.xpi) = 454738
SHA256 (xpi/firefox-i18n-48.0/ca.xpi) = 744eeac5f2cee322d09a0bc4559ab9e59e8e8684d804ccd59bc5c7592fa53180
SIZE (xpi/firefox-i18n-48.0/ca.xpi) = 446257
SHA256 (xpi/firefox-i18n-48.0/cs.xpi) = 1f16d9a53a226553c8a750abeb0a8426cbcf836d7550be4590f0117a06afb34c
SIZE (xpi/firefox-i18n-48.0/cs.xpi) = 441919
SHA256 (xpi/firefox-i18n-48.0/cy.xpi) = f4bc01f93ab0fa7f8f89ef165504a3eb6d6d58c371c0e15896bfccada05edad0
SIZE (xpi/firefox-i18n-48.0/cy.xpi) = 437567
SHA256 (xpi/firefox-i18n-48.0/da.xpi) = 05932d071a850dc761703e34638fd6fdfab738d1f8d8f9a0dfb75ac57c9e973d
SIZE (xpi/firefox-i18n-48.0/da.xpi) = 427790
SHA256 (xpi/firefox-i18n-48.0/de.xpi) = c5f1a5b1112428b395e6b83c1bc79c764e076aafc7aff40754eb1245d031604d
SIZE (xpi/firefox-i18n-48.0/de.xpi) = 443909
SHA256 (xpi/firefox-i18n-48.0/dsb.xpi) = d5cc3afe80dc62afe48a0a2c5c9e06032ae91a731377cd937bc0df0487b5c0d3
SIZE (xpi/firefox-i18n-48.0/dsb.xpi) = 461890
SHA256 (xpi/firefox-i18n-48.0/el.xpi) = eb6e167a4c9324d745c23d8f3ae4b768a7553023c510de4883d674bab20b4671
SIZE (xpi/firefox-i18n-48.0/el.xpi) = 475371
SHA256 (xpi/firefox-i18n-48.0/en-GB.xpi) = e1bce58a63e2dd9015142714bccbf2cfdd641170e3ba8775bd68b73e3c863174
SIZE (xpi/firefox-i18n-48.0/en-GB.xpi) = 425127
SHA256 (xpi/firefox-i18n-48.0/en-US.xpi) = eb74328691d2a387a109cc48dab62ae1d38cb42363bb51247ce88a80d871b384
SIZE (xpi/firefox-i18n-48.0/en-US.xpi) = 430727
SHA256 (xpi/firefox-i18n-48.0/en-ZA.xpi) = 7af7d442e7e1f4519aaa6383f8702121a82811c2073aed252620d6c74f281705
SIZE (xpi/firefox-i18n-48.0/en-ZA.xpi) = 414654
SHA256 (xpi/firefox-i18n-48.0/eo.xpi) = f3cd1d534796354787a5eddea38f13cbf8c4db0c4fa57adc0764adf2c173d5dd
SIZE (xpi/firefox-i18n-48.0/eo.xpi) = 438151
SHA256 (xpi/firefox-i18n-48.0/es-AR.xpi) = a264be05f2afc9b45d7b66e3a72169609915570ed36123108a36642d6bcf4fe9
SIZE (xpi/firefox-i18n-48.0/es-AR.xpi) = 441918
SHA256 (xpi/firefox-i18n-48.0/es-CL.xpi) = 17a5872af2d0b3ae5958e62ca40eb74a28897e88fa7db3144f8e41879be74312
SIZE (xpi/firefox-i18n-48.0/es-CL.xpi) = 441535
SHA256 (xpi/firefox-i18n-48.0/es-ES.xpi) = ac0eda15655821cc99b924865c184e8820c24283176164b85e0c1242728c4c77
SIZE (xpi/firefox-i18n-48.0/es-ES.xpi) = 350170
SHA256 (xpi/firefox-i18n-48.0/es-MX.xpi) = ffc54382ad13c93cce37cee66586979640964d465cba93c0fca1d8855da651d6
SIZE (xpi/firefox-i18n-48.0/es-MX.xpi) = 453288
SHA256 (xpi/firefox-i18n-48.0/et.xpi) = 7d2310dcc301faffb4c8aaeea51383c93e43226692886aaa7836328900cfd585
SIZE (xpi/firefox-i18n-48.0/et.xpi) = 425727
SHA256 (xpi/firefox-i18n-48.0/eu.xpi) = f703f3111a023e5f77c83c9ad95e59940b2381b0c997b3fb19470aa557fd85c3
SIZE (xpi/firefox-i18n-48.0/eu.xpi) = 439682
SHA256 (xpi/firefox-i18n-48.0/fa.xpi) = e659bf195799866f665d9d6d2ad93274dc31804ee3153b66492955790b4c1849
SIZE (xpi/firefox-i18n-48.0/fa.xpi) = 494119
SHA256 (xpi/firefox-i18n-48.0/ff.xpi) = 5da27fa744912b39e2ff0339843a2deff6a694d0d4a57f81c93da3060f5e0924
SIZE (xpi/firefox-i18n-48.0/ff.xpi) = 449385
SHA256 (xpi/firefox-i18n-48.0/fi.xpi) = 637dd1c47f1c2addce89c2d366d8b3902459f7819f93ceb01dfed8ee3f931ee6
SIZE (xpi/firefox-i18n-48.0/fi.xpi) = 432945
SHA256 (xpi/firefox-i18n-48.0/fr.xpi) = 00b49d68dd7a4cd99a2d508376b6549df4bd584ec5181bf7504148f2d3fe7bb9
SIZE (xpi/firefox-i18n-48.0/fr.xpi) = 454087
SHA256 (xpi/firefox-i18n-48.0/fy-NL.xpi) = 52abf5760c79fdeb46c8f24094c05efd5e31e684e103b79563d96e645d06bc18
SIZE (xpi/firefox-i18n-48.0/fy-NL.xpi) = 446157
SHA256 (xpi/firefox-i18n-48.0/ga-IE.xpi) = 2556605db4396e8eb368c7a428565b70d5f7d3cafe9f9d6a83b74f022c4887ce
SIZE (xpi/firefox-i18n-48.0/ga-IE.xpi) = 458777
SHA256 (xpi/firefox-i18n-48.0/gd.xpi) = c1e3819384ec8c0f903ef4460ee83dec04c61c051dd58dee572a647fa6c93122
SIZE (xpi/firefox-i18n-48.0/gd.xpi) = 446696
SHA256 (xpi/firefox-i18n-48.0/gl.xpi) = fb3983249dbec4a4504b27bbb5b1b9cb50382546c9f86277b7c0f45f30f453f4
SIZE (xpi/firefox-i18n-48.0/gl.xpi) = 446346
SHA256 (xpi/firefox-i18n-48.0/gn.xpi) = 4806332b3508c2470a4d9f8667733ddbc1b01bcef8d00825fed7452cdfb8d400
SIZE (xpi/firefox-i18n-48.0/gn.xpi) = 472567
SHA256 (xpi/firefox-i18n-48.0/gu-IN.xpi) = 267e2b74011d8b92ac0e32ad415b25c08bb568d44350dece5c8c483b68530e85
SIZE (xpi/firefox-i18n-48.0/gu-IN.xpi) = 478608
SHA256 (xpi/firefox-i18n-48.0/he.xpi) = 3a4815515ab909fd0cce959dd7a0fedacdbf3ff12cee49f99119480c40863b25
SIZE (xpi/firefox-i18n-48.0/he.xpi) = 460109
SHA256 (xpi/firefox-i18n-48.0/hi-IN.xpi) = 94d2ac871d627af088503e419fc3eeaceb87cbb2424763745f0ef244aea6cc72
SIZE (xpi/firefox-i18n-48.0/hi-IN.xpi) = 494802
SHA256 (xpi/firefox-i18n-48.0/hr.xpi) = ed64ffb5a735995545542dcdc97a9bc24b9c538eb75465977d511105f4f049fc
SIZE (xpi/firefox-i18n-48.0/hr.xpi) = 451652
SHA256 (xpi/firefox-i18n-48.0/hsb.xpi) = 76172cb26db645b601b891c2ad26d5a314dcba6ccd3ec8b2208d6f214b05e6e3
SIZE (xpi/firefox-i18n-48.0/hsb.xpi) = 459743
SHA256 (xpi/firefox-i18n-48.0/hu.xpi) = 6ebd24622a4324dd33f72f19c33c9aaa59ae676cb68acd081f849f9cd6a974f9
SIZE (xpi/firefox-i18n-48.0/hu.xpi) = 452260
SHA256 (xpi/firefox-i18n-48.0/hy-AM.xpi) = 7d27b14b84638cbfae7118d3eb3d2827372a3227a2b1c2a7a0c019e71b82d37b
SIZE (xpi/firefox-i18n-48.0/hy-AM.xpi) = 501827
SHA256 (xpi/firefox-i18n-48.0/id.xpi) = 496a8cd3e2e3af369f0c16b1af5efe89965f94208c31f93fcbdf106601076814
SIZE (xpi/firefox-i18n-48.0/id.xpi) = 428456
SHA256 (xpi/firefox-i18n-48.0/is.xpi) = 085227bdcee890486b42cbad14ce591b83958703ae54b944c09b18fb95a36047
SIZE (xpi/firefox-i18n-48.0/is.xpi) = 440983
SHA256 (xpi/firefox-i18n-48.0/it.xpi) = be4fa7f3247d10a93c28f950a83713a0351e19755d17e4c6dd261d40c7a8e5c8
SIZE (xpi/firefox-i18n-48.0/it.xpi) = 344430
SHA256 (xpi/firefox-i18n-48.0/ja.xpi) = 7bc8c020c6ebccb9d4e7db99b656018168093042b536738fe5fcb29e20fcd711
SIZE (xpi/firefox-i18n-48.0/ja.xpi) = 488755
SHA256 (xpi/firefox-i18n-48.0/kk.xpi) = d9bfa671ff2ea276289179dfe034281bd8e1b7ec99d97096cc53e90f138908f0
SIZE (xpi/firefox-i18n-48.0/kk.xpi) = 495567
SHA256 (xpi/firefox-i18n-48.0/km.xpi) = 5e169c7ab19cc3cbc02d10cb2988dc5db616e687f0cd17ef08b4d019110f4e10
SIZE (xpi/firefox-i18n-48.0/km.xpi) = 515077
SHA256 (xpi/firefox-i18n-48.0/kn.xpi) = b3147e7c4c105054c0376fc29aee397c44c57235219747fbfc59e9faadea4f42
SIZE (xpi/firefox-i18n-48.0/kn.xpi) = 519323
SHA256 (xpi/firefox-i18n-48.0/ko.xpi) = 10d5f065a8467d04adc3c6636b8b2f044d0f8eba5bf82c94bf75448032177207
SIZE (xpi/firefox-i18n-48.0/ko.xpi) = 462018
SHA256 (xpi/firefox-i18n-48.0/lij.xpi) = 9fa589c0d59121434ca201f6c21109fcafb60a6a106bfc188c280160c5d11ebe
SIZE (xpi/firefox-i18n-48.0/lij.xpi) = 400156
SHA256 (xpi/firefox-i18n-48.0/lt.xpi) = bcbd91b6ccd90846873d74c774f7d075921204204c1b5043b9cc2cde0c078b58
SIZE (xpi/firefox-i18n-48.0/lt.xpi) = 453175
SHA256 (xpi/firefox-i18n-48.0/lv.xpi) = 4576cbb69aabd1cf20b2d677c2b6021bdc67eb9bd483ce26e88c59d12578c669
SIZE (xpi/firefox-i18n-48.0/lv.xpi) = 450209
SHA256 (xpi/firefox-i18n-48.0/mai.xpi) = be0fac35b2adce645f429d36994290eac06a275f144d25013cde6965eacd6612
SIZE (xpi/firefox-i18n-48.0/mai.xpi) = 500508
SHA256 (xpi/firefox-i18n-48.0/mk.xpi) = 7ca04a072b76c639f88bff011b3e166978d980be1cb98d6a31addd5afb4164cb
SIZE (xpi/firefox-i18n-48.0/mk.xpi) = 481708
SHA256 (xpi/firefox-i18n-48.0/ml.xpi) = d48b7df0ca2308e2dd3d9e39c7feb1477ba3e2924187fa43dc545da412873e96
SIZE (xpi/firefox-i18n-48.0/ml.xpi) = 532683
SHA256 (xpi/firefox-i18n-48.0/mr.xpi) = bda568ab9eabc11f3af72250dae276939c98a0f0a405daadeefcb8dc18b87c9f
SIZE (xpi/firefox-i18n-48.0/mr.xpi) = 502134
SHA256 (xpi/firefox-i18n-48.0/ms.xpi) = 119089ade11673a3ca39d65c675aeb20423e4d1c7db459f1649fadb66d3a1b54
SIZE (xpi/firefox-i18n-48.0/ms.xpi) = 450457
SHA256 (xpi/firefox-i18n-48.0/nb-NO.xpi) = b98989e90f8e59b78e6d07219556bcf968b5846a527b2f17b78081987478bb9f
SIZE (xpi/firefox-i18n-48.0/nb-NO.xpi) = 433305
SHA256 (xpi/firefox-i18n-48.0/nl.xpi) = 0d36620b8bf025dd08fdcff6d007272fb54a463e09833f783999e5bb5dc679f7
SIZE (xpi/firefox-i18n-48.0/nl.xpi) = 433118
SHA256 (xpi/firefox-i18n-48.0/nn-NO.xpi) = 3d564300a7bda57e3afad6955ea62527b12375b8b792d37f23310feb41b5aafa
SIZE (xpi/firefox-i18n-48.0/nn-NO.xpi) = 429362
SHA256 (xpi/firefox-i18n-48.0/or.xpi) = 443693631d37f2a05d50264dd90c86680dac8b54944d4088bed204565b5d6ec1
SIZE (xpi/firefox-i18n-48.0/or.xpi) = 503706
SHA256 (xpi/firefox-i18n-48.0/pa-IN.xpi) = 0fa019ea44f655daad5122054aed2c1129e0612f9405a4e5e33a127f8b5e307d
SIZE (xpi/firefox-i18n-48.0/pa-IN.xpi) = 498536
SHA256 (xpi/firefox-i18n-48.0/pl.xpi) = 4f971a418f92a9f051f1f4337897ba89a026a28e990784b4456cd10a70371b0f
SIZE (xpi/firefox-i18n-48.0/pl.xpi) = 373161
SHA256 (xpi/firefox-i18n-48.0/pt-BR.xpi) = 45bf59e5b673020a5800466274b1b47a50a56375353fabe61680cce0006e0919
SIZE (xpi/firefox-i18n-48.0/pt-BR.xpi) = 451281
SHA256 (xpi/firefox-i18n-48.0/pt-PT.xpi) = 42620d19756e7eec1c6cf647ff0e19db4022eb0647a571e01ac2530375d7d799
SIZE (xpi/firefox-i18n-48.0/pt-PT.xpi) = 435408
SHA256 (xpi/firefox-i18n-48.0/rm.xpi) = 61c591c88af31076fba39abb4267206a69572b8663390cf5f559ab17b698d935
SIZE (xpi/firefox-i18n-48.0/rm.xpi) = 439206
SHA256 (xpi/firefox-i18n-48.0/ro.xpi) = 7e2c6ac94b665469a1d09170f03821244092f65a8d3b2a513342787a1c5f70b9
SIZE (xpi/firefox-i18n-48.0/ro.xpi) = 453389
SHA256 (xpi/firefox-i18n-48.0/ru.xpi) = 03fe65e11965df84aa2cb4c61329582f37d878edabf67950c469c77e1aa49c56
SIZE (xpi/firefox-i18n-48.0/ru.xpi) = 395081
SHA256 (xpi/firefox-i18n-48.0/si.xpi) = 46486aec6276b6982990ab206ca28db0db5147f417a8cde7fb87cfcf83374017
SIZE (xpi/firefox-i18n-48.0/si.xpi) = 495088
SHA256 (xpi/firefox-i18n-48.0/sk.xpi) = d039d8f02232837861e894049ce8059e8a47d8787810df50aab7b0b75d63b8e2
SIZE (xpi/firefox-i18n-48.0/sk.xpi) = 456805
SHA256 (xpi/firefox-i18n-48.0/sl.xpi) = 3e01b89ca0e6becaa51775ca378f7a69de128edacf0388a4e0d60c3232f7bb3a
SIZE (xpi/firefox-i18n-48.0/sl.xpi) = 437372
SHA256 (xpi/firefox-i18n-48.0/son.xpi) = 133867e6d11982e07cc1123e9f08f38fe904e9fad6116302f200106730f7cc01
SIZE (xpi/firefox-i18n-48.0/son.xpi) = 437177
SHA256 (xpi/firefox-i18n-48.0/sq.xpi) = 3fda852a258657bbe2ba9125eb54810f2d1ed653856fa7011f15fdf51f0c43f7
SIZE (xpi/firefox-i18n-48.0/sq.xpi) = 454344
SHA256 (xpi/firefox-i18n-48.0/sr.xpi) = d7cf481050901595859d8c125dadff8e54e9555284f1cec7911ee13e93984d3b
SIZE (xpi/firefox-i18n-48.0/sr.xpi) = 466335
SHA256 (xpi/firefox-i18n-48.0/sv-SE.xpi) = d33e7b6594ea86b01977cecd60e23c76ccf211fcbdcb9b036f6769d039cecbc3
SIZE (xpi/firefox-i18n-48.0/sv-SE.xpi) = 442220
SHA256 (xpi/firefox-i18n-48.0/ta.xpi) = 24eb1aad05ab4af4ebbc9c5b25fcd3bd9f8b89b20e4e97abcc440aa9a3de9a12
SIZE (xpi/firefox-i18n-48.0/ta.xpi) = 490892
SHA256 (xpi/firefox-i18n-48.0/te.xpi) = 2fbf2414feb19e8cff54a5a279c0338df261117d13feed681dd7ff9eae2d007a
SIZE (xpi/firefox-i18n-48.0/te.xpi) = 524920
SHA256 (xpi/firefox-i18n-48.0/th.xpi) = c52d9d0627f32273e53d5c2a807beda93580fde710c66d35590af87c7b5c8aaf
SIZE (xpi/firefox-i18n-48.0/th.xpi) = 487643
SHA256 (xpi/firefox-i18n-48.0/tr.xpi) = 2237500551fcab3112613861316a6542e2bd81d5db0b8afc5328eb58acfe23b6
SIZE (xpi/firefox-i18n-48.0/tr.xpi) = 442838
SHA256 (xpi/firefox-i18n-48.0/uk.xpi) = 80a228338e398dddf03bd3af9c92a102b22e0f0cba3fc276eb635c5ef00133e1
SIZE (xpi/firefox-i18n-48.0/uk.xpi) = 493809
SHA256 (xpi/firefox-i18n-48.0/uz.xpi) = 4a564a76313dbc3c0678634bb4941f9e783a70e3d284e015c90e96ae9c55e30d
SIZE (xpi/firefox-i18n-48.0/uz.xpi) = 453528
SHA256 (xpi/firefox-i18n-48.0/vi.xpi) = 4ff24adcff416e8dd15c91cbefe4da6a53aa1af6a3c785c3047d9d203daa1231
SIZE (xpi/firefox-i18n-48.0/vi.xpi) = 461380
SHA256 (xpi/firefox-i18n-48.0/xh.xpi) = c16a47017795844456d029dbac215cec71cd09c8f2515f396f78aec62e8e5d1b
SIZE (xpi/firefox-i18n-48.0/xh.xpi) = 443336
SHA256 (xpi/firefox-i18n-48.0/zh-CN.xpi) = 5e6008806e9e2351aa25ed4158ec5b2756fa0a72ea8c544707391540f2083fa4
SIZE (xpi/firefox-i18n-48.0/zh-CN.xpi) = 469205
SHA256 (xpi/firefox-i18n-48.0/zh-TW.xpi) = e012cd3a41acd21206f76326f2b08e2f458785d826e58300c354e5db3354b98c
SIZE (xpi/firefox-i18n-48.0/zh-TW.xpi) = 471419

Return to bug 211792

Lines 37-48 Link Here

(-)Mk/Uses/gecko.mk (-2 / +2 lines)
37	.elif ${gecko_ARGS:Mfirefox}	37	.elif ${gecko_ARGS:Mfirefox}
38		38
39	_GECKO_DEFAULT_VERSION= 45	39	_GECKO_DEFAULT_VERSION= 45
40	_GECKO_VERSIONS= 45 47	40	_GECKO_VERSIONS= 45 48
41	_GECKO_TYPE= firefox	41	_GECKO_TYPE= firefox
42		42
43	# Dependence lines for different Firefox versions	43	# Dependence lines for different Firefox versions
44	45_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr	44	45_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
45	47_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox	45	48_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox
46		46
47	.if exists(${LOCALBASE}/bin/firefox)	47	.if exists(${LOCALBASE}/bin/firefox)
48	_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null	48	_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null

Lines 2-28 Link Here

(-)www/firefox/Makefile (-8 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= firefox	4	PORTNAME= firefox
5	DISTVERSION= 47.0.1	5	DISTVERSION= 48.0
6	PORTREVISION= 2
7	DISTVERSIONSUFFIX=.source	6	DISTVERSIONSUFFIX=.source
8	PORTEPOCH= 1	7	PORTEPOCH= 1
9	CATEGORIES= www ipv6	8	CATEGORIES= www ipv6
10	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \	9	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
11	MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source	10	MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
12		11
13	MAINTAINER= gecko@FreeBSD.org	12	MAINTAINER= gecko@FreeBSD.org
14	COMMENT= Web browser based on the browser portion of Mozilla	13	COMMENT= Web browser based on the browser portion of Mozilla
15		14
16	BUILD_DEPENDS= nspr>=4.12:devel/nspr \	15	BUILD_DEPENDS= nspr>=4.12:devel/nspr \
17	nss>=3.23:security/nss \	16	nss>=3.24:security/nss \
18	libevent2>=2.0.21_2:devel/libevent2 \	17	libevent2>=2.0.21_2:devel/libevent2 \
19	soundtouch>=1.9.0:audio/soundtouch \	18	soundtouch>=1.9.0:audio/soundtouch \
20	harfbuzz>=1.2.2:print/harfbuzz \	19	harfbuzz>=1.2.6:print/harfbuzz \
21	graphite2>=1.3.8:graphics/graphite2 \	20	graphite2>=1.3.8:graphics/graphite2 \
22	png>=1.6.21:graphics/png \	21	png>=1.6.21:graphics/png \
23	libvorbis>=1.3.5,3:audio/libvorbis \	22	libvorbis>=1.3.5,3:audio/libvorbis \
24	libvpx>=1.5.0:multimedia/libvpx \	23	libvpx>=1.5.0:multimedia/libvpx \
25	sqlite3>=3.11.0:databases/sqlite3 \	24	sqlite3>=3.12.2:databases/sqlite3 \
26	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \	25	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
27	v4l_compat>0:multimedia/v4l_compat \	26	v4l_compat>0:multimedia/v4l_compat \
28	autoconf-2.13:devel/autoconf213 \	27	autoconf-2.13:devel/autoconf213 \
Lines 40-49 Link Here
40	USE_GL= gl	39	USE_GL= gl
41	USES= tar:xz	40	USES= tar:xz
42		41
		42	COMPILER_TYPE= clang
		43
43	FIREFOX_ICON= ${MOZILLA}.png	44	FIREFOX_ICON= ${MOZILLA}.png
44	FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png	45	FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
45	MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \	46	MOZ_OPTIONS= --enable-application=browser \
46	--enable-application=browser \
47	--enable-official-branding	47	--enable-official-branding
48		48
49	OPTIONS_EXCLUDE= GSTREAMER LOGGING	49	OPTIONS_EXCLUDE= GSTREAMER LOGGING

Lines 1-3 Link Here

(-)www/firefox/files/patch-bug1021761 (-2 / +14 lines)
		1	diff --git build/moz.configure/old.configure build/moz.configure/old.configure
		2	index b95dd2b..4cbefd5 100644
		3	--- build/moz.configure/old.configure
		4	+++ build/moz.configure/old.configure
		5	@@ -305,6 +305,7 @@ def old_configure_options(*options):
		6	'--with-nspr-prefix',
		7	'--with-nss-exec-prefix',
		8	'--with-nss-prefix',
		9	+ '--with-oss',
		10	'--with-pthreads',
		11	'--with-qemu-exe',
		12	'--with-servo',
1	diff --git old-configure.in configure.in	13	diff --git old-configure.in configure.in
2	index 48e60c0..ec08417 100644	14	index 48e60c0..ec08417 100644
3	--- old-configure.in	15	--- old-configure.in
Lines 1091-1103 Link Here
1091	+if CONFIG['MOZ_OSS']:	1103	+if CONFIG['MOZ_OSS']:
1092	+ OS_LIBS += CONFIG['MOZ_OSS_LIBS']	1104	+ OS_LIBS += CONFIG['MOZ_OSS_LIBS']
1093		1105
1094	if CONFIG['MOZ_NATIVE_JPEG']:	1106	if CONFIG['MOZ_SYSTEM_JPEG']:
1095	OS_LIBS += CONFIG['MOZ_JPEG_LIBS']	1107	OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
1096	diff --git toolkit/library/moz.build toolkit/library/moz.build	1108	diff --git toolkit/library/moz.build toolkit/library/moz.build
1097	index e191f13..4fb268a 100644	1109	index e191f13..4fb268a 100644
1098	--- toolkit/library/moz.build	1110	--- toolkit/library/moz.build
1099	+++ toolkit/library/moz.build	1111	+++ toolkit/library/moz.build
1100	@@ -234,8 +234,8 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:	1112	@@ -234,8 +234,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
1101	if not CONFIG['MOZ_TREE_PIXMAN']:	1113	if not CONFIG['MOZ_TREE_PIXMAN']:
1102	OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']	1114	OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
1103		1115

Lines 1-15 Link Here

(-)www/firefox/files/patch-bug847568 (-28 / +41 lines)
1	# Allow building against system-wide graphite2/harfbuzz.	1	# Allow building against system-wide graphite2/harfbuzz.
2		2
		3	diff --git build/moz.configure/old.configure build/moz.configure/old.configure
		4	index 4cbefd5..42ab554 100644
		5	--- build/moz.configure/old.configure
		6	+++ build/moz.configure/old.configure
		7	@@ -312,6 +312,8 @@ def old_configure_options(*options):
		8	'--with-sixgill',
		9	'--with-soft-float',
		10	'--with-system-bz2',
		11	+ '--with-system-graphite2',
		12	+ '--with-system-harfbuzz',
		13	'--with-system-icu',
		14	'--with-system-jpeg',
		15	'--with-system-libevent',
3	diff --git config/Makefile.in config/Makefile.in	16	diff --git config/Makefile.in config/Makefile.in
4	index 14bfc0d..5383399 100644	17	index 14bfc0d..5383399 100644
5	--- config/Makefile.in	18	--- config/Makefile.in
6	+++ config/Makefile.in	19	+++ config/Makefile.in
7	@@ -49,6 +49,8 @@ export:: $(export-preqs)	20	@@ -49,6 +49,8 @@ export:: $(export-preqs)
8	-DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \	21	-DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \
9	-DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \	22	-DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \
10	-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \	23	-DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
11	+ -DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \	24	+ -DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \
12	+ -DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \	25	+ -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \
13	$(srcdir)/system-headers \| $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers	26	$(srcdir)/system-headers \| $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
14	$(INSTALL) system_wrappers $(DIST)	27	$(INSTALL) system_wrappers $(DIST)
15		28
Lines 21-31 Link Here
21	#endif	34	#endif
22	libutil.h	35	libutil.h
23	unwind.h	36	unwind.h
24	+#if MOZ_NATIVE_GRAPHITE2==1	37	+#if MOZ_SYSTEM_GRAPHITE2==1
25	+graphite2/Font.h	38	+graphite2/Font.h
26	+graphite2/Segment.h	39	+graphite2/Segment.h
27	+#endif	40	+#endif
28	+#if MOZ_NATIVE_HARFBUZZ==1	41	+#if MOZ_SYSTEM_HARFBUZZ==1
29	+harfbuzz/hb-ot.h	42	+harfbuzz/hb-ot.h
30	+harfbuzz/hb.h	43	+harfbuzz/hb.h
31	+#endif	44	+#endif
Lines 42-55 Link Here
42	+	55	+
43	+MOZ_ARG_WITH_BOOL(system-harfbuzz,	56	+MOZ_ARG_WITH_BOOL(system-harfbuzz,
44	+[ --with-system-harfbuzz Use system harfbuzz (located with pkgconfig)],	57	+[ --with-system-harfbuzz Use system harfbuzz (located with pkgconfig)],
45	+MOZ_NATIVE_HARFBUZZ=1,	58	+MOZ_SYSTEM_HARFBUZZ=1,
46	+MOZ_NATIVE_HARFBUZZ=)	59	+MOZ_SYSTEM_HARFBUZZ=)
47	+	60	+
48	+if test -n "$MOZ_NATIVE_HARFBUZZ"; then	61	+if test -n "$MOZ_SYSTEM_HARFBUZZ"; then
49	+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 1.2.2)	62	+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 1.2.6)
50	+fi	63	+fi
51	+	64	+
52	+AC_SUBST(MOZ_NATIVE_HARFBUZZ)	65	+AC_SUBST(MOZ_SYSTEM_HARFBUZZ)
53	+	66	+
54	+dnl ========================================================	67	+dnl ========================================================
55	+dnl Check for graphite2	68	+dnl Check for graphite2
Lines 57-66 Link Here
57	+	70	+
58	+MOZ_ARG_WITH_BOOL(system-graphite2,	71	+MOZ_ARG_WITH_BOOL(system-graphite2,
59	+[ --with-system-graphite2 Use system graphite2 (located with pkgconfig)],	72	+[ --with-system-graphite2 Use system graphite2 (located with pkgconfig)],
60	+MOZ_NATIVE_GRAPHITE2=1,	73	+MOZ_SYSTEM_GRAPHITE2=1,
61	+MOZ_NATIVE_GRAPHITE2=)	74	+MOZ_SYSTEM_GRAPHITE2=)
62	+	75	+
63	+if test -n "$MOZ_NATIVE_GRAPHITE2"; then	76	+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
64	+ PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2)	77	+ PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2)
65	+	78	+
66	+ dnl graphite2.pc has bogus version, check manually	79	+ dnl graphite2.pc has bogus version, check manually
Lines 77-83 Link Here
77	+ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])])	90	+ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])])
78	+fi	91	+fi
79	+	92	+
80	+AC_SUBST(MOZ_NATIVE_GRAPHITE2)	93	+AC_SUBST(MOZ_SYSTEM_GRAPHITE2)
81	+	94	+
82	+dnl ========================================================	95	+dnl ========================================================
83	dnl Check for pixman and cairo	96	dnl Check for pixman and cairo
Lines 91-97 Link Here
91	SOURCES += ['nsTextFragmentSSE2.cpp']	104	SOURCES += ['nsTextFragmentSSE2.cpp']
92	SOURCES['nsTextFragmentSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']	105	SOURCES['nsTextFragmentSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
93		106
94	+if CONFIG['MOZ_NATIVE_HARFBUZZ']:	107	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
95	+ SOURCES['nsContentUtils.cpp'].flags += CONFIG['MOZ_HARFBUZZ_CFLAGS']	108	+ SOURCES['nsContentUtils.cpp'].flags += CONFIG['MOZ_HARFBUZZ_CFLAGS']
96	+	109	+
97	EXTRA_COMPONENTS += [	110	EXTRA_COMPONENTS += [
Lines 148-157 Link Here
148	if CONFIG['MOZ_TREE_CAIRO']:	161	if CONFIG['MOZ_TREE_CAIRO']:
149	DIRS += ['cairo']	162	DIRS += ['cairo']
150		163
151	+if not CONFIG['MOZ_NATIVE_GRAPHITE2']:	164	+if not CONFIG['MOZ_SYSTEM_GRAPHITE2']:
152	+ DIRS += ['graphite2/src' ]	165	+ DIRS += ['graphite2/src' ]
153	+	166	+
154	+if not CONFIG['MOZ_NATIVE_HARFBUZZ']:	167	+if not CONFIG['MOZ_SYSTEM_HARFBUZZ']:
155	+ DIRS += ['harfbuzz/src']	168	+ DIRS += ['harfbuzz/src']
156	+	169	+
157	DIRS += [	170	DIRS += [
Lines 174-180 Link Here
174	'-Wno-unused-private-field',	187	'-Wno-unused-private-field',
175	]	188	]
176		189
177	+if CONFIG['MOZ_NATIVE_HARFBUZZ']:	190	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
178	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']	191	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
179	+	192	+
180	if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):	193	if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
Lines 188-194 Link Here
188	'-Wno-unused-private-field',	201	'-Wno-unused-private-field',
189	]	202	]
190		203
191	+if CONFIG['MOZ_NATIVE_HARFBUZZ']:	204	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
192	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']	205	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
193	+	206	+
194	if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):	207	if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
Lines 203-212 Link Here
203	LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']	216	LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
204		217
205	-DEFINES['GRAPHITE2_STATIC'] = True	218	-DEFINES['GRAPHITE2_STATIC'] = True
206	+if CONFIG['MOZ_NATIVE_HARFBUZZ']:	219	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
207	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']	220	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
208	+	221	+
209	+if CONFIG['MOZ_NATIVE_GRAPHITE2']:	222	+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
210	+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']	223	+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
211	+else:	224	+else:
212	+ DEFINES['GRAPHITE2_STATIC'] = True	225	+ DEFINES['GRAPHITE2_STATIC'] = True
Lines 220-226 Link Here
220	LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']	233	LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
221	USE_LIBS += ['icu']	234	USE_LIBS += ['icu']
222		235
223	+if CONFIG['MOZ_NATIVE_HARFBUZZ']:	236	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
224	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']	237	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
225	+	238	+
226	DIST_INSTALL = True	239	DIST_INSTALL = True
Lines 232-238 Link Here
232	'/netwerk/base',	245	'/netwerk/base',
233	]	246	]
234		247
235	+if CONFIG['MOZ_NATIVE_HARFBUZZ']:	248	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
236	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']	249	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
237	+	250	+
238	if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '19':	251	if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '19':
Lines 242-255 Link Here
242	index 67f0db9..d42137a 100644	255	index 67f0db9..d42137a 100644
243	--- toolkit/library/moz.build	256	--- toolkit/library/moz.build
244	+++ toolkit/library/moz.build	257	+++ toolkit/library/moz.build
245	@@ -231,6 +231,12 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:	258	@@ -231,6 +231,12 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
246	if not CONFIG['MOZ_TREE_PIXMAN']:	259	if not CONFIG['MOZ_TREE_PIXMAN']:
247	OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']	260	OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
248		261
249	+if CONFIG['MOZ_NATIVE_GRAPHITE2']:	262	+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
250	+ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']	263	+ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
251	+	264	+
252	+if CONFIG['MOZ_NATIVE_HARFBUZZ']:	265	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
253	+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']	266	+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
254	+	267	+
255	if CONFIG['MOZ_OSS']:	268	if CONFIG['MOZ_OSS']:

Lines 1-15 Link Here

(-)www/firefox/files/patch-modules-libpref-init-all.js (-7 / +6 lines)
1	--- modules/libpref/init/all.js.orig 2015-08-06 22:39:34 UTC	1	--- modules/libpref/init/all.js.orig 2016-07-25 20:22:05 UTC
2	+++ modules/libpref/init/all.js	2	+++ modules/libpref/init/all.js
3	@@ -4052,7 +4052,12 @@ pref("layers.max-active", -1);	3	@@ -4453,6 +4453,11 @@ pref("layers.max-active", -1);
		4	// if you change the tile size.
4	pref("layers.tiles.adjust", true);	5	pref("layers.tiles.adjust", true);
5		6
6	// Set the default values, and then override per-platform as needed	7	+#ifndef MOZ_TREE_CAIRO
7	+#ifdef MOZ_TREE_CAIRO
8	pref("layers.offmainthreadcomposition.enabled", true);
9	+#else
10	+// Disable for system cairo on suspicion of causing random crashes	8	+// Disable for system cairo on suspicion of causing random crashes
11	+pref("layers.offmainthreadcomposition.enabled", false);	9	+pref("layers.offmainthreadcomposition.force-disabled", true);
12	+#endif	10	+#endif
		11	+
13	// Compositor target frame rate. NOTE: If vsync is enabled the compositor	12	// Compositor target frame rate. NOTE: If vsync is enabled the compositor
14	// frame rate will still be capped.	13	// frame rate will still be capped.
15	// -1 -> default (match layout.frame_rate or 60 FPS)	14	// -1 -> default (match layout.frame_rate or 60 FPS)

Lines 1-18 Link Here

(-)www/firefox/files/patch-z-bug517422 (-61 / +78 lines)
1	# Allow more config/external/ libs built against system-wide version.	1	# Allow more config/external/ libs built against system-wide version.
2		2
		3	diff --git build/moz.configure/old.configure build/moz.configure/old.configure
		4	index 42ab554..c91df3d 100644
		5	--- build/moz.configure/old.configure
		6	+++ build/moz.configure/old.configure
		7	@@ -320,7 +320,12 @@ def old_configure_options(*options):
		8	'--with-system-libvpx',
		9	'--with-system-nspr',
		10	'--with-system-nss',
		11	+ '--with-system-ogg',
		12	'--with-system-png',
		13	+ '--with-system-soundtouch',
		14	+ '--with-system-theora',
		15	+ '--with-system-tremor',
		16	+ '--with-system-vorbis',
		17	'--with-system-zlib',
		18	'--with-thumb',
		19	'--with-thumb-interwork',
3	diff --git config/Makefile.in config/Makefile.in	20	diff --git config/Makefile.in config/Makefile.in
4	index 5383399..0410004 100644	21	index 5383399..0410004 100644
5	--- config/Makefile.in	22	--- config/Makefile.in
6	+++ config/Makefile.in	23	+++ config/Makefile.in
7	@@ -77,6 +77,11 @@ export:: $(export-preqs)	24	@@ -77,6 +77,11 @@ export:: $(export-preqs)
8	-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \	25	-DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
9	-DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \	26	-DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \
10	-DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \	27	-DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \
11	+ -DMOZ_NATIVE_OGG=$(MOZ_NATIVE_OGG) \	28	+ -DMOZ_SYSTEM_OGG=$(MOZ_SYSTEM_OGG) \
12	+ -DMOZ_NATIVE_THEORA=$(MOZ_NATIVE_THEORA) \	29	+ -DMOZ_SYSTEM_THEORA=$(MOZ_SYSTEM_THEORA) \
13	+ -DMOZ_NATIVE_VORBIS=$(MOZ_NATIVE_VORBIS) \	30	+ -DMOZ_SYSTEM_VORBIS=$(MOZ_SYSTEM_VORBIS) \
14	+ -DMOZ_NATIVE_TREMOR=$(MOZ_NATIVE_TREMOR) \	31	+ -DMOZ_SYSTEM_TREMOR=$(MOZ_SYSTEM_TREMOR) \
15	+ -DMOZ_NATIVE_SOUNDTOUCH=$(MOZ_NATIVE_SOUNDTOUCH) \	32	+ -DMOZ_SYSTEM_SOUNDTOUCH=$(MOZ_SYSTEM_SOUNDTOUCH) \
16	$(srcdir)/system-headers \| $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers	33	$(srcdir)/system-headers \| $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
17	$(INSTALL) system_wrappers $(DIST)	34	$(INSTALL) system_wrappers $(DIST)
18		35
Lines 25-44 Link Here
25	external_dirs += ['modules/brotli']	42	external_dirs += ['modules/brotli']
26		43
27	-if CONFIG['MOZ_VORBIS']:	44	-if CONFIG['MOZ_VORBIS']:
28	+if not CONFIG['MOZ_NATIVE_OGG']:	45	+if not CONFIG['MOZ_SYSTEM_OGG']:
29	+ external_dirs += ['media/libogg']	46	+ external_dirs += ['media/libogg']
30	+	47	+
31	+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']:	48	+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_SYSTEM_VORBIS']:
32	external_dirs += ['media/libvorbis']	49	external_dirs += ['media/libvorbis']
33		50
34	-if CONFIG['MOZ_TREMOR']:	51	-if CONFIG['MOZ_TREMOR']:
35	+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_NATIVE_TREMOR']:	52	+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_SYSTEM_TREMOR']:
36	external_dirs += ['media/libtremor']	53	external_dirs += ['media/libtremor']
37		54
38	+if not CONFIG['MOZ_NATIVE_THEORA']:	55	+if not CONFIG['MOZ_SYSTEM_THEORA']:
39	+ external_dirs += ['media/libtheora']	56	+ external_dirs += ['media/libtheora']
40	+	57	+
41	+if not CONFIG['MOZ_NATIVE_SOUNDTOUCH']:	58	+if not CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
42	+ external_dirs += ['media/libsoundtouch']	59	+ external_dirs += ['media/libsoundtouch']
43	+	60	+
44	if CONFIG['MOZ_WEBM_ENCODER']:	61	if CONFIG['MOZ_WEBM_ENCODER']:
Lines 65-82 Link Here
65	harfbuzz/hb-ot.h	82	harfbuzz/hb-ot.h
66	harfbuzz/hb.h	83	harfbuzz/hb.h
67	#endif	84	#endif
68	+#if MOZ_NATIVE_OGG==1	85	+#if MOZ_SYSTEM_OGG==1
69	+ogg/ogg.h	86	+ogg/ogg.h
70	+ogg/os_types.h	87	+ogg/os_types.h
71	+#endif	88	+#endif
72	+#if MOZ_NATIVE_THEORA==1	89	+#if MOZ_SYSTEM_THEORA==1
73	+theora/theoradec.h	90	+theora/theoradec.h
74	+#endif	91	+#endif
75	+#if MOZ_NATIVE_VORBIS==1	92	+#if MOZ_SYSTEM_VORBIS==1
76	+vorbis/codec.h	93	+vorbis/codec.h
77	+vorbis/vorbisenc.h	94	+vorbis/vorbisenc.h
78	+#endif	95	+#endif
79	+#if MOZ_NATIVE_TREMOR==1	96	+#if MOZ_SYSTEM_TREMOR==1
80	+tremor/ivorbiscodec.h	97	+tremor/ivorbiscodec.h
81	+#endif	98	+#endif
82	diff --git old-configure.in configure.in	99	diff --git old-configure.in configure.in
Lines 93-102 Link Here
93	+	110	+
94	+MOZ_ARG_WITH_BOOL(system-ogg,	111	+MOZ_ARG_WITH_BOOL(system-ogg,
95	+[ --with-system-ogg Use system libogg (located with pkgconfig)],	112	+[ --with-system-ogg Use system libogg (located with pkgconfig)],
96	+MOZ_NATIVE_OGG=1,	113	+MOZ_SYSTEM_OGG=1,
97	+MOZ_NATIVE_OGG=)	114	+MOZ_SYSTEM_OGG=)
98	+	115	+
99	+if test -n "$MOZ_NATIVE_OGG"; then	116	+if test -n "$MOZ_SYSTEM_OGG"; then
100	+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)	117	+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
101	+	118	+
102	+ _SAVE_LIBS=$LIBS	119	+ _SAVE_LIBS=$LIBS
Lines 106-112 Link Here
106	+ LIBS=$_SAVE_LIBS	123	+ LIBS=$_SAVE_LIBS
107	+fi	124	+fi
108	+	125	+
109	+AC_SUBST(MOZ_NATIVE_OGG)	126	+AC_SUBST(MOZ_SYSTEM_OGG)
110	+	127	+
111	+dnl ========================================================	128	+dnl ========================================================
112	+dnl Check for libvorbis	129	+dnl Check for libvorbis
Lines 114-127 Link Here
114	+	131	+
115	+MOZ_ARG_WITH_BOOL(system-vorbis,	132	+MOZ_ARG_WITH_BOOL(system-vorbis,
116	+[ --with-system-vorbis Use system libvorbis (located with pkgconfig)],	133	+[ --with-system-vorbis Use system libvorbis (located with pkgconfig)],
117	+MOZ_NATIVE_VORBIS=1,	134	+MOZ_SYSTEM_VORBIS=1,
118	+MOZ_NATIVE_VORBIS=)	135	+MOZ_SYSTEM_VORBIS=)
119	+	136	+
120	+if test -n "$MOZ_NATIVE_VORBIS"; then	137	+if test -n "$MOZ_SYSTEM_VORBIS"; then
121	+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)	138	+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)
122	+fi	139	+fi
123	+	140	+
124	+AC_SUBST(MOZ_NATIVE_VORBIS)	141	+AC_SUBST(MOZ_SYSTEM_VORBIS)
125	+	142	+
126	+dnl ========================================================	143	+dnl ========================================================
127	+dnl Check for integer-only libvorbis aka tremor	144	+dnl Check for integer-only libvorbis aka tremor
Lines 129-142 Link Here
129	+	146	+
130	+MOZ_ARG_WITH_BOOL(system-tremor,	147	+MOZ_ARG_WITH_BOOL(system-tremor,
131	+[ --with-system-tremor Use system libtremor (located with pkgconfig)],	148	+[ --with-system-tremor Use system libtremor (located with pkgconfig)],
132	+MOZ_NATIVE_TREMOR=1,	149	+MOZ_SYSTEM_TREMOR=1,
133	+MOZ_NATIVE_TREMOR=)	150	+MOZ_SYSTEM_TREMOR=)
134	+	151	+
135	+if test -n "$MOZ_NATIVE_TREMOR"; then	152	+if test -n "$MOZ_SYSTEM_TREMOR"; then
136	+ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1)	153	+ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1)
137	+fi	154	+fi
138	+	155	+
139	+AC_SUBST(MOZ_NATIVE_TREMOR)	156	+AC_SUBST(MOZ_SYSTEM_TREMOR)
140	+	157	+
141	+dnl ========================================================	158	+dnl ========================================================
142	+dnl Check for libtheora	159	+dnl Check for libtheora
Lines 144-157 Link Here
144	+	161	+
145	+MOZ_ARG_WITH_BOOL(system-theora,	162	+MOZ_ARG_WITH_BOOL(system-theora,
146	+[ --with-system-theora Use system libtheora (located with pkgconfig)],	163	+[ --with-system-theora Use system libtheora (located with pkgconfig)],
147	+MOZ_NATIVE_THEORA=1,	164	+MOZ_SYSTEM_THEORA=1,
148	+MOZ_NATIVE_THEORA=)	165	+MOZ_SYSTEM_THEORA=)
149	+	166	+
150	+if test -n "$MOZ_NATIVE_THEORA"; then	167	+if test -n "$MOZ_SYSTEM_THEORA"; then
151	+ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2)	168	+ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2)
152	+fi	169	+fi
153	+	170	+
154	+AC_SUBST(MOZ_NATIVE_THEORA)	171	+AC_SUBST(MOZ_SYSTEM_THEORA)
155	+	172	+
156	+dnl ========================================================	173	+dnl ========================================================
157	+dnl Check for libSoundTouch	174	+dnl Check for libSoundTouch
Lines 159-168 Link Here
159	+	176	+
160	+MOZ_ARG_WITH_BOOL(system-soundtouch,	177	+MOZ_ARG_WITH_BOOL(system-soundtouch,
161	+[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)],	178	+[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)],
162	+MOZ_NATIVE_SOUNDTOUCH=1,	179	+MOZ_SYSTEM_SOUNDTOUCH=1,
163	+MOZ_NATIVE_SOUNDTOUCH=)	180	+MOZ_SYSTEM_SOUNDTOUCH=)
164	+	181	+
165	+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then	182	+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then
166	+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0)	183	+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0)
167	+	184	+
168	+ AC_LANG_SAVE	185	+ AC_LANG_SAVE
Lines 187-196 Link Here
187	+ fi	204	+ fi
188	+fi	205	+fi
189	+	206	+
190	+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then	207	+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then
191	+ AC_DEFINE(MOZ_NATIVE_SOUNDTOUCH)	208	+ AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH)
192	+fi	209	+fi
193	+AC_SUBST(MOZ_NATIVE_SOUNDTOUCH)	210	+AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH)
194	+	211	+
195	dnl system libvpx Support	212	dnl system libvpx Support
196	dnl ========================================================	213	dnl ========================================================
Lines 203-209 Link Here
203	, mOutChannels(0)	220	, mOutChannels(0)
204	, mWritten(0)	221	, mWritten(0)
205	, mAudioClock(this)	222	, mAudioClock(this)
206	+#ifndef MOZ_NATIVE_SOUNDTOUCH	223	+#ifndef MOZ_SYSTEM_SOUNDTOUCH
207	, mTimeStretcher(nullptr)	224	, mTimeStretcher(nullptr)
208	+#endif	225	+#endif
209	, mDumpFile(nullptr)	226	, mDumpFile(nullptr)
Lines 213-219 Link Here
213	if (mDumpFile) {	230	if (mDumpFile) {
214	fclose(mDumpFile);	231	fclose(mDumpFile);
215	}	232	}
216	+#ifndef MOZ_NATIVE_SOUNDTOUCH	233	+#ifndef MOZ_SYSTEM_SOUNDTOUCH
217	if (mTimeStretcher) {	234	if (mTimeStretcher) {
218	soundtouch::destroySoundTouchObj(mTimeStretcher);	235	soundtouch::destroySoundTouchObj(mTimeStretcher);
219	}	236	}
Lines 225-231 Link Here
225	{	242	{
226	mMonitor.AssertCurrentThreadOwns();	243	mMonitor.AssertCurrentThreadOwns();
227	if (!mTimeStretcher) {	244	if (!mTimeStretcher) {
228	+#ifdef MOZ_NATIVE_SOUNDTOUCH	245	+#ifdef MOZ_SYSTEM_SOUNDTOUCH
229	+ mTimeStretcher = new soundtouch::SoundTouch();	246	+ mTimeStretcher = new soundtouch::SoundTouch();
230	+#else	247	+#else
231	mTimeStretcher = soundtouch::createSoundTouchObj();	248	mTimeStretcher = soundtouch::createSoundTouchObj();
Lines 241-247 Link Here
241	#include "mozilla/RefPtr.h"	258	#include "mozilla/RefPtr.h"
242	#include "mozilla/UniquePtr.h"	259	#include "mozilla/UniquePtr.h"
243	#include "CubebUtils.h"	260	#include "CubebUtils.h"
244	+#ifdef MOZ_NATIVE_SOUNDTOUCH	261	+#ifdef MOZ_SYSTEM_SOUNDTOUCH
245	+#include "soundtouch/SoundTouch.h"	262	+#include "soundtouch/SoundTouch.h"
246	+#else	263	+#else
247	#include "soundtouch/SoundTouchFactory.h"	264	#include "soundtouch/SoundTouchFactory.h"
Lines 253-259 Link Here
253	// Number of frames written to the buffers.	270	// Number of frames written to the buffers.
254	int64_t mWritten;	271	int64_t mWritten;
255	AudioClock mAudioClock;	272	AudioClock mAudioClock;
256	+#ifdef MOZ_NATIVE_SOUNDTOUCH	273	+#ifdef MOZ_SYSTEM_SOUNDTOUCH
257	+ nsAutoPtr<soundtouch::SoundTouch> mTimeStretcher;	274	+ nsAutoPtr<soundtouch::SoundTouch> mTimeStretcher;
258	+#else	275	+#else
259	soundtouch::SoundTouch* mTimeStretcher;	276	soundtouch::SoundTouch* mTimeStretcher;
Lines 269-287 Link Here
269		286
270	DEFINES['MOZILLA_INTERNAL_API'] = True	287	DEFINES['MOZILLA_INTERNAL_API'] = True
271		288
272	+if CONFIG['MOZ_NATIVE_OGG']:	289	+if CONFIG['MOZ_SYSTEM_OGG']:
273	+ CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS']	290	+ CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS']
274	+	291	+
275	+if CONFIG['MOZ_NATIVE_THEORA']:	292	+if CONFIG['MOZ_SYSTEM_THEORA']:
276	+ CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS']	293	+ CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS']
277	+	294	+
278	+if CONFIG['MOZ_NATIVE_VORBIS']:	295	+if CONFIG['MOZ_SYSTEM_VORBIS']:
279	+ CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS']	296	+ CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS']
280	+	297	+
281	+if CONFIG['MOZ_NATIVE_TREMOR']:	298	+if CONFIG['MOZ_SYSTEM_TREMOR']:
282	+ CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS']	299	+ CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS']
283	+	300	+
284	+if CONFIG['MOZ_NATIVE_SOUNDTOUCH']:	301	+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
285	+ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']	302	+ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']
286	+	303	+
287	if CONFIG['OS_TARGET'] == 'WINNT':	304	if CONFIG['OS_TARGET'] == 'WINNT':
Lines 316-322 Link Here
316		333
317	#pragma GCC visibility push(default)	334	#pragma GCC visibility push(default)
318	#include "SoundTouch.h"	335	#include "SoundTouch.h"
319	+#ifndef MOZ_NATIVE_SOUNDTOUCH	336	+#ifndef MOZ_SYSTEM_SOUNDTOUCH
320	#include "SoundTouchFactory.h"	337	#include "SoundTouchFactory.h"
321	+#endif	338	+#endif
322	#pragma GCC visibility pop	339	#pragma GCC visibility pop
Lines 341-347 Link Here
341	# The encoder is currently not included.	358	# The encoder is currently not included.
342	DEFINES['THEORA_DISABLE_ENCODE'] = True	359	DEFINES['THEORA_DISABLE_ENCODE'] = True
343		360
344	+if CONFIG['MOZ_NATIVE_OGG']:	361	+if CONFIG['MOZ_SYSTEM_OGG']:
345	+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS']	362	+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
346	+	363	+
347	# Suppress warnings in third-party code.	364	# Suppress warnings in third-party code.
Lines 366-372 Link Here
366		383
367	DIRS += ['include/tremor', 'lib']	384	DIRS += ['include/tremor', 'lib']
368		385
369	+if CONFIG['MOZ_NATIVE_OGG']:	386	+if CONFIG['MOZ_SYSTEM_OGG']:
370	+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS']	387	+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
371	diff --git media/libvorbis/README_MOZILLA media/libvorbis/README_MOZILLA	388	diff --git media/libvorbis/README_MOZILLA media/libvorbis/README_MOZILLA
372	index 7c7454c..55baedd 100644	389	index 7c7454c..55baedd 100644
Lines 388-419 Link Here
388	if CONFIG['GNU_CC']:	405	if CONFIG['GNU_CC']:
389	CFLAGS += ['-Wno-uninitialized']	406	CFLAGS += ['-Wno-uninitialized']
390	+	407	+
391	+if CONFIG['MOZ_NATIVE_OGG']:	408	+if CONFIG['MOZ_SYSTEM_OGG']:
392	+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS']	409	+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
393	diff --git toolkit/library/moz.build toolkit/library/moz.build	410	diff --git toolkit/library/moz.build toolkit/library/moz.build
394	index d42137a..695e75a8 100644	411	index d42137a..695e75a8 100644
395	--- toolkit/library/moz.build	412	--- toolkit/library/moz.build
396	+++ toolkit/library/moz.build	413	+++ toolkit/library/moz.build
397	@@ -178,6 +178,21 @@ if CONFIG['MOZ_NATIVE_PNG']:	414	@@ -178,6 +178,21 @@ if CONFIG['MOZ_SYSTEM_PNG']:
398	if CONFIG['MOZ_NATIVE_HUNSPELL']:	415	if CONFIG['MOZ_SYSTEM_HUNSPELL']:
399	OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']	416	OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
400		417
401	+if CONFIG['MOZ_NATIVE_OGG']:	418	+if CONFIG['MOZ_SYSTEM_OGG']:
402	+ OS_LIBS += CONFIG['MOZ_OGG_LIBS']	419	+ OS_LIBS += CONFIG['MOZ_OGG_LIBS']
403	+	420	+
404	+if CONFIG['MOZ_NATIVE_THEORA']:	421	+if CONFIG['MOZ_SYSTEM_THEORA']:
405	+ OS_LIBS += CONFIG['MOZ_THEORA_LIBS']	422	+ OS_LIBS += CONFIG['MOZ_THEORA_LIBS']
406	+	423	+
407	+if CONFIG['MOZ_NATIVE_VORBIS']:	424	+if CONFIG['MOZ_SYSTEM_VORBIS']:
408	+ OS_LIBS += CONFIG['MOZ_VORBIS_LIBS']	425	+ OS_LIBS += CONFIG['MOZ_VORBIS_LIBS']
409	+	426	+
410	+if CONFIG['MOZ_NATIVE_TREMOR']:	427	+if CONFIG['MOZ_SYSTEM_TREMOR']:
411	+ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS']	428	+ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS']
412	+	429	+
413	+if CONFIG['MOZ_NATIVE_SOUNDTOUCH']:	430	+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
414	+ OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS']	431	+ OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS']
415	+	432	+
416	if CONFIG['MOZ_NATIVE_LIBEVENT']:	433	if CONFIG['MOZ_SYSTEM_LIBEVENT']:
417	OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']	434	OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
418		435
419	diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp	436	diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp

Lines 2-11 Link Here

(-)www/firefox-i18n/Makefile (-3 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= firefox-i18n	4	PORTNAME= firefox-i18n
5	PORTVERSION= 47.0.1	5	PORTVERSION= 48.0
6	CATEGORIES= www	6	CATEGORIES= www
7	MASTER_SITES= MOZILLA/${PORTNAME:S\|-i18n\|\|}/releases/${DISTVERSION}/linux-i686/xpi \	7	MASTER_SITES= MOZILLA/${PORTNAME:S\|-i18n\|\|}/releases/${DISTVERSION}/linux-i686/xpi \
8	MOZILLA/${PORTNAME:S\|-i18n\|\|}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi	8	MOZILLA/${PORTNAME:S\|-i18n\|\|}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi
9	PKGNAMEPREFIX=	9	PKGNAMEPREFIX=
10	DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/}	10	DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/}
11	DIST_SUBDIR= xpi/${DISTNAME}	11	DIST_SUBDIR= xpi/${DISTNAME}
Lines 15-21 Link Here
15		15
16	EXTRACT_DEPENDS= zip:archivers/zip	16	EXTRACT_DEPENDS= zip:archivers/zip
17		17
18	USES= zip:infozip gecko:firefox,47,build	18	USES= zip:infozip gecko:firefox,48,build
19	USE_XPI= firefox	19	USE_XPI= firefox
20		20
21	NO_ARCH= yes	21	NO_ARCH= yes