[packages/libav] - up to 11.4 - added ilbc patch (fixes build with current webrtc-libilbc)

[qboosh]

commit 5f4c382b51e036a93c90fe731af0103c2f07dc84
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Oct 17 11:18:12 2015 +0200

    - up to 11.4
    - added ilbc patch (fixes build with current webrtc-libilbc)

 libav-ilbc.patch | 22 ++++++++++++++++++++++
 libav.spec       |  8 +++++---
 2 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/libav.spec b/libav.spec
index d200343..0be6a02 100644
--- a/libav.spec
+++ b/libav.spec
@@ -33,7 +33,7 @@
 Summary:	libav - Open Source audio and video processing tools
 Summary(pl.UTF-8):	libav - narzędzia do przetwarzania dźwięku i obrazu o otwartych źródłach
 Name:		libav
-Version:	11.3
+Version:	11.4
 Release:	0.1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (some filters, x264, x265, xavs, xvid, x11grab)
@@ -41,8 +41,9 @@ Release:	0.1
 License:	GPL v3+ with LGPL v3+ parts
 Group:		Libraries
 Source0:	http://libav.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	16f896b12458fe7a0d5150e44e0639ec
+# Source0-md5:	98c264530a3a5e569543f60b917c3daa
 Patch0:		%{name}-opencv24.patch
+Patch1:		%{name}-ilbc.patch
 URL:		http://libav.org/
 BuildRequires:	SDL-devel >= 1.2.1
 BuildRequires:	alsa-lib-devel
@@ -173,7 +174,7 @@ Requires:	twolame-devel
 Requires:	vo-aacenc-devel
 Requires:	vo-amrwbenc-devel
 %{?with_wavpack:Requires:	wavpack-devel}
-%{?with_ilbc:Requires:	webrtc-libilbc}
+%{?with_ilbc:Requires:	webrtc-libilbc-devel}
 Requires:	xavs-devel
 Requires:	xorg-lib-libXext-devel
 Requires:	xorg-lib-libXfixes-devel
@@ -230,6 +231,7 @@ testowania różnych API libav.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > libav-avconfig
diff --git a/libav-ilbc.patch b/libav-ilbc.patch
new file mode 100644
index 0000000..cf78e81
--- /dev/null
+++ b/libav-ilbc.patch
@@ -0,0 +1,22 @@
+--- libav-11.4/libavcodec/libilbc.c.orig	2015-05-31 16:56:19.000000000 +0200
++++ libav-11.4/libavcodec/libilbc.c	2015-10-17 10:49:08.164415994 +0200
+@@ -95,8 +95,8 @@
+         return ret;
+     }
+ 
+-    WebRtcIlbcfix_DecodeImpl((WebRtc_Word16*) frame->data[0],
+-                             (const WebRtc_UWord16*) buf, &s->decoder, 1);
++    WebRtcIlbcfix_DecodeImpl((int16_t*) frame->data[0],
++                             (const uint16_t*) buf, &s->decoder, 1);
+ 
+     *got_frame_ptr = 1;
+ 
+@@ -168,7 +168,7 @@
+         return ret;
+     }
+ 
+-    WebRtcIlbcfix_EncodeImpl((WebRtc_UWord16*) avpkt->data, (const WebRtc_Word16*) frame->data[0], &s->encoder);
++    WebRtcIlbcfix_EncodeImpl((uint16_t*) avpkt->data, (const int16_t*) frame->data[0], &s->encoder);
+ 
+     avpkt->size     = s->encoder.no_of_bytes;
+     *got_packet_ptr = 1;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libav.git/commitdiff/5f4c382b51e036a93c90fe731af0103c2f07dc84