Date: Thu, 13 Jun 2013 15:35:57 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1269 - in trunk: devel/nspr security/nss security/nss/files www/firefox www/firefox-nightly www/firefox-nightly/files www/firefox/files Message-ID: <201306131535.r5DFZvcg054175@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Jun 13 15:35:57 2013
New Revision: 1269
Log:
update
Added:
trunk/security/nss/files/patch-coreconf_FreeBSD.mk
- copied, changed from r1268, trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk
trunk/security/nss/files/patch-coreconf_UNIX.mk
- copied, changed from r1268, trunk/security/nss/files/patch-..::coreconf::UNIX.mk
trunk/security/nss/files/patch-coreconf_arch.mk
- copied, changed from r1268, trunk/security/nss/files/patch-.._coreconf_arch.mk
trunk/security/nss/files/patch-coreconf_command.mk
- copied, changed from r1268, trunk/security/nss/files/patch-..::coreconf::command.mk
trunk/security/nss/files/patch-coreconf_rules.mk
- copied, changed from r1268, trunk/security/nss/files/patch-..::coreconf::rules.mk
trunk/security/nss/files/patch-coreconf_ruleset.mk
- copied, changed from r1268, trunk/security/nss/files/patch-..::coreconf::ruleset.mk
Deleted:
trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk
trunk/security/nss/files/patch-..::coreconf::UNIX.mk
trunk/security/nss/files/patch-..::coreconf::command.mk
trunk/security/nss/files/patch-..::coreconf::rules.mk
trunk/security/nss/files/patch-..::coreconf::ruleset.mk
trunk/security/nss/files/patch-.._coreconf_arch.mk
trunk/security/nss/files/patch-Makefile
Modified:
trunk/devel/nspr/Makefile
trunk/devel/nspr/distinfo
trunk/security/nss/Makefile
trunk/security/nss/distinfo
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox-nightly/files/extra-bug780531
trunk/www/firefox-nightly/files/patch-bug844818
trunk/www/firefox/Makefile
trunk/www/firefox/distinfo
trunk/www/firefox/files/extra-bug780531
Modified: trunk/devel/nspr/Makefile
==============================================================================
--- trunk/devel/nspr/Makefile Thu Jun 13 15:35:43 2013 (r1268)
+++ trunk/devel/nspr/Makefile Thu Jun 13 15:35:57 2013 (r1269)
@@ -6,14 +6,14 @@
# $MCom: ports-experimental/devel/nspr/Makefile,v 1.6 2008/03/12 13:06:56 ahze Exp $
PORTNAME= nspr
-DISTVERSION= 4.9.6
+DISTVERSION= 4.10
CATEGORIES= devel
MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
MAINTAINER= gecko@FreeBSD.org
COMMENT= A platform-neutral API for system level and libc like functions
-WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla/nsprpub/build
+WRKSRC= ${WRKDIR}/${DISTNAME}/nspr/build
USE_LDCONFIG= yes
USE_GMAKE= yes
Modified: trunk/devel/nspr/distinfo
==============================================================================
--- trunk/devel/nspr/distinfo Thu Jun 13 15:35:43 2013 (r1268)
+++ trunk/devel/nspr/distinfo Thu Jun 13 15:35:57 2013 (r1269)
@@ -1,2 +1,2 @@
-SHA256 (nspr-4.9.6.tar.gz) = 7693fddd3c5cc15d53a50df53ab5dcdaa2eb58f5003302690559471744d6c6f9
-SIZE (nspr-4.9.6.tar.gz) = 1163033
+SHA256 (nspr-4.10.tar.gz) = 0cfbe561676b92e5af3ddc7ac77452014e3da8885da66baec811e7354138cc16
+SIZE (nspr-4.10.tar.gz) = 1103862
Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile Thu Jun 13 15:35:43 2013 (r1268)
+++ trunk/security/nss/Makefile Thu Jun 13 15:35:57 2013 (r1269)
@@ -2,7 +2,7 @@
# $FreeBSD: head/security/nss/Makefile 310165 2013-01-09 23:28:19Z flo $
PORTNAME= nss
-PORTVERSION= 3.14.3
+PORTVERSION= 3.15
#DISTVERSIONSUFFIX= .with.ckbi.1.93
CATEGORIES= security
MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src
@@ -16,7 +16,7 @@
LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr \
sqlite3.8:${PORTSDIR}/databases/sqlite3
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/nss
MAKE_JOBS_UNSAFE= yes
USE_LDCONFIG= ${PREFIX}/lib/nss
@@ -25,14 +25,13 @@
MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" \
SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \
NSS_ENABLE_ECC=1 NSS_USE_SYSTEM_SQLITE=1
-ALL_TARGET= nss_build_all
CFLAGS+= -I${LOCALBASE}/include/nspr
SUB_FILES= nss-config nss.pc
SUB_LIST= MAJOR_VERSION=${PORTVERSION:R:R} \
PORTVERSION=${PORTVERSION}
-DIST= ${WRKSRC:H:H}/dist
+DIST= ${WRKSRC:H}/dist
EXTERNALS= CVS dbm security/nss/lib/zlib nsprpub security/dbm
EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
Modified: trunk/security/nss/distinfo
==============================================================================
--- trunk/security/nss/distinfo Thu Jun 13 15:35:43 2013 (r1268)
+++ trunk/security/nss/distinfo Thu Jun 13 15:35:57 2013 (r1269)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.14.3.tar.gz) = d9d366be94d33395597ebf82363fcdedfa693a6d627cf7f6bec025f609d54cc0
-SIZE (nss-3.14.3.tar.gz) = 6189790
+SHA256 (nss-3.15.tar.gz) = c139f331ddcff4d5485590ee1b4489d3731aa520d4f5d942e2e40bba1e23a3cd
+SIZE (nss-3.15.tar.gz) = 6276213
Deleted: trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk
==============================================================================
--- trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk Thu Jun 13 15:35:57 2013 (r1268)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,58 +0,0 @@
---- ../../security/coreconf/FreeBSD.mk.orig 2009-08-22 07:33:09.000000000 +0200
-+++ ../../security/coreconf/FreeBSD.mk 2010-03-28 23:01:33.000000000 +0200
-@@ -37,9 +37,9 @@
-
- include $(CORE_DEPTH)/coreconf/UNIX.mk
-
--DEFAULT_COMPILER = gcc
--CC = gcc
--CCC = g++
-+DEFAULT_COMPILER = $(CC)
-+CC ?= gcc
-+CCC = $(CXX)
- RANLIB = ranlib
-
- CPU_ARCH = $(OS_TEST)
-@@ -52,6 +52,13 @@ endif
- ifeq ($(CPU_ARCH),amd64)
- CPU_ARCH = x86_64
- endif
-+ifneq (,$(filter powerpc%, $(CPU_ARCH)))
-+CPU_ARCH = ppc
-+endif
-+
-+ifneq (,$(filter %64, $(OS_TEST)))
-+USE_64 = 1
-+endif
-
- OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-@@ -70,15 +85,15 @@
-
- ARCH = freebsd
-
--MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+ifndef MOZILLA_CLIENT
-+DLL_SUFFIX = so.1
-+endif
-
--ifeq ($(MOZ_OBJFORMAT),elf)
--DLL_SUFFIX = so
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS)
- else
--DLL_SUFFIX = so.1.0
-+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
- endif
--
--MKSHLIB = $(CC) $(DSO_LDOPTS)
- ifdef MAPFILE
- MKSHLIB += -Wl,--version-script,$(MAPFILE)
- endif
-@@ -87,4 +100,5 @@
-
- G++INCLUDES = -I/usr/include/g++
-
--INCLUDES += -I/usr/X11R6/include
-+USE_SYSTEM_ZLIB = 1
-+ZLIB_LIBS = -lz
Deleted: trunk/security/nss/files/patch-..::coreconf::UNIX.mk
==============================================================================
--- trunk/security/nss/files/patch-..::coreconf::UNIX.mk Thu Jun 13 15:35:57 2013 (r1268)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- ../coreconf/UNIX.mk~
-+++ ../coreconf/UNIX.mk
-@@ -42,10 +42,8 @@ AR = ar cr $@
- LDOPTS += -L$(SOURCE_LIB_DIR)
-
- ifdef BUILD_OPT
-- OPTIMIZER += -O
- DEFINES += -UDEBUG -DNDEBUG
- else
-- OPTIMIZER += -g
- USERNAME := $(shell whoami)
- USERNAME := $(subst -,_,$(USERNAME))
- DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME)
Deleted: trunk/security/nss/files/patch-..::coreconf::command.mk
==============================================================================
--- trunk/security/nss/files/patch-..::coreconf::command.mk Thu Jun 13 15:35:57 2013 (r1268)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,9 +0,0 @@
---- ../coreconf/command.mk Mon Oct 10 19:46:12 2005
-+++ ../coreconf/command.mk Wed Jan 18 17:23:28 2006
-@@ -46,5 +46,5 @@
- LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
- LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS)
--CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
-+CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
- $(XCFLAGS)
- RANLIB = echo
Deleted: trunk/security/nss/files/patch-..::coreconf::rules.mk
==============================================================================
--- trunk/security/nss/files/patch-..::coreconf::rules.mk Thu Jun 13 15:35:57 2013 (r1268)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,12 +0,0 @@
---- ../coreconf/rules.mk.orig Sat Jan 6 00:48:54 2007
-+++ ../coreconf/rules.mk Fri Mar 23 10:15:46 2007
-@@ -114,6 +114,9 @@
- endif
- ifdef SHARED_LIBRARY
- $(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR)
-+ifndef MOZILLA_CLIENT
-+ ln -sf $(notdir $(SHARED_LIBRARY)) $(SOURCE_LIB_DIR)/$(notdir $(SHARED_LIBRARY:.so.1=.so))
-+endif
- ifdef MOZ_DEBUG_SYMBOLS
- ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
- $(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR)
Deleted: trunk/security/nss/files/patch-..::coreconf::ruleset.mk
==============================================================================
--- trunk/security/nss/files/patch-..::coreconf::ruleset.mk Thu Jun 13 15:35:57 2013 (r1268)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- ../coreconf/ruleset.mk~
-+++ ../coreconf/ruleset.mk
-@@ -85,7 +85,7 @@
- #
-
- ifndef COMPILER_TAG
-- ifneq ($(DEFAULT_COMPILER), $(notdir $(firstword $(CC))))
-+ ifneq ($(DEFAULT_COMPILER), $(CC))
- #
- # Temporary define for the Client; to be removed when binary release is used
- #
Deleted: trunk/security/nss/files/patch-.._coreconf_arch.mk
==============================================================================
--- trunk/security/nss/files/patch-.._coreconf_arch.mk Thu Jun 13 15:35:57 2013 (r1268)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- ../coreconf/arch.mk.orig 2011-03-03 18:13:52.000000000 +0100
-+++ ../coreconf/arch.mk 2011-03-03 18:14:09.000000000 +0100
-@@ -66,7 +66,7 @@
- # Attempt to differentiate between sparc and x86 Solaris
- #
-
--OS_TEST := $(shell uname -m)
-+OS_TEST := $(shell uname -p)
- ifeq ($(OS_TEST),i86pc)
- OS_RELEASE := $(shell uname -r)_$(OS_TEST)
- else
Deleted: trunk/security/nss/files/patch-Makefile
==============================================================================
--- trunk/security/nss/files/patch-Makefile Thu Jun 13 15:35:57 2013 (r1268)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- Makefile.orig Thu Apr 14 20:28:40 2005
-+++ Makefile Tue Aug 30 15:32:11 2005
-@@ -78,7 +78,7 @@
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
-
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf all
-
- build_coreconf:
- cd $(CORE_DEPTH)/coreconf ; $(MAKE)
Copied and modified: trunk/security/nss/files/patch-coreconf_FreeBSD.mk (from r1268, trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk)
==============================================================================
--- trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk Thu Jun 13 15:35:43 2013 (r1268, copy source)
+++ trunk/security/nss/files/patch-coreconf_FreeBSD.mk Thu Jun 13 15:35:57 2013 (r1269)
@@ -1,5 +1,5 @@
---- ../../security/coreconf/FreeBSD.mk.orig 2009-08-22 07:33:09.000000000 +0200
-+++ ../../security/coreconf/FreeBSD.mk 2010-03-28 23:01:33.000000000 +0200
+--- coreconf/FreeBSD.mk.orig 2009-08-22 07:33:09.000000000 +0200
++++ coreconf/FreeBSD.mk 2010-03-28 23:01:33.000000000 +0200
@@ -37,9 +37,9 @@
include $(CORE_DEPTH)/coreconf/UNIX.mk
Copied and modified: trunk/security/nss/files/patch-coreconf_UNIX.mk (from r1268, trunk/security/nss/files/patch-..::coreconf::UNIX.mk)
==============================================================================
--- trunk/security/nss/files/patch-..::coreconf::UNIX.mk Thu Jun 13 15:35:43 2013 (r1268, copy source)
+++ trunk/security/nss/files/patch-coreconf_UNIX.mk Thu Jun 13 15:35:57 2013 (r1269)
@@ -1,5 +1,5 @@
---- ../coreconf/UNIX.mk~
-+++ ../coreconf/UNIX.mk
+--- coreconf/UNIX.mk~
++++ coreconf/UNIX.mk
@@ -42,10 +42,8 @@ AR = ar cr $@
LDOPTS += -L$(SOURCE_LIB_DIR)
Copied and modified: trunk/security/nss/files/patch-coreconf_arch.mk (from r1268, trunk/security/nss/files/patch-.._coreconf_arch.mk)
==============================================================================
--- trunk/security/nss/files/patch-.._coreconf_arch.mk Thu Jun 13 15:35:43 2013 (r1268, copy source)
+++ trunk/security/nss/files/patch-coreconf_arch.mk Thu Jun 13 15:35:57 2013 (r1269)
@@ -1,5 +1,5 @@
---- ../coreconf/arch.mk.orig 2011-03-03 18:13:52.000000000 +0100
-+++ ../coreconf/arch.mk 2011-03-03 18:14:09.000000000 +0100
+--- coreconf/arch.mk.orig 2011-03-03 18:13:52.000000000 +0100
++++ coreconf/arch.mk 2011-03-03 18:14:09.000000000 +0100
@@ -66,7 +66,7 @@
# Attempt to differentiate between sparc and x86 Solaris
#
Copied and modified: trunk/security/nss/files/patch-coreconf_command.mk (from r1268, trunk/security/nss/files/patch-..::coreconf::command.mk)
==============================================================================
--- trunk/security/nss/files/patch-..::coreconf::command.mk Thu Jun 13 15:35:43 2013 (r1268, copy source)
+++ trunk/security/nss/files/patch-coreconf_command.mk Thu Jun 13 15:35:57 2013 (r1269)
@@ -1,5 +1,5 @@
---- ../coreconf/command.mk Mon Oct 10 19:46:12 2005
-+++ ../coreconf/command.mk Wed Jan 18 17:23:28 2006
+--- coreconf/command.mk Mon Oct 10 19:46:12 2005
++++ coreconf/command.mk Wed Jan 18 17:23:28 2006
@@ -46,5 +46,5 @@
LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS)
Copied and modified: trunk/security/nss/files/patch-coreconf_rules.mk (from r1268, trunk/security/nss/files/patch-..::coreconf::rules.mk)
==============================================================================
--- trunk/security/nss/files/patch-..::coreconf::rules.mk Thu Jun 13 15:35:43 2013 (r1268, copy source)
+++ trunk/security/nss/files/patch-coreconf_rules.mk Thu Jun 13 15:35:57 2013 (r1269)
@@ -1,5 +1,5 @@
---- ../coreconf/rules.mk.orig Sat Jan 6 00:48:54 2007
-+++ ../coreconf/rules.mk Fri Mar 23 10:15:46 2007
+--- coreconf/rules.mk.orig Sat Jan 6 00:48:54 2007
++++ coreconf/rules.mk Fri Mar 23 10:15:46 2007
@@ -114,6 +114,9 @@
endif
ifdef SHARED_LIBRARY
Copied and modified: trunk/security/nss/files/patch-coreconf_ruleset.mk (from r1268, trunk/security/nss/files/patch-..::coreconf::ruleset.mk)
==============================================================================
--- trunk/security/nss/files/patch-..::coreconf::ruleset.mk Thu Jun 13 15:35:43 2013 (r1268, copy source)
+++ trunk/security/nss/files/patch-coreconf_ruleset.mk Thu Jun 13 15:35:57 2013 (r1269)
@@ -1,5 +1,5 @@
---- ../coreconf/ruleset.mk~
-+++ ../coreconf/ruleset.mk
+--- coreconf/ruleset.mk~
++++ coreconf/ruleset.mk
@@ -85,7 +85,7 @@
#
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Thu Jun 13 15:35:43 2013 (r1268)
+++ trunk/www/firefox-nightly/Makefile.hgrev Thu Jun 13 15:35:57 2013 (r1269)
@@ -1 +1 @@
-HGREV= 134362:6cafe68983ca
+HGREV= 134789:68760713a30f
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Thu Jun 13 15:35:43 2013 (r1268)
+++ trunk/www/firefox-nightly/distinfo Thu Jun 13 15:35:57 2013 (r1269)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/6cafe68983ca.tar.bz2) = 26177ea48d709fd89047a6d1ef631f3740099f8e2cc5040d2b1cd2db920041e5
-SIZE (firefox-nightly/6cafe68983ca.tar.bz2) = 112785672
+SHA256 (firefox-nightly/68760713a30f.tar.bz2) = 8e8a46924f49d8a21bda71157326fbd6bd9affc1b8f3a9cabed777b4d0641b7e
+SIZE (firefox-nightly/68760713a30f.tar.bz2) = 112736843
Modified: trunk/www/firefox-nightly/files/extra-bug780531
==============================================================================
--- trunk/www/firefox-nightly/files/extra-bug780531 Thu Jun 13 15:35:43 2013 (r1268)
+++ trunk/www/firefox-nightly/files/extra-bug780531 Thu Jun 13 15:35:57 2013 (r1269)
@@ -1,13 +1,24 @@
--- configure.in~
+++ configure.in
-@@ -5151,8 +5148,8 @@ fi
+@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP)
- AC_SUBST(MOZ_WEBRTC)
-
--case "$target_cpu" in
--arm*)
+ dnl Use integers over floats for audio on B2G and Android, because audio
+ dnl backends for those platforms don't support floats.
+-if test "$OS_TARGET" = "Android"; then
+case "$target" in
-+arm-*-linux*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
++*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
MOZ_SAMPLE_TYPE_S16=1
AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
AC_SUBST(MOZ_SAMPLE_TYPE_S16)
+-else
++;;
++*)
+ MOZ_SAMPLE_TYPE_FLOAT32=1
+ AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32)
+ AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32)
+-fi
++;;
++esac
+
+ dnl ========================================================
+ dnl = Disable Speech API code
Modified: trunk/www/firefox-nightly/files/patch-bug844818
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug844818 Thu Jun 13 15:35:43 2013 (r1268)
+++ trunk/www/firefox-nightly/files/patch-bug844818 Thu Jun 13 15:35:57 2013 (r1269)
@@ -1,9 +1,9 @@
diff --git configure.in configure.in
-index 7cd6e17..a1dbdf7 100644
+index f1111a0..2e83433 100644
--- configure.in
+++ configure.in
-@@ -9106,6 +9106,18 @@ elif test "${OS_TARGET}" = "Android"; th
- fi
+@@ -9132,6 +9132,18 @@ if test -n "$ARM_ARCH"; then
+ fi
fi
+# Keep libcubeb and audio_device backends in sync
@@ -18,14 +18,14 @@
+ EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D include_pulse_audio=0"
+fi
+
- # Don't try to compile sse4.1 code if toolchain doesn't support
- if test -z "$HAVE_TOOLCHAIN_SUPPORT_MSSE4_1"; then
+ # Don't try to compile ssse3/sse4.1 code if toolchain doesn't support
+ if test -z "$HAVE_TOOLCHAIN_SUPPORT_SSSE3" || test -z "$HAVE_TOOLCHAIN_SUPPORT_MSSE4_1"; then
EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D yuv_disable_asm=1"
diff --git media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
-index 8457737..dfc83ff 100644
+index 5dc16e0..a1ed9e7 100644
--- media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
+++ media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
-@@ -45,11 +45,15 @@
+@@ -45,11 +45,11 @@
'dummy/audio_device_utility_dummy.h',
],
'conditions': [
@@ -35,15 +35,11 @@
'linux',
],
- }], # OS==linux
-+ 'defines': [
-+ # avoid pointless rename
-+ 'WEBRTC_LINUX',
-+ ],
+ }], # include_alsa_audio==1 or include_pulse_audio==1
['OS=="ios"', {
'include_dirs': [
'ios',
-@@ -74,14 +78,8 @@
+@@ -78,14 +78,8 @@
}],
['include_internal_audio_device==1', {
'sources': [
@@ -57,8 +53,8 @@
- 'linux/audio_mixer_manager_alsa_linux.h',
'linux/latebindingsymboltable_linux.cc',
'linux/latebindingsymboltable_linux.h',
- 'mac/audio_device_mac.cc',
-@@ -116,28 +114,36 @@
+ 'ios/audio_device_ios.cc',
+@@ -126,28 +120,42 @@
},
}],
['OS=="linux"', {
@@ -86,6 +82,9 @@
- }],
+ }],
+ ['include_alsa_audio==1', {
++ 'cflags_mozilla': [
++ '$(MOZ_ALSA_CFLAGS)',
++ ],
+ 'defines': [
+ 'LINUX_ALSA',
+ ],
@@ -99,6 +98,9 @@
+ ],
+ }],
+ ['include_pulse_audio==1', {
++ 'cflags_mozilla': [
++ '$(MOZ_PULSEAUDIO_CFLAGS)',
++ ],
+ 'defines': [
+ 'LINUX_PULSE',
+ ],
@@ -111,16 +113,102 @@
+ 'linux/pulseaudiosymboltable_linux.h',
],
}],
- ['OS=="mac"', {
+ ['OS=="mac" or OS=="ios"', {
+diff --git media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc
+index 444340f..629ed3b 100644
+--- media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc
++++ media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc
+@@ -16,7 +16,9 @@
+ #include <assert.h>
+ #include <string.h>
+
+-#if defined(_WIN32)
++#if defined(WEBRTC_DUMMY_AUDIO_BUILD)
++// do not include platform specific headers
++#elif defined(_WIN32)
+ #include "audio_device_utility_win.h"
+ #include "audio_device_wave_win.h"
+ #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
+diff --git media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
+index 8f3c7c8..a2339fb 100644
+--- media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
++++ media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
+@@ -27,7 +27,7 @@
+
+ #include "latebindingsymboltable_linux.h"
+
+-#ifdef WEBRTC_LINUX
++#ifdef WEBRTC_POSIX
+ #include <dlfcn.h>
+ #endif
+
+@@ -37,7 +37,7 @@ using namespace webrtc;
+ namespace webrtc_adm_linux {
+
+ inline static const char *GetDllError() {
+-#ifdef WEBRTC_LINUX
++#ifdef WEBRTC_POSIX
+ char *err = dlerror();
+ if (err) {
+ return err;
+@@ -50,7 +50,7 @@ inline static const char *GetDllError() {
+ }
+
+ DllHandle InternalLoadDll(const char dll_name[]) {
+-#ifdef WEBRTC_LINUX
++#ifdef WEBRTC_POSIX
+ DllHandle handle = dlopen(dll_name, RTLD_NOW);
+ #else
+ #error Not implemented
+@@ -63,7 +63,7 @@ DllHandle InternalLoadDll(const char dll_name[]) {
+ }
+
+ void InternalUnloadDll(DllHandle handle) {
+-#ifdef WEBRTC_LINUX
++#ifdef WEBRTC_POSIX
+ if (dlclose(handle) != 0) {
+ WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1,
+ "%d", GetDllError());
+@@ -76,7 +76,7 @@ void InternalUnloadDll(DllHandle handle) {
+ static bool LoadSymbol(DllHandle handle,
+ const char *symbol_name,
+ void **symbol) {
+-#ifdef WEBRTC_LINUX
++#ifdef WEBRTC_POSIX
+ *symbol = dlsym(handle, symbol_name);
+ char *err = dlerror();
+ if (err) {
+@@ -101,7 +101,7 @@ bool InternalLoadSymbols(DllHandle handle,
+ int num_symbols,
+ const char *const symbol_names[],
+ void *symbols[]) {
+-#ifdef WEBRTC_LINUX
++#ifdef WEBRTC_POSIX
+ // Clear any old errors.
+ dlerror();
+ #endif
+diff --git media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h
+index 91d25aa..500725f 100644
+--- media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h
++++ media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h
+@@ -42,7 +42,7 @@
+
+ namespace webrtc_adm_linux {
+
+-#ifdef WEBRTC_LINUX
++#ifdef WEBRTC_POSIX
+ typedef void *DllHandle;
+
+ const DllHandle kInvalidDllHandle = NULL;
diff --git media/webrtc/webrtc_config.gypi media/webrtc/webrtc_config.gypi
-index b504d3d..e2eb127 100644
+index d464265..af7d538 100644
--- media/webrtc/webrtc_config.gypi
+++ media/webrtc/webrtc_config.gypi
-@@ -9,7 +9,6 @@
+@@ -14,7 +14,6 @@
'include_internal_video_render': 0,
'clang_use_chrome_plugins': 0,
'enable_protobuf': 0,
- 'include_pulse_audio': 0,
'include_tests': 0,
- 'use_system_libjpeg': 1,
- 'use_system_libvpx': 1,
+ 'enable_android_opensl': 1,
+ # use_system_lib* still seems to be in use in trunk/build
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Thu Jun 13 15:35:43 2013 (r1268)
+++ trunk/www/firefox/Makefile Thu Jun 13 15:35:57 2013 (r1269)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $
PORTNAME= firefox
-DISTVERSION= 22.0b2
+DISTVERSION= 22.0b5
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo Thu Jun 13 15:35:43 2013 (r1268)
+++ trunk/www/firefox/distinfo Thu Jun 13 15:35:57 2013 (r1269)
@@ -1,2 +1,2 @@
-SHA256 (firefox-22.0b2.source.tar.bz2) = b8a3f86ebd528c3f94386169b35ab3b726c8a1e6cdb11a4267ea41ccb1976862
-SIZE (firefox-22.0b2.source.tar.bz2) = 111346720
+SHA256 (firefox-22.0b5.source.tar.bz2) = dffa84a9802c6360208fc02a78f04b4c5a4527f360bcbd412db35f6f6b965661
+SIZE (firefox-22.0b5.source.tar.bz2) = 111748130
Modified: trunk/www/firefox/files/extra-bug780531
==============================================================================
--- trunk/www/firefox/files/extra-bug780531 Thu Jun 13 15:35:43 2013 (r1268)
+++ trunk/www/firefox/files/extra-bug780531 Thu Jun 13 15:35:57 2013 (r1269)
@@ -1,13 +1,24 @@
--- configure.in~
+++ configure.in
-@@ -5151,8 +5148,8 @@ fi
+@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP)
- AC_SUBST(MOZ_WEBRTC)
-
--case "$target_cpu" in
--arm*)
+ dnl Use integers over floats for audio on B2G and Android, because audio
+ dnl backends for those platforms don't support floats.
+-if test "$OS_TARGET" = "Android"; then
+case "$target" in
-+arm-*-linux*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
++*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
MOZ_SAMPLE_TYPE_S16=1
AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
AC_SUBST(MOZ_SAMPLE_TYPE_S16)
+-else
++;;
++*)
+ MOZ_SAMPLE_TYPE_FLOAT32=1
+ AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32)
+ AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32)
+-fi
++;;
++esac
+
+ dnl ========================================================
+ dnl = Disable Speech API code
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306131535.r5DFZvcg054175>