From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 12 14:22:21 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 89BE53ED for ; Mon, 12 Nov 2012 14:22:21 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id EB19E8FC16 for ; Mon, 12 Nov 2012 14:22:20 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id qACEMJ1G025331 for ; Mon, 12 Nov 2012 14:22:19 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id qACEMDLr022457 for freebsd-gecko@freebsd.org; Mon, 12 Nov 2012 14:22:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 12 Nov 2012 14:22:13 GMT Message-Id: <201211121422.qACEMDLr022457@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1096 - in trunk: . mail/thunderbird mail/thunderbird-esr www/firefox www/firefox-esr www/firefox-nightly www/firefox-nightly/files www/seamonkey www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Nov 2012 14:22:21 -0000 Author: jbeich Date: Mon Nov 12 14:22:13 2012 New Revision: 1096 Log: update Deleted: trunk/www/firefox-nightly/files/patch-bug806139 trunk/www/seamonkey/files/patch-bug786690 trunk/www/seamonkey/files/patch-bug803811 Modified: trunk/Gecko_TODO trunk/mail/thunderbird-esr/Makefile trunk/mail/thunderbird-esr/distinfo trunk/mail/thunderbird/Makefile trunk/mail/thunderbird/distinfo trunk/www/firefox-esr/Makefile trunk/www/firefox-esr/distinfo trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox-nightly/files/patch-bug807492 trunk/www/firefox-nightly/files/patch-ipc-chromium-src-base-message_pump_libevent.cc trunk/www/firefox/Makefile trunk/www/firefox/distinfo trunk/www/seamonkey/Makefile trunk/www/seamonkey/distinfo Modified: trunk/Gecko_TODO ============================================================================== --- trunk/Gecko_TODO Mon Nov 12 14:22:02 2012 (r1095) +++ trunk/Gecko_TODO Mon Nov 12 14:22:13 2012 (r1096) @@ -25,4 +25,3 @@ - switch to --ignore-unresolved-symbol (waiting for binutils 2.24) - add Gtk3 support (waiting for upstream) - move PGO to bsd.gecko.mk (blocked by USE_PYTHON_BUILD in *-esr) -- port tools/profiler (NS_StackWalk or not?) Modified: trunk/mail/thunderbird-esr/Makefile ============================================================================== --- trunk/mail/thunderbird-esr/Makefile Mon Nov 12 14:22:02 2012 (r1095) +++ trunk/mail/thunderbird-esr/Makefile Mon Nov 12 14:22:13 2012 (r1096) @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 10.0.8 +DISTVERSION= 10.0.10 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}esr/source @@ -22,7 +22,7 @@ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip -EM_VERSION= 1.4.5 +EM_VERSION= 1.4.6 USE_AUTOTOOLS= autoconf213:env LATEST_LINK= thunderbird-esr Modified: trunk/mail/thunderbird-esr/distinfo ============================================================================== --- trunk/mail/thunderbird-esr/distinfo Mon Nov 12 14:22:02 2012 (r1095) +++ trunk/mail/thunderbird-esr/distinfo Mon Nov 12 14:22:13 2012 (r1096) @@ -1,4 +1,4 @@ -SHA256 (thunderbird-10.0.8esr.source.tar.bz2) = 9575f9f97fab48d36b3a24040db83fb9b92de913b3689e9910afaf39a486fbbd -SIZE (thunderbird-10.0.8esr.source.tar.bz2) = 97594384 -SHA256 (enigmail-1.4.5.tar.gz) = fa59491fba21de9414a003933349074a8ec1833a1d64cac9f0a9f7020ed6c020 -SIZE (enigmail-1.4.5.tar.gz) = 1269207 +SHA256 (thunderbird-10.0.10esr.source.tar.bz2) = afe9ccb5a893d3bac23acc942e439601102dbb7f804ce8a7c2c252672dc7fe84 +SIZE (thunderbird-10.0.10esr.source.tar.bz2) = 97607731 +SHA256 (enigmail-1.4.6.tar.gz) = f3771d1faa26676818bab5e2c50dce85013b9de30b82de526159eaa7ca34f036 +SIZE (enigmail-1.4.6.tar.gz) = 1262280 Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Mon Nov 12 14:22:02 2012 (r1095) +++ trunk/mail/thunderbird/Makefile Mon Nov 12 14:22:13 2012 (r1096) @@ -23,7 +23,7 @@ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip -EM_VERSION= 1.4.5 +EM_VERSION= 1.4.6 USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=-2.7 Modified: trunk/mail/thunderbird/distinfo ============================================================================== --- trunk/mail/thunderbird/distinfo Mon Nov 12 14:22:02 2012 (r1095) +++ trunk/mail/thunderbird/distinfo Mon Nov 12 14:22:13 2012 (r1096) @@ -1,4 +1,4 @@ SHA256 (thunderbird-17.0b2.source.tar.bz2) = 32e22234d87541483e22e1bc6725b8da570fcc69a281d473be8470769e6aaf28 SIZE (thunderbird-17.0b2.source.tar.bz2) = 113367956 -SHA256 (enigmail-1.4.5.tar.gz) = fa59491fba21de9414a003933349074a8ec1833a1d64cac9f0a9f7020ed6c020 -SIZE (enigmail-1.4.5.tar.gz) = 1269207 +SHA256 (enigmail-1.4.6.tar.gz) = f3771d1faa26676818bab5e2c50dce85013b9de30b82de526159eaa7ca34f036 +SIZE (enigmail-1.4.6.tar.gz) = 1262280 Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox-esr/Makefile Mon Nov 12 14:22:02 2012 (r1095) +++ trunk/www/firefox-esr/Makefile Mon Nov 12 14:22:13 2012 (r1096) @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 10.0.8 +DISTVERSION= 10.0.10 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} Modified: trunk/www/firefox-esr/distinfo ============================================================================== --- trunk/www/firefox-esr/distinfo Mon Nov 12 14:22:02 2012 (r1095) +++ trunk/www/firefox-esr/distinfo Mon Nov 12 14:22:13 2012 (r1096) @@ -1,2 +1,2 @@ -SHA256 (firefox-10.0.8esr.source.tar.bz2) = e908c51761b0143b9f5e8b045b8c91b624357eee8786cd861028e1df60da52f9 -SIZE (firefox-10.0.8esr.source.tar.bz2) = 75620783 +SHA256 (firefox-10.0.10esr.source.tar.bz2) = ea14528ae9292332721eef1da5aeebf07c188e5878cd65eb16c2ae03247460c0 +SIZE (firefox-10.0.10esr.source.tar.bz2) = 75629310 Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Mon Nov 12 14:22:02 2012 (r1095) +++ trunk/www/firefox-nightly/Makefile.hgrev Mon Nov 12 14:22:13 2012 (r1096) @@ -1 +1 @@ -HGREV= 112086:00c925c90f86 +HGREV= 112977:b2bdbfe06b10 Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Mon Nov 12 14:22:02 2012 (r1095) +++ trunk/www/firefox-nightly/distinfo Mon Nov 12 14:22:13 2012 (r1096) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/00c925c90f86.tar.bz2) = 229a0fb0016b28a934afc2b8227b773f54801ea72791de758f8ea3f666d2923e -SIZE (firefox-nightly/00c925c90f86.tar.bz2) = 96092989 +SHA256 (firefox-nightly/b2bdbfe06b10.tar.bz2) = 11e40fbc9a927f1199e981a5d89c1e68c2b49b602bd99e008cee42c311b5b360 +SIZE (firefox-nightly/b2bdbfe06b10.tar.bz2) = 97034747 Deleted: trunk/www/firefox-nightly/files/patch-bug806139 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug806139 Mon Nov 12 14:22:13 2012 (r1095) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,39 +0,0 @@ ---- content/html/content/public/nsHTMLMediaElement.h~ -+++ content/html/content/public/nsHTMLMediaElement.h -@@ -312,14 +312,16 @@ public: - static bool IsGStreamerSupportedType(const nsACString& aType); - static bool IsH264Type(const nsACString& aType); - static const char gH264Types[3][16]; -- static char const *const gH264Codecs[7]; - #endif - - #ifdef MOZ_WIDGET_GONK - static bool IsOmxEnabled(); - static bool IsOmxSupportedType(const nsACString& aType); - static const char gOmxTypes[5][16]; -- static char const *const gH264Codecs[7]; -+#endif -+ -+#if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK) -+ static char const *const gH264Codecs[9]; - #endif - - #ifdef MOZ_MEDIA_PLUGINS ---- content/html/content/src/nsHTMLMediaElement.cpp~ -+++ content/html/content/src/nsHTMLMediaElement.cpp -@@ -2134,12 +2134,14 @@ nsHTMLMediaElement::IsWebMType(const nsA - #endif - - #if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK) --char const *const nsHTMLMediaElement::gH264Codecs[7] = { -+char const *const nsHTMLMediaElement::gH264Codecs[9] = { - "avc1.42E01E", // H.264 Constrained Baseline Profile Level 3.0 - "avc1.42001E", // H.264 Baseline Profile Level 3.0 - "avc1.58A01E", // H.264 Extended Profile Level 3.0 - "avc1.4D401E", // H.264 Main Profile Level 3.0 - "avc1.64001E", // H.264 High Profile Level 3.0 -+ "avc1.64001F", // H.264 High Profile Level 3.1 -+ "mp4v.20.3", // 3GPP - "mp4a.40.2", // AAC-LC - nullptr - }; Modified: trunk/www/firefox-nightly/files/patch-bug807492 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug807492 Mon Nov 12 14:22:02 2012 (r1095) +++ trunk/www/firefox-nightly/files/patch-bug807492 Mon Nov 12 14:22:13 2012 (r1096) @@ -2015,10 +2015,10 @@ '$(DEPTH)/dist/include', ], diff --git media/webrtc/trunk/tools/gyp/pylib/gyp/common.py media/webrtc/trunk/tools/gyp/pylib/gyp/common.py -index 6144d2f..631c7b4 100644 +index 6144d2f..84ff5be 100644 --- media/webrtc/trunk/tools/gyp/pylib/gyp/common.py +++ media/webrtc/trunk/tools/gyp/pylib/gyp/common.py -@@ -354,24 +354,20 @@ def WriteOnDiff(filename): +@@ -354,25 +354,28 @@ def WriteOnDiff(filename): return Writer() @@ -2029,14 +2029,23 @@ 'cygwin': 'win', - 'win32': 'win', 'darwin': 'mac', - 'sunos5': 'solaris', +- 'sunos5': 'solaris', - 'freebsd7': 'freebsd', - 'freebsd8': 'freebsd', - 'freebsd9': 'freebsd', ++ 'sunos': 'solaris', } - flavor = flavors.get(sys.platform, 'linux') -+ flavor = flavors.get(sys.platform, sys.platform.rstrip('0123456789')) - return params.get('flavor', flavor) +- return params.get('flavor', flavor) ++ # platform name without major version ++ platform = sys.platform.rstrip('0123456789') ++ ++ if 'flavor' in params: ++ return params['flavor'] ++ if platform in flavors: ++ return flavors[platform] ++ ++ return platform def CopyTool(flavor, out_path): @@ -2044,11 +2053,12 @@ to |out_path|.""" prefix = { 'solaris': 'sun', 'mac': 'mac', 'win': 'win' }.get(flavor, None) if not prefix: + return diff --git media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py -index 338d0b7..a2f81d1 100644 +index 338d0b7..a509baf 100644 --- media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py +++ media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py -@@ -112,23 +112,20 @@ endif +@@ -112,24 +112,29 @@ endif def ensure_directory_exists(path): dir = os.path.dirname(path) if dir and not os.path.exists(dir): @@ -2058,14 +2068,24 @@ """Returns |params.flavor| if it's set, the system's default flavor else.""" flavors = { - 'win32': 'win', ++ 'cygwin': 'win', 'darwin': 'mac', - 'sunos5': 'solaris', +- 'sunos5': 'solaris', - 'freebsd7': 'freebsd', - 'freebsd8': 'freebsd', ++ 'sunos': 'solaris', } - flavor = flavors.get(sys.platform, 'linux') -+ flavor = flavors.get(sys.platform, sys.platform.rstrip('0123456789')) - return params.get('flavor', flavor) +- return params.get('flavor', flavor) ++ # strip major version or '32' from win32 ++ platform = sys.platform.rstrip('0123456789') ++ ++ if 'flavor' in params: ++ return params['flavor'] ++ if platform in flavors: ++ return flavors[platform] ++ ++ return platform def CalculateVariables(default_variables, params): @@ -2073,3 +2093,4 @@ default_variables['OS'] = generator_flags.get('os', GetFlavor(params)) + def CalculateGeneratorInputInfo(params): Modified: trunk/www/firefox-nightly/files/patch-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- trunk/www/firefox-nightly/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Mon Nov 12 14:22:02 2012 (r1095) +++ trunk/www/firefox-nightly/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Mon Nov 12 14:22:13 2012 (r1096) @@ -1,9 +1,9 @@ --- ipc/chromium/src/base/message_pump_libevent.cc~ +++ ipc/chromium/src/base/message_pump_libevent.cc -@@ -15,7 +15,7 @@ - #include "base/scoped_nsautorelease_pool.h" +@@ -16,7 +16,7 @@ #include "base/scoped_ptr.h" #include "base/time.h" + #include "nsDependentSubstring.h" -#include "third_party/libevent/event.h" +#include "event.h" Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Mon Nov 12 14:22:02 2012 (r1095) +++ trunk/www/firefox/Makefile Mon Nov 12 14:22:13 2012 (r1096) @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 17.0b4 +DISTVERSION= 17.0b5 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Mon Nov 12 14:22:02 2012 (r1095) +++ trunk/www/firefox/distinfo Mon Nov 12 14:22:13 2012 (r1096) @@ -1,2 +1,2 @@ -SHA256 (firefox-17.0b4.source.tar.bz2) = 77b881d67cc95693e9facc9c8bf97908cd024a3bf68c3629599c3ce5f9f994b2 -SIZE (firefox-17.0b4.source.tar.bz2) = 90966156 +SHA256 (firefox-17.0b5.source.tar.bz2) = 2bdbb72da5a9bf06f1f2814d47f3d0939c61acf5a3cc1cfe0e7a629a58500d14 +SIZE (firefox-17.0b5.source.tar.bz2) = 90948814 Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Mon Nov 12 14:22:02 2012 (r1095) +++ trunk/www/seamonkey/Makefile Mon Nov 12 14:22:13 2012 (r1096) @@ -6,7 +6,7 @@ # PORTNAME= seamonkey -DISTVERSION= 2.14b2 +DISTVERSION= 2.14b4 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -22,7 +22,7 @@ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ unzip:${PORTSDIR}/archivers/unzip -EM_VERSION= 1.4.5 +EM_VERSION= 1.4.6 USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=-2.7 Modified: trunk/www/seamonkey/distinfo ============================================================================== --- trunk/www/seamonkey/distinfo Mon Nov 12 14:22:02 2012 (r1095) +++ trunk/www/seamonkey/distinfo Mon Nov 12 14:22:13 2012 (r1096) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.14b2.source.tar.bz2) = a4e166fe62c6b9016b8f9fe82151004ed9eb28bade51ea1d6fff28c3fa571013 -SIZE (seamonkey-2.14b2.source.tar.bz2) = 114029145 -SHA256 (enigmail-1.4.5.tar.gz) = fa59491fba21de9414a003933349074a8ec1833a1d64cac9f0a9f7020ed6c020 -SIZE (enigmail-1.4.5.tar.gz) = 1269207 +SHA256 (seamonkey-2.14b4.source.tar.bz2) = 0f551c680d1b75f78d94defabb3c029ece8cf215be3c5424f06d7928af4e0f34 +SIZE (seamonkey-2.14b4.source.tar.bz2) = 114095816 +SHA256 (enigmail-1.4.6.tar.gz) = f3771d1faa26676818bab5e2c50dce85013b9de30b82de526159eaa7ca34f036 +SIZE (enigmail-1.4.6.tar.gz) = 1262280 Deleted: trunk/www/seamonkey/files/patch-bug786690 ============================================================================== --- trunk/www/seamonkey/files/patch-bug786690 Mon Nov 12 14:22:13 2012 (r1095) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,26 +0,0 @@ -commit 38301c3 -Author: Michael Wu -Date: Fri Aug 31 10:18:46 2012 -0300 - - Bug 786690 - Fix buffered streams on 16 bit outputs, r=kinetik ---- - content/media/nsAudioStream.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git content/media/nsAudioStream.cpp content/media/nsAudioStream.cpp -index ac8ef58..8087d31 100644 ---- mozilla/content/media/nsAudioStream.cpp -+++ mozilla/content/media/nsAudioStream.cpp -@@ -953,10 +953,11 @@ nsBufferedAudioStream::Init(int32_t aNumChannels, int32_t aRate) - params.channels = aNumChannels; - #ifdef MOZ_SAMPLE_TYPE_S16LE - params.format = CUBEB_SAMPLE_S16NE; -+ mBytesPerFrame = sizeof(int16_t) * aNumChannels; - #else /* MOZ_SAMPLE_TYPE_FLOAT32 */ - params.format = CUBEB_SAMPLE_FLOAT32NE; --#endif - mBytesPerFrame = sizeof(float) * aNumChannels; -+#endif - - { - cubeb_stream* stream; Deleted: trunk/www/seamonkey/files/patch-bug803811 ============================================================================== --- trunk/www/seamonkey/files/patch-bug803811 Mon Nov 12 14:22:13 2012 (r1095) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,111 +0,0 @@ -commit 4ff5f0c -Author: Landry Breuil -Date: Wed Oct 24 09:56:51 2012 +0400 - - Bug 803811 - Fix system zlib detection by porting bug #763651 ---- - aclocal.m4 | 1 + - configure.in | 46 ++++++---------------------------------------- - 2 files changed, 7 insertions(+), 40 deletions(-) - -diff --git aclocal.m4 aclocal.m4 -index f5486dd..a3924d1 100644 ---- aclocal.m4 -+++ aclocal.m4 -@@ -16,6 +16,7 @@ builtin(include, mozilla/build/autoconf/acwinpaths.m4)dnl - builtin(include, mozilla/build/autoconf/lto.m4)dnl - builtin(include, mozilla/build/autoconf/frameptr.m4)dnl - builtin(include, mozilla/build/autoconf/compiler-opts.m4)dnl -+builtin(include, mozilla/build/autoconf/zlib.m4)dnl - - MOZ_PROG_CHECKMSYS() - -diff --git configure.in configure.in -index be833e8..c90fe39 100644 ---- configure.in -+++ configure.in -@@ -63,7 +63,6 @@ dnl Set the version number of the libs included with mozilla - dnl ======================================================== - MOZJPEG=62 - MOZPNG=10401 --MOZZLIB=0x1230 - NSPR_VERSION=4 - NSS_VERSION=3 - -@@ -868,8 +867,6 @@ MOZ_USER_DIR=".mozilla" - - MOZ_JPEG_CFLAGS= - MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/mozilla/jpeg)' --MOZ_ZLIB_CFLAGS= --MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/mozilla/modules/zlib/src)' - MOZ_BZ2_CFLAGS= - MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/mozilla/modules/libbz2/src)' - MOZ_PNG_CFLAGS= -@@ -3957,47 +3954,19 @@ if test -n "${JPEG_DIR}" -a -d "${JPEG_DIR}" -a "$MOZ_NATIVE_JPEG" = 1; then - MOZ_JPEG_CFLAGS="-I${JPEG_DIR}/include" - MOZ_JPEG_LIBS="-L${JPEG_DIR}/lib ${MOZ_JPEG_LIBS}" - fi -+fi # SKIP_LIBRARY_CHECKS - - dnl system ZLIB support - dnl ======================================================== --MOZ_ARG_WITH_STRING(system-zlib, --[ --with-system-zlib[=PFX] -- Use system libz [installed at prefix PFX]], -- ZLIB_DIR=$withval) - --_SAVE_CFLAGS=$CFLAGS --_SAVE_LDFLAGS=$LDFLAGS --_SAVE_LIBS=$LIBS --if test -n "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "yes"; then -- CFLAGS="-I${ZLIB_DIR}/include $CFLAGS" -- LDFLAGS="-L${ZLIB_DIR}/lib $LDFLAGS" --fi --if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then -- MOZ_NATIVE_ZLIB= --else -- AC_CHECK_LIB(z, gzread, [MOZ_NATIVE_ZLIB=1 MOZ_ZLIB_LIBS="-lz"], -- [MOZ_NATIVE_ZLIB=]) --fi --if test "$MOZ_NATIVE_ZLIB" = 1; then -- MOZZLIBNUM=`echo $MOZZLIB | awk -F. '{printf "0x%x\n", ((($1 * 16 + $2) * 16) + $3) * 16 + $4}'` -- AC_TRY_COMPILE([ #include -- #include -- #include ], -- [ #if ZLIB_VERNUM < $MOZZLIBNUM -- #error "Insufficient zlib version ($MOZZLIBNUM required)." -- #endif ], -- MOZ_NATIVE_ZLIB=1, --AC_MSG_ERROR([Insufficient zlib version for --with-system-zlib ($MOZZLIB required)])) --fi --CFLAGS=$_SAVE_CFLAGS --LDFLAGS=$_SAVE_LDFLAGS --LIBS=$_SAVE_LIBS -+MOZ_ZLIB_CHECK([1.2.3]) - --if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$MOZ_NATIVE_ZLIB" = 1; then -- MOZ_ZLIB_CFLAGS="-I${ZLIB_DIR}/include" -- MOZ_ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" -+if test "$MOZ_NATIVE_ZLIB" != 1; then -+ MOZ_ZLIB_CFLAGS= -+ MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/mozilla/modules/zlib/src)' - fi - -+if test -z "$SKIP_LIBRARY_CHECKS"; then - dnl system BZIP2 Support - dnl ======================================================== - MOZ_ARG_WITH_STRING(system-bz2, -@@ -6556,13 +6525,10 @@ AC_SUBST(MOZ_NATIVE_MAKEDEPEND) - AC_SUBST(SYSTEM_LIBXUL) - AC_SUBST(MOZ_NATIVE_JPEG) - AC_SUBST(MOZ_NATIVE_PNG) --AC_SUBST(MOZ_NATIVE_ZLIB) - AC_SUBST(MOZ_NATIVE_BZ2) - - AC_SUBST(MOZ_JPEG_CFLAGS) - AC_SUBST(MOZ_JPEG_LIBS) --AC_SUBST(MOZ_ZLIB_CFLAGS) --AC_SUBST(MOZ_ZLIB_LIBS) - AC_SUBST(MOZ_BZ2_CFLAGS) - AC_SUBST(MOZ_BZ2_LIBS) - AC_SUBST(MOZ_PNG_CFLAGS)