Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Nov 2013 20:25:30 GMT
From:      svn-freebsd-gecko@chruetertee.ch
To:        freebsd-gecko@freebsd.org
Subject:   [SVN-Commit] r1385 - in trunk: mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/linux-tor-browser www/linux-tor-browser/files
Message-ID:  <201311152025.rAFKPUIa051871@trillian.chruetertee.ch>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Nov 15 20:25:30 2013
New Revision: 1385

Log:
just let alsa convert float samples

Unlike the workaround from bug 780531 always using S16 samples, ALSA
can convert them to S32 if ARIFF_OSS option is enabled (ports/183861).

PR:		ports/184006

Deleted:
   trunk/mail/thunderbird/files/extra-bug780531
   trunk/www/firefox-esr/files/extra-bug780531
   trunk/www/firefox-nightly/files/extra-bug780531
   trunk/www/firefox/files/extra-bug780531
   trunk/www/libxul/files/extra-bug780531
   trunk/www/linux-tor-browser/files/freebsd.js
Modified:
   trunk/www/linux-tor-browser/Makefile
   trunk/www/linux-tor-browser/pkg-plist

Deleted: trunk/mail/thunderbird/files/extra-bug780531
==============================================================================
--- trunk/mail/thunderbird/files/extra-bug780531	Fri Nov 15 20:25:30 2013	(r1384)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,24 +0,0 @@
---- mozilla/configure.in~
-+++ mozilla/configure.in
-@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP)
- 
- 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
-+*-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

Deleted: trunk/www/firefox-esr/files/extra-bug780531
==============================================================================
--- trunk/www/firefox-esr/files/extra-bug780531	Fri Nov 15 20:25:30 2013	(r1384)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,24 +0,0 @@
---- configure.in~
-+++ configure.in
-@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP)
- 
- 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
-+*-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

Deleted: trunk/www/firefox-nightly/files/extra-bug780531
==============================================================================
--- trunk/www/firefox-nightly/files/extra-bug780531	Fri Nov 15 20:25:30 2013	(r1384)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,24 +0,0 @@
---- configure.in~
-+++ configure.in
-@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP)
- 
- 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
-+*-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

Deleted: trunk/www/firefox/files/extra-bug780531
==============================================================================
--- trunk/www/firefox/files/extra-bug780531	Fri Nov 15 20:25:30 2013	(r1384)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,24 +0,0 @@
---- configure.in~
-+++ configure.in
-@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP)
- 
- 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
-+*-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

Deleted: trunk/www/libxul/files/extra-bug780531
==============================================================================
--- trunk/www/libxul/files/extra-bug780531	Fri Nov 15 20:25:30 2013	(r1384)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,24 +0,0 @@
---- configure.in~
-+++ configure.in
-@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP)
- 
- 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
-+*-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/linux-tor-browser/Makefile
==============================================================================
--- trunk/www/linux-tor-browser/Makefile	Fri Nov 15 08:35:49 2013	(r1384)
+++ trunk/www/linux-tor-browser/Makefile	Fri Nov 15 20:25:30 2013	(r1385)
@@ -111,10 +111,6 @@
 	@${LN} -sf ${LOCALBASE}/lib/browser_plugins/symlinks/linux-firefox \
 		${WRKSRC}/App/Firefox/plugins
 
-	@${MKDIR} ${WRKSRC}/App/Firefox/defaults/preferences
-	@${CP} ${FILESDIR}/freebsd.js \
-		${WRKSRC}/App/Firefox/defaults/preferences/
-
 post-patch:
 	@${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/start-tor-browser

Deleted: trunk/www/linux-tor-browser/files/freebsd.js
==============================================================================
--- trunk/www/linux-tor-browser/files/freebsd.js	Fri Nov 15 20:25:30 2013	(r1384)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,2 +0,0 @@
-// no AFMT_FLOAT support in kernel (firefox bug 780531)
-pref("media.use_cubeb", false);

Modified: trunk/www/linux-tor-browser/pkg-plist
==============================================================================
--- trunk/www/linux-tor-browser/pkg-plist	Fri Nov 15 08:35:49 2013	(r1384)
+++ trunk/www/linux-tor-browser/pkg-plist	Fri Nov 15 20:25:30 2013	(r1385)
@@ -7,7 +7,6 @@
 lib/linux-tor-browser/App/Firefox/components/libbrowsercomps.so
 lib/linux-tor-browser/App/Firefox/components/libdbusservice.so
 lib/linux-tor-browser/App/Firefox/defaults/pref/channel-prefs.js
-lib/linux-tor-browser/App/Firefox/defaults/preferences/freebsd.js
 lib/linux-tor-browser/App/Firefox/defaults/profile/bookmarks.html
 lib/linux-tor-browser/App/Firefox/defaults/profile/preferences/extension-overrides.js
 lib/linux-tor-browser/App/Firefox/dependentlibs.list
@@ -338,7 +337,6 @@
 @dirrm lib/linux-tor-browser/App/Firefox/dictionaries
 @dirrm lib/linux-tor-browser/App/Firefox/defaults/profile/preferences
 @dirrm lib/linux-tor-browser/App/Firefox/defaults/profile
-@dirrm lib/linux-tor-browser/App/Firefox/defaults/preferences
 @dirrm lib/linux-tor-browser/App/Firefox/defaults/pref
 @dirrm lib/linux-tor-browser/App/Firefox/defaults
 @dirrm lib/linux-tor-browser/App/Firefox/components



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311152025.rAFKPUIa051871>