firefox-hg: update patches.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: firefox-hg: update patches.
From: Thomas Klausner <wiz%NetBSD.org@localhost>
Date: Tue, 29 Dec 2015 22:49:34 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue Dec 29 23:49:34 2015 +0100
Changeset:	5358bfb6628efaf24692b68e0cb4a62365808d41

Modified Files:
	firefox-hg/distinfo
	firefox-hg/mozilla-common.mk
	firefox-hg/patches/patch-aa
	firefox-hg/patches/patch-config_Makefile.in
	firefox-hg/patches/patch-config_system-headers
	firefox-hg/patches/patch-toolkit_library_moz.build
Removed Files:
	firefox-hg/patches/patch-config_external_moz.build
	firefox-hg/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp

Log Message:
firefox-hg: update patches.

In particular, remove partial vorbis-from-pkgsrc and speex-from-pkgsrc
support that wasn't used.

Does not build on NetBSD because of missing uselocale() support.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5358bfb6628efaf24692b68e0cb4a62365808d41

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 firefox-hg/distinfo                                | 10 ++--
 firefox-hg/mozilla-common.mk                       |  9 +---
 firefox-hg/patches/patch-aa                        | 55 ++--------------------
 firefox-hg/patches/patch-config_Makefile.in        |  4 +-
 firefox-hg/patches/patch-config_external_moz.build | 30 ------------
 firefox-hg/patches/patch-config_system-headers     |  9 +---
 ...atch-dom_media_gstreamer_GStreamerAllocator.cpp | 12 -----
 firefox-hg/patches/patch-toolkit_library_moz.build | 13 -----
 8 files changed, 12 insertions(+), 130 deletions(-)

diffs:
diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index 472d85c..a620304 100644
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -3,19 +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) = 627fa9fc3918cb0cecb43cfec7d812ff2372ee9d
+SHA1 (patch-aa) = 78a03a1df778094851bda16fdc550fef4b90cb35
 SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
 SHA1 (patch-bf) = 87cd1a9a1d7503e0748569028a3d693124d43208
 SHA1 (patch-browser_extensions_loop_run-all-loop-tests.sh) = c9e7b621f35a7c961ad76197252a3aec43d88744
 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) = 44b83731f53ea326d1e990670d479185e73e351b
-SHA1 (patch-config_external_moz.build) = c7fc60c53457e63189e77f4f35b9a0654035b308
+SHA1 (patch-config_Makefile.in) = 816e6dc2ffe5ce5e817ce9494a55938ec0a7be5e
 SHA1 (patch-config_rules.mk) = debd5acd52f4f7593ea4e54dd0fdad91eeb46839
-SHA1 (patch-config_system-headers) = 743312fba3e7fc9235bacd8c8878066cb19e522c
+SHA1 (patch-config_system-headers) = 8324b6229bd88453ff6426b013b58bf7c6216faf
 SHA1 (patch-dom_base_moz.build) = c0d68528c487a9f06fed2a886ceafd7d904cc8a5
-SHA1 (patch-dom_media_gstreamer_GStreamerAllocator.cpp) = 66b2d775a2a4faae027edc459a37145318f0fe3f
 SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 939f25f70f81eb86757696269c7e87c11a789c87
 SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9
 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e104bea7922dac0ce441bca4ba7a6f9b2379d17a
@@ -32,7 +30,7 @@ SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__captur
 SHA1 (patch-mfbt_Alignment.h) = 1d97ee858b62c31112fe90ebb2d8fe430c95ed56
 SHA1 (patch-mfbt_Attributes.h) = b587038d2f41d3cd4dbc346ac591088b2f36750c
 SHA1 (patch-ostream) = 593a114a31a0117af6c00cd12e3aed4565571288
-SHA1 (patch-toolkit_library_moz.build) = aa2bc4b71827402262b6e52bbf611c6335fca04f
+SHA1 (patch-toolkit_library_moz.build) = 57017a6766a7d7a075bcd01d713c34cab5f45f2a
 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 27b7d8a..3f4c4d0 100644
--- a/firefox-hg/mozilla-common.mk
+++ b/firefox-hg/mozilla-common.mk
@@ -55,7 +55,6 @@ CONFIGURE_ARGS+=	--with-system-nspr
 CONFIGURE_ARGS+=	--with-system-jpeg
 CONFIGURE_ARGS+=	--with-system-zlib
 CONFIGURE_ARGS+=	--with-system-bz2
-#CONFIGURE_ARGS+=	--with-system-vorbis
 CONFIGURE_ARGS+=	--with-system-graphite2
 CONFIGURE_ARGS+=	--with-system-harfbuzz
 CONFIGURE_ARGS+=	--with-system-libevent=${BUILDLINK_PREFIX.libevent}
@@ -113,7 +112,7 @@ OBJDIR=			../build
 CONFIGURE_DIRS=		${OBJDIR}
 CONFIGURE_SCRIPT=	${WRKSRC}/configure
 
-PLIST_VARS+=	sps vorbis glskia throwwrapper mozglue
+PLIST_VARS+=	sps glskia throwwrapper mozglue
 
 .include "../../mk/endian.mk"
 .if ${MACHINE_ENDIAN} == "little"
@@ -131,11 +130,6 @@ PLIST.throwwrapper=	yes
 PLIST.sps=	yes
 .endif
 
-.if !empty(MACHINE_PLATFORM:MLinux-*-arm*)
-.else
-PLIST.vorbis=	yes
-.endif
-
 # See ${WRKSRC}/mozglue/build/moz.build: libmozglue is built and
 # installed as a shared library on these platforms.
 .if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" # or Android
@@ -180,7 +174,6 @@ PLIST_SUBST+=	DLL_SUFFIX=".so"
 .endif
 
 .include "../../archivers/bzip2/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
 #.include "../../databases/sqlite3/buildlink3.mk"
diff --git a/firefox-hg/patches/patch-aa b/firefox-hg/patches/patch-aa
index bfc1eba..cf835f0 100644
--- 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-11-21 10:14:06.000000000 +0000
+--- configure.in.orig	2015-12-29 06:56:12.000000000 +0000
 +++ configure.in
-@@ -3496,11 +3496,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+@@ -3553,11 +3553,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
                       #include <jpeglib.h> ],
                     [ #if JPEG_LIB_VERSION < $MOZJPEG
                       #error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -15,8 +15,8 @@ $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
-@@ -5005,6 +5001,9 @@ if test -n "$MOZ_WEBRTC"; then
-     MOZ_VPX=1
+@@ -5039,6 +5035,9 @@ if test -n "$MOZ_WEBRTC"; then
+     MOZ_RAW=1
      MOZ_VPX_ERROR_CONCEALMENT=1
  
 +    dnl with libv4l2 we can support more cameras
@@ -25,52 +25,7 @@ $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)
-@@ -5131,6 +5130,22 @@ AC_CACHE_CHECK([__attribute__ ((aligned 
-     [ac_cv_c_attribute_aligned],
-     [ac_cv_c_attribute_aligned=0
-      CFLAGS_save="${CFLAGS}"
-+dnl ========================================================
-+dnl Check for libvorbis
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-vorbis,
-+[  --with-system-vorbis    Use system libvorbis (located with pkgconfig)],
-+MOZ_NATIVE_VORBIS=1,
-+MOZ_NATIVE_VORBIS=)
-+
-+if test -n "$MOZ_NATIVE_VORBIS"; then
-+    PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_VORBIS)
-+
-+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"
-@@ -5148,6 +5163,21 @@ if test "${ac_cv_c_attribute_aligned}" !
- fi
- 
- 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 = Disable VP8 decoder support
- dnl ========================================================
- MOZ_ARG_DISABLE_BOOL(webm,
-@@ -8136,6 +8166,48 @@ if test "$USE_FC_FREETYPE"; then
+@@ -8051,6 +8050,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 ad9701a..f5e1dd1 100644
--- a/firefox-hg/patches/patch-config_Makefile.in
+++ b/firefox-hg/patches/patch-config_Makefile.in
@@ -2,14 +2,12 @@ $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,10 @@ export:: $(export-preqs)
+@@ -73,6 +73,8 @@ 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_VORBIS=$(MOZ_NATIVE_VORBIS) \
-+		-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
deleted file mode 100644
index fc36d6b..0000000
--- a/firefox-hg/patches/patch-config_external_moz.build
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-config_external_moz.build,v 1.5 2015/06/04 13:11:03 thomasklausner Exp $
-
---- config/external/moz.build.orig	2015-11-22 02:18:37.000000000 +0000
-+++ config/external/moz.build
-@@ -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 CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']:
-     external_dirs += ['media/libvorbis']
- 
- if CONFIG['MOZ_TREMOR']:
-@@ -47,13 +47,15 @@ if CONFIG['MOZ_WEBSPEECH_POCKETSPHINX']:
-         'media/pocketsphinx',
-     ]
- 
-+if not CONFIG['MOZ_NATIVE_SPEEX']:
-+    external_dirs += ['media/libspeex_resampler']
-+
- external_dirs += [
-     'media/kiss_fft',
-     'media/libcubeb',
-     'media/libogg',
-     'media/libopus',
-     '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 b9d9350..dd9c622 100644
--- a/firefox-hg/patches/patch-config_system-headers
+++ b/firefox-hg/patches/patch-config_system-headers
@@ -2,7 +2,7 @@ $NetBSD: patch-config_system-headers,v 1.1 2014/09/29 10:46:24 thomasklausner Ex
 
 --- config/system-headers.orig	2015-11-21 10:14:06.000000000 +0000
 +++ config/system-headers
-@@ -1342,3 +1342,18 @@ unicode/utypes.h
+@@ -1342,3 +1342,11 @@ unicode/utypes.h
  #endif
  libutil.h
  unwind.h
@@ -14,10 +14,3 @@ $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_VORBIS==1
-+vorbis/codec.h
-+vorbis/vorbisenc.h
-+#endif
-+#if MOZ_NATIVE_SPEEX==1
-+speex/speex_resampler.h
-+#endif
diff --git a/firefox-hg/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp b/firefox-hg/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp
deleted file mode 100644
index 3623ddd..0000000
--- a/firefox-hg/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-dom_media_gstreamer_GStreamerAllocator.cpp,v 1.1 2014/10/27 22:53:23 thomasklausner Exp $
-
---- dom/media/gstreamer/GStreamerAllocator.cpp.orig	2014-10-27 20:46:32.000000000 +0000
-+++ dom/media/gstreamer/GStreamerAllocator.cpp
-@@ -51,7 +51,6 @@ typedef struct
- #pragma GCC diagnostic ignored "-Wunused-function"
- G_DEFINE_TYPE(MozGfxMemoryAllocator, moz_gfx_memory_allocator, GST_TYPE_ALLOCATOR);
- G_DEFINE_TYPE(MozGfxBufferPool, moz_gfx_buffer_pool, GST_TYPE_VIDEO_BUFFER_POOL);
--#pragma GCC diagnostic pop
- 
- void
- moz_gfx_memory_reset(MozGfxMemory *mem)
diff --git a/firefox-hg/patches/patch-toolkit_library_moz.build b/firefox-hg/patches/patch-toolkit_library_moz.build
index f3dd78c..d1be92b 100644
--- a/firefox-hg/patches/patch-toolkit_library_moz.build
+++ b/firefox-hg/patches/patch-toolkit_library_moz.build
@@ -2,19 +2,6 @@ $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,12 @@ if CONFIG['MOZ_NATIVE_PNG']:
- if CONFIG['MOZ_NATIVE_HUNSPELL']:
-     OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
- 
-+if CONFIG['MOZ_NATIVE_VORBIS']:
-+    OS_LIBS += CONFIG['MOZ_VORBIS_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 +244,15 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
  if not CONFIG['MOZ_TREE_PIXMAN']:
      OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
Prev by Date: py-watchdog: Delete, imported in pkgsrc as sysutils/py-watchdog
Next by Date: openal-soft: Adjust usage of pthread_setname_np(3) for NetBSD.
Previous by Thread: py-watchdog: Delete, imported in pkgsrc as sysutils/py-watchdog
Next by Thread: openal-soft: Adjust usage of pthread_setname_np(3) for NetBSD.
Indexes:
Home | Main Index | Thread Index | Old Index