Date: Thu, 30 Aug 2012 04:06:07 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r964 - in branches/experimental: Mk mail/thunderbird/files www/firefox-nightly/files www/firefox/files www/seamonkey/files Message-ID: <201208300406.q7U467Cj033766@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Aug 30 04:06:07 2012
New Revision: 964
Log:
use s16le sample format with ALSA
Added:
branches/experimental/mail/thunderbird/files/extra-bug780531
branches/experimental/www/firefox-nightly/files/extra-bug780531
branches/experimental/www/firefox/files/extra-bug780531
branches/experimental/www/seamonkey/files/extra-bug780531
Modified:
branches/experimental/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Thu Aug 30 04:05:56 2012 (r963)
+++ branches/experimental/Mk/bsd.gecko.mk Thu Aug 30 04:06:07 2012 (r964)
@@ -724,7 +724,9 @@
LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib
RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
MOZ_OPTIONS+= --enable-alsa
-MOZ_OPTIONS+= --disable-floating-point # bug780531
+. if exists(${FILESDIR}/extra-bug780531)
+EXTRA_PATCHES+= ${FILESDIR}/extra-bug780531
+. endif
.endif
.if ${PORT_OPTIONS:MPULSEAUDIO}
Added: branches/experimental/mail/thunderbird/files/extra-bug780531
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/extra-bug780531 Thu Aug 30 04:06:07 2012 (r964)
@@ -0,0 +1,34 @@
+--- mozilla/configure.in~
++++ mozilla/configure.in
+@@ -5585,10 +5585,13 @@ if test -n "$MOZ_OGG"; then
+ MOZ_SYDNEYAUDIO=1
+ MOZ_CUBEB=1
+ MOZ_MEDIA=1
+- case "$target_cpu" in
+- arm*)
++ case "$target" in
++ arm-*-linux*)
+ MOZ_TREMOR=1
+ ;;
++ *-freebsd*)
++ MOZ_TREMOR=1
++ ;;
+ *)
+ MOZ_VORBIS=1
+ ;;
+@@ -5715,10 +5720,13 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
+ MOZ_SYDNEYAUDIO=1
+ MOZ_CUBEB=1
+ MOZ_MEDIA=1
+- case "$target_cpu" in
+- arm*)
++ case "$target" in
++ arm-*-linux*)
+ MOZ_TREMOR=1
+ ;;
++ *-freebsd*)
++ MOZ_TREMOR=1
++ ;;
+ *)
+ MOZ_VORBIS=1
+ ;;
Added: branches/experimental/www/firefox-nightly/files/extra-bug780531
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/extra-bug780531 Thu Aug 30 04:06:07 2012 (r964)
@@ -0,0 +1,22 @@
+--- configure.in~
++++ configure.in
+@@ -5151,12 +5148,17 @@ fi
+
+ AC_SUBST(MOZ_WEBRTC)
+
+-case "$target_cpu" in
+-arm*)
++case "$target" in
++arm-*-linux*)
+ MOZ_SAMPLE_TYPE_S16LE=1
+ AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE)
+ AC_SUBST(MOZ_SAMPLE_TYPE_S16LE)
+ ;;
++*-freebsd*)
++ MOZ_SAMPLE_TYPE_S16LE=1
++ AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE)
++ AC_SUBST(MOZ_SAMPLE_TYPE_S16LE)
++;;
+ *)
+ MOZ_SAMPLE_TYPE_FLOAT32=1
+ AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32)
Added: branches/experimental/www/firefox/files/extra-bug780531
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/extra-bug780531 Thu Aug 30 04:06:07 2012 (r964)
@@ -0,0 +1,34 @@
+--- configure.in~
++++ configure.in
+@@ -5585,10 +5585,13 @@ if test -n "$MOZ_OGG"; then
+ MOZ_SYDNEYAUDIO=1
+ MOZ_CUBEB=1
+ MOZ_MEDIA=1
+- case "$target_cpu" in
+- arm*)
++ case "$target" in
++ arm-*-linux*)
+ MOZ_TREMOR=1
+ ;;
++ *-freebsd*)
++ MOZ_TREMOR=1
++ ;;
+ *)
+ MOZ_VORBIS=1
+ ;;
+@@ -5715,10 +5720,13 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
+ MOZ_SYDNEYAUDIO=1
+ MOZ_CUBEB=1
+ MOZ_MEDIA=1
+- case "$target_cpu" in
+- arm*)
++ case "$target" in
++ arm-*-linux*)
+ MOZ_TREMOR=1
+ ;;
++ *-freebsd*)
++ MOZ_TREMOR=1
++ ;;
+ *)
+ MOZ_VORBIS=1
+ ;;
Added: branches/experimental/www/seamonkey/files/extra-bug780531
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/extra-bug780531 Thu Aug 30 04:06:07 2012 (r964)
@@ -0,0 +1,34 @@
+--- mozilla/configure.in~
++++ mozilla/configure.in
+@@ -5585,10 +5585,13 @@ if test -n "$MOZ_OGG"; then
+ MOZ_SYDNEYAUDIO=1
+ MOZ_CUBEB=1
+ MOZ_MEDIA=1
+- case "$target_cpu" in
+- arm*)
++ case "$target" in
++ arm-*-linux*)
+ MOZ_TREMOR=1
+ ;;
++ *-freebsd*)
++ MOZ_TREMOR=1
++ ;;
+ *)
+ MOZ_VORBIS=1
+ ;;
+@@ -5715,10 +5720,13 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
+ MOZ_SYDNEYAUDIO=1
+ MOZ_CUBEB=1
+ MOZ_MEDIA=1
+- case "$target_cpu" in
+- arm*)
++ case "$target" in
++ arm-*-linux*)
+ MOZ_TREMOR=1
+ ;;
++ *-freebsd*)
++ MOZ_TREMOR=1
++ ;;
+ *)
+ MOZ_VORBIS=1
+ ;;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208300406.q7U467Cj033766>