summaryrefslogtreecommitdiff
path: root/www/firefox
diff options
context:
space:
mode:
Diffstat (limited to 'www/firefox')
-rw-r--r--www/firefox/Makefile22
-rw-r--r--www/firefox/distinfo4
-rw-r--r--www/firefox/files/patch-bug10217614
-rw-r--r--www/firefox/files/patch-bug122874213
-rw-r--r--www/firefox/files/patch-bug124213213
-rw-r--r--www/firefox/files/patch-bug125224644
-rw-r--r--www/firefox/files/patch-bug70217911
-rw-r--r--www/firefox/files/patch-bug82698538
-rw-r--r--www/firefox/files/patch-bug84756864
-rw-r--r--www/firefox/files/patch-config-baseconfig.mk11
-rw-r--r--www/firefox/files/patch-z-bug517422213
11 files changed, 154 insertions, 283 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 67c731478189..6afdcfe8f3fe 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -2,24 +2,25 @@
# $FreeBSD$
PORTNAME= firefox
-DISTVERSION= 44.0.2
+DISTVERSION= 45.0
DISTVERSIONSUFFIX=.source
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
- MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/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.10.10:${PORTSDIR}/devel/nspr \
- nss>=3.21:${PORTSDIR}/security/nss \
+BUILD_DEPENDS= nspr>=4.12:${PORTSDIR}/devel/nspr \
+ nss>=3.21.1:${PORTSDIR}/security/nss \
libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
- soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
- harfbuzz>=0.9.42:${PORTSDIR}/print/harfbuzz \
- graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
+ soundtouch>=1.9.0:${PORTSDIR}/audio/soundtouch \
+ harfbuzz>=1.1.0:${PORTSDIR}/print/harfbuzz \
+ graphite2>=1.3.5:${PORTSDIR}/graphics/graphite2 \
+ png>=1.6.19:${PORTSDIR}/graphics/png \
libvorbis>=1.3.5,3:${PORTSDIR}/audio/libvorbis \
- libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
+ libvpx>=1.5.0:${PORTSDIR}/multimedia/libvpx \
sqlite3>=3.9.1:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
@@ -27,14 +28,13 @@ BUILD_DEPENDS= nspr>=4.10.10:${PORTSDIR}/devel/nspr \
yasm:${PORTSDIR}/devel/yasm \
zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip
-# opus>=1.1:${PORTSDIR}/audio/opus \
LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
USE_GECKO= gecko
CONFLICTS_INSTALL= firefox-esr-45.* firefox-esr-3[18].* firefox-esr-24.*
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -opus
+USE_MOZILLA= # empty
MOZILLA_NAME= Firefox
USE_QT5= # empty
@@ -64,8 +64,6 @@ post-extract:
<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
post-patch:
- @${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \
- ${WRKSRC}/configure.in
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/browser/app/nsBrowserApp.cpp
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index c0f3e9959c16..580839d61dce 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-44.0.2.source.tar.xz) = 0bb28841a9268c50cbb239f759f16f55b3a624f679c68965158beaa0a83a2d9e
-SIZE (firefox-44.0.2.source.tar.xz) = 182355632
+SHA256 (firefox-45.0.source.tar.xz) = 36ab0f09b1b1df071a8aafa673c6286d99c18dc06cecbb70d1bb2021fbf379f1
+SIZE (firefox-45.0.source.tar.xz) = 183999640
diff --git a/www/firefox/files/patch-bug1021761 b/www/firefox/files/patch-bug1021761
index 3f84eca482a3..86c4d9b0f19b 100644
--- a/www/firefox/files/patch-bug1021761
+++ b/www/firefox/files/patch-bug1021761
@@ -561,8 +561,8 @@ index a962553..1f780f4 100644
/* get a pcm, disabling resampling, so we get a rate the
* hardware/dmix/pulse/etc. supports. */
-- r = snd_pcm_open(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
-+ r = WRAP(snd_pcm_open)(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
+- r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
++ r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
if (r < 0) {
return CUBEB_ERROR;
}
diff --git a/www/firefox/files/patch-bug1228742 b/www/firefox/files/patch-bug1228742
deleted file mode 100644
index 100acd12da2a..000000000000
--- a/www/firefox/files/patch-bug1228742
+++ /dev/null
@@ -1,13 +0,0 @@
---- toolkit/crashreporter/test/moz.build.orig 2015-12-16 16:15:25.278076000 +0100
-+++ toolkit/crashreporter/test/moz.build 2015-12-16 16:15:35.254959000 +0100
-@@ -19,10 +19,6 @@
-
- GeckoSharedLibrary('testcrasher')
-
--EXTRA_JS_MODULES += [
-- 'CrashTestUtils.jsm',
--]
--
- DEFINES['SHARED_LIBRARY'] = '%s%s%s' % (
- CONFIG['DLL_PREFIX'],
- LIBRARY_NAME,
diff --git a/www/firefox/files/patch-bug1242132 b/www/firefox/files/patch-bug1242132
new file mode 100644
index 000000000000..2a228cd466a1
--- /dev/null
+++ b/www/firefox/files/patch-bug1242132
@@ -0,0 +1,13 @@
+# nss-config --cflags returns multiple flags, don't treat them as one string
+
+--- python/mozbuild/mozbuild/frontend/gyp_reader.py~
++++ python/mozbuild/mozbuild/frontend/gyp_reader.py
+@@ -217,7 +217,7 @@ def read_from_gyp(config, path, output,
+ # We may be getting make variable references out of the
+ # gyp data, and we don't want those in emitted data, so
+ # substitute them with their actual value.
+- f = expand_variables(f, config.substs)
++ f = expand_variables(f, config.substs).split()
+ if not f:
+ continue
+ # the result may be a string or a list.
diff --git a/www/firefox/files/patch-bug1252246 b/www/firefox/files/patch-bug1252246
new file mode 100644
index 000000000000..429391f0dc15
--- /dev/null
+++ b/www/firefox/files/patch-bug1252246
@@ -0,0 +1,44 @@
+# Prefer PTHREAD_PROCESS_SHARED on FreeBSD 11.0 or later
+
+diff --git a/ipc/glue/CrossProcessMutex.h b/ipc/glue/CrossProcessMutex.h
+--- ipc/glue/CrossProcessMutex.h
++++ ipc/glue/CrossProcessMutex.h
+@@ -9,7 +9,7 @@
+ #include "base/process.h"
+ #include "mozilla/Mutex.h"
+
+-#if defined(OS_LINUX) || defined(XP_DARWIN)
++#if !defined(OS_WIN) && !defined(OS_NETBSD) && !defined(OS_OPENBSD)
+ #include <pthread.h>
+ #include "SharedMemoryBasic.h"
+ #include "mozilla/Atomics.h"
+@@ -34,7 +34,7 @@ struct ParamTraits;
+ namespace mozilla {
+ #if defined(OS_WIN)
+ typedef HANDLE CrossProcessMutexHandle;
+-#elif defined(OS_LINUX) || defined(OS_MACOSX)
++#elif !defined(OS_NETBSD) && !defined(OS_OPENBSD)
+ typedef mozilla::ipc::SharedMemoryBasic::Handle CrossProcessMutexHandle;
+ #else
+ // Stub for other platforms. We can't use uintptr_t here since different
+@@ -100,7 +100,7 @@ private:
+
+ #if defined(OS_WIN)
+ HANDLE mMutex;
+-#elif defined(OS_LINUX) || defined(OS_MACOSX)
++#elif !defined(OS_NETBSD) && !defined(OS_OPENBSD)
+ RefPtr<mozilla::ipc::SharedMemoryBasic> mSharedBuffer;
+ pthread_mutex_t* mMutex;
+ mozilla::Atomic<int32_t>* mCount;
+diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build
+--- ipc/glue/moz.build
++++ ipc/glue/moz.build
+@@ -61,7 +61,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
+ SOURCES += [
+ 'CrossProcessMutex_windows.cpp',
+ ]
+-elif CONFIG['OS_ARCH'] in ('Linux', 'Darwin'):
++elif not CONFIG['OS_ARCH'] in ('NetBSD', 'OpenBSD'):
+ UNIFIED_SOURCES += [
+ 'CrossProcessMutex_posix.cpp',
+ ]
diff --git a/www/firefox/files/patch-bug702179 b/www/firefox/files/patch-bug702179
index 924377d7a06e..bb642382dfd8 100644
--- a/www/firefox/files/patch-bug702179
+++ b/www/firefox/files/patch-bug702179
@@ -1,10 +1,13 @@
--- js/src/moz.build.orig 2015-12-16 12:32:04.574425000 +0100
+++ js/src/moz.build 2015-12-16 12:32:09.032032000 +0100
-@@ -637,7 +637,3 @@
+@@ -671,10 +671,6 @@ CFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+ CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+ LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
- if not CONFIG['GNU_CXX']:
- ALLOW_COMPILER_WARNINGS = True
--
-NO_EXPAND_LIBS = True
-
-DIST_INSTALL = True
+-
+ # Prepare self-hosted JS code for embedding
+ GENERATED_FILES += ['selfhosted.out.h']
+ selfhosted = GENERATED_FILES['selfhosted.out.h']
diff --git a/www/firefox/files/patch-bug826985 b/www/firefox/files/patch-bug826985
index e165441bc15a..941acf53f265 100644
--- a/www/firefox/files/patch-bug826985
+++ b/www/firefox/files/patch-bug826985
@@ -145,26 +145,26 @@ index d46b5aa..e452223 100644
'targets': [
{
'target_name': 'video_capture_module',
-@@ -69,6 +72,19 @@
- 'linux/video_capture_linux.cc',
- 'linux/video_capture_linux.h',
- ],
-+ 'conditions': [
-+ ['use_libv4l2==1', {
-+ 'defines': [
-+ 'HAVE_LIBV4L2',
+@@ -75,6 +78,19 @@
+ 'linux/video_capture_linux.cc',
+ 'linux/video_capture_linux.h',
+ ],
++ 'conditions': [
++ ['use_libv4l2==1', {
++ 'defines': [
++ 'HAVE_LIBV4L2',
++ ],
++ 'cflags_mozilla': [
++ '$(MOZ_LIBV4L2_CFLAGS)',
++ ],
++ 'libraries': [
++ '-lv4l2',
++ ],
++ }],
+ ],
-+ 'cflags_mozilla': [
-+ '$(MOZ_LIBV4L2_CFLAGS)',
-+ ],
-+ 'libraries': [
-+ '-lv4l2',
-+ ],
-+ }],
-+ ],
- }], # linux
- ['OS=="mac"', {
- 'sources': [
+ }], # linux
+ ['OS=="mac"', {
+ 'sources': [
diff --git toolkit/library/moz.build toolkit/library/moz.build
index 9c16ffa..1db3794 100644
--- toolkit/library/moz.build
diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568
index 7bed0aac8371..7dda577cf5c4 100644
--- a/www/firefox/files/patch-bug847568
+++ b/www/firefox/files/patch-bug847568
@@ -4,7 +4,7 @@ diff --git config/Makefile.in config/Makefile.in
index 14bfc0d..5383399 100644
--- config/Makefile.in
+++ config/Makefile.in
-@@ -75,6 +75,8 @@ export:: $(export-preqs)
+@@ -49,6 +49,8 @@ export:: $(export-preqs)
-DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \
-DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \
-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
@@ -17,7 +17,7 @@ diff --git config/system-headers config/system-headers
index 18e8703..bdc5f82 100644
--- config/system-headers
+++ config/system-headers
-@@ -1350,3 +1350,11 @@ unicode/utypes.h
+@@ -1344,3 +1344,11 @@ unicode/utypes.h
#endif
libutil.h
unwind.h
@@ -33,7 +33,7 @@ diff --git configure.in configure.in
index ac38f40..87536b7 100644
--- configure.in
+++ configure.in
-@@ -7986,6 +7986,49 @@ if test "$USE_FC_FREETYPE"; then
+@@ -7989,6 +7989,49 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
@@ -46,7 +46,7 @@ index ac38f40..87536b7 100644
+MOZ_NATIVE_HARFBUZZ=)
+
+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
-+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.42)
++ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 1.1.0)
+fi
+
+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
@@ -70,7 +70,7 @@ index ac38f40..87536b7 100644
+ * 100 + GR2_VERSION_BUGFIX >= \
+ (major) * 10000 + (minor) * 100 + (bugfix) )
+ ], [
-+ #if !GR2_VERSION_REQUIRE(1,2,4)
++ #if !GR2_VERSION_REQUIRE(1,3,5)
+ #error "Insufficient graphite2 version."
+ #endif
+ ], [],
@@ -87,7 +87,7 @@ diff --git dom/base/moz.build dom/base/moz.build
index a660ba4..6b2f602 100644
--- dom/base/moz.build
+++ dom/base/moz.build
-@@ -375,6 +375,9 @@ if CONFIG['INTEL_ARCHITECTURE']:
+@@ -397,6 +397,9 @@ if CONFIG['INTEL_ARCHITECTURE']:
SOURCES += ['nsTextFragmentSSE2.cpp']
SOURCES['nsTextFragmentSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
@@ -101,16 +101,32 @@ diff --git gfx/graphite2/moz-gr-update.sh gfx/graphite2/moz-gr-update.sh
index f3d76ea..a9e7fb6 100644
--- gfx/graphite2/moz-gr-update.sh
+++ gfx/graphite2/moz-gr-update.sh
-@@ -37,6 +37,9 @@
+@@ -1,6 +1,7 @@
+ #!/bin/bash
+
+ # Script used to update the Graphite2 library in the mozilla source tree
++# and bump version for --with-system-graphite2
+
+ # This script lives in gfx/graphite2, along with the library source,
+ # but must be run from the top level of the mozilla-central tree.
+@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >>
#find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
#find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
++# chase version for --with-system-graphite2
+perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \
+ if /GR2_VERSION_REQUIRE/" configure.in
+
# summarize what's been touched
echo Updated to $RELEASE.
echo Here is what changed in the gfx/graphite2 directory:
+ echo
+
+-hg stat gfx/graphite2
++hg stat configure.in gfx/graphite2
+
+ echo
+ echo If gfx/graphite2/src/files.mk has changed, please make corresponding
diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/README-mozilla
index ca57d16..1ce21fe 100644
--- gfx/harfbuzz/README-mozilla
@@ -154,9 +170,9 @@ diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py
index 28fa6b5..240dced 100755
--- gfx/skia/generate_mozbuild.py
+++ gfx/skia/generate_mozbuild.py
-@@ -142,6 +142,9 @@ if CONFIG['GNU_CXX']:
- if CONFIG['CPU_ARCH'] == 'arm':
- SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
+@@ -134,6 +134,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_
+ '-Wno-unused-private-field',
+ ]
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
@@ -168,9 +184,9 @@ diff --git gfx/skia/moz.build gfx/skia/moz.build
index 1d0c2f9..adb8941 100644
--- gfx/skia/moz.build
+++ gfx/skia/moz.build
-@@ -970,6 +970,9 @@ if CONFIG['GNU_CXX']:
- if CONFIG['CPU_ARCH'] == 'arm':
- SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
+@@ -752,6 +752,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_
+ '-Wno-unused-private-field',
+ ]
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
@@ -182,9 +198,9 @@ diff --git gfx/thebes/moz.build gfx/thebes/moz.build
index d5852fa..aeeab25 100644
--- gfx/thebes/moz.build
+++ gfx/thebes/moz.build
-@@ -294,7 +294,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
- CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
+@@ -306,7 +306,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk
+
+ LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
-DEFINES['GRAPHITE2_STATIC'] = True
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
@@ -195,14 +211,13 @@ index d5852fa..aeeab25 100644
+else:
+ DEFINES['GRAPHITE2_STATIC'] = True
- if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
- DEFINES['OTS_DLL'] = True
-diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build
+ if CONFIG['CLANG_CXX']:
+ # Suppress warnings from Skia header files.
index d736943..41a931f 100644
--- intl/unicharutil/util/moz.build
+++ intl/unicharutil/util/moz.build
-@@ -43,4 +43,7 @@
- CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+@@ -44,4 +44,7 @@ if CONFIG['ENABLE_INTL_API']:
+ LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
USE_LIBS += ['icu']
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
@@ -213,7 +228,7 @@ diff --git netwerk/dns/moz.build netwerk/dns/moz.build
index 0b0717a..2e665c9 100644
--- netwerk/dns/moz.build
+++ netwerk/dns/moz.build
-@@ -66,5 +66,8 @@ LOCAL_INCLUDES += [
+@@ -66,6 +66,9 @@ LOCAL_INCLUDES += [
'/netwerk/base',
]
@@ -221,12 +236,13 @@ index 0b0717a..2e665c9 100644
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '19':
- CXXFLAGS += ['-I%s/bionic/libc/dns/include' % CONFIG['ANDROID_SOURCE']]
+ LOCAL_INCLUDES += ['%' + '%s/bionic/libc/dns/include' % CONFIG['ANDROID_SOURCE']]
+
diff --git toolkit/library/moz.build toolkit/library/moz.build
index 67f0db9..d42137a 100644
--- toolkit/library/moz.build
+++ toolkit/library/moz.build
-@@ -187,6 +187,12 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
+@@ -231,6 +231,12 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
if not CONFIG['MOZ_TREE_PIXMAN']:
OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
diff --git a/www/firefox/files/patch-config-baseconfig.mk b/www/firefox/files/patch-config-baseconfig.mk
index 9db69516cbcc..40a81f4587f4 100644
--- a/www/firefox/files/patch-config-baseconfig.mk
+++ b/www/firefox/files/patch-config-baseconfig.mk
@@ -1,6 +1,9 @@
--- config/baseconfig.mk~
+++ config/baseconfig.mk
-@@ -1,7 +1,7 @@
+@@ -2,10 +2,10 @@
+ # directly in python/mozbuild/mozbuild/base.py for gmake validation.
+ # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
+ # whether a normal build is happening or whether the check is running.
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@@ -9,6 +12,6 @@
+idldir = $(datadir)/idl/%%MOZILLA%%
+installdir = $(libdir)/%%MOZILLA%%
+sdkdir = $(libdir)/%%MOZILLA%%
- ifndef TOP_DIST
- TOP_DIST = dist
- endif
+ ifeq (.,$(DEPTH))
+ DIST = dist
+ else
diff --git a/www/firefox/files/patch-z-bug517422 b/www/firefox/files/patch-z-bug517422
index ca107478641f..b7cc4505521b 100644
--- a/www/firefox/files/patch-z-bug517422
+++ b/www/firefox/files/patch-z-bug517422
@@ -4,7 +4,7 @@ diff --git config/Makefile.in config/Makefile.in
index 5383399..0410004 100644
--- config/Makefile.in
+++ config/Makefile.in
-@@ -77,6 +77,14 @@ export:: $(export-preqs)
+@@ -77,6 +77,11 @@ export:: $(export-preqs)
-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
-DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \
-DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \
@@ -12,9 +12,6 @@ index 5383399..0410004 100644
+ -DMOZ_NATIVE_THEORA=$(MOZ_NATIVE_THEORA) \
+ -DMOZ_NATIVE_VORBIS=$(MOZ_NATIVE_VORBIS) \
+ -DMOZ_NATIVE_TREMOR=$(MOZ_NATIVE_TREMOR) \
-+ -DMOZ_NATIVE_CELT=$(MOZ_NATIVE_CELT) \
-+ -DMOZ_NATIVE_OPUS=$(MOZ_NATIVE_OPUS) \
-+ -DMOZ_NATIVE_SPEEX=$(MOZ_NATIVE_SPEEX) \
+ -DMOZ_NATIVE_SOUNDTOUCH=$(MOZ_NATIVE_SOUNDTOUCH) \
$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
$(INSTALL) system_wrappers $(DIST)
@@ -23,7 +20,7 @@ diff --git config/external/moz.build config/external/moz.build
index f67c5c7..eb909ce 100644
--- config/external/moz.build
+++ config/external/moz.build
-@@ -19,10 +19,19 @@ if CONFIG['MOZ_UPDATER']:
+@@ -19,10 +19,16 @@ if CONFIG['MOZ_UPDATER']:
# There's no "native brotli" yet, but probably in the future...
external_dirs += ['modules/brotli']
@@ -31,9 +28,6 @@ index f67c5c7..eb909ce 100644
+if not CONFIG['MOZ_NATIVE_OGG']:
+ external_dirs += ['media/libogg']
+
-+if not CONFIG['MOZ_NATIVE_CELT'] or not CONFIG['MOZ_NATIVE_OPUS']:
-+ external_dirs += ['media/libopus']
-+
+if not CONFIG['MOZ_NATIVE_THEORA']:
+ external_dirs += ['media/libtheora']
+
@@ -45,13 +39,10 @@ index f67c5c7..eb909ce 100644
external_dirs += ['media/libtremor']
if CONFIG['MOZ_WEBM']:
-@@ -37,15 +46,16 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ
+@@ -37,15 +46,15 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ
if not CONFIG['MOZ_NATIVE_PNG']:
external_dirs += ['media/libpng']
-+if not CONFIG['MOZ_NATIVE_SPEEX']:
-+ external_dirs += ['media/libspeex_resampler']
-+
+if not CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
+ external_dirs += ['media/libsoundtouch']
+
@@ -59,9 +50,9 @@ index f67c5c7..eb909ce 100644
'media/kiss_fft',
'media/libcubeb',
- 'media/libogg',
-- 'media/libopus',
+ 'media/libopus',
- 'media/libtheora',
-- 'media/libspeex_resampler',
+ 'media/libspeex_resampler',
'media/libstagefright',
- 'media/libsoundtouch',
]
@@ -82,7 +73,7 @@ index bef567c..9807c29 100644
#if MOZ_LIBAV_FFT==1
libavcodec/avfft.h
#endif
-@@ -1364,3 +1363,32 @@ graphite2/Segment.h
+@@ -1364,3 +1363,17 @@ graphite2/Segment.h
harfbuzz/hb-ot.h
harfbuzz/hb.h
#endif
@@ -100,26 +91,11 @@ index bef567c..9807c29 100644
+#if MOZ_NATIVE_TREMOR==1
+tremor/ivorbiscodec.h
+#endif
-+#if MOZ_NATIVE_CELT==1
-+celt.h
-+celt_header.h
-+celt/celt.h
-+celt/celt_header.h
-+#endif
-+#if MOZ_NATIVE_OPUS==1
-+opus.h
-+opus_multistream.h
-+opus/opus.h
-+opus/opus_multistream.h
-+#endif
-+#if MOZ_NATIVE_SPEEX==1
-+speex/speex_resampler.h
-+#endif
diff --git configure.in configure.in
index 87db361..7947626 100644
--- configure.in
+++ configure.in
-@@ -5223,6 +5223,160 @@ if test "${ac_cv_c_attribute_aligned}" !
+@@ -5223,6 +5223,111 @@ if test "${ac_cv_c_attribute_aligned}" !
fi
dnl ========================================================
@@ -174,40 +150,6 @@ index 87db361..7947626 100644
+AC_SUBST(MOZ_NATIVE_TREMOR)
+
+dnl ========================================================
-+dnl Check for libcelt
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-celt,
-+[ --with-system-celt Use system libcelt (located with pkgconfig)],
-+MOZ_NATIVE_CELT=1,
-+MOZ_NATIVE_CELT=)
-+
-+if test -n "$MOZ_NATIVE_CELT"; then
-+ PKG_CHECK_MODULES(MOZ_CELT, celt)
-+else
-+ MOZ_CELT_CFLAGS='-I$(topsrcdir)/media/libopus'
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_CELT)
-+
-+dnl ========================================================
-+dnl Check for libopus
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-opus,
-+[ --with-system-opus Use system libopus (located with pkgconfig)],
-+MOZ_NATIVE_OPUS=1,
-+MOZ_NATIVE_OPUS=)
-+
-+if test -n "$MOZ_NATIVE_OPUS"; then
-+ PKG_CHECK_MODULES(MOZ_OPUS, opus >= 1.1)
-+else
-+ MOZ_OPUS_CFLAGS='-I$(topsrcdir)/media/libopus/include'
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_OPUS)
-+
-+dnl ========================================================
+dnl Check for libtheora
+dnl ========================================================
+
@@ -223,21 +165,6 @@ index 87db361..7947626 100644
+AC_SUBST(MOZ_NATIVE_THEORA)
+
+dnl ========================================================
-+dnl Check for libspeex resampler
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-speex,
-+[ --with-system-speex Use system libspeex (located with pkgconfig)],
-+MOZ_NATIVE_SPEEX=1,
-+MOZ_NATIVE_SPEEX=)
-+
-+if test -n "$MOZ_NATIVE_SPEEX"; then
-+ PKG_CHECK_MODULES(MOZ_SPEEX, speexdsp >= 1.2)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_SPEEX)
-+
-+dnl ========================================================
+dnl Check for libSoundTouch
+dnl ========================================================
+
@@ -247,7 +174,7 @@ index 87db361..7947626 100644
+MOZ_NATIVE_SOUNDTOUCH=)
+
+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
-+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.8.0)
++ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0)
+
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
@@ -350,7 +277,7 @@ diff --git dom/media/moz.build dom/media/moz.build
index 7526cff..e0a0ca0 100644
--- dom/media/moz.build
+++ dom/media/moz.build
-@@ -212,3 +212,24 @@ if CONFIG['ANDROID_VERSION'] > '15':
+@@ -212,3 +212,18 @@ if CONFIG['ANDROID_VERSION'] > '15':
CFLAGS += CONFIG['GSTREAMER_CFLAGS']
CXXFLAGS += CONFIG['GSTREAMER_CFLAGS']
@@ -367,28 +294,8 @@ index 7526cff..e0a0ca0 100644
+if CONFIG['MOZ_NATIVE_TREMOR']:
+ CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS']
+
-+if CONFIG['MOZ_NATIVE_OPUS']:
-+ CXXFLAGS += CONFIG['MOZ_OPUS_CFLAGS']
-+
-+if CONFIG['MOZ_NATIVE_SPEEX']:
-+ CXXFLAGS += CONFIG['MOZ_SPEEX_CFLAGS']
-+
+if CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
+ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']
-diff --git media/libcubeb/src/moz.build media/libcubeb/src/moz.build
-index 944744d..9a7c8c0 100644
---- media/libcubeb/src/moz.build
-+++ media/libcubeb/src/moz.build
-@@ -65,6 +65,9 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
-
- FINAL_LIBRARY = 'gkmedias'
-
-+if CONFIG['MOZ_NATIVE_SPEEX']:
-+ SOURCES['cubeb_resampler.cpp'].flags += CONFIG['MOZ_SPEEX_CFLAGS']
-+
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
- CFLAGS += [
- '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [
diff --git media/libogg/README_MOZILLA media/libogg/README_MOZILLA
index 0833e4d..7ece97b 100644
--- media/libogg/README_MOZILLA
@@ -400,17 +307,6 @@ index 0833e4d..7ece97b 100644
+
+The in-tree copy may be omitted during build by --with-system-ogg.
+Keep version in configure.in in sync on updates.
-diff --git media/libopus/README_MOZILLA media/libopus/README_MOZILLA
-index 2d85c9f..d3fb9f8 100644
---- media/libopus/README_MOZILLA
-+++ media/libopus/README_MOZILLA
-@@ -9,3 +9,6 @@ files after the copy step.
- The upstream repository is https://git.xiph.org/opus.git
-
- The git tag/revision used was v1.1.
-+
-+The in-tree copy may be omitted during build by --with-system-opus.
-+So, keep its pkg-config version check within configure.in in sync on updates.
diff --git media/libsoundtouch/README_MOZILLA media/libsoundtouch/README_MOZILLA
index bfd4b1a..15b158d 100644
--- media/libsoundtouch/README_MOZILLA
@@ -435,17 +331,6 @@ index 0af2fe6..d80c145 100644
#pragma GCC visibility pop
#endif // MOZILLA_SOUNDTOUCH_PERMS_H
-diff --git media/libspeex_resampler/README_MOZILLA media/libspeex_resampler/README_MOZILLA
-index 7f6b1bb..e830300 100644
---- media/libspeex_resampler/README_MOZILLA
-+++ media/libspeex_resampler/README_MOZILLA
-@@ -3,3 +3,6 @@ This source is from the Speex DSP library
-
- It consists in the audio resampling code (resampler.c) and its header files
- dependancies, imported into the tree using the update.sh script.
-+
-+The in-tree copy may be omitted during build by --with-system-speex.
-+Keep version in configure.in in sync on updates.
diff --git media/libtheora/README_MOZILLA media/libtheora/README_MOZILLA
index d48dbfa..f08a2ed 100644
--- media/libtheora/README_MOZILLA
@@ -514,80 +399,11 @@ index 919b99e..cc776f7 100644
+
+if CONFIG['MOZ_NATIVE_OGG']:
+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
-diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build
-index bbc971c..6ed7e41 100644
---- media/webrtc/signaling/test/common.build
-+++ media/webrtc/signaling/test/common.build
-@@ -108,6 +109,9 @@ if CONFIG['MOZ_OSS']:
- if CONFIG['MOZ_NATIVE_JPEG']:
- OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
-
-+if CONFIG['MOZ_NATIVE_OPUS']:
-+ OS_LIBS += CONFIG['MOZ_OPUS_LIBS']
-+
- if CONFIG['MOZ_NATIVE_LIBVPX']:
- OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS']
-
-diff --git media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
-index 00e77e7..55f48ab 100644
---- media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
-+++ media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
-@@ -17,18 +17,11 @@
- 'conditions': [
- ['build_with_mozilla==1', {
- # Mozilla provides its own build of the opus library.
-- 'include_dirs': [
-- '/media/libopus/include',
-- '/media/libopus/src',
-- '/media/libopus/celt',
-+ 'cflags_mozilla': [
-+ '$(filter -I%, $(MOZ_CELT_CFLAGS))/celt',
-+ '$(MOZ_OPUS_CFLAGS)',
-+ '$(filter -I%, $(MOZ_OPUS_CFLAGS))/../src',
- ],
-- 'direct_dependent_settings': {
-- 'include_dirs': [
-- '/media/libopus/include',
-- '/media/libopus/src',
-- '/media/libopus/celt',
-- ],
-- },
- }, {
- 'dependencies': [
- '<(DEPTH)/third_party/opus/opus.gyp:opus'
-diff --git media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi
-index 00e77e7..55f48ab 100644
---- media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi
-+++ media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi
-@@ -84,19 +84,11 @@
- ],
- }],
- ['build_with_mozilla==1', {
-- 'include_dirs': [
-- # Need Opus header files for the audio classifier.
-- '<(DEPTH)/../../../media/opus/celt',
--# '<(DEPTH)/third_party/opus/src/src',
-+ 'cflags_mozilla': [
-+ '$(filter -I%, $(MOZ_CELT_CFLAGS))/celt',
-+ '$(MOZ_OPUS_CFLAGS)',
-+ '$(filter -I%, $(MOZ_OPUS_CFLAGS))/../src',
- ],
-- 'direct_dependent_settings': {
-- 'include_dirs': [
-- '../../../../../../media/opus/celt',
-- # Need Opus header files for the audio classifier.
-- '<(DEPTH)/../../../media/opus/celt',
--# '<(DEPTH)/third_party/opus/src/src',
-- ],
-- },
- }],
- ],
- 'sources': [
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,30 @@ if CONFIG['MOZ_NATIVE_PNG']:
+@@ -178,6 +178,21 @@ if CONFIG['MOZ_NATIVE_PNG']:
if CONFIG['MOZ_NATIVE_HUNSPELL']:
OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
@@ -603,15 +419,6 @@ index d42137a..695e75a8 100644
+if CONFIG['MOZ_NATIVE_TREMOR']:
+ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS']
+
-+if CONFIG['MOZ_NATIVE_CELT']:
-+ OS_LIBS += CONFIG['MOZ_CELT_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_OPUS']:
-+ OS_LIBS += CONFIG['MOZ_OPUS_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_SPEEX']:
-+ OS_LIBS += CONFIG['MOZ_SPEEX_LIBS']
-+
+if CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
+ OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS']
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-08 19:52:34 +0000