[SVN-Commit] r1576 - in trunk: . Mk www/firefox www/firefox-nightly www/seamonkey

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sat Apr 19 22:35:11 2014
New Revision: 1576

Log:
backout r1571 and instead require gst-libav with the fix

gst-libav-1.2.4 was released at 2014-04-18 while firefox-29.0 is
expected at 2014-04-29 leaving slightly more than a week for
multimedia@ team to act. gecko@ seems to be the only consumer
of gstreamer 1.x ports, anyway.

PR:		ports/188133

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

Modified: trunk/Gecko_ChangeLog
==============================================================================
--- trunk/Gecko_ChangeLog	Thu Apr 17 23:16:55 2014	(r1575)
+++ trunk/Gecko_ChangeLog	Sat Apr 19 22:35:11 2014	(r1576)
@@ -1,6 +1,6 @@
 - use port dependency for soundtouch library
 - require recent graphite2 version explicitly [1]
-- switch back to multimedia/gstreamer until seek crash is resolved [2]
+- require gst-libav version that doesn't crash on seeking [2]
 
 PR:	ports/187939 [1]
 PR:	ports/188133 [2]

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Thu Apr 17 23:16:55 2014	(r1575)
+++ trunk/Mk/bsd.gecko.mk	Sat Apr 19 22:35:11 2014	(r1576)
@@ -728,8 +728,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MGSTREAMER}
-.if 0 # XXX seeking crashes (bug 991588)
-#. if ${MOZILLA_VER:R:R} >= 30 || exists(${FILESDIR}/patch-bug806917)
+. if ${MOZILLA_VER:R:R} >= 30 || exists(${FILESDIR}/patch-bug806917)
 USE_GSTREAMER1?=good libav
 MOZ_OPTIONS+=	--enable-gstreamer=1.0
 . else

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Thu Apr 17 23:16:55 2014	(r1575)
+++ trunk/www/firefox-nightly/Makefile	Sat Apr 19 22:35:11 2014	(r1576)
@@ -93,6 +93,10 @@
 BUILD_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
 .endif
 
+.if ${PORT_OPTIONS:MGSTREAMER}
+BUILD_DEPENDS+=	gstreamer1-libav>=1.2.4:${PORTSDIR}/multimedia/gstreamer1-libav
+.endif
+
 .if ! ${PORT_OPTIONS:MMACH}
 GNU_CONFIGURE=	yes
 .endif

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Thu Apr 17 23:16:55 2014	(r1575)
+++ trunk/www/firefox/Makefile	Sat Apr 19 22:35:11 2014	(r1576)
@@ -81,6 +81,10 @@
 BUILD_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
 .endif
 
+.if ${PORT_OPTIONS:MGSTREAMER}
+BUILD_DEPENDS+=	gstreamer1-libav>=1.2.4:${PORTSDIR}/multimedia/gstreamer1-libav
+.endif
+
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Thu Apr 17 23:16:55 2014	(r1575)
+++ trunk/www/seamonkey/Makefile	Sat Apr 19 22:35:11 2014	(r1576)
@@ -106,6 +106,10 @@
 BUILD_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
 .endif
 
+.if ${PORT_OPTIONS:MGSTREAMER}
+BUILD_DEPENDS+=	gstreamer1-libav>=1.2.4:${PORTSDIR}/multimedia/gstreamer1-libav
+.endif
+
 .if ! ${PORT_OPTIONS:MMAILNEWS}
 MOZ_OPTIONS+=	--disable-ldap --disable-mailnews
 .else