[packages/webrtc] - fix building with libvpx 1.4.x - rel 12

[baggins]

commit 94f5116acaa2d049d0db6df8f73107837b830cef
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat May 23 22:42:03 2015 +0200

    - fix building with libvpx 1.4.x
    - rel 12

 libvpx2.patch | 24 ++++++++++++++++++++++++
 webrtc.spec   |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/webrtc.spec b/webrtc.spec
index 73ba217..b7b1f07 100644
--- a/webrtc.spec
+++ b/webrtc.spec
@@ -4,7 +4,7 @@
 Summary:	Libraries to provide Real Time Communications via the web
 Name:		webrtc
 Version:	0.1
-Release:	0.11.%{svndate}svn%{svnrev}
+Release:	0.12.%{svndate}svn%{svnrev}
 License:	BSD
 Group:		Libraries
 URL:		http://www.webrtc.org/
@@ -17,6 +17,7 @@ Source0:	%{name}-%{svndate}svn%{svnrev}.tar.bz2
 # Google provides no real way to build this code, except as part of Chromium
 # That's just stupid.
 Patch0:		build-sanity.patch
+Patch1:		libvpx2.patch
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -56,6 +57,7 @@ Development files for WebRTC.
 touch NEWS README ChangeLog
 ln -s LICENSE COPYING
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/libvpx2.patch b/libvpx2.patch
new file mode 100644
index 0000000..6c2186c
--- /dev/null
+++ b/libvpx2.patch
@@ -0,0 +1,24 @@
+--- webrtc-20121218svn2718/src/modules/video_coding/codecs/vp8/vp8.cc~	2012-08-25 01:01:38.000000000 +0200
++++ webrtc-20121218svn2718/src/modules/video_coding/codecs/vp8/vp8.cc	2015-05-23 22:41:02.950092007 +0200
+@@ -179,7 +179,7 @@
+   if (codec_.width % 32 == 0) {
+     align = 32;
+   }
+-  raw_ = vpx_img_alloc(NULL, IMG_FMT_I420, codec_.width, codec_.height, align);
++  raw_ = vpx_img_alloc(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height, align);
+   // populate encoder configuration with default values
+   if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) {
+     return WEBRTC_VIDEO_CODEC_ERROR;
+@@ -347,9 +347,9 @@
+   uint8_t* buffer = input_image.Buffer();
+   uint32_t v_plane_loc = codec_.height * codec_.width +
+     ((codec_.width + 1) >> 1) * ((codec_.height + 1) >> 1);
+-  raw_->planes[PLANE_Y] = buffer;
+-  raw_->planes[PLANE_U] = &buffer[codec_.width * codec_.height];
+-  raw_->planes[PLANE_V] = &buffer[v_plane_loc];
++  raw_->planes[VPX_PLANE_Y] = buffer;
++  raw_->planes[VPX_PLANE_U] = &buffer[codec_.width * codec_.height];
++  raw_->planes[VPX_PLANE_V] = &buffer[v_plane_loc];
+ 
+   int flags = 0;
+ #if WEBRTC_LIBVPX_VERSION >= 971
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/webrtc.git/commitdiff/94f5116acaa2d049d0db6df8f73107837b830cef