[SM-Commit] GIT changes to master grimoire by George Sherwood (202e61bab07a8253d0047340958d01df74d5465a)

George Sherwood scm at sourcemage.org
Sat Aug 28 11:45:25 EDT 2010


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 http/firefox/BUILD   |    7 ++++++-
 http/firefox/DEPENDS |    6 +++++-
 http/firefox/DETAILS |    2 +-
 http/firefox/HISTORY |    5 +++++
 4 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 202e61bab07a8253d0047340958d01df74d5465a
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    firefox: Updated devel to version 4.0b4.  Added optional_depends
    for yasm to enable Webm Video

diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 98b8d2a..498a968 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -25,7 +25,12 @@ CFLAGS="${CFLAGS//-ffast-math/}"      &&
 CXXFLAGS="${CXXFLAGS//-ffast-math/}"  &&
 
 if [[ "$FIREFOX_CVS" == "y" ]]; then
-autoconf-2.13
+  autoconf-2.13 &&
+ 
+# workaround for configure not handling --disable-webm correctly
+  if [[ $OPTS =~ --disable-webm ]]; then
+   echo ac_add_options --disable-webm >> .mozconfig
+  fi
 fi &&
 
 # necko-wifi is part of xulrunner if enabled, but firefox
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 82281f1..249e60b 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -17,7 +17,11 @@ depends -sub APNG libpng                   &&
 depends  xulrunner
 else
 depends autoconf-2.13                      &&
-depends libnotify
+depends libnotify                          &&
+optional_depends yasm \
+                 "--enable-webm" \
+                 "--disable-webm" \
+                 "enables the WebM video format"
 fi                                         &&
 
 depends  gtk+2                             &&
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 31d2567..d309fbf 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
            SPELL=firefox
 if [[ $FIREFOX_CVS == y ]]; then
-         VERSION=4.0b3
+         VERSION=4.0b4
           SOURCE=$SPELL-$VERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 0add17a..dba8f8e 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2010-08-28 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 4.0b4
+	* DEPENDS: Optional depends on yasm
+	* BUILD: Add workaround to configure correctly for Webm video
+
 2010-08-13 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated devel to version 4.0b3
 



More information about the SM-Commit mailing list