diff options
| author | markd <markd@pkgsrc.org> | 2015-06-30 21:09:21 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2015-06-30 21:09:21 +0000 |
| commit | 7839ab3f9935ff748f231033c9081e9cd1c3d2c5 (patch) | |
| tree | 26f53b3784de981e42cad733742152f738881c5a /www/firefox31 | |
| parent | 83df3e364fd97c696052beaa2d44c8060e27ea21 (diff) | |
| download | pkgsrc-7839ab3f9935ff748f231033c9081e9cd1c3d2c5.tar.gz | |
Fix build with libvpx 1.4.0
Diffstat (limited to 'www/firefox31')
| -rw-r--r-- | www/firefox31/distinfo | 3 | ||||
| -rw-r--r-- | www/firefox31/patches/patch-content_media_encoder_VP8TrackEncoder.cpp | 55 |
2 files changed, 57 insertions, 1 deletions
diff --git a/www/firefox31/distinfo b/www/firefox31/distinfo index 0d80a1d9ac6..24cabbbd76a 100644 --- a/www/firefox31/distinfo +++ b/www/firefox31/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2015/06/29 21:31:43 markd Exp $ +$NetBSD: distinfo,v 1.15 2015/06/30 21:09:21 markd Exp $ SHA1 (firefox-31.7.0esr.source.tar.bz2) = d8c79d4228c15ff903e79362d2392401329e027f RMD160 (firefox-31.7.0esr.source.tar.bz2) = 1f04f235a3b2b0f2ac5d33951ae04e2131e5fff7 @@ -37,6 +37,7 @@ SHA1 (patch-content_media_AudioStream.h) = 11cd8649f35c001fa0bf9e0f6119e49bd41ab SHA1 (patch-content_media_Makefile.in) = 54c8c5e41eb36bae0ce544360ded9f75ba3acc13 SHA1 (patch-content_media_MediaData.cpp) = 150a29b046a964f939c5401cfbb9f36ae7a64459 SHA1 (patch-content_media_MediaData.h) = dc1ba6c0e0b62fb4213531e75be7d47cd7d71dd2 +SHA1 (patch-content_media_encoder_VP8TrackEncoder.cpp) = 9d2291a3a8f7453d71999a6b395f192108e3d7b0 SHA1 (patch-content_media_fmp4_demuxer_bit_reader.cc) = 6d87cd7231e61a12396d15dd2fa3d1a51051e8ee SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 524a669e411189926e142912b6d94d3d8dbdb0eb SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1 diff --git a/www/firefox31/patches/patch-content_media_encoder_VP8TrackEncoder.cpp b/www/firefox31/patches/patch-content_media_encoder_VP8TrackEncoder.cpp new file mode 100644 index 00000000000..83c9c430684 --- /dev/null +++ b/www/firefox31/patches/patch-content_media_encoder_VP8TrackEncoder.cpp @@ -0,0 +1,55 @@ +$NetBSD: patch-content_media_encoder_VP8TrackEncoder.cpp,v 1.1 2015/06/30 21:09:22 markd Exp $ + +Deprecated names have gone completely in libvpx 1.4.0 so use prefered +ones. + +--- content/media/encoder/VP8TrackEncoder.cpp.orig 2015-05-05 02:53:53.000000000 +0000 ++++ content/media/encoder/VP8TrackEncoder.cpp +@@ -84,7 +84,7 @@ VP8TrackEncoder::Init(int32_t aWidth, in + // 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 @@ void VP8TrackEncoder::PrepareMutedFrame( + 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 @@ nsresult VP8TrackEncoder::PrepareRawFram + 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 @@ nsresult VP8TrackEncoder::PrepareRawFram + 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; |