firefox-hg: adapt patches.

Remove some unused patches for allowing external copies of the
following libraries to be used:
ogg
opus
theora
tremor

They were not used in this package and I want to concentrate in this
package on getting the real NetBSD-specific stuff upstream.

diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index 99f03a78d413d4e2f35dd903cc3fa6ba73b21b97..55c0a00a7fed354e6b8f20f4f407e2d71d128f07 100644 (file)
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -3,17 +3,17 @@ $NetBSD: distinfo,v 1.159 2014/08/13 22:33:44 joerg Exp $
 SHA1 (firefox-31.0.source.tar.bz2) = a6c3e25ee3aeb7da42db2aaeb50a385d63532beb
 RMD160 (firefox-31.0.source.tar.bz2) = 8512ed164920c9fdad492ba2b47b46aae4894564
 Size (firefox-31.0.source.tar.bz2) = 147507120 bytes
-SHA1 (patch-aa) = a601eeae35a6a6fb8f72dac565304ce641bc4796
+SHA1 (patch-aa) = 627fa9fc3918cb0cecb43cfec7d812ff2372ee9d
 SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
 SHA1 (patch-bf) = 87cd1a9a1d7503e0748569028a3d693124d43208
 SHA1 (patch-browser_components_loop_run-all-loop-tests.sh) = e9cdfe64d1f1133ee59b3d6117beef232ecd2b07
 SHA1 (patch-browser_installer_package-manifest.in) = 5a96a90a2c14c419ccab4de2e68f7bb21e738e3e
 SHA1 (patch-build_autoconf_nss.m4) = 53e8c6844fc0095237ee07df3ab3791edd248fc2
 SHA1 (patch-build_gyp.mozbuild) = 2842da0783d344dd12e86adde447f7cda6191518
-SHA1 (patch-config_Makefile.in) = ad5377ca534aa88c1b245c0085180f64c2ca9d15
-SHA1 (patch-config_external_moz.build) = 5ad465266c609801f9d52c91c06e46834b0c408c
+SHA1 (patch-config_Makefile.in) = 44b83731f53ea326d1e990670d479185e73e351b
+SHA1 (patch-config_external_moz.build) = c7fc60c53457e63189e77f4f35b9a0654035b308
 SHA1 (patch-config_rules.mk) = debd5acd52f4f7593ea4e54dd0fdad91eeb46839
-SHA1 (patch-config_system-headers) = 39e7ced1410ce6355bba2d0d3a8e9764d08d2795
+SHA1 (patch-config_system-headers) = 743312fba3e7fc9235bacd8c8878066cb19e522c
 SHA1 (patch-dom_base_moz.build) = c0d68528c487a9f06fed2a886ceafd7d904cc8a5
 SHA1 (patch-dom_media_gstreamer_GStreamerAllocator.cpp) = 66b2d775a2a4faae027edc459a37145318f0fe3f
 SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 939f25f70f81eb86757696269c7e87c11a789c87
@@ -27,13 +27,12 @@ SHA1 (patch-ipc_ipdl_ipdl_cxx_ast.py) = c91e03a142d38e68f1bcaa4c3d0d0231445232b3
 SHA1 (patch-ipc_ipdl_ipdl_cxx_cgen.py) = d7f7dc85b1ff26c6d7e902f94c0ac09f04497105
 SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 57650470a96312fb1c4a2634711ede69e36666ff
-SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi) = bad25c23d89b426a9a669dfafe477106af3efd36
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 9ff1dcf200feaf67bf576f07beb612e0ec91d7d1
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = c7f8c14339c4cc5feb86c267aab300b06f9a7470
 SHA1 (patch-mfbt_Alignment.h) = 1d97ee858b62c31112fe90ebb2d8fe430c95ed56
 SHA1 (patch-mfbt_Attributes.h) = b587038d2f41d3cd4dbc346ac591088b2f36750c
 SHA1 (patch-ostream) = 593a114a31a0117af6c00cd12e3aed4565571288
-SHA1 (patch-toolkit_library_moz.build) = 44389f31b916f980e8c85971104dd216d64260d8
+SHA1 (patch-toolkit_library_moz.build) = aa2bc4b71827402262b6e52bbf611c6335fca04f
 SHA1 (patch-toolkit_toolkit.mozbuild) = a92b9f5114c3eab2c8e9f1d0eb21926235d2203a
 SHA1 (patch-unwind.h) = c7a606c83cb60d0d6bcc7babad8157097d9036a8
 SHA1 (patch-xg) = 2b472858270a109c2b317bb08698c12717174510

diff --git a/firefox-hg/mozilla-common.mk b/firefox-hg/mozilla-common.mk
index 933a8655d7135f9c73e99e3c3bff0026401a4729..766f46c0075481608cf7ca33cdc33946eb887d5c 100644 (file)
--- a/firefox-hg/mozilla-common.mk
+++ b/firefox-hg/mozilla-common.mk
@@ -55,13 +55,7 @@ CONFIGURE_ARGS+=     --with-system-nspr
 CONFIGURE_ARGS+=       --with-system-jpeg
 CONFIGURE_ARGS+=       --with-system-zlib
 CONFIGURE_ARGS+=       --with-system-bz2
-# 1.2 or later is required.
-#CONFIGURE_ARGS+=      --with-system-theora
-#CONFIGURE_ARGS+=      --with-system-ogg
-#CONFIGURE_ARGS+=      --with-system-tremor
 #CONFIGURE_ARGS+=      --with-system-vorbis
-# opus support requires Ogg Theora support
-#CONFIGURE_ARGS+=      --with-system-opus
 CONFIGURE_ARGS+=       --with-system-graphite2
 CONFIGURE_ARGS+=       --with-system-harfbuzz
 CONFIGURE_ARGS+=       --with-system-libevent=${BUILDLINK_PREFIX.libevent}
@@ -119,7 +113,7 @@ OBJDIR=                     ../build
 CONFIGURE_DIRS=                ${OBJDIR}
 CONFIGURE_SCRIPT=      ${WRKSRC}/configure
 
-PLIST_VARS+=   sps vorbis tremor glskia throwwrapper mozglue
+PLIST_VARS+=   sps vorbis glskia throwwrapper mozglue
 
 .include "../../mk/endian.mk"
 .if ${MACHINE_ENDIAN} == "little"
@@ -138,7 +132,6 @@ PLIST.sps=  yes
 .endif
 
 .if !empty(MACHINE_PLATFORM:MLinux-*-arm*)
-PLIST.tremor=  yes
 .else
 PLIST.vorbis=  yes
 .endif
@@ -187,8 +180,6 @@ PLIST_SUBST+=       DLL_SUFFIX=".so"
 .endif
 
 .include "../../archivers/bzip2/buildlink3.mk"
-#.include "../../audio/libopus/buildlink3.mk"
-#.include "../../audio/tremor/buildlink3.mk"
 #.include "../../audio/libvorbis/buildlink3.mk"
 #BUILDLINK_API_DEPENDS.sqlite3+=       sqlite3>=3.8.8.2
 #CONFIGURE_ENV+=       ac_cv_sqlite_secure_delete=yes  # c.f. patches/patch-al
@@ -205,8 +196,6 @@ BUILDLINK_API_DEPENDS.libevent+=    libevent>=1.1
 BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.10.2nb4
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/graphite2/buildlink3.mk"
-#.include "../../multimedia/libogg/buildlink3.mk"
-#.include "../../multimedia/libtheora/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
 .include "../../multimedia/libvpx/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"

diff --git a/firefox-hg/patches/patch-aa b/firefox-hg/patches/patch-aa
index bd5629e904ee1ef77f35a5e7479b6e81605fe96f..bfc1eba35bfc3a0e161ff498b85752dcf8ddc214 100644 (file)
--- a/firefox-hg/patches/patch-aa
+++ b/firefox-hg/patches/patch-aa
@@ -1,8 +1,8 @@
 $NetBSD: patch-aa,v 1.8 2015/08/17 07:30:48 thomasklausner Exp $
 
---- configure.in.orig  2015-10-25 13:54:45.000000000 +0000
+--- configure.in.orig  2015-11-21 10:14:06.000000000 +0000
 +++ configure.in
-@@ -3491,11 +3491,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+@@ -3496,11 +3496,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
                       #include <jpeglib.h> ],
                     [ #if JPEG_LIB_VERSION < $MOZJPEG
                       #error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.8 2015/08/17 07:30:48 thomasklausner Exp $
                     MOZ_NATIVE_JPEG=1,
                     AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
  fi
-@@ -4989,6 +4985,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5005,6 +5001,9 @@ if test -n "$MOZ_WEBRTC"; then
      MOZ_VPX=1
      MOZ_VPX_ERROR_CONCEALMENT=1
  
@@ -25,30 +25,10 @@ $NetBSD: patch-aa,v 1.8 2015/08/17 07:30:48 thomasklausner Exp $
  dnl enable once Signaling lands
      MOZ_WEBRTC_SIGNALING=1
      AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -5115,6 +5114,57 @@ AC_CACHE_CHECK([__attribute__ ((aligned 
+@@ -5131,6 +5130,22 @@ AC_CACHE_CHECK([__attribute__ ((aligned 
      [ac_cv_c_attribute_aligned],
      [ac_cv_c_attribute_aligned=0
       CFLAGS_save="${CFLAGS}"
-+dnl Check for libogg
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-ogg,
-+[  --with-system-ogg       Use system libogg (located with pkgconfig)],
-+MOZ_NATIVE_OGG=1,
-+MOZ_NATIVE_OGG=)
-+
-+if test -n "$MOZ_NATIVE_OGG"; then
-+    PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
-+
-+    _SAVE_LIBS=$LIBS
-+    LIBS="$LIBS $MOZ_OGG_LIBS"
-+    AC_CHECK_FUNC(ogg_set_mem_functions, [],
-+      [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)])
-+    LIBS=$_SAVE_LIBS
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_OGG)
-+
 +dnl ========================================================
 +dnl Check for libvorbis
 +dnl ========================================================
@@ -64,61 +44,14 @@ $NetBSD: patch-aa,v 1.8 2015/08/17 07:30:48 thomasklausner Exp $
 +
 +AC_SUBST(MOZ_NATIVE_VORBIS)
 +
-+dnl ========================================================
-+dnl Check for integer-only libvorbis aka tremor
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-tremor,
-+[  --with-system-tremor    Use system libtremor (located with pkgconfig)],
-+MOZ_NATIVE_TREMOR=1,
-+MOZ_NATIVE_TREMOR=)
-+
-+if test -n "$MOZ_NATIVE_TREMOR"; then
-+    PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_TREMOR)
-+
 +dnl ========================================================
       CFLAGS="${CFLAGS} -Werror"
       for ac_cv_c_attr_align_try in 64 32 16 8; do
         echo "trying $ac_cv_c_attr_align_try"
-@@ -5132,6 +5182,53 @@ if test "${ac_cv_c_attribute_aligned}" !
+@@ -5148,6 +5163,21 @@ if test "${ac_cv_c_attribute_aligned}" !
  fi
  
  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 ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-theora,
-+[  --with-system-theora    Use system libtheora (located with pkgconfig)],
-+MOZ_NATIVE_THEORA=1,
-+MOZ_NATIVE_THEORA=)
-+
-+if test -n "$MOZ_NATIVE_THEORA"; then
-+    PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_THEORA)
-+
-+dnl ========================================================
 +dnl Check for libspeex resampler
 +dnl ========================================================
 +
@@ -137,7 +70,7 @@ $NetBSD: patch-aa,v 1.8 2015/08/17 07:30:48 thomasklausner Exp $
  dnl = Disable VP8 decoder support
  dnl ========================================================
  MOZ_ARG_DISABLE_BOOL(webm,
-@@ -8131,6 +8228,48 @@ if test "$USE_FC_FREETYPE"; then
+@@ -8136,6 +8166,48 @@ if test "$USE_FC_FREETYPE"; then
  fi
  
  dnl ========================================================

diff --git a/firefox-hg/patches/patch-config_Makefile.in b/firefox-hg/patches/patch-config_Makefile.in
index 39215f232dee05a433741010a7c1350796b66714..ad9701a5d2e8b064e9b976e8d296c0ef782e0231 100644 (file)
--- a/firefox-hg/patches/patch-config_Makefile.in
+++ b/firefox-hg/patches/patch-config_Makefile.in
@@ -2,17 +2,13 @@ $NetBSD: patch-config_Makefile.in,v 1.1 2014/09/29 10:46:24 thomasklausner Exp $
 
 --- config/Makefile.in.orig    2015-10-25 13:54:45.000000000 +0000
 +++ config/Makefile.in
-@@ -73,6 +73,14 @@ export:: $(export-preqs)
+@@ -73,6 +73,10 @@ export:: $(export-preqs)
                -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \
                -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \
                -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
 +              -DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \
 +              -DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \
-+              -DMOZ_NATIVE_OGG=$(MOZ_NATIVE_OGG) \
-+              -DMOZ_NATIVE_THEORA=$(MOZ_NATIVE_THEORA) \
 +              -DMOZ_NATIVE_VORBIS=$(MOZ_NATIVE_VORBIS) \
-+              -DMOZ_NATIVE_TREMOR=$(MOZ_NATIVE_TREMOR) \
-+              -DMOZ_NATIVE_OPUS=$(MOZ_NATIVE_OPUS) \
 +              -DMOZ_NATIVE_SPEEX=$(MOZ_NATIVE_SPEEX) \
                $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
        $(INSTALL) system_wrappers $(DIST)

diff --git a/firefox-hg/patches/patch-config_external_moz.build b/firefox-hg/patches/patch-config_external_moz.build
index e234e1def1362aa7945cbf4b8b13f6ffa258f3ac..fc36d6bd293f149403dcd6864fa2094b34a1696c 100644 (file)
--- a/firefox-hg/patches/patch-config_external_moz.build
+++ b/firefox-hg/patches/patch-config_external_moz.build
@@ -1,27 +1,17 @@
 $NetBSD: patch-config_external_moz.build,v 1.5 2015/06/04 13:11:03 thomasklausner Exp $
 
---- config/external/moz.build.orig     2015-10-25 13:54:45.000000000 +0000
+--- config/external/moz.build.orig     2015-11-22 02:18:37.000000000 +0000
 +++ config/external/moz.build
-@@ -20,10 +20,16 @@ if CONFIG['MOZ_UPDATER']:
+@@ -20,7 +20,7 @@ if CONFIG['MOZ_UPDATER']:
  # There's no "native brotli" yet, but probably in the future...
  external_dirs += ['modules/brotli']
  
 -if CONFIG['MOZ_VORBIS']:
-+if not CONFIG['MOZ_NATIVE_OGG']:
-+    external_dirs += ['media/libogg']
-+
-+if not CONFIG['MOZ_NATIVE_THEORA']:
-+    external_dirs += ['media/libtheora']
-+
 +if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']:
      external_dirs += ['media/libvorbis']
  
--if CONFIG['MOZ_TREMOR']:
-+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_NATIVE_TREMOR']:
-     external_dirs += ['media/libtremor']
- 
- if CONFIG['MOZ_WEBM']:
-@@ -47,13 +53,13 @@ if CONFIG['MOZ_WEBSPEECH_POCKETSPHINX']:
+ if CONFIG['MOZ_TREMOR']:
+@@ -47,13 +47,15 @@ if CONFIG['MOZ_WEBSPEECH_POCKETSPHINX']:
          'media/pocketsphinx',
      ]
  
@@ -31,9 +21,9 @@ $NetBSD: patch-config_external_moz.build,v 1.5 2015/06/04 13:11:03 thomasklausne
  external_dirs += [
      'media/kiss_fft',
      'media/libcubeb',
--    'media/libogg',
+     'media/libogg',
      'media/libopus',
--    'media/libtheora',
+     'media/libtheora',
 -    'media/libspeex_resampler',
      'media/libstagefright',
      'media/libsoundtouch',

diff --git a/firefox-hg/patches/patch-config_system-headers b/firefox-hg/patches/patch-config_system-headers
index 71f0c1a20726c3c004957e0077e81fa8fdd23fcc..b9d9350c7d1abd5d4c57071b61a29436e61bc3a0 100644 (file)
--- a/firefox-hg/patches/patch-config_system-headers
+++ b/firefox-hg/patches/patch-config_system-headers
@@ -1,8 +1,8 @@
 $NetBSD: patch-config_system-headers,v 1.1 2014/09/29 10:46:24 thomasklausner Exp $
 
---- config/system-headers.orig 2015-10-25 13:54:45.000000000 +0000
+--- config/system-headers.orig 2015-11-21 10:14:06.000000000 +0000
 +++ config/system-headers
-@@ -1342,3 +1342,34 @@ unicode/utypes.h
+@@ -1342,3 +1342,18 @@ unicode/utypes.h
  #endif
  libutil.h
  unwind.h
@@ -14,26 +14,10 @@ $NetBSD: patch-config_system-headers,v 1.1 2014/09/29 10:46:24 thomasklausner Ex
 +harfbuzz/hb-ot.h
 +harfbuzz/hb.h
 +#endif
-+#if MOZ_NATIVE_OGG==1
-+ogg/ogg.h
-+ogg/os_types.h
-+#endif
-+#if MOZ_NATIVE_THEORA==1
-+theora/theoradec.h
-+#endif
 +#if MOZ_NATIVE_VORBIS==1
 +vorbis/codec.h
 +vorbis/vorbisenc.h
 +#endif
-+#if MOZ_NATIVE_TREMOR==1
-+tremor/ivorbiscodec.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 a/firefox-hg/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi b/firefox-hg/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi
deleted file mode 100644 (file)
index ffacf8e..0000000
--- a/firefox-hg/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi,v 1.2 2015/01/31 09:12:06 thomasklausner Exp $
-
---- media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi.orig  2015-01-31 08:17:36.000000000 +0000
-+++ media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
-@@ -16,19 +16,9 @@
-       'type': 'static_library',
-       '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': [
-+            '$(MOZ_OPUS_CFLAGS)',
-           ],
--          'direct_dependent_settings': {
--            'include_dirs': [
--              '/media/libopus/include',
--              '/media/libopus/src',
--              '/media/libopus/celt',
--            ],
--          },
-         }, {
-           'dependencies': [
-             '<(DEPTH)/third_party/opus/opus.gyp:opus'

diff --git a/firefox-hg/patches/patch-toolkit_library_moz.build b/firefox-hg/patches/patch-toolkit_library_moz.build
index 308a54e200b7db08c275d3c38e03372ab3f87a0d..f3dd78c4920b45ed22369b9b1999242814525f74 100644 (file)
--- a/firefox-hg/patches/patch-toolkit_library_moz.build
+++ b/firefox-hg/patches/patch-toolkit_library_moz.build
@@ -2,32 +2,20 @@ $NetBSD: patch-toolkit_library_moz.build,v 1.1 2014/09/29 10:46:25 thomasklausne
 
 --- toolkit/library/moz.build.orig     2015-10-25 13:54:43.000000000 +0000
 +++ toolkit/library/moz.build
-@@ -220,6 +220,24 @@ if CONFIG['MOZ_NATIVE_PNG']:
+@@ -220,6 +220,12 @@ if CONFIG['MOZ_NATIVE_PNG']:
  if CONFIG['MOZ_NATIVE_HUNSPELL']:
      OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
  
-+if CONFIG['MOZ_NATIVE_OGG']:
-+    OS_LIBS += CONFIG['MOZ_OGG_LIBS']
-+
-+if CONFIG['MOZ_NATIVE_THEORA']:
-+    OS_LIBS += CONFIG['MOZ_THEORA_LIBS']
-+
 +if CONFIG['MOZ_NATIVE_VORBIS']:
 +    OS_LIBS += CONFIG['MOZ_VORBIS_LIBS']
 +
-+if CONFIG['MOZ_NATIVE_TREMOR']:
-+    OS_LIBS += CONFIG['MOZ_TREMOR_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_LIBEVENT']:
      OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
  
-@@ -229,6 +247,15 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
+@@ -229,6 +244,15 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
  if not CONFIG['MOZ_TREE_PIXMAN']:
      OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']