Date: Thu, 4 Jul 2013 21:55:52 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322292 - in head/www: seamonkey seamonkey-i18n seamonkey/files Message-ID: <201307042155.r64Ltq28058905@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Thu Jul 4 21:55:52 2013 New Revision: 322292 URL: http://svnweb.freebsd.org/changeset/ports/322292 Log: Update to 2.19 Security: b3fcb387-de4b-11e2-b1c6-0025905a4771 In collaboration with: Jan Beich <jbeich@tormail.org> Added: head/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mozbuild (contents, props changed) head/www/seamonkey/files/patch-toolkit-components-osfile-osfile_unix_allthreads.jsm (contents, props changed) Deleted: head/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk head/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile head/www/seamonkey/files/patch-bug685258 head/www/seamonkey/files/patch-bug780432 head/www/seamonkey/files/patch-bug824317 head/www/seamonkey/files/patch-bug827521 head/www/seamonkey/files/patch-bug828003 head/www/seamonkey/files/patch-bug836824 head/www/seamonkey/files/patch-bug854936 head/www/seamonkey/files/patch-clang33 head/www/seamonkey/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c Modified: head/www/seamonkey-i18n/Makefile head/www/seamonkey-i18n/distinfo head/www/seamonkey/Makefile head/www/seamonkey/distinfo head/www/seamonkey/files/extra-bug780531 head/www/seamonkey/files/patch-bug807492 head/www/seamonkey/files/patch-bug826985 head/www/seamonkey/files/patch-bug844818 head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp Modified: head/www/seamonkey-i18n/Makefile ============================================================================== --- head/www/seamonkey-i18n/Makefile Thu Jul 4 21:53:31 2013 (r322291) +++ head/www/seamonkey-i18n/Makefile Thu Jul 4 21:55:52 2013 (r322292) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= seamonkey-i18n -PORTVERSION= 2.17.1 +PORTVERSION= 2.19 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack PKGNAMEPREFIX= Modified: head/www/seamonkey-i18n/distinfo ============================================================================== --- head/www/seamonkey-i18n/distinfo Thu Jul 4 21:53:31 2013 (r322291) +++ head/www/seamonkey-i18n/distinfo Thu Jul 4 21:55:52 2013 (r322292) @@ -1,46 +1,46 @@ -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.ca.langpack.xpi) = 51d8590b68aeb95b66854f2a0ee2e49fabdf184bf5370a51121eadafb9d2918b -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.ca.langpack.xpi) = 778283 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.cs.langpack.xpi) = a92aa966a0afdcf07f1efa2e0a932cdd6d1bb6ca5829966c291a608d09376f54 -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.cs.langpack.xpi) = 783459 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.de.langpack.xpi) = ff2bbeab22ffc55d336b50e9dfbb2528e9a0628fe0023ded7bc6a302f4d7f8d1 -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.de.langpack.xpi) = 807008 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.en-GB.langpack.xpi) = 0f2395b44af71b4f84a111e5a3011333d80a0ffe98fb602a68c3e2ffb72fc767 -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.en-GB.langpack.xpi) = 752488 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.en-US.langpack.xpi) = 6affe3dffed45c4d5258a6e750daf04e54103e8ca41757f246af41902d887968 -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.en-US.langpack.xpi) = 752988 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.es-AR.langpack.xpi) = f14def5018aa50f3a140b8374b66ff7697099609cfe55145c0169a35a19d0042 -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.es-AR.langpack.xpi) = 825532 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.es-ES.langpack.xpi) = 82e8ca3a00d6c70e676b7b60099b79b416d8c00059f8fbacee1dadb2193e699c -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.es-ES.langpack.xpi) = 773656 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.fi.langpack.xpi) = ca3817112c16417037f0bf95b007b2afa9a058de31a697aed28e6ad17a6d2fbe -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.fi.langpack.xpi) = 773170 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.fr.langpack.xpi) = 5aeae97aaca39598418781d88cb764de8955cdabc14f6f040393844efffc9b45 -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.fr.langpack.xpi) = 782686 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.hu.langpack.xpi) = bd7453f98b951b477007f1704712030bb4a3230645eee2f26b40c387891e6bab -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.hu.langpack.xpi) = 815706 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.it.langpack.xpi) = 6153b5658595549315888a0959df2abbe2a0ce786bed00b89ca837feb0a1bb46 -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.it.langpack.xpi) = 722919 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.ja-JP-mac.langpack.xpi) = 4b07671b8edb3ebef599a72afd66a340e46dca476206a9f389fb05b8e1d50461 -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.ja-JP-mac.langpack.xpi) = 856275 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.ja.langpack.xpi) = 78b5d488c2feb11a6c972e2b138de401b4185ed94e96a6b44ec9c3a1225cf2e5 -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.ja.langpack.xpi) = 831239 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.lt.langpack.xpi) = 06e5487ad9ea5f99d8b483091a652d3156e3ef9a8c42676565d65bc8b6579592 -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.lt.langpack.xpi) = 796678 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.nb-NO.langpack.xpi) = e1f5549934a973bca053ea8199a77802bfe99b8e1c898336693b392651b4021d -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.nb-NO.langpack.xpi) = 771630 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.nl.langpack.xpi) = 615b508f1cd804d5960cab09ef6dc3706dd09059c75433a4ead2860deddbb87f -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.nl.langpack.xpi) = 768853 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.pl.langpack.xpi) = d308de8a1f8681b800eb27baca2a67dc4cd27150da86751cb44923036f0f5b3c -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.pl.langpack.xpi) = 814403 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.pt-PT.langpack.xpi) = 237bf3bed897717609c057f2dec10af4b0028e4d6dc9a7e30d4caa6e50df2d24 -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.pt-PT.langpack.xpi) = 807020 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.ru.langpack.xpi) = f835db2cc61a24c4ceddebbd4a0e2f5add0bb25994fbabf642458301eab0507f -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.ru.langpack.xpi) = 877101 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.sk.langpack.xpi) = 3aff0993537eb3d90dc32ac398a3632fe5d23493b985f48ef3c61aeee7ba14bb -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.sk.langpack.xpi) = 810247 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.sv-SE.langpack.xpi) = 5fe1315605f3e8bc8b7c3e341695456f335f3c23e9bf0ce59e554d5b50c8de13 -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.sv-SE.langpack.xpi) = 796146 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.tr.langpack.xpi) = f10041a860a777874b4cb545ae336dc7f267efcab703c84df653166611368a3b -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.tr.langpack.xpi) = 836222 -SHA256 (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.uk.langpack.xpi) = fc1dceb45ce7efa89350d3114292d83e273eeaf99b7b2775d730026c1fcfac87 -SIZE (xpi/seamonkey-i18n-2.17.1/seamonkey-2.17.1.uk.langpack.xpi) = 836888 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ca.langpack.xpi) = 43bc80367ac83b52fc8196eb794ec44faa478259de4e791506f8b8ab183e2a1c +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ca.langpack.xpi) = 782120 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.cs.langpack.xpi) = c77a8fdd500cef05f3bcca2e82a17b1a7a92c9de5620d0aa0e51e1f9a0c5a6a2 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.cs.langpack.xpi) = 788132 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.de.langpack.xpi) = cc10f5cb1278981ce2725ed9f6e8f276d9530b40b90864072344f0608c429dba +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.de.langpack.xpi) = 811668 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.en-GB.langpack.xpi) = 4d26df065da998674f0feb701b0491c4481e52c377f5c2e52a85c93dfa9c36ea +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.en-GB.langpack.xpi) = 766029 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.en-US.langpack.xpi) = 7e29cfb57078b9022279745dc9fb182138c96cf7e134e7267ee5d7df4228bfc8 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.en-US.langpack.xpi) = 766506 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.es-AR.langpack.xpi) = f2551937b5bf0d40c72149b7d0502d7b82f7cd75cbddbee14bc2409aedd1aa89 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.es-AR.langpack.xpi) = 829099 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.es-ES.langpack.xpi) = c6d22970c82c182fb6506be2ab65852405e7d4ed3ab22a367e30bf5f46e26a33 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.es-ES.langpack.xpi) = 787293 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.fi.langpack.xpi) = 2c1feb90c524c5bcd07258839b41d06b2435cc78602713546710aba411d29ab7 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.fi.langpack.xpi) = 777244 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.fr.langpack.xpi) = 98c8cf48da13468a016c027745e1c1374d83ebfe025182b22dc71c69e985c9a5 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.fr.langpack.xpi) = 786708 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.hu.langpack.xpi) = 69f81bd9ed97cd45222892bd8ba5c848fbb899018150fe52ab1036b8eb5d78a5 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.hu.langpack.xpi) = 819737 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.it.langpack.xpi) = 06997605d522ded7af7daae0b33b1de3804ae801f803eb66dd16bea0fb041ed7 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.it.langpack.xpi) = 723359 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ja-JP-mac.langpack.xpi) = a06bfb44abff6508016046df3e547612dc3ff49d6cdd8f1a6b65d8e2d9909a55 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ja-JP-mac.langpack.xpi) = 871084 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ja.langpack.xpi) = a899460ae18a4d8e5a9d2f5dbe02dc10156d6d6af7f6e5dde51450cb6cb990dd +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ja.langpack.xpi) = 845891 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.lt.langpack.xpi) = c1de1df7602e9fa294d624b31e2c30bf78ab2ee2a916ebceaf7857276f5f218d +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.lt.langpack.xpi) = 819104 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.nb-NO.langpack.xpi) = ed86364d32e7def012ddf4ab87da215ee97e62223eef6d1040d14593db367044 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.nb-NO.langpack.xpi) = 778423 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.nl.langpack.xpi) = bbe767f7e0a7bf4b3127e914f9dc537748bfda11e61f0f789265445a649d622d +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.nl.langpack.xpi) = 772729 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.pl.langpack.xpi) = 433d5fb608abf5cfe1a021b793ef59b88c29aeb6f056ce8b2c34ee28d4d2a8c4 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.pl.langpack.xpi) = 818458 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.pt-PT.langpack.xpi) = b4150bb86c0986c3da75f4d26d1d3e98fab4f92d9dd388e6734f9044a003bff1 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.pt-PT.langpack.xpi) = 813536 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ru.langpack.xpi) = a39e3acf34ad7ddbffbadc1077e776759f13031333f707907daad47797f8c6f9 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ru.langpack.xpi) = 880523 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.sk.langpack.xpi) = 19febc855bcf4f3d14a85433f98dacb8a9bd7816cd7f4d54f71abf4b90289ff5 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.sk.langpack.xpi) = 814425 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.sv-SE.langpack.xpi) = 8c9ee97d5606c109e715e67b79d3ff9f9499c2ef6a731ea5279130ba93761399 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.sv-SE.langpack.xpi) = 799857 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.tr.langpack.xpi) = 3e0f47c6704f6553a881c6a645a7d837073604731fcd32cef93244f3528a27e5 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.tr.langpack.xpi) = 842484 +SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.uk.langpack.xpi) = 949176949a02ae353f70355b82c0c61ce85eef83edc536619c9dc52c082e0fa4 +SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.uk.langpack.xpi) = 843376 Modified: head/www/seamonkey/Makefile ============================================================================== --- head/www/seamonkey/Makefile Thu Jul 4 21:53:31 2013 (r322291) +++ head/www/seamonkey/Makefile Thu Jul 4 21:55:52 2013 (r322292) @@ -2,24 +2,24 @@ # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.17.1 +DISTVERSION= 2.19 CATEGORIES?= www ipv6 -MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source +MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ + https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser -BUILD_DEPENDS= nspr>=4.9.4:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.9.6:${PORTSDIR}/devel/nspr \ nss>=3.14.3:${PORTSDIR}/security/nss \ - sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \ + sqlite3>=3.7.16.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ unzip:${PORTSDIR}/archivers/unzip -EM_VERSION= 1.5.1 -L_VERSION= 2.2b1 +EM_VERSION= 1.5.2 +L_VERSION= 2.4b1 USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=-2.7 @@ -34,7 +34,7 @@ WANT_PERL= yes GNU_CONFIGURE= yes ALL_TARGET= default USE_GL= gl -USE_DOS2UNIX= mozilla/media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp +USE_DOS2UNIX= mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome @@ -47,8 +47,8 @@ MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 -OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL GSTREAMER LDAP LIGHTNING MAILNEWS WEBRTC -OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL GIO LDAP LIGHTNING MAILNEWS WEBRTC +OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS WEBRTC +OPTIONS_DEFAULT=CHATZILLA COMPOSER LDAP LIGHTNING MAILNEWS WEBRTC CHATZILLA_DESC?=Chatzilla IRC module COMPOSER_DESC?= HTML Composer module @@ -57,7 +57,8 @@ MAILNEWS_DESC?= Mail and News modules .include "${.CURDIR}/../../www/firefox/Makefile.options" -OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/OSS/ALSA/} +# OSS is gone after bug 852401 +OPTIONS_SINGLE_AUDIO:=${OPTIONS_SINGLE_AUDIO:S/OSS//} .include <bsd.port.options.mk> @@ -73,8 +74,7 @@ MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi .if ! ${PORT_OPTIONS:MMAILNEWS} -EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk \ - ${FILESDIR}/extra-patch-configure.in +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure.in MOZ_OPTIONS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP @@ -95,7 +95,6 @@ EM_ID= ${PORTNAME}@mozilla-enigmail.org EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \ ${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \ ${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm -EXTRA_PATCHES+= ${FILESDIR}/extrapatch-enigmail-ipc-src-Makefile .endif .endif @@ -122,7 +121,6 @@ post-extract: post-patch: @${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \ - -e '/^SQLITE_VERSION/s/=.*/=3.7.14.1/' \ ${MOZSRC}/configure.in ${WRKSRC}/configure.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/suite/app/nsSuiteApp.cpp Modified: head/www/seamonkey/distinfo ============================================================================== --- head/www/seamonkey/distinfo Thu Jul 4 21:53:31 2013 (r322291) +++ head/www/seamonkey/distinfo Thu Jul 4 21:55:52 2013 (r322292) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.17.1.source.tar.bz2) = 7795c181acd1c5d96c170fe5a43c3e9cae9f968007fcc0643b4996f9ec94b9bd -SIZE (seamonkey-2.17.1.source.tar.bz2) = 122794219 -SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0 -SIZE (enigmail-1.5.1.tar.gz) = 1213954 +SHA256 (seamonkey-2.19.source.tar.bz2) = 3d05fc6af5a6bb7c30da38b7dfc32b68c6d8e3ab3257545e6605aa4d682abb46 +SIZE (seamonkey-2.19.source.tar.bz2) = 136076805 +SHA256 (enigmail-1.5.2.tar.gz) = 0f6b4313f8400242c1c479b0329375122acc4a4e43e5065fbc9e00adbfc42895 +SIZE (enigmail-1.5.2.tar.gz) = 1211342 Modified: head/www/seamonkey/files/extra-bug780531 ============================================================================== --- head/www/seamonkey/files/extra-bug780531 Thu Jul 4 21:53:31 2013 (r322291) +++ head/www/seamonkey/files/extra-bug780531 Thu Jul 4 21:55:52 2013 (r322292) @@ -1,13 +1,24 @@ --- mozilla/configure.in~ +++ mozilla/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 Added: head/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mozbuild ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mozbuild Thu Jul 4 21:55:52 2013 (r322292) @@ -0,0 +1,9 @@ +--- bridge/bridge.mozbuild.orig 2013-07-03 22:34:52.815960909 +0200 ++++ bridge/bridge.mozbuild 2013-07-03 22:34:28.504986226 +0200 +@@ -14,4 +14,6 @@ + if 'mork' in component_libs or CONFIG['MOZ_MORK']: + app_libxul_dirs += [bridge_reldir + 'db/mork'] + ++ifdef disabled + app_libxul_dirs += [bridge_reldir + 'mailnews'] ++endif Modified: head/www/seamonkey/files/patch-bug807492 ============================================================================== --- head/www/seamonkey/files/patch-bug807492 Thu Jul 4 21:53:31 2013 (r322291) +++ head/www/seamonkey/files/patch-bug807492 Thu Jul 4 21:55:52 2013 (r322292) @@ -17,42 +17,14 @@ diff --git configure.in configure.in index c167461..8346c11 100644 --- mozilla/configure.in +++ mozilla/configure.in -@@ -1449,16 +1449,27 @@ if test "$GNU_CC"; then - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -mssse3" - AC_TRY_COMPILE([asm ("pmaddubsw %xmm2,%xmm3");],,AC_MSG_RESULT([yes]) - [HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1], - AC_MSG_RESULT([no])) - CFLAGS=$_SAVE_CFLAGS - AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3) - -+ # Check for -msse4.1 on $CC -+ AC_MSG_CHECKING([if toolchain supports -msse4.1 option]) -+ HAVE_TOOLCHAIN_SUPPORT_MSSE4_1= -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS -msse4.1" -+ AC_TRY_COMPILE([asm ("pmulld %xmm6,%xmm0");],,AC_MSG_RESULT([yes]) -+ [HAVE_TOOLCHAIN_SUPPORT_MSSE4_1=1], -+ AC_MSG_RESULT([no])) -+ CFLAGS=$_SAVE_CFLAGS -+ AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSE4_1) -+ - # Turn on GNU-specific warnings: - # -Wall - turn on a lot of warnings - # -pedantic - this is turned on below - # -Wpointer-arith - enabled with -pedantic, but good to have even if not - # -Wdeclaration-after-statement - MSVC doesn't like these - # -Werror=return-type - catches missing returns, zero false positives - # -Wtype-limits - catches overflow bugs, few false positives - # -Wempty-body - catches bugs, e.g. "if (c); foo();", few false positives -@@ -5259,17 +5270,17 @@ dnl Turn off webrtc for OS's we don't handle yet, but allow - dnl --enable-webrtc to override. Can disable for everything in - dnl the master list above. - if test -n "$MOZ_WEBRTC"; then - case "$target" in +@@ -5258,17 +5258,17 @@ if test -n "$MOZ_WEBRTC"; then *-android*|*-linuxandroid*) - dnl Make sure doesn't get matched by *-linux* - MOZ_WEBRTC= + if test -n "$MOZ_B2G"; then + MOZ_WEBRTC=1 + else + dnl Make sure doesn't get matched by *-linux* + MOZ_WEBRTC= + fi ;; - *-linux*|*-mingw*|*-darwin*) + *-linux*|*-mingw*|*-darwin*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) @@ -64,28 +36,6 @@ index c167461..8346c11 100644 ;; esac fi -@@ -9065,16 +9076,21 @@ elif test "${OS_TARGET}" = "Android"; then - EXTRA_GYP_DEFINES="-D gtest_target_type=executable -D android_toolchain=${android_toolchain} -G os=android " - if test -n "$ARM_ARCH" && test "$ARM_ARCH" -lt 7; then - EXTRA_GYP_DEFINES+=" -D armv7=0 " - else - EXTRA_GYP_DEFINES+=" -D armv7=1 " - fi - fi - -+# Don't try to compile sse4.1 code if toolchain doesn't support -+if test -z "$HAVE_TOOLCHAIN_SUPPORT_MSSE4_1"; then -+ EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D yuv_disable_asm=1" -+fi -+ - if test -n "$MOZ_WEBRTC"; then - AC_MSG_RESULT("generating WebRTC Makefiles...") - - dnl Any --include files must also appear in -D FORCED_INCLUDE_FILE= entries - dnl so that regeneration via dependencies works correctly - WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi" - - GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} -D target_arch=${WEBRTC_TARGET_ARCH} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}" diff --git js/src/config/system-headers js/src/config/system-headers index 9bd1efa..1095a01 100644 --- mozilla/js/src/config/system-headers @@ -137,7 +87,7 @@ diff --git media/mtransport/test/Makefil index c1d5bf4..2ecf2c7 100644 --- mozilla/media/mtransport/test/Makefile.in +++ mozilla/media/mtransport/test/Makefile.in -@@ -67,22 +67,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1 +@@ -73,22 +73,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1 else #default_fallback; probably doesn't work DEFINES += -D__Userspace_os_$(OS_TARGET)=1 @@ -167,7 +117,7 @@ diff --git media/mtransport/third_party/ index 0e1f8b4..9a4b995 100644 --- mozilla/media/mtransport/third_party/nICEr/nicer.gyp +++ mozilla/media/mtransport/third_party/nICEr/nicer.gyp -@@ -124,26 +124,36 @@ +@@ -126,26 +126,36 @@ 'R_DEFINED_UINT2=uint16_t', 'R_DEFINED_INT4=int32_t', 'R_DEFINED_UINT4=uint32_t', @@ -367,12 +317,12 @@ index cc260b7..66af2d7 100644 if (!(my_locale = r_strdup(setlocale(LC_CTYPE, 0)))) ABORT(R_NO_MEMORY); -@@ -93,28 +101,28 @@ mbslen(const char *s, size_t *ncharsp) - #else +@@ -94,28 +102,28 @@ mbslen(const char *s, size_t *ncharsp) /* can't count UTF-8 characters with mbrlen if the locale isn't UTF-8 */ /* null-checking setlocale is required because Android */ char *locale = setlocale(LC_CTYPE, 0); - if (!locale || !strcasestr(locale, "UTF-8")) + /* some systems use "utf8" instead of "UTF-8" like Fedora 17 */ + if (!locale || (!strcasestr(locale, "UTF-8") && !strcasestr(locale, "UTF8"))) ABORT(R_NOT_FOUND); #endif @@ -394,12 +344,12 @@ index cc260b7..66af2d7 100644 +#endif /* HAVE_XLOCALE */ { if (nbytes == (size_t)-1) /* should never happen */ { - assert(0); ABORT(R_INTERNAL); - } + } if (nbytes == (size_t)-2) /* encoding error */ { - assert(0); ABORT(R_BAD_DATA); + } + diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp index 3cc8e1c..74016c6 100644 --- mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp @@ -443,7 +393,7 @@ index 3cc8e1c..74016c6 100644 'RETSIGTYPE=void', 'TIME_WITH_SYS_TIME_H=1', diff --git media/mtransport/third_party/nrappkit/src/log/r_log.c media/mtransport/third_party/nrappkit/src/log/r_log.c -index b25d5c2..b207b8c 100644 +index efb7ef2..aebf578 100644 --- mozilla/media/mtransport/third_party/nrappkit/src/log/r_log.c +++ mozilla/media/mtransport/third_party/nrappkit/src/log/r_log.c @@ -43,16 +43,17 @@ static char *RCSSTRING __UNUSED__ ="$Id: r_log.c,v 1.10 2008/11/25 22:25:18 adam @@ -464,32 +414,6 @@ index b25d5c2..b207b8c 100644 #include <time.h> -diff --git media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h -index 15452e3..2c9651a 100644 ---- mozilla/media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h -+++ mozilla/media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h -@@ -37,16 +37,21 @@ - */ - - - #ifndef _platform_h - #define _platform_h - - #include <unistd.h> - -+#ifdef BSD -+/* Hack version of addr2ascii (in util/util.c) */ -+char *addr2ascii(int af, const void *addrp, int len,char *buf); -+#endif -+ - #define STDIO_BYTES_BUFFERED(fp) (fp->_r) - - #ifdef NR_SOCKET_IS_VOID_PTR - typedef void* NR_SOCKET; - #else - typedef int NR_SOCKET; - #define NR_SOCKET_READ(sock,buf,count) read((sock),(buf),(count)) - #define NR_SOCKET_WRITE(sock,buf,count) write((sock),(buf),(count)) diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h index bcb1ec0..bb73591 100644 --- mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h @@ -504,21 +428,14 @@ index bcb1ec0..bb73591 100644 #define __offsetof offsetof #endif diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c -index 3aced8b..be020bb 100644 +index a7d4ff1..ff11a60 100644 --- mozilla/media/mtransport/third_party/nrappkit/src/util/util.c +++ mozilla/media/mtransport/third_party/nrappkit/src/util/util.c -@@ -36,20 +36,24 @@ - ekr@rtfm.com Wed Dec 26 17:19:36 2001 - */ - - +@@ -40,16 +40,17 @@ static char *RCSSTRING __UNUSED__ ="$Id: util.c,v 1.5 2007/11/21 00:09:13 adamcain Exp $"; #ifndef WIN32 #include <sys/uio.h> -+#include <sys/socket.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> #include <pwd.h> #include <dirent.h> #endif @@ -532,25 +449,6 @@ index 3aced8b..be020bb 100644 #include "nr_common.h" #include "r_common.h" #include "registry.h" -@@ -431,17 +435,17 @@ int nr_reg_uint8_fetch_and_check(NR_registry key, UINT8 min, UINT8 max, int log_ - abort: - if(die && _status){ - r_log(log_fac,LOG_CRIT,"Exiting due to invalid configuration (key '%s')",key); - exit(1); - } - return(_status); - } - --#if defined(LINUX) || defined(WIN32) -+#if defined(LINUX) || defined(BSD) || defined(WIN32) - /* Hack version of addr2ascii */ - char *addr2ascii(int af, const void *addrp, int len,char *buf) - { - static char buf2[256]; - char *ret; - struct in_addr *addr=(struct in_addr *)addrp; - - if (! buf) diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp index 2a91e3d..31de641 100644 --- mozilla/media/webrtc/signaling/signaling.gyp @@ -664,26 +562,7 @@ diff --git media/webrtc/signaling/test/M index a30e330..cfbd8a3 100644 --- mozilla/media/webrtc/signaling/test/Makefile.in +++ mozilla/media/webrtc/signaling/test/Makefile.in -@@ -22,17 +22,17 @@ LIBS = \ - $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \ - $(DEPTH)/media/webrtc/signalingtest/signaling_sipcc/$(LIB_PREFIX)sipcc.$(LIB_SUFFIX) \ - $(DEPTH)/layout/media/$(LIB_PREFIX)gkmedias.$(LIB_SUFFIX) \ - $(DEPTH)/media/webrtc/trunk/testing/gtest_gtest/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \ - $(DEPTH)/netwerk/srtp/src/$(LIB_PREFIX)nksrtp_s.$(LIB_SUFFIX) \ - $(NULL) - - ifdef MOZ_SYDNEYAUDIO --ifeq ($(OS_TARGET),Linux) -+ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) - LIBS += \ - $(MOZ_ALSA_LIBS) \ - $(NULL) - endif - endif - - ifeq ($(OS_TARGET),Android) - LIBS += \ -@@ -76,17 +76,17 @@ endif +@@ -81,17 +81,17 @@ endif ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) LIBS += \ $(XLIBS) \ @@ -702,139 +581,39 @@ index a30e330..cfbd8a3 100644 ifeq ($(OS_TARGET),Darwin) LIBS += \ -framework AudioToolbox \ -diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi -index 6ca2f70..5d261cb 100644 ---- mozilla/media/webrtc/trunk/build/common.gypi -+++ mozilla/media/webrtc/trunk/build/common.gypi -@@ -75,22 +75,31 @@ - # ash. This rule should be removed for the future when Windows is - # using the aura windows without the ash interface. - ['use_aura==1 and OS=="win"', { - 'use_ash%': 1, - }], - ['use_ash==1', { - 'use_aura%': 1, - }], -+ -+ # A flag for BSD platforms -+ ['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or \ -+ OS=="openbsd"', { -+ 'os_bsd%': 1, -+ }, { -+ 'os_bsd%': 0, -+ }], - ], - }, - # Copy conditionally-set variables out one scope. - 'chromeos%': '<(chromeos)', - 'use_aura%': '<(use_aura)', - 'use_ash%': '<(use_ash)', -+ 'os_bsd%': '<(os_bsd)', - 'use_openssl%': '<(use_openssl)', - 'use_ibus%': '<(use_ibus)', - 'enable_viewport%': '<(enable_viewport)', - 'enable_hidpi%': '<(enable_hidpi)', - 'enable_touch_ui%': '<(enable_touch_ui)', - 'android_upstream_bringup%': '<(android_upstream_bringup)', - 'buildtype%': '<(buildtype)', - -@@ -114,17 +123,17 @@ - # Set default value of toolkit_views based on OS. - ['OS=="win" or chromeos==1 or use_aura==1', { - 'toolkit_views%': 1, - }, { - 'toolkit_views%': 0, - }], - - # Set toolkit_uses_gtk for the Chromium browser on Linux. -- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', { -+ ['(OS=="linux" or OS=="solaris" or os_bsd==1) and use_aura==0', { - 'toolkit_uses_gtk%': 1, - }, { - 'toolkit_uses_gtk%': 0, - }], - - # Enable HiDPI on Mac OS and Chrome OS. - ['OS=="mac" or chromeos==1', { - 'enable_hidpi%': 1, -@@ -139,16 +148,17 @@ - - # Copy conditionally-set variables out one scope. - 'chromeos%': '<(chromeos)', - 'host_arch%': '<(host_arch)', - 'toolkit_views%': '<(toolkit_views)', - 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', - 'use_aura%': '<(use_aura)', - 'use_ash%': '<(use_ash)', -+ 'os_bsd%': '<(os_bsd)', - 'use_openssl%': '<(use_openssl)', - 'use_ibus%': '<(use_ibus)', - 'enable_viewport%': '<(enable_viewport)', - 'enable_hidpi%': '<(enable_hidpi)', - 'enable_touch_ui%': '<(enable_touch_ui)', - 'android_upstream_bringup%': '<(android_upstream_bringup)', - 'android_build_type%': '<(android_build_type)', - -@@ -397,25 +407,18 @@ - - # A flag for POSIX platforms - ['OS=="win"', { - 'os_posix%': 0, - }, { - 'os_posix%': 1, - }], - -- # A flag for BSD platforms -- ['OS=="freebsd" or OS=="openbsd"', { -- 'os_bsd%': 1, -- }, { -- 'os_bsd%': 0, -- }], -- - # NSS usage. -- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_openssl==0', { -+ ['(OS=="linux" or OS=="solaris" or os_bsd==1) and use_openssl==0', { - 'use_nss%': 1, - }, { - 'use_nss%': 0, - }], - - # Flags to use X11 on non-Mac POSIX platforms - ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', { - 'use_glib%': 0, -diff --git media/webrtc/trunk/src/build/common.gypi media/webrtc/trunk/src/build/common.gypi +diff --git media/webrtc/trunk/webrtc/build/common.gypi media/webrtc/trunk/webrtc/build/common.gypi index 9ca9f7c..d5c4ab9 100644 ---- mozilla/media/webrtc/trunk/src/build/common.gypi -+++ mozilla/media/webrtc/trunk/src/build/common.gypi -@@ -101,16 +101,21 @@ - 'enable_protobuf%': 1, - 'include_tests%': 1, - - # TODO(andrew): For now, disable the Chrome plugins, which causes a +--- mozilla/media/webrtc/trunk/webrtc/build/common.gypi ++++ mozilla/media/webrtc/trunk/webrtc/build/common.gypi +@@ -119,16 +119,21 @@ # flood of chromium-style warnings. Investigate enabling them: # http://code.google.com/p/webrtc/issues/detail?id=163 'clang_use_chrome_plugins%': 0, + + # Switch between Android audio device OpenSL ES implementation + # and Java Implementation + 'enable_android_opensl%': 0, }], + ['OS=="linux" or OS=="solaris" or os_bsd==1', { + 'include_v4l2_video_capture%': 1, + }, { + 'include_v4l2_video_capture%': 0, + }], - ], # conditions - }, - 'target_defaults': { - 'include_dirs': [ - # TODO(andrew): we should be able to just use <(webrtc_root) here. - '..','../..', - ], - 'defines': [ -@@ -176,16 +181,28 @@ - 'defines': [ - 'WEBRTC_LINUX', - 'WEBRTC_THREAD_RR', - # TODO(andrew): can we select this automatically? - # Define this if the Linux system does not support CLOCK_MONOTONIC. - #'WEBRTC_CLOCK_TYPE_REALTIME', + ['OS=="ios"', { + 'enable_video%': 0, + 'enable_protobuf%': 0, + 'build_libjpeg%': 0, + 'build_libyuv%': 0, + 'build_libvpx%': 0, + 'include_tests%': 0, + }], +@@ -205,16 +210,28 @@ + 'defines': ['WEBRTC_ARCH_ARM_NEON', + 'WEBRTC_BUILD_NEON_LIBS', + 'WEBRTC_DETECT_ARM_NEON'], + }], + ], + }], ], }], + ['os_bsd==1', { @@ -849,18 +628,18 @@ index 9ca9f7c..d5c4ab9 100644 + 'WEBRTC_CLOCK_TYPE_REALTIME', + ], + }], - ['OS=="mac"', { + ['OS=="ios"', { 'defines': [ 'WEBRTC_MAC', - 'WEBRTC_MAC_INTEL', # TODO(andrew): remove this. + 'WEBRTC_IOS', 'WEBRTC_THREAD_RR', 'WEBRTC_CLOCK_TYPE_REALTIME', ], }], -diff --git media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc +diff --git media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc index 203f09a..0b0b70e 100644 ---- mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc -+++ mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_utility.cc +--- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc ++++ mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc @@ -41,17 +41,17 @@ bool AudioDeviceUtility::StringCompare( const char* str1 , const char* str2, const WebRtc_UWord32 length) @@ -893,10 +672,10 @@ index 203f09a..0b0b70e 100644 +#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) -diff --git media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc +diff --git media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc index bdad224..39e1132 100644 ---- mozilla/media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc -+++ mozilla/media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc +--- mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc ++++ mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc @@ -7,16 +7,17 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. @@ -915,10 +694,10 @@ index bdad224..39e1132 100644 #include "system_wrappers/interface/trace.h" namespace webrtc { -diff --git media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc +diff --git media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc index 298d479..37b70c9 100644 ---- mozilla/media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc -+++ mozilla/media/webrtc/trunk/src/modules/rtp_rtcp/source/rtp_utility.cc +--- mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc ++++ mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc @@ -13,17 +13,17 @@ #include <cassert> #include <cmath> // ceil @@ -995,9 +774,9 @@ index 298d479..37b70c9 100644 WebRtc_UWord32 GetCurrentRTP(RtpRtcpClock* clock, WebRtc_UWord32 freq) { const bool use_global_clock = (clock == NULL); -@@ -313,17 +313,17 @@ bool OldTimestamp(uint32_t newTimestamp, - * Misc utility routines - */ +@@ -325,17 +325,17 @@ WebRtc_UWord16 GetPayloadDataLength(const WebRtcRTPHeader* rtp_header, + return static_cast<WebRtc_UWord16>(length); + } #if defined(_WIN32) bool StringCompare(const char* str1, const char* str2, @@ -1014,10 +793,10 @@ index 298d479..37b70c9 100644 #if !defined(WEBRTC_LITTLE_ENDIAN) && !defined(WEBRTC_BIG_ENDIAN) #error Either WEBRTC_LITTLE_ENDIAN or WEBRTC_BIG_ENDIAN must be defined -diff --git media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc +diff --git media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport_impl.cc media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport_impl.cc index e50db5d..70ad8a8 100644 ---- mozilla/media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc -+++ mozilla/media/webrtc/trunk/src/modules/udp_transport/source/udp_transport_impl.cc +--- mozilla/media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport_impl.cc ++++ mozilla/media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport_impl.cc @@ -13,60 +13,62 @@ #include <stdio.h> #include <stdlib.h> @@ -1041,7 +820,7 @@ index e50db5d..70ad8a8 100644 -#include <sys/socket.h> #include <sys/time.h> #include <unistd.h> - #ifndef MAC_IPHONE + #ifndef WEBRTC_IOS #include <net/if_arp.h> #endif #endif // defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) @@ -1162,10 +941,10 @@ index e50db5d..70ad8a8 100644 ptrNumericIP = &(address._sockaddr_in.sin_addr); } else if(ipFamily == AF_INET6) -diff --git media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc +diff --git media/webrtc/trunk/webrtc/modules/utility/source/rtp_dump_impl.cc media/webrtc/trunk/webrtc/modules/utility/source/rtp_dump_impl.cc index 69a52ec..7ac226c 100644 ---- mozilla/media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc -+++ mozilla/media/webrtc/trunk/src/modules/utility/source/rtp_dump_impl.cc +--- mozilla/media/webrtc/trunk/webrtc/modules/utility/source/rtp_dump_impl.cc ++++ mozilla/media/webrtc/trunk/webrtc/modules/utility/source/rtp_dump_impl.cc @@ -14,17 +14,17 @@ #include <stdio.h> @@ -1204,10 +983,10 @@ index 69a52ec..7ac226c 100644 val = tv.tv_sec * 1000 + tv.tv_usec / 1000; return val; #else -diff --git media/webrtc/trunk/src/modules/video_capture/main/source/Linux/device_info_linux.cc media/webrtc/trunk/src/modules/video_capture/main/source/Linux/device_info_linux.cc +diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc index 653ee16..8d6fd68 100644 ---- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/Linux/device_info_linux.cc -+++ mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/Linux/device_info_linux.cc +--- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc ++++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc @@ -14,17 +14,23 @@ #include <unistd.h> #include <sys/ioctl.h> @@ -1232,10 +1011,10 @@ index 653ee16..8d6fd68 100644 namespace webrtc { namespace videocapturemodule -diff --git media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc +diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc index 12df1b3..424ea0a 100644 ---- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc -+++ mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/Linux/video_capture_linux.cc +--- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc ++++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc @@ -7,22 +7,30 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. @@ -1268,10 +1047,10 @@ index 12df1b3..424ea0a 100644 #include "critical_section_wrapper.h" #include "video_capture_linux.h" -diff --git media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc +diff --git media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.cc media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.cc index e3f7bb5..882cede 100644 ---- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc -+++ mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc +--- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.cc ++++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.cc @@ -49,17 +49,17 @@ WebRtc_Word32 DeviceInfoImpl::NumberOfCapabilities( if (!deviceUniqueIdUTF8) return -1; @@ -1281,8 +1060,8 @@ index e3f7bb5..882cede 100644 if (_lastUsedDeviceNameLength == strlen((char*) deviceUniqueIdUTF8)) { // Is it the same device that is asked for again. --#if defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_LINUX) -+#if defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) +-#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) ++#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) if(strncasecmp((char*)_lastUsedDeviceName, (char*) deviceUniqueIdUTF8, _lastUsedDeviceNameLength)==0) @@ -1300,8 +1079,8 @@ index e3f7bb5..882cede 100644 ReadLockScoped cs(_apiLock); if ((_lastUsedDeviceNameLength != strlen((char*) deviceUniqueIdUTF8)) --#if defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_LINUX) -+#if defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) +-#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) ++#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || (strncasecmp((char*)_lastUsedDeviceName, (char*) deviceUniqueIdUTF8, _lastUsedDeviceNameLength)!=0)) @@ -1319,8 +1098,8 @@ index e3f7bb5..882cede 100644 ReadLockScoped cs(_apiLock); if ((_lastUsedDeviceNameLength != strlen((char*) deviceUniqueIdUTF8)) --#if defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_LINUX) -+#if defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) +-#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) ++#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || (strncasecmp((char*)_lastUsedDeviceName, (char*) deviceUniqueIdUTF8, _lastUsedDeviceNameLength)!=0)) @@ -1329,38 +1108,38 @@ index e3f7bb5..882cede 100644 (char*) deviceUniqueIdUTF8, _lastUsedDeviceNameLength) != 0)) #endif -diff --git media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi +diff --git media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi index 0a9765e..8d4bbf4 100644 ---- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi -+++ mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi -@@ -55,17 +55,17 @@ +--- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi ++++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi +@@ -43,17 +43,17 @@ + 'conditions': [ ['include_internal_video_capture==0', { 'sources': [ - 'External/device_info_external.cc', - 'External/video_capture_external.cc', + 'external/device_info_external.cc', + 'external/video_capture_external.cc', ], - },{ # include_internal_video_capture == 1 + }, { # include_internal_video_capture == 1 'conditions': [ - # DEFINE PLATFORM SPECIFIC SOURCE FILES - ['OS=="linux"', { + ['include_v4l2_video_capture==1', { 'include_dirs': [ - 'Linux', + 'linux', ], 'sources': [ - 'Linux/device_info_linux.h', - 'Linux/video_capture_linux.h', - 'Linux/device_info_linux.cc', - 'Linux/video_capture_linux.cc', -@@ -162,31 +162,35 @@ - '../interface', + 'linux/device_info_linux.cc', + 'linux/device_info_linux.h', + 'linux/video_capture_linux.cc', + 'linux/video_capture_linux.h', +@@ -152,31 +152,35 @@ + 'include_dirs': [ + 'include', ], 'sources': [ - '../test/video_capture_unittest.cc', - '../test/video_capture_main_mac.mm', + 'test/video_capture_unittest.cc', + 'test/video_capture_main_mac.mm', ], 'conditions': [ - # DEFINE PLATFORM SPECIFIC INCLUDE AND CFLAGS - ['OS=="mac" or OS=="linux"', { + ['OS!="win" and OS!="android"', { 'cflags': [ @@ -1391,176 +1170,167 @@ index 0a9765e..8d4bbf4 100644 'xcode_settings': { # TODO(andrew): CoreAudio and AudioToolbox shouldn't be needed. 'OTHER_LDFLAGS': [ -diff --git media/webrtc/trunk/src/system_wrappers/interface/tick_util.h media/webrtc/trunk/src/system_wrappers/interface/tick_util.h +diff --git media/webrtc/trunk/webrtc/system_wrappers/interface/asm_defines.h media/webrtc/trunk/webrtc/system_wrappers/interface/asm_defines.h index 0cd85d0..45591be 100644 ---- mozilla/media/webrtc/trunk/src/system_wrappers/interface/tick_util.h -+++ mozilla/media/webrtc/trunk/src/system_wrappers/interface/tick_util.h -@@ -161,17 +161,17 @@ inline TickTime TickTime::Now() - // so it must have been a wrap around. - if(old > 0xf0000000 && now < 0x0fffffff) - { - numWrapTimeGetTime++; - } - } - result._ticks = now + (numWrapTimeGetTime<<32); - #endif +--- mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/asm_defines.h ++++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/asm_defines.h +@@ -6,17 +6,17 @@ + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + + #ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ASM_DEFINES_H_ + #define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ASM_DEFINES_H_ + +-#if defined(__linux__) && defined(__ELF__) ++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(__ELF__) + .section .note.GNU-stack,"",%progbits + #endif + + // Define the macros used in ARM assembly code, so that for Mac or iOS builds + // we add leading underscores for the function names. + #ifdef __APPLE__ + .macro GLOBAL_FUNCTION name + .global _\name +diff --git media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h +index 0cd85d0..45591be 100644 +--- mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h ++++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h +@@ -189,17 +189,17 @@ inline WebRtc_Word64 TickTime::QueryOsForTicks() { + // 0x0fffffff ~3.1 days, the code will not take that long to execute + // so it must have been a wrap around. + if (old > 0xf0000000 && now < 0x0fffffff) { + num_wrap_time_get_time++; + } + } + result.ticks_ = now + (num_wrap_time_get_time << 32); + #endif -#elif defined(WEBRTC_LINUX) +#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - struct timespec ts; - // TODO(wu): Remove CLOCK_REALTIME implementation. - #ifdef WEBRTC_CLOCK_TYPE_REALTIME - clock_gettime(CLOCK_REALTIME, &ts); - #else - clock_gettime(CLOCK_MONOTONIC, &ts); - #endif - result._ticks = 1000000000LL * static_cast<WebRtc_Word64>(ts.tv_sec) + static_cast<WebRtc_Word64>(ts.tv_nsec); -@@ -203,17 +203,17 @@ inline WebRtc_Word64 TickTime::MillisecondTimestamp() + struct timespec ts; + // TODO(wu): Remove CLOCK_REALTIME implementation. + #ifdef WEBRTC_CLOCK_TYPE_REALTIME + clock_gettime(CLOCK_REALTIME, &ts); + #else + clock_gettime(CLOCK_MONOTONIC, &ts); + #endif + result.ticks_ = 1000000000LL * static_cast<WebRtc_Word64>(ts.tv_sec) + +@@ -236,34 +236,34 @@ inline WebRtc_Word64 TickTime::MillisecondTimestamp() { #if _WIN32 - #ifdef USE_QUERY_PERFORMANCE_COUNTER - LARGE_INTEGER qpfreq; - QueryPerformanceFrequency(&qpfreq); - return (now._ticks * 1000) / qpfreq.QuadPart; - #else - return now._ticks; - #endif + #ifdef USE_QUERY_PERFORMANCE_COUNTER + LARGE_INTEGER qpfreq; + QueryPerformanceFrequency(&qpfreq); + return (ticks * 1000) / qpfreq.QuadPart; + #else + return ticks; + #endif -#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) +#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - return now._ticks / 1000000LL; + return ticks / 1000000LL; #else - return now._ticks / 1000LL; + return ticks / 1000LL; #endif } - inline WebRtc_Word64 TickTime::MicrosecondTimestamp() - { -@@ -222,17 +222,17 @@ inline WebRtc_Word64 TickTime::MicrosecondTimestamp() *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307042155.r64Ltq28058905>