[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, www-client/firefox/files/

[Nirbheek Chauhan]

commit:     371d63c6f908f966d9bcba5a67bd544520716ce6
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  4 11:29:29 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Jun  4 11:52:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=371d63c6

firefox: add patches to support h.264 and aac/mp3 properly

---
 www-client/firefox/Manifest                        |    7 ++
 .../files/firefox-14.0_alpha2-gst-aac-mp3.patch    |   70 ++++++++++++++++++++
 .../firefox-14.0_alpha2-gst-youtube-h264.patch     |   26 +++++++
 ...alpha2.ebuild => firefox-14.0_alpha2-r1.ebuild} |    4 +-
 4 files changed, 106 insertions(+), 1 deletions(-)

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 44d7a9a..caac62a 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,3 +1,5 @@
+AUX firefox-14.0_alpha2-gst-aac-mp3.patch 2454 RMD160 47fe9e90b2d5acf6f25d4641b983a5a077d89a57 SHA1 234ccafcb7df3f55d4cee6f776a01987068bb685 SHA256 ef3e6539d292629a52a592cecd90a23562480d7280cfd3883d4407ad06e418a7
+AUX firefox-14.0_alpha2-gst-youtube-h264.patch 1437 RMD160 48daef08188b9862cef5af9192f029347a7a0a9b SHA1 03bde68c29b6acd50e4b6b6eac5fa2c12053b216 SHA256 9b871769727e6d16939c55695b4f08c6b460c3f6cf5bce46ce429f40c4801669
 AUX gentoo-default-prefs.js-1 821 RMD160 13a7be3a165b7059e51fab2cc7fc8d31a82260eb SHA1 333339c4deb4fd41527fd87e1acf0af12cf1007c SHA256 16259ec24a231d1d60097c8d892caa80d2703ba5be72304f6da55cfce1b329de
 AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac7583747031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5
 DIST firefox-12.0-af.xpi 248464 RMD160 84e4439e4f316e068293645ec9f65371109bfabd SHA1 954468cb4d2e7b833f0a320311ce7892993727ba SHA256 eb4da7b66f26286917239430a3072afc6c4b00b39e4547271f4f2689888b4f21
@@ -88,5 +90,10 @@ DIST firefox-12.0-zu.xpi 255708 RMD160 42b5013ff842ed74bcb70bacf338b6239340a1c6
 DIST firefox-12.0.source.tar.bz2 78956707 RMD160 d83eb97543fc09f84b30a46ba8217c17f30bd572 SHA1 0177185e54b7d63dc36bd5bd5c80ba6afd52e199 SHA256 9a232a10e5803b0e4a85bd986e3e88b87ccde7bdc3363ea7022d5761944dbb1d
 DIST firefox-14.0-patches-0.1.tar.xz 9832 RMD160 70d23bc9e3860c405126bcb3a1365e81fd46fce6 SHA1 71a3c33ffa4423db46c4758690424e33a7f386da SHA256 9490723fc44e89dbf541d3427796cdab1a9398e43f869a30e35455c7fb5ee8b5
 DIST firefox-14.0a2_7f3c5dd8e78f.source.tar.bz2 81112940 RMD160 e5412ebb1fbe471b04aeba1ad18b579224c9e2b4 SHA1 8ba004b4b6a8b31fba50c12926113e141ac917fd SHA256 c02f8e267d61ad9be7837645bf02b71a3df125c681a4a639abbfdad73b75e466
+<<<<<<< HEAD
 EBUILD firefox-12.0-r2.ebuild 11062 RMD160 de99a90c98c63eeb6da65eb3d928889955d33790 SHA1 54ccc5f19e61f5f980a6ae86d41c5149d1201c96 SHA256 d73ebb5e37fd56105cc3b420dab845328ae44504f221976a3334733bc338a410
 EBUILD firefox-14.0_alpha2.ebuild 11434 RMD160 a2bfb110306199466256300389ff1073be9939ab SHA1 a094bbf18a7fc08a17a87e29b7ce4f2465a39afc SHA256 0f4d5a55aac63caad61161f41183279ff18a086bfc863f935da8400048c7b5c6
+=======
+EBUILD firefox-12.0-r1.ebuild 11124 RMD160 8226d263a1232057d29c01917dc97d6c1ae663de SHA1 8f8c00c0611c9b3117c806a4c7a6664ebd6917b1 SHA256 a54edd364c3857119a54726004a9bbad657a542c1b467d7e90a489eea66b4cad
+EBUILD firefox-14.0_alpha2-r1.ebuild 11473 RMD160 38b67289f2b15c556a7655b38741e81267ef394a SHA1 1ee60c849bbe0f56c1c06c19cbb21115d791a3c0 SHA256 ab80136e68ade3730557f93e0c385ba47b2b49e49cc99abeda259b2f62b97b18
+>>>>>>> firefox: add patches to support h.264 and aac/mp3 properly

diff --git a/www-client/firefox/files/firefox-14.0_alpha2-gst-aac-mp3.patch b/www-client/firefox/files/firefox-14.0_alpha2-gst-aac-mp3.patch
new file mode 100644
index 0000000..136375a
--- /dev/null
+++ b/www-client/firefox/files/firefox-14.0_alpha2-gst-aac-mp3.patch
@@ -0,0 +1,70 @@
+diff -urNp mozilla-aurora-7f3c5dd8e78f.old/content/html/content/public/nsHTMLMediaElement.h mozilla-aurora-7f3c5dd8e78f/content/html/content/public/nsHTMLMediaElement.h
+--- mozilla-aurora-7f3c5dd8e78f.old/content/html/content/public/nsHTMLMediaElement.h	2012-06-04 11:37:25.791017257 +0530
++++ mozilla-aurora-7f3c5dd8e78f/content/html/content/public/nsHTMLMediaElement.h	2012-06-04 11:38:22.259014896 +0530
+@@ -305,8 +305,10 @@ public:
+ #ifdef MOZ_GSTREAMER
+   static bool IsH264Enabled();
+   static bool IsH264Type(const nsACString& aType);
++  static bool IsSupportedAudioType(const nsACString& aType);
+   static const char gH264Types[3][17];
+   static char const *const gH264Codecs[6];
++  static const char gSupportedAudioTypes[2][11];
+ #endif
+ 
+   /**
+diff -urNp mozilla-aurora-7f3c5dd8e78f.old/content/html/content/src/nsHTMLMediaElement.cpp mozilla-aurora-7f3c5dd8e78f/content/html/content/src/nsHTMLMediaElement.cpp
+--- mozilla-aurora-7f3c5dd8e78f.old/content/html/content/src/nsHTMLMediaElement.cpp	2012-06-04 11:37:25.834017256 +0530
++++ mozilla-aurora-7f3c5dd8e78f/content/html/content/src/nsHTMLMediaElement.cpp	2012-06-04 11:40:04.358010627 +0530
+@@ -1865,6 +1865,11 @@ char const *const nsHTMLMediaElement::gH
+   nsnull
+ };
+ 
++const char nsHTMLMediaElement::gSupportedAudioTypes[2][11] = {
++  "audio/mp4",
++  "audio/mpeg",
++};
++
+ bool
+ nsHTMLMediaElement::IsH264Enabled()
+ {
+@@ -1886,6 +1891,18 @@ nsHTMLMediaElement::IsH264Type(const nsA
+ 
+   return false;
+ }
++
++bool
++nsHTMLMediaElement::IsSupportedAudioType(const nsACString& aType)
++{
++  for (PRUint32 i = 0; i < ArrayLength(gSupportedAudioTypes); ++i) {
++    if (aType.EqualsASCII(gSupportedAudioTypes[i])) {
++      return true;
++    }
++  }
++
++  return false;
++}
+ #endif
+ 
+ /* static */
+@@ -1919,6 +1936,11 @@ nsHTMLMediaElement::CanHandleMediaType(c
+ #endif
+ 
+ #ifdef MOZ_GSTREAMER
++  if (IsSupportedAudioType(nsDependentCString(aMIMEType))) {
++    *aCodecList = NULL;
++    return CANPLAY_MAYBE;
++  }
++
+   if (IsH264Type(nsDependentCString(aMIMEType))) {
+     *aCodecList = gH264Codecs;
+     return CANPLAY_YES;
+@@ -1992,7 +2014,8 @@ nsHTMLMediaElement::GetCanPlay(const nsA
+   while (tokenizer.hasMoreTokens()) {
+     const nsSubstring& token = tokenizer.nextToken();
+ 
+-    if (!CodecListContains(supportedCodecs, token)) {
++    if (supportedCodecs == NULL ||
++        !CodecListContains(supportedCodecs, token)) {
+       // Totally unsupported codec
+       return CANPLAY_NO;
+     }

diff --git a/www-client/firefox/files/firefox-14.0_alpha2-gst-youtube-h264.patch b/www-client/firefox/files/firefox-14.0_alpha2-gst-youtube-h264.patch
new file mode 100644
index 0000000..c9002c7
--- /dev/null
+++ b/www-client/firefox/files/firefox-14.0_alpha2-gst-youtube-h264.patch
@@ -0,0 +1,26 @@
+diff -urNp mozilla-aurora-7f3c5dd8e78f.old/content/html/content/public/nsHTMLMediaElement.h mozilla-aurora-7f3c5dd8e78f/content/html/content/public/nsHTMLMediaElement.h
+--- mozilla-aurora-7f3c5dd8e78f.old/content/html/content/public/nsHTMLMediaElement.h	2012-06-04 11:48:14.664990120 +0530
++++ mozilla-aurora-7f3c5dd8e78f/content/html/content/public/nsHTMLMediaElement.h	2012-06-04 11:48:43.970988893 +0530
+@@ -307,7 +307,7 @@ public:
+   static bool IsH264Type(const nsACString& aType);
+   static bool IsSupportedAudioType(const nsACString& aType);
+   static const char gH264Types[3][17];
+-  static char const *const gH264Codecs[6];
++  static char const *const gH264Codecs[7];
+   static const char gSupportedAudioTypes[2][11];
+ #endif
+ 
+diff -urNp mozilla-aurora-7f3c5dd8e78f.old/content/html/content/src/nsHTMLMediaElement.cpp mozilla-aurora-7f3c5dd8e78f/content/html/content/src/nsHTMLMediaElement.cpp
+--- mozilla-aurora-7f3c5dd8e78f.old/content/html/content/src/nsHTMLMediaElement.cpp	2012-06-04 11:48:14.667990120 +0530
++++ mozilla-aurora-7f3c5dd8e78f/content/html/content/src/nsHTMLMediaElement.cpp	2012-06-04 11:49:18.261987460 +0530
+@@ -1856,8 +1856,9 @@ const char nsHTMLMediaElement::gH264Type
+   "video/quicktime",
+ };
+ 
+-char const *const nsHTMLMediaElement::gH264Codecs[6] = {
++char const *const nsHTMLMediaElement::gH264Codecs[7] = {
+   "avc1.42E01E",
++  "avc1.42001E",
+   "avc1.58A01E",
+   "avc1.4D401E",
+   "avc1.64001E",

diff --git a/www-client/firefox/firefox-14.0_alpha2.ebuild b/www-client/firefox/firefox-14.0_alpha2-r1.ebuild
similarity index 99%
rename from www-client/firefox/firefox-14.0_alpha2.ebuild
rename to www-client/firefox/firefox-14.0_alpha2-r1.ebuild
index 68683f1..a1e4c76 100644
--- a/www-client/firefox/firefox-14.0_alpha2.ebuild
+++ b/www-client/firefox/firefox-14.0_alpha2-r1.ebuild
@@ -143,6 +143,8 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/firefox"
 
+	epatch "${FILESDIR}"/${P}-gst-*.patch
+
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user
 
@@ -174,7 +176,7 @@ src_prepare() {
 		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
 		-i "${S}"/config/system-headers \
 		-i "${S}"/js/src/config/system-headers || die "Sed failed"
-	
+
 	eautoreconf
 }