Date: Sun, 10 Mar 2013 21:05:24 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1208 - in trunk/www/firefox-nightly: . files Message-ID: <201303102105.r2AL5OUk004537@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Mar 10 21:05:24 2013
New Revision: 1208
Log:
update Nightly
Deleted:
trunk/www/firefox-nightly/files/patch-bug829653
trunk/www/firefox-nightly/files/patch-bug836824
trunk/www/firefox-nightly/files/patch-webvtt-issue227
Modified:
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Sun Mar 10 21:05:16 2013 (r1207)
+++ trunk/www/firefox-nightly/Makefile.hgrev Sun Mar 10 21:05:24 2013 (r1208)
@@ -1 +1 @@
-HGREV= 124110:0e7639e3bdfb
+HGREV= 124318:b1a08130fae6
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Sun Mar 10 21:05:16 2013 (r1207)
+++ trunk/www/firefox-nightly/distinfo Sun Mar 10 21:05:24 2013 (r1208)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/0e7639e3bdfb.tar.bz2) = d9222d211aaa9c4af638b9c366e1664cd1c00b6615b3df2ad4e6db340f8a413c
-SIZE (firefox-nightly/0e7639e3bdfb.tar.bz2) = 110668706
+SHA256 (firefox-nightly/b1a08130fae6.tar.bz2) = 7ea8667851f1b455a3cdb256ab1606f12dbf421cb6a37971497b2f5582b9fa85
+SIZE (firefox-nightly/b1a08130fae6.tar.bz2) = 109313974
Deleted: trunk/www/firefox-nightly/files/patch-bug829653
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug829653 Sun Mar 10 21:05:24 2013 (r1207)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,78 +0,0 @@
-dro.d@gmail.com>
-Bug 829653 - fix content/media build with --enable-gstreamer
-
-
-diff --git a/content/media/DecoderTraits.cpp b/content/media/DecoderTraits.cpp
-index d4f1e42..ab1d0d5 100644
---- content/media/DecoderTraits.cpp
-+++ content/media/DecoderTraits.cpp
-@@ -178,16 +178,22 @@ IsWebMType(const nsACString& aType)
- static const char* const gH264Types[4] = {
- "video/mp4",
- "video/3gpp",
- "video/quicktime",
- nullptr
- };
-
- static bool
-+IsH264Type(const nsACString& aType)
-+{
-+ return CodecListContains(gH264Types, aType);
-+}
-+
-+static bool
- IsGStreamerSupportedType(const nsACString& aMimeType)
- {
- if (!MediaDecoder::IsGStreamerEnabled())
- return false;
- if (IsH264Type(aMimeType))
- return true;
- if (!Preferences::GetBool("media.prefer-gstreamer", false))
- return false;
-@@ -196,22 +202,16 @@ IsGStreamerSupportedType(const nsACString& aMimeType)
- return true;
- #endif
- #ifdef MOZ_OGG
- if (IsOggType(aMimeType))
- return true;
- #endif
- return false;
- }
--
--static bool
--IsH264Type(const nsACString& aType)
--{
-- return CodecListContains(gH264Types, aType);
--}
- #endif
-
- #ifdef MOZ_WIDGET_GONK
- static const char* const gOmxTypes[6] = {
- "audio/mpeg",
- "audio/mp4",
- "video/mp4",
- "video/3gpp",
-diff --git a/content/media/Makefile.in b/content/media/Makefile.in
-index 4b24c94..df28c17 100644
---- content/media/Makefile.in
-+++ content/media/Makefile.in
-@@ -72,15 +72,19 @@ ifdef MOZ_SYDNEYAUDIO
- EXPORTS += \
- AudioStream.h \
- $(NULL)
- CPPSRCS += \
- AudioStream.cpp \
- $(NULL)
- endif
-
-+ifdef MOZ_GSTREAMER
-+OS_CXXFLAGS += $(GSTREAMER_CFLAGS)
-+endif
-+
- FORCE_STATIC_LIB = 1
-
- include $(topsrcdir)/config/config.mk
- include $(topsrcdir)/ipc/chromium/chromium-config.mk
- include $(topsrcdir)/config/rules.mk
-
- DEFINES += -D_IMPL_NS_LAYOUT
Deleted: trunk/www/firefox-nightly/files/patch-bug836824
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug836824 Sun Mar 10 21:05:24 2013 (r1207)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,33 +0,0 @@
-commit 35107a0 (HEAD)
-Author: Paul Adenot <paul@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-webvtt-issue227
==============================================================================
--- trunk/www/firefox-nightly/files/patch-webvtt-issue227 Sun Mar 10 21:05:24 2013 (r1207)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,14 +0,0 @@
---- media/webvtt/alloc.c~
-+++ media/webvtt/alloc.c
-@@ -26,11 +26,7 @@
- */
-
- #include <webvtt/util.h>
--#if ( defined(__APPLE__) && defined(__MACH__) )
- #include <stdlib.h>
--#else
--#include <malloc.h>
--#endif
- #include <string.h>
-
- static void *default_alloc( void *unused, webvtt_uint nb );
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303102105.r2AL5OUk004537>