Date: Thu, 1 Nov 2012 15:06:17 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1090 - trunk/www/firefox-nightly/files Message-ID: <201211011506.qA1F6HLP009836@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Nov 1 15:06:17 2012
New Revision: 1090
Log:
oops, forgot a few changes
Modified:
trunk/www/firefox-nightly/files/patch-bug807492
Modified: trunk/www/firefox-nightly/files/patch-bug807492
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492 Thu Nov 1 15:00:52 2012 (r1089)
+++ trunk/www/firefox-nightly/files/patch-bug807492 Thu Nov 1 15:06:17 2012 (r1090)
@@ -1,8 +1,8 @@
diff --git config/system-headers config/system-headers
-index f781c82..241036e 100644
+index 9bd1efa..1095a01 100644
--- config/system-headers
+++ config/system-headers
-@@ -1067,8 +1067,10 @@ gst/app/gstappsink.h
+@@ -1066,8 +1066,10 @@ gst/app/gstappsink.h
gst/app/gstappsrc.h
gst/video/video.h
sys/msg.h
@@ -14,7 +14,7 @@
+err.h
+xlocale.h
diff --git configure.in configure.in
-index bb7780f..07737f2 100644
+index bb7780f..7353b5e 100644
--- configure.in
+++ configure.in
@@ -1424,16 +1424,27 @@ if test "$GNU_CC"; then
@@ -55,7 +55,7 @@
MOZ_WEBRTC=
;;
- *-linux*|*-mingw*|*-darwin*)
-+ *-linux*|*-mingw*|*-darwin*|*-freebsd*)
++ *-linux*|*-mingw*|*-darwin*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
dnl Leave enabled
;;
*)
@@ -87,10 +87,10 @@
GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}"
diff --git js/src/config/system-headers js/src/config/system-headers
-index f781c82..241036e 100644
+index 9bd1efa..1095a01 100644
--- js/src/config/system-headers
+++ js/src/config/system-headers
-@@ -1067,8 +1067,10 @@ gst/app/gstappsink.h
+@@ -1066,8 +1066,10 @@ gst/app/gstappsink.h
gst/app/gstappsrc.h
gst/video/video.h
sys/msg.h
@@ -1922,6 +1922,36 @@
'include_dirs': [
'$(DEPTH)/dist/include',
],
+diff --git media/webrtc/trunk/tools/gyp/pylib/gyp/common.py media/webrtc/trunk/tools/gyp/pylib/gyp/common.py
+index 6144d2f..631c7b4 100644
+--- media/webrtc/trunk/tools/gyp/pylib/gyp/common.py
++++ media/webrtc/trunk/tools/gyp/pylib/gyp/common.py
+@@ -354,24 +354,20 @@ def WriteOnDiff(filename):
+
+ return Writer()
+
+
+ def GetFlavor(params):
+ """Returns |params.flavor| if it's set, the system's default flavor else."""
+ flavors = {
+ 'cygwin': 'win',
+- 'win32': 'win',
+ 'darwin': 'mac',
+ 'sunos5': 'solaris',
+- 'freebsd7': 'freebsd',
+- 'freebsd8': 'freebsd',
+- 'freebsd9': 'freebsd',
+ }
+- flavor = flavors.get(sys.platform, 'linux')
++ flavor = flavors.get(sys.platform, sys.platform.rstrip('0123456789'))
+ return params.get('flavor', flavor)
+
+
+ def CopyTool(flavor, out_path):
+ """Finds (mac|sun|win)_tool.gyp in the gyp directory and copies it
+ to |out_path|."""
+ prefix = { 'solaris': 'sun', 'mac': 'mac', 'win': 'win' }.get(flavor, None)
+ if not prefix:
diff --git media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
index 338d0b7..a2f81d1 100644
--- media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211011506.qA1F6HLP009836>