Date: Tue, 11 Feb 2014 21:11:14 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1491 - in trunk/www: firefox-nightly/files firefox/files Message-ID: <201402112111.s1BLBEEU050995@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Feb 11 21:11:14 2014
New Revision: 1491
Log:
unbreak disabling gstreamer
Modified:
trunk/www/firefox-nightly/files/patch-bug806917
trunk/www/firefox/files/patch-bug806917
Modified: trunk/www/firefox-nightly/files/patch-bug806917
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug806917 Tue Feb 11 11:39:22 2014 (r1490)
+++ trunk/www/firefox-nightly/files/patch-bug806917 Tue Feb 11 21:11:14 2014 (r1491)
@@ -30,7 +30,7 @@
MOZ_DIRECTSHOW=
MOZ_WMF=
MOZ_FMP4=
-@@ -5634,44 +5635,59 @@ WINNT|Darwin|Android)
+@@ -5634,44 +5635,61 @@ WINNT|Darwin|Android)
;;
*)
MOZ_GSTREAMER=1
@@ -51,6 +51,8 @@
+ # API version, eg 0.10, 1.0 etc
+ if test -z "$enableval" -o "$enableval" = "yes"; then
GST_API_VERSION=0.10
++ elif test "$enableval" = "no"; then
++ MOZ_GSTREAMER=
+ else
+ GST_API_VERSION=$enableval
+ fi],
Modified: trunk/www/firefox/files/patch-bug806917
==============================================================================
--- trunk/www/firefox/files/patch-bug806917 Tue Feb 11 11:39:22 2014 (r1490)
+++ trunk/www/firefox/files/patch-bug806917 Tue Feb 11 21:11:14 2014 (r1491)
@@ -30,7 +30,7 @@
MOZ_DIRECTSHOW=
MOZ_WMF=
MOZ_FMP4=
-@@ -5606,43 +5607,58 @@ dnl = Enable GStreamer
+@@ -5606,43 +5607,60 @@ dnl = Enable GStreamer
dnl ========================================================
if test "$OS_TARGET" = "Linux"; then
MOZ_GSTREAMER=1
@@ -50,6 +50,8 @@
+ # API version, eg 0.10, 1.0 etc
+ if test -z "$enableval" -o "$enableval" = "yes"; then
GST_API_VERSION=0.10
++ elif test "$enableval" = "no"; then
++ MOZ_GSTREAMER=
+ else
+ GST_API_VERSION=$enableval
+ fi],
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402112111.s1BLBEEU050995>