main/firefox: rebuild against libvpx-1.4.0

2 files changed, 79 insertions, 1 deletions

diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD
index f6d94a904b..88257290ec 100644
--- a/main/firefox/APKBUILD
+++ b/main/firefox/APKBUILD
@@ -4,7 +4,7 @@ pkgname=firefox
 pkgver=31.6.0
 _pkgver=$pkgver
 _xulver=$pkgver
-pkgrel=2
+pkgrel=3
 pkgdesc="Firefox web browser"
 url="https://www.mozilla.org/en-US/firefox/organizations/faq/"
 arch="all"
@@ -69,6 +69,7 @@ source="ftp://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-$
 
 	rhbz-966424.patch
 	fix-fortify-inline.patch
+	libvpx-1.4.0.patch
 
 	firefox.desktop
 	firefox-safe.desktop"
@@ -186,6 +187,7 @@ d9a2245b93a7f5855ee029b5fa44e4e9  stat.patch
 4383d038b8d8411ea46f4a109197c19e  stab.h
 15ebeeeb6823c185f4fed98e9bf1b786  rhbz-966424.patch
 4272fe0d076566e16daf67faee4090b0  fix-fortify-inline.patch
+8387ed2b3a908df11a96d953e60af9eb  libvpx-1.4.0.patch
 ba96924ece1d77453e462429037a2ce5  firefox.desktop
 6f38a5899034b7786cb1f75ad42032b8  firefox-safe.desktop"
 sha256sums="88ad45202a7aee9c43378879863b023270aa29463d312f396a78a6e9cdcbf5c3  firefox-31.6.0esr.source.tar.bz2
@@ -205,6 +207,7 @@ a0f8a0fa9977ee43f3853b6c6bf5a506fdfabdfa32b4279e0ac3d7a3078f34cc  stat.patch
 960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h
 a50d15a640f230a2c66e1eb2afd2bed4117605d0f1591dcfec1ca30f0bc2352f  rhbz-966424.patch
 bcd8759804a52ffd542292f28d0aafc6f4f1f9408fe0f36adb9ba11fe3b85afc  fix-fortify-inline.patch
+87d01a1913a5a6b93c49893ae0fe5aec81db55ebf6cc60d808a9e6eabebc6339  libvpx-1.4.0.patch
 b571c4a49884a3c98806246c9cc3e60c73d5a8f4aeb7f96217db0be1d6210eda  firefox.desktop
 4b6de45753856a890f4482055666e77f9b01bdfb7e0df08bafaa3a4d9937eed3  firefox-safe.desktop"
 sha512sums="6b81059b3a38f2a264cf5bea665ad107e5439a8614644fd3a910034381ab6c0635cea50aa30bd83fec8d8cfebea76c3480eee3a96dfdcbb606c1dd62ef3880a4  firefox-31.6.0esr.source.tar.bz2
@@ -224,5 +227,6 @@ e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb1
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
 06ededcd196af98b77991dcba3b710b0dfc061404adb4676fcc380be80410a2621f64d67257b0aefdf36f566e0ea1294b5405b7b4db43e83281a1c64d02da579  rhbz-966424.patch
 0f7a6b71dd25048b353cafa8147b56a90e0c324e78a721ea4c0777bd6c193a985591b936209f026bc3aa6f64f8b749a27a212c51754af48f8f237bd7eb59faa2  fix-fortify-inline.patch
+a439299bca2f3e5e21aeffa3ef08d9bf2683ed7afe335c799c0cc07e36049d96c7c86563d9e8cbfd079ba33fc263ef4b5faadefcf9fe992cfffe066e7eb7bfe5  libvpx-1.4.0.patch
 f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454  firefox.desktop
 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed  firefox-safe.desktop"
diff --git a/main/firefox/libvpx-1.4.0.patch b/main/firefox/libvpx-1.4.0.patch
new file mode 100644
index 0000000000..9d393cc17f
--- /dev/null
+++ b/main/firefox/libvpx-1.4.0.patch
@@ -0,0 +1,74 @@
+--- ./media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.orig
++++ ./media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+@@ -180,7 +180,7 @@
+   // Creating a wrapper to the image - setting image data to NULL. Actual
+   // pointer will be set in encode. Setting align to 1, as it is meaningless
+   // (actual memory is not allocated).
+-  raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height,
++  raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height,
+                       1, NULL);
+   // populate encoder configuration with default values
+   if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) {
+@@ -349,9 +349,9 @@
+   }
+   // Image in vpx_image_t format.
+   // Input image is const. VP8's raw image is not defined as const.
+-  raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
+-  raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
+-  raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
++  raw_->planes[VPX_PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
++  raw_->planes[VPX_PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
++  raw_->planes[VPX_PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
+   // TODO(mikhal): Stride should be set in initialization.
+   raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane);
+   raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane);
+--- ./content/media/encoder/VP8TrackEncoder.cpp.orig
++++ ./content/media/encoder/VP8TrackEncoder.cpp
+@@ -84,7 +84,7 @@
+   // Creating a wrapper to the image - setting image data to NULL. Actual
+   // pointer will be set in encode. Setting align to 1, as it is meaningless
+   // (actual memory is not allocated).
+-  vpx_img_wrap(mVPXImageWrapper, IMG_FMT_I420,
++  vpx_img_wrap(mVPXImageWrapper, VPX_IMG_FMT_I420,
+                mFrameWidth, mFrameHeight, 1, nullptr);
+ 
+   config.g_w = mFrameWidth;
+@@ -239,9 +239,9 @@
+   uint8_t *cb = mMuteFrame.Elements() + yPlaneSize;
+   uint8_t *cr = mMuteFrame.Elements() + yPlaneSize + uvPlaneSize;
+ 
+-  mVPXImageWrapper->planes[PLANE_Y] = y;
+-  mVPXImageWrapper->planes[PLANE_U] = cb;
+-  mVPXImageWrapper->planes[PLANE_V] = cr;
++  mVPXImageWrapper->planes[VPX_PLANE_Y] = y;
++  mVPXImageWrapper->planes[VPX_PLANE_U] = cb;
++  mVPXImageWrapper->planes[VPX_PLANE_V] = cr;
+   mVPXImageWrapper->stride[VPX_PLANE_Y] = mFrameWidth;
+   mVPXImageWrapper->stride[VPX_PLANE_U] = halfWidth;
+   mVPXImageWrapper->stride[VPX_PLANE_V] = halfWidth;
+@@ -297,9 +297,9 @@
+     const PlanarYCbCrImage::Data *data = yuv->GetData();
+ 
+     if (isYUV420(data) && !data->mCbSkip) { // 420 planar
+-      mVPXImageWrapper->planes[PLANE_Y] = data->mYChannel;
+-      mVPXImageWrapper->planes[PLANE_U] = data->mCbChannel;
+-      mVPXImageWrapper->planes[PLANE_V] = data->mCrChannel;
++      mVPXImageWrapper->planes[VPX_PLANE_Y] = data->mYChannel;
++      mVPXImageWrapper->planes[VPX_PLANE_U] = data->mCbChannel;
++      mVPXImageWrapper->planes[VPX_PLANE_V] = data->mCrChannel;
+       mVPXImageWrapper->stride[VPX_PLANE_Y] = data->mYStride;
+       mVPXImageWrapper->stride[VPX_PLANE_U] = data->mCbCrStride;
+       mVPXImageWrapper->stride[VPX_PLANE_V] = data->mCbCrStride;
+@@ -355,9 +355,9 @@
+         return NS_ERROR_NOT_IMPLEMENTED;
+       }
+ 
+-      mVPXImageWrapper->planes[PLANE_Y] = y;
+-      mVPXImageWrapper->planes[PLANE_U] = cb;
+-      mVPXImageWrapper->planes[PLANE_V] = cr;
++      mVPXImageWrapper->planes[VPX_PLANE_Y] = y;
++      mVPXImageWrapper->planes[VPX_PLANE_U] = cb;
++      mVPXImageWrapper->planes[VPX_PLANE_V] = cr;
+       mVPXImageWrapper->stride[VPX_PLANE_Y] = mFrameWidth;
+       mVPXImageWrapper->stride[VPX_PLANE_U] = halfWidth;
+       mVPXImageWrapper->stride[VPX_PLANE_V] = halfWidth;