[packages/iceape] - fix building with libvpx 1.4.x - rel 2
baggins
baggins at pld-linux.org
Sat May 23 22:07:55 CEST 2015
commit 04b516f55351c7059a9f7953b0b057160a03829a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat May 23 22:07:37 2015 +0200
- fix building with libvpx 1.4.x
- rel 2
iceape.spec | 4 +++-
libvpx2.patch | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 64 insertions(+), 1 deletion(-)
---
diff --git a/iceape.spec b/iceape.spec
index 7301f71..82e1a2b 100644
--- a/iceape.spec
+++ b/iceape.spec
@@ -23,7 +23,7 @@ Summary(pl.UTF-8): Iceape - przeglądarka WWW
Summary(pt_BR.UTF-8): Navegador Iceape
Name: iceape
Version: 2.26.1
-Release: 1
+Release: 2
License: MPL v2.0
Group: X11/Applications/Networking
Source0: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/source/seamonkey-%{version}.source.tar.bz2
@@ -46,6 +46,7 @@ Patch5: makefile.patch
Patch6: %{name}-pixman.patch
# Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
Patch7: system-virtualenv.patch
+Patch8: libvpx2.patch
Patch9: %{name}-system-xulrunner.patch
URL: http://www.pld-linux.org/Packages/Iceape
BuildRequires: GConf2-devel >= 1.2.1
@@ -251,6 +252,7 @@ tar -jxf %{SOURCE2}
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%patch9 -p2
%build
diff --git a/libvpx2.patch b/libvpx2.patch
new file mode 100644
index 0000000..2b22440
--- /dev/null
+++ b/libvpx2.patch
@@ -0,0 +1,61 @@
+--- comm-release/mozilla/content/media/encoder/VP8TrackEncoder.cpp~ 2014-06-13 02:46:03.000000000 +0200
++++ comm-release/mozilla/content/media/encoder/VP8TrackEncoder.cpp 2015-05-23 22:03:23.420308335 +0200
+@@ -77,7 +77,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;
+@@ -230,9 +230,9 @@
+ uint8_t *cb = mMuteFrame.Elements() + yPlanSize;
+ uint8_t *cr = mMuteFrame.Elements() + yPlanSize + uvPlanSize;
+
+- 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;
+@@ -261,9 +261,9 @@
+ MOZ_ASSERT(yuv);
+ const layers::PlanarYCbCrImage::Data *data = yuv->GetData();
+
+- 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;
+--- comm-release/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc~ 2014-06-13 02:45:44.000000000 +0200
++++ comm-release/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-05-23 22:04:53.241382776 +0200
+@@ -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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceape.git/commitdiff/04b516f55351c7059a9f7953b0b057160a03829a
More information about the pld-cvs-commit
mailing list