From owner-freebsd-gecko@FreeBSD.ORG  Tue Feb 11 21:11:23 2014
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3F1B5B36
 for <freebsd-gecko@freebsd.org>; Tue, 11 Feb 2014 21:11:23 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
 [217.150.244.247])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C3AC112BB
 for <freebsd-gecko@freebsd.org>; Tue, 11 Feb 2014 21:11:22 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.244.247])
 by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s1BLBJHr051527
 for <freebsd-gecko@freebsd.org>; Tue, 11 Feb 2014 21:11:19 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s1BLBEEU050995
 for freebsd-gecko@freebsd.org; Tue, 11 Feb 2014 21:11:14 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Tue, 11 Feb 2014 21:11:14 GMT
Message-Id: <201402112111.s1BLBEEU050995@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
 svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
Subject: [SVN-Commit] r1491 - in trunk/www: firefox-nightly/files firefox/files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko/>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Feb 2014 21:11:23 -0000

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],