[SVN-Commit] r1189 - in trunk/www: firefox-nightly/files firefox/files
svn-freebsd-gecko at chruetertee.ch
svn-freebsd-gecko at chruetertee.ch
Sun Feb 24 03:54:23 UTC 2013
Author: jbeich
Date: Sun Feb 24 03:54:15 2013
New Revision: 1189
Log:
r1183 followup: more freebsd 9.0 fixes from upstream
Added:
trunk/www/firefox-nightly/files/patch-bug836824
trunk/www/firefox/files/patch-bug827521
trunk/www/firefox/files/patch-bug836824
Deleted:
trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp
trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp
Added: trunk/www/firefox-nightly/files/patch-bug836824
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug836824 Sun Feb 24 03:54:15 2013 (r1189)
@@ -0,0 +1,33 @@
+commit 35107a0 (HEAD)
+Author: Paul Adenot <paul at paul.cx>
+Date: Mon Feb 4 20:21:19 2013 +0100
+
+ Bug 836824 - libsoundtouch fails to build due to __get_cpuid() invocation, if you don't have xcode command line tools. r=
+---
+ media/libsoundtouch/moz-libsoundtouch.patch | 24 ++++++++++++++++++++++++
+ media/libsoundtouch/src/cpu_detect_x86.cpp | 5 ++++-
+ 2 files changed, 28 insertions(+), 1 deletion(-)
+
+diff --git media/libsoundtouch/src/cpu_detect_x86.cpp media/libsoundtouch/src/cpu_detect_x86.cpp
+index a42008e..7a31aa9 100644
+--- media/libsoundtouch/src/cpu_detect_x86.cpp
++++ media/libsoundtouch/src/cpu_detect_x86.cpp
+@@ -101,7 +101,7 @@ uint detectCPUextensions(void)
+
+ uint res = 0;
+
+-#if defined(__GNUC__)
++#if defined(__GNUC__) && defined(HAVE_CPUID_H)
+ // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support.
+ uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable.
+
+@@ -112,6 +112,9 @@ uint detectCPUextensions(void)
+ if (edx & bit_SSE) res = res | SUPPORT_SSE;
+ if (edx & bit_SSE2) res = res | SUPPORT_SSE2;
+
++#elif defined(__GNUC__)
++ // No cpuid.h --> no cpuid support
++ return 0;
+ #else
+ // Window / VS version of cpuid. Notice that Visual Studio 2005 or later required
+ // for __cpuid intrinsic support.
Deleted: trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp
==============================================================================
--- trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp Sun Feb 24 03:54:15 2013 (r1188)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,14 +0,0 @@
---- media/libsoundtouch/src/cpu_detect_x86.cpp~
-+++ media/libsoundtouch/src/cpu_detect_x86.cpp
-@@ -101,7 +101,10 @@ uint detectCPUextensions(void)
-
- uint res = 0;
-
--#if defined(__GNUC__)
-+#if defined(__clang__) && __clang_minor__ == 0
-+ // No __get_cpuid() on FreeBSD 9.0 with Clang 3.0
-+ return 0;
-+#elif defined(__GNUC__)
- // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support.
- uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable.
-
Added: trunk/www/firefox/files/patch-bug827521
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug827521 Sun Feb 24 03:54:15 2013 (r1189)
@@ -0,0 +1,147 @@
+commit ab46441
+Author: Graeme McCutcheon <graememcc_firefox at graeme-online.co.uk>
+Date: Thu Jan 10 14:37:30 2013 +0000
+
+ Bug 827521 - Work around spurious operator ambiguity errors in buggy versions of Clang. r=longsonr
+---
+ .../svg/content/src/SVGAnimatedPreserveAspectRatio.cpp | 17 ++++++++---------
+ .../svg/content/src/SVGAnimatedPreserveAspectRatio.h | 7 +++----
+ content/svg/content/src/SVGPreserveAspectRatio.h | 17 +++++++++++++----
+ 3 files changed, 24 insertions(+), 17 deletions(-)
+
+diff --git content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp
+index 6593461..56956b2 100644
+--- content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp
++++ content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp
+@@ -54,7 +54,7 @@ GetAlignForString(const nsAString &aAlignString)
+ {
+ for (uint32_t i = 0 ; i < ArrayLength(sAlignStrings) ; i++) {
+ if (aAlignString.EqualsASCII(sAlignStrings[i])) {
+- return (i + SVG_PRESERVEASPECTRATIO_NONE);
++ return (i + SVG_ALIGN_MIN_VALID);
+ }
+ }
+
+@@ -65,12 +65,11 @@ static void
+ GetAlignString(nsAString& aAlignString, uint16_t aAlign)
+ {
+ NS_ASSERTION(
+- aAlign >= SVG_PRESERVEASPECTRATIO_NONE &&
+- aAlign <= SVG_PRESERVEASPECTRATIO_XMAXYMAX,
++ aAlign >= SVG_ALIGN_MIN_VALID && aAlign <= SVG_ALIGN_MAX_VALID,
+ "Unknown align");
+
+ aAlignString.AssignASCII(
+- sAlignStrings[aAlign - SVG_PRESERVEASPECTRATIO_NONE]);
++ sAlignStrings[aAlign - SVG_ALIGN_MIN_VALID]);
+ }
+
+ static uint16_t
+@@ -78,7 +77,7 @@ GetMeetOrSliceForString(const nsAString &aMeetOrSlice)
+ {
+ for (uint32_t i = 0 ; i < ArrayLength(sMeetOrSliceStrings) ; i++) {
+ if (aMeetOrSlice.EqualsASCII(sMeetOrSliceStrings[i])) {
+- return (i + SVG_MEETORSLICE_MEET);
++ return (i + SVG_MEETORSLICE_MIN_VALID);
+ }
+ }
+
+@@ -89,12 +88,12 @@ static void
+ GetMeetOrSliceString(nsAString& aMeetOrSliceString, uint16_t aMeetOrSlice)
+ {
+ NS_ASSERTION(
+- aMeetOrSlice >= SVG_MEETORSLICE_MEET &&
+- aMeetOrSlice <= SVG_MEETORSLICE_SLICE,
++ aMeetOrSlice >= SVG_MEETORSLICE_MIN_VALID &&
++ aMeetOrSlice <= SVG_MEETORSLICE_MAX_VALID,
+ "Unknown meetOrSlice");
+
+ aMeetOrSliceString.AssignASCII(
+- sMeetOrSliceStrings[aMeetOrSlice - SVG_MEETORSLICE_MEET]);
++ sMeetOrSliceStrings[aMeetOrSlice - SVG_MEETORSLICE_MIN_VALID]);
+ }
+
+ already_AddRefed<DOMSVGPreserveAspectRatio>
+@@ -226,7 +225,7 @@ SVGAnimatedPreserveAspectRatio::GetBaseValueString(
+ GetAlignString(tmpString, mBaseVal.mAlign);
+ aValueAsString.Append(tmpString);
+
+- if (mBaseVal.mAlign != SVG_PRESERVEASPECTRATIO_NONE) {
++ if (mBaseVal.mAlign != uint8_t(SVG_PRESERVEASPECTRATIO_NONE)) {
+
+ aValueAsString.AppendLiteral(" ");
+ GetMeetOrSliceString(tmpString, mBaseVal.mMeetOrSlice);
+diff --git content/svg/content/src/SVGAnimatedPreserveAspectRatio.h content/svg/content/src/SVGAnimatedPreserveAspectRatio.h
+index 61cfba7..b08fb60 100644
+--- content/svg/content/src/SVGAnimatedPreserveAspectRatio.h
++++ content/svg/content/src/SVGAnimatedPreserveAspectRatio.h
+@@ -42,8 +42,7 @@ public:
+ void SetBaseValue(const SVGPreserveAspectRatio &aValue,
+ nsSVGElement *aSVGElement);
+ nsresult SetBaseAlign(uint16_t aAlign, nsSVGElement *aSVGElement) {
+- if (aAlign < SVG_PRESERVEASPECTRATIO_NONE ||
+- aAlign > SVG_PRESERVEASPECTRATIO_XMAXYMAX) {
++ if (aAlign < SVG_ALIGN_MIN_VALID || aAlign > SVG_ALIGN_MAX_VALID) {
+ return NS_ERROR_FAILURE;
+ }
+ SetBaseValue(SVGPreserveAspectRatio(
+@@ -53,8 +52,8 @@ public:
+ return NS_OK;
+ }
+ nsresult SetBaseMeetOrSlice(uint16_t aMeetOrSlice, nsSVGElement *aSVGElement) {
+- if (aMeetOrSlice < SVG_MEETORSLICE_MEET ||
+- aMeetOrSlice > SVG_MEETORSLICE_SLICE) {
++ if (aMeetOrSlice < SVG_MEETORSLICE_MIN_VALID ||
++ aMeetOrSlice > SVG_MEETORSLICE_MAX_VALID) {
+ return NS_ERROR_FAILURE;
+ }
+ SetBaseValue(SVGPreserveAspectRatio(
+diff --git content/svg/content/src/SVGPreserveAspectRatio.h content/svg/content/src/SVGPreserveAspectRatio.h
+index 066ad52..ebe724e 100644
+--- content/svg/content/src/SVGPreserveAspectRatio.h
++++ content/svg/content/src/SVGPreserveAspectRatio.h
+@@ -28,6 +28,11 @@ enum SVGAlign MOZ_ENUM_TYPE(uint8_t) {
+ SVG_PRESERVEASPECTRATIO_XMAXYMAX = 10
+ };
+
++// These constants represent the range of valid enum values for the <align>
++// parameter. They exclude the sentinel _UNKNOWN value.
++const uint16_t SVG_ALIGN_MIN_VALID = SVG_PRESERVEASPECTRATIO_NONE;
++const uint16_t SVG_ALIGN_MAX_VALID = SVG_PRESERVEASPECTRATIO_XMAXYMAX;
++
+ // Meet-or-slice Types
+ enum SVGMeetOrSlice MOZ_ENUM_TYPE(uint8_t) {
+ SVG_MEETORSLICE_UNKNOWN = 0,
+@@ -35,6 +40,11 @@ enum SVGMeetOrSlice MOZ_ENUM_TYPE(uint8_t) {
+ SVG_MEETORSLICE_SLICE = 2
+ };
+
++// These constants represent the range of valid enum values for the
++// <meetOrSlice> parameter. They exclude the sentinel _UNKNOWN value.
++const uint16_t SVG_MEETORSLICE_MIN_VALID = SVG_MEETORSLICE_MEET;
++const uint16_t SVG_MEETORSLICE_MAX_VALID = SVG_MEETORSLICE_SLICE;
++
+ class SVGAnimatedPreserveAspectRatio;
+
+ class SVGPreserveAspectRatio MOZ_FINAL
+@@ -57,8 +67,7 @@ public:
+ {}
+
+ nsresult SetAlign(uint16_t aAlign) {
+- if (aAlign < SVG_PRESERVEASPECTRATIO_NONE ||
+- aAlign > SVG_PRESERVEASPECTRATIO_XMAXYMAX)
++ if (aAlign < SVG_ALIGN_MIN_VALID || aAlign > SVG_ALIGN_MAX_VALID)
+ return NS_ERROR_FAILURE;
+ mAlign = static_cast<uint8_t>(aAlign);
+ return NS_OK;
+@@ -69,8 +78,8 @@ public:
+ }
+
+ nsresult SetMeetOrSlice(uint16_t aMeetOrSlice) {
+- if (aMeetOrSlice < SVG_MEETORSLICE_MEET ||
+- aMeetOrSlice > SVG_MEETORSLICE_SLICE)
++ if (aMeetOrSlice < SVG_MEETORSLICE_MIN_VALID ||
++ aMeetOrSlice > SVG_MEETORSLICE_MAX_VALID)
+ return NS_ERROR_FAILURE;
+ mMeetOrSlice = static_cast<uint8_t>(aMeetOrSlice);
+ return NS_OK;
Added: trunk/www/firefox/files/patch-bug836824
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug836824 Sun Feb 24 03:54:15 2013 (r1189)
@@ -0,0 +1,33 @@
+commit 35107a0 (HEAD)
+Author: Paul Adenot <paul at paul.cx>
+Date: Mon Feb 4 20:21:19 2013 +0100
+
+ Bug 836824 - libsoundtouch fails to build due to __get_cpuid() invocation, if you don't have xcode command line tools. r=
+---
+ media/libsoundtouch/moz-libsoundtouch.patch | 24 ++++++++++++++++++++++++
+ media/libsoundtouch/src/cpu_detect_x86.cpp | 5 ++++-
+ 2 files changed, 28 insertions(+), 1 deletion(-)
+
+diff --git media/libsoundtouch/src/cpu_detect_x86.cpp media/libsoundtouch/src/cpu_detect_x86.cpp
+index a42008e..7a31aa9 100644
+--- media/libsoundtouch/src/cpu_detect_x86.cpp
++++ media/libsoundtouch/src/cpu_detect_x86.cpp
+@@ -101,7 +101,7 @@ uint detectCPUextensions(void)
+
+ uint res = 0;
+
+-#if defined(__GNUC__)
++#if defined(__GNUC__) && defined(HAVE_CPUID_H)
+ // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support.
+ uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable.
+
+@@ -112,6 +112,9 @@ uint detectCPUextensions(void)
+ if (edx & bit_SSE) res = res | SUPPORT_SSE;
+ if (edx & bit_SSE2) res = res | SUPPORT_SSE2;
+
++#elif defined(__GNUC__)
++ // No cpuid.h --> no cpuid support
++ return 0;
+ #else
+ // Window / VS version of cpuid. Notice that Visual Studio 2005 or later required
+ // for __cpuid intrinsic support.
Deleted: trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp
==============================================================================
--- trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp Sun Feb 24 03:54:15 2013 (r1188)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,14 +0,0 @@
---- media/libsoundtouch/src/cpu_detect_x86.cpp~
-+++ media/libsoundtouch/src/cpu_detect_x86.cpp
-@@ -101,7 +101,10 @@ uint detectCPUextensions(void)
-
- uint res = 0;
-
--#if defined(__GNUC__)
-+#if defined(__clang__) && __clang_minor__ == 0
-+ // No __get_cpuid() on FreeBSD 9.0 with Clang 3.0
-+ return 0;
-+#elif defined(__GNUC__)
- // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support.
- uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable.
-
More information about the freebsd-gecko
mailing list