[SVN-Commit] r1337 - in trunk: . Mk mail/thunderbird www/firefox www/firefox-nightly www/seamonkey

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Wed Aug 28 23:16:02 UTC 2013 

Author: jbeich
Date: Wed Aug 28 23:15:53 2013
New Revision: 1337

Log:
nuke WEBRTC option

Modified:
   trunk/Gecko_ChangeLog
   trunk/Gecko_TODO
   trunk/Mk/bsd.gecko.mk
   trunk/mail/thunderbird/Makefile
   trunk/www/firefox-nightly/Makefile
   trunk/www/firefox/Makefile
   trunk/www/firefox/Makefile.options
   trunk/www/seamonkey/Makefile

Modified: trunk/Gecko_ChangeLog
==============================================================================
--- trunk/Gecko_ChangeLog	Sun Aug 25 08:04:19 2013	(r1336)
+++ trunk/Gecko_ChangeLog	Wed Aug 28 23:15:53 2013	(r1337)
@@ -1,2 +1,3 @@
 24.0:
 - enable GSTREAMER by default for html5 with h264/aac/mp3
+- WEBRTC is now always built

Modified: trunk/Gecko_TODO
==============================================================================
--- trunk/Gecko_TODO	Sun Aug 25 08:04:19 2013	(r1336)
+++ trunk/Gecko_TODO	Wed Aug 28 23:15:53 2013	(r1337)
@@ -28,5 +28,4 @@
 
 jbeich:
 - remove 9.0 support at esr24
-- remove WEBRTC option at 22.0 -> always build with
 - switch to --ignore-unresolved-symbol (waiting for binutils 2.24)

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Sun Aug 25 08:04:19 2013	(r1336)
+++ trunk/Mk/bsd.gecko.mk	Wed Aug 28 23:15:53 2013	(r1337)
@@ -772,16 +772,6 @@
 . endif
 .endif
 
-.if ${PORT_OPTIONS:MWEBRTC}
-BUILD_DEPENDS+=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS+=	v4l2:${PORTSDIR}/multimedia/libv4l
-. if ${PORT_OPTIONS:MOSS}
-IGNORE=		WEBRTC works only with ALSA and PULSEAUDIO audio backends
-. endif
-.else
-MOZ_OPTIONS+=	--disable-webrtc
-.endif
-
 .if ${PORT_OPTIONS:MALSA}
 LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
 RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins

Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile	Sun Aug 25 08:04:19 2013	(r1336)
+++ trunk/mail/thunderbird/Makefile	Wed Aug 28 23:15:53 2013	(r1337)
@@ -16,7 +16,9 @@
 		sqlite3>=3.7.16.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
+		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
 		unzip:${PORTSDIR}/archivers/unzip
+LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
 EM_VERSION=	1.5.2
 L_VERSION=	2.6b1
@@ -50,8 +52,8 @@
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
 MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 
-OPTIONS_DEFINE=	ENIGMAIL LIGHTNING WEBRTC
-OPTIONS_DEFAULT=ENIGMAIL LIGHTNING WEBRTC
+OPTIONS_DEFINE=	ENIGMAIL LIGHTNING
+OPTIONS_DEFAULT=ENIGMAIL LIGHTNING
 
 # non-client.mk objdir build broken after bug 846540
 .undef GNU_CONFIGURE

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Sun Aug 25 08:04:19 2013	(r1336)
+++ trunk/www/firefox-nightly/Makefile	Wed Aug 28 23:15:53 2013	(r1337)
@@ -17,9 +17,12 @@
 		sqlite3>=3.7.17:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
+		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
 		unzip:${PORTSDIR}/archivers/unzip
 #		nss>=3.15:${PORTSDIR}/security/nss \
 
+LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=2.7
 OBJDIR_BUILD=	# in-tree build broken after bug 789837
@@ -47,8 +50,7 @@
 MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
 		--enable-application=browser
 
-OPTIONS_DEFINE=	WEBRTC
-OPTIONS_DEFAULT=GSTREAMER GTK2 WEBRTC
+OPTIONS_DEFAULT=GSTREAMER GTK2
 
 OPTIONS_SINGLE+=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Sun Aug 25 08:04:19 2013	(r1336)
+++ trunk/www/firefox/Makefile	Wed Aug 28 23:15:53 2013	(r1337)
@@ -17,7 +17,9 @@
 		sqlite3>=3.7.16.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
+		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
 		unzip:${PORTSDIR}/archivers/unzip
+LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=-2.7
@@ -45,8 +47,7 @@
 		--enable-application=browser \
 		--enable-official-branding
 
-OPTIONS_DEFINE=	WEBRTC
-OPTIONS_DEFAULT=GSTREAMER WEBRTC
+OPTIONS_DEFAULT=GSTREAMER
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 

Modified: trunk/www/firefox/Makefile.options
==============================================================================
--- trunk/www/firefox/Makefile.options	Sun Aug 25 08:04:19 2013	(r1336)
+++ trunk/www/firefox/Makefile.options	Wed Aug 28 23:15:53 2013	(r1337)
@@ -13,4 +13,3 @@
 LIBPROXY_DESC?=		Proxy support via libproxy
 LIGHTNING_DESC?=	Calendar extension
 LOGGING_DESC?=		Additional log messages
-WEBRTC_DESC?=		Web Real-Time Communication

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Sun Aug 25 08:04:19 2013	(r1336)
+++ trunk/www/seamonkey/Makefile	Wed Aug 28 23:15:53 2013	(r1337)
@@ -16,7 +16,9 @@
 		nss>=3.15:${PORTSDIR}/security/nss \
 		sqlite3>=3.7.16.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
+		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
 		unzip:${PORTSDIR}/archivers/unzip
+LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
 EM_VERSION=	1.5.2
 L_VERSION=	2.6b1
@@ -45,8 +47,8 @@
 
 NOT_FOR_ARCHS=	ia64
 
-OPTIONS_DEFINE=	CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS WEBRTC
-OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL GSTREAMER LDAP LIGHTNING MAILNEWS WEBRTC
+OPTIONS_DEFINE=	CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS
+OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL GSTREAMER LDAP LIGHTNING MAILNEWS
 
 CHATZILLA_DESC?=Chatzilla IRC module
 COMPOSER_DESC?=	HTML Composer module

More information about the freebsd-gecko mailing list