Wed May 7 20:23:22 2014 UTC ()
Bump PKGREVISION, fix native HTML5 audio playback

* Set MOZ_SAMPLE_TYPE_FLOAT32 for non-Android platforms.


(ryoon)
diff -r1.20 -r1.21 pkgsrc/www/firefox24/Makefile
diff -r1.10 -r1.11 pkgsrc/www/firefox24/distinfo
diff -r1.3 -r1.4 pkgsrc/www/firefox24/patches/patch-aa
cvs diff -r1.20 -r1.21 pkgsrc/www/firefox24/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox24/Attic/Makefile 2014/05/06 13:56:38 1.20
+++ pkgsrc/www/firefox24/Attic/Makefile 2014/05/07 20:23:22 1.21
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.20 2014/05/06 13:56:38 ryoon Exp $ 1# $NetBSD: Makefile,v 1.21 2014/05/07 20:23:22 ryoon Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 24.5.0 4MOZ_BRANCH= 24.5.0
5MOZ_BRANCH_MINOR= esr 5MOZ_BRANCH_MINOR= esr
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= firefox24-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} 8PKGNAME= firefox24-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
 9PKGREVISION= 1
9CATEGORIES= www 10CATEGORIES= www
10#MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11#MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
11MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} 12MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
12EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
13 14
14WRKSRC= ${WRKDIR}/mozilla-esr24 15WRKSRC= ${WRKDIR}/mozilla-esr24
15 16
16MAINTAINER= ryoon@NetBSD.org 17MAINTAINER= ryoon@NetBSD.org
17HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 18HOMEPAGE= http://www.mozilla.com/en-US/firefox/
18COMMENT= Web browser with support for extensions (version 24.x) 19COMMENT= Web browser with support for extensions (version 24.x)
19LICENSE= mpl-1.1 20LICENSE= mpl-1.1
20 21
21MOZILLA_DIR= # empty 22MOZILLA_DIR= # empty
cvs diff -r1.10 -r1.11 pkgsrc/www/firefox24/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox24/Attic/distinfo 2014/05/06 13:56:38 1.10
+++ pkgsrc/www/firefox24/Attic/distinfo 2014/05/07 20:23:22 1.11
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.10 2014/05/06 13:56:38 ryoon Exp $ 1$NetBSD: distinfo,v 1.11 2014/05/07 20:23:22 ryoon Exp $
2 2
3SHA1 (firefox-24.5.0esr.source.tar.bz2) = 1b549d6dce80faec1c23f11b95122e607d2ed1bb 3SHA1 (firefox-24.5.0esr.source.tar.bz2) = 1b549d6dce80faec1c23f11b95122e607d2ed1bb
4RMD160 (firefox-24.5.0esr.source.tar.bz2) = 38a987d7c1283c3dd6476685eb025c308fb2f185 4RMD160 (firefox-24.5.0esr.source.tar.bz2) = 38a987d7c1283c3dd6476685eb025c308fb2f185
5Size (firefox-24.5.0esr.source.tar.bz2) = 119830718 bytes 5Size (firefox-24.5.0esr.source.tar.bz2) = 119830718 bytes
6SHA1 (patch-aa) = 3c6f7028ac86a9f567fbba936e69238113190451 6SHA1 (patch-aa) = c5e419b9c99e3950eb3359ed33b21de572d66630
7SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be 7SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be
8SHA1 (patch-al) = 553c6042a98e4b381a46eec50c02cff349d88bd2 8SHA1 (patch-al) = 553c6042a98e4b381a46eec50c02cff349d88bd2
9SHA1 (patch-ao) = fdb521b3d895b85f8b2b0516cdc1eec6a6b5f6e1 9SHA1 (patch-ao) = fdb521b3d895b85f8b2b0516cdc1eec6a6b5f6e1
10SHA1 (patch-as) = 0c1818ca9fd663810e655cf5078e60526f7d58c3 10SHA1 (patch-as) = 0c1818ca9fd663810e655cf5078e60526f7d58c3
11SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756 11SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
12SHA1 (patch-bg) = e5af56b3dca81ad67149c09942580ebd9062b38d 12SHA1 (patch-bg) = e5af56b3dca81ad67149c09942580ebd9062b38d
13SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85 13SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85
14SHA1 (patch-browser_app_profile_firefox.js) = 108efbe1ae65669912d2f76caec546753e1ac8f3 14SHA1 (patch-browser_app_profile_firefox.js) = 108efbe1ae65669912d2f76caec546753e1ac8f3
15SHA1 (patch-browser_installer_package-manifest.in) = a00ac3c6ddedd316c7350ad9867a1a68cce974e1 15SHA1 (patch-browser_installer_package-manifest.in) = a00ac3c6ddedd316c7350ad9867a1a68cce974e1
16SHA1 (patch-browser_locales_en-US_chrome_browser-region_region.properties) = 284d62596718d7f372c4e5214fd05adec043c93a 16SHA1 (patch-browser_locales_en-US_chrome_browser-region_region.properties) = 284d62596718d7f372c4e5214fd05adec043c93a
17SHA1 (patch-browser_locales_en-US_searchplugins_duckduckgo.xml) = 69eca52185ac868e95041b5d87611ee32c2b6330 17SHA1 (patch-browser_locales_en-US_searchplugins_duckduckgo.xml) = 69eca52185ac868e95041b5d87611ee32c2b6330
18SHA1 (patch-browser_locales_en-US_searchplugins_list.txt) = a6677b3a195b6c956858326e4e7474441823a47f 18SHA1 (patch-browser_locales_en-US_searchplugins_list.txt) = a6677b3a195b6c956858326e4e7474441823a47f
19SHA1 (patch-build_autoconf_nss.m4) = 4731f46a41f6d4ff31a6da07c9badb328a0f676f 19SHA1 (patch-build_autoconf_nss.m4) = 4731f46a41f6d4ff31a6da07c9badb328a0f676f
cvs diff -r1.3 -r1.4 pkgsrc/www/firefox24/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/firefox24/patches/Attic/patch-aa 2014/05/06 13:56:38 1.3
+++ pkgsrc/www/firefox24/patches/Attic/patch-aa 2014/05/07 20:23:22 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.3 2014/05/06 13:56:38 ryoon Exp $ 1$NetBSD: patch-aa,v 1.4 2014/05/07 20:23:22 ryoon Exp $
2 2
3--- configure.in.orig 2013-12-06 02:21:00.000000000 +0000 3--- configure.in.orig 2013-12-06 02:21:00.000000000 +0000
4+++ configure.in 4+++ configure.in
5@@ -1370,6 +1370,17 @@ if test "$GNU_CC"; then 5@@ -1370,6 +1370,17 @@ if test "$GNU_CC"; then
6 CFLAGS=$_SAVE_CFLAGS 6 CFLAGS=$_SAVE_CFLAGS
7 AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSE4_1) 7 AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSE4_1)
8  8
9+ # Check for -msse4.1 on $CC 9+ # Check for -msse4.1 on $CC
10+ AC_MSG_CHECKING([if toolchain supports -msse4.1 option]) 10+ AC_MSG_CHECKING([if toolchain supports -msse4.1 option])
11+ HAVE_TOOLCHAIN_SUPPORT_MSSE4_1= 11+ HAVE_TOOLCHAIN_SUPPORT_MSSE4_1=
12+ _SAVE_CFLAGS=$CFLAGS 12+ _SAVE_CFLAGS=$CFLAGS
13+ CFLAGS="$CFLAGS -msse4.1" 13+ CFLAGS="$CFLAGS -msse4.1"
14+ AC_TRY_COMPILE([asm ("pmulld %xmm6,%xmm0");],,AC_MSG_RESULT([yes]) 14+ AC_TRY_COMPILE([asm ("pmulld %xmm6,%xmm0");],,AC_MSG_RESULT([yes])
@@ -142,27 +142,27 @@ $NetBSD: patch-aa,v 1.3 2014/05/06 13:56 @@ -142,27 +142,27 @@ $NetBSD: patch-aa,v 1.3 2014/05/06 13:56
142  142
143+ dnl with libv4l2 we can support more cameras 143+ dnl with libv4l2 we can support more cameras
144+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2) 144+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
145+ 145+
146 dnl enable once Signaling lands 146 dnl enable once Signaling lands
147 MOZ_WEBRTC_SIGNALING=1 147 MOZ_WEBRTC_SIGNALING=1
148 AC_DEFINE(MOZ_WEBRTC_SIGNALING) 148 AC_DEFINE(MOZ_WEBRTC_SIGNALING)
149@@ -5381,15 +5425,18 @@ AC_SUBST(MOZ_SRTP) 149@@ -5381,15 +5425,18 @@ AC_SUBST(MOZ_SRTP)
150  150
151 dnl Use integers over floats for audio on B2G and Android, because audio 151 dnl Use integers over floats for audio on B2G and Android, because audio
152 dnl backends for those platforms don't support floats. 152 dnl backends for those platforms don't support floats.
153-if test "$OS_TARGET" = "Android"; then 153-if test "$OS_TARGET" = "Android"; then
154+case "$target" in 154+case "$target" in
155+*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-openbsd*) 155+*-android*|*-linuxandroid*)
156 MOZ_SAMPLE_TYPE_S16=1 156 MOZ_SAMPLE_TYPE_S16=1
157 AC_DEFINE(MOZ_SAMPLE_TYPE_S16) 157 AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
158 AC_SUBST(MOZ_SAMPLE_TYPE_S16) 158 AC_SUBST(MOZ_SAMPLE_TYPE_S16)
159-else 159-else
160+;; 160+;;
161+*) 161+*)
162 MOZ_SAMPLE_TYPE_FLOAT32=1 162 MOZ_SAMPLE_TYPE_FLOAT32=1
163 AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32) 163 AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32)
164 AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32) 164 AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32)
165-fi 165-fi
166+;; 166+;;
167+esac 167+esac
168  168