svn commit: r395349 - in head: Mk mail/thunderbird/files www/firefox www/firefox-esr/files www/firefox/files www/libxul/files www/seamonkey/files

Wed Aug 26 06:38:35 UTC 2015

Author: jbeich
Date: Wed Aug 26 06:38:32 2015
New Revision: 395349
URL: https://svnweb.freebsd.org/changeset/ports/395349

Log:
  gecko: add INTEGER_SAMPLES option
  
  arm use S16 samples and libtremor since Firefox 34. So, adjust
  dependencies and make it controllable (for testing on x86).
  
  Note, arm is still BROKEN until ports/202642.
  
  https://bugzilla.mozilla.org/show_bug.cgi?id=1047791

Added:
  head/mail/thunderbird/files/patch-sample-type   (contents, props changed)
  head/www/firefox-esr/files/patch-sample-type   (contents, props changed)
  head/www/firefox/files/patch-sample-type   (contents, props changed)
  head/www/libxul/files/patch-sample-type   (contents, props changed)
  head/www/seamonkey/files/patch-sample-type   (contents, props changed)
Modified:
  head/Mk/bsd.gecko.mk
  head/www/firefox/Makefile.options

Modified: head/Mk/bsd.gecko.mk
==============================================================================

--- head/Mk/bsd.gecko.mk	Wed Aug 26 06:22:26 2015	(r395348)
+++ head/Mk/bsd.gecko.mk	Wed Aug 26 06:38:32 2015	(r395349)
@@ -142,7 +142,14 @@ MOZ_OPTIONS+=	--enable-jemalloc
 .endif # !DragonFly
 
 # Standard depends
-_ALL_DEPENDS=	cairo event ffi graphite harfbuzz hunspell icu jpeg nspr nss opus png pixman soundtouch sqlite vorbis vpx
+_ALL_DEPENDS=	cairo event ffi graphite harfbuzz hunspell icu jpeg nspr nss opus png pixman soundtouch sqlite vpx
+
+.if ${PORT_OPTIONS:MINTEGER_SAMPLES}
+MOZ_EXPORT+=	MOZ_INTEGER_SAMPLES=1
+_ALL_DEPENDS+=	tremor
+.else
+_ALL_DEPENDS+=	vorbis
+.endif
 
 .if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
 cairo_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
@@ -209,6 +216,9 @@ sqlite_MOZ_OPTIONS=	--enable-system-sqli
 theora_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
 theora_MOZ_OPTIONS=	--with-system-theora
 
+tremor_LIB_DEPENDS=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
+tremor_MOZ_OPTIONS=	--with-system-tremor --with-system-ogg
+
 vorbis_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 vorbis_MOZ_OPTIONS=	--with-system-vorbis --with-system-ogg
 .endif

Added: head/mail/thunderbird/files/patch-sample-type
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-sample-type	Wed Aug 26 06:38:32 2015	(r395349)
@@ -0,0 +1,13 @@
+# Let ports handle default sample type
+
+--- mozilla/configure.in~
++++ mozilla/configure.in
+@@ -5144,7 +5144,7 @@ dnl Use integers over floats for audio o
+ dnl (regarless of the CPU architecture, because audio
+ dnl backends for those platforms don't support floats. We also
+ dnl use integers on ARM with other OS, because it's more efficient.
+-if test "$OS_TARGET" = "Android" -o "$CPU_ARCH" = "arm"; then
++if test -n "$MOZ_INTEGER_SAMPLES"; then
+     MOZ_SAMPLE_TYPE_S16=1
+     AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
+     AC_SUBST(MOZ_SAMPLE_TYPE_S16)

Added: head/www/firefox-esr/files/patch-sample-type
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-sample-type	Wed Aug 26 06:38:32 2015	(r395349)
@@ -0,0 +1,13 @@
+# Let ports handle default sample type
+
+--- configure.in~
++++ configure.in
+@@ -5144,7 +5144,7 @@ dnl Use integers over floats for audio o
+ dnl (regarless of the CPU architecture, because audio
+ dnl backends for those platforms don't support floats. We also
+ dnl use integers on ARM with other OS, because it's more efficient.
+-if test "$OS_TARGET" = "Android" -o "$CPU_ARCH" = "arm"; then
++if test -n "$MOZ_INTEGER_SAMPLES"; then
+     MOZ_SAMPLE_TYPE_S16=1
+     AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
+     AC_SUBST(MOZ_SAMPLE_TYPE_S16)

Modified: head/www/firefox/Makefile.options
==============================================================================
--- head/www/firefox/Makefile.options	Wed Aug 26 06:22:26 2015	(r395348)
+++ head/www/firefox/Makefile.options	Wed Aug 26 06:38:32 2015	(r395349)
@@ -1,10 +1,11 @@
 # -*- makefile-bsdmake -*-
 
 OPTIONS_DEFINE+= 	BUNDLED_CAIRO CANBERRA DBUS DEBUG DTRACE GCONF GIO \
-			GNOMEUI GSTREAMER LIBPROXY LOGGING OPTIMIZED_CFLAGS \
-			PGO PROFILE TEST
+			GNOMEUI GSTREAMER INTEGER_SAMPLES LIBPROXY LOGGING \
+			OPTIMIZED_CFLAGS PGO PROFILE TEST
 
-OPTIONS_DEFAULT+=	ALSA DBUS GIO GSTREAMER LOGGING OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT+=	ALSA DBUS GIO GSTREAMER LOGGING OPTIMIZED_CFLAGS \
+			${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/INTEGER_SAMPLES/}
 
 OPTIONS_MULTI+=		AUDIO
 OPTIONS_MULTI_AUDIO=	ALSA PULSEAUDIO
@@ -13,6 +14,7 @@ BUNDLED_CAIRO_DESC?=	Use bundled fork of
 CANBERRA_DESC?=		Sound theme alerts
 ENIGMAIL_DESC?=		Enigmail extension
 GNOMEUI_DESC?=		libgnomeui support module
+INTEGER_SAMPLES_DESC?=	Integer audio sample format
 LIBPROXY_DESC?=		Proxy support via libproxy
 LIGHTNING_DESC?=	Calendar extension
 LOGGING_DESC?=		Additional log messages

Added: head/www/firefox/files/patch-sample-type
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/firefox/files/patch-sample-type	Wed Aug 26 06:38:32 2015	(r395349)
@@ -0,0 +1,13 @@
+# Let ports handle default sample type
+
+--- configure.in~
++++ configure.in
+@@ -5144,7 +5144,7 @@ dnl Use integers over floats for audio o
+ dnl (regarless of the CPU architecture, because audio
+ dnl backends for those platforms don't support floats. We also
+ dnl use integers on ARM with other OS, because it's more efficient.
+-if test "$OS_TARGET" = "Android" -o "$CPU_ARCH" = "arm"; then
++if test -n "$MOZ_INTEGER_SAMPLES"; then
+     MOZ_SAMPLE_TYPE_S16=1
+     AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
+     AC_SUBST(MOZ_SAMPLE_TYPE_S16)

Added: head/www/libxul/files/patch-sample-type
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/libxul/files/patch-sample-type	Wed Aug 26 06:38:32 2015	(r395349)
@@ -0,0 +1,13 @@
+# Let ports handle default sample type
+
+--- configure.in~
++++ configure.in
+@@ -5144,7 +5144,7 @@ dnl Use integers over floats for audio o
+ dnl (regarless of the CPU architecture, because audio
+ dnl backends for those platforms don't support floats. We also
+ dnl use integers on ARM with other OS, because it's more efficient.
+-if test "$OS_TARGET" = "Android" -o "$CPU_ARCH" = "arm"; then
++if test -n "$MOZ_INTEGER_SAMPLES"; then
+     MOZ_SAMPLE_TYPE_S16=1
+     AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
+     AC_SUBST(MOZ_SAMPLE_TYPE_S16)

Added: head/www/seamonkey/files/patch-sample-type
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/seamonkey/files/patch-sample-type	Wed Aug 26 06:38:32 2015	(r395349)
@@ -0,0 +1,13 @@
+# Let ports handle default sample type
+
+--- mozilla/configure.in~
++++ mozilla/configure.in
+@@ -5144,7 +5144,7 @@ dnl Use integers over floats for audio o
+ dnl (regarless of the CPU architecture, because audio
+ dnl backends for those platforms don't support floats. We also
+ dnl use integers on ARM with other OS, because it's more efficient.
+-if test "$OS_TARGET" = "Android" -o "$CPU_ARCH" = "arm"; then
++if test -n "$MOZ_INTEGER_SAMPLES"; then
+     MOZ_SAMPLE_TYPE_S16=1
+     AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
+     AC_SUBST(MOZ_SAMPLE_TYPE_S16)
