svn commit: r383165 - in head/multimedia/libav: . files

[Thomas Zander]

Author: riggs
Date: Fri Apr  3 18:00:58 2015
New Revision: 383165
URL: https://svnweb.freebsd.org/changeset/ports/383165

Log:
  - Update to upstream version 11.3
  - Fix security vulnerabilities in utvideodec and tiff decoders
    (CVE-2014-9604 and CVE-2014-8544)
  - Fix build with non-default CDIO option
  
  MFH:		2015Q2

Added:
  head/multimedia/libav/files/patch-libavcodec-libilbc.c   (contents, props changed)
Modified:
  head/multimedia/libav/Makefile
  head/multimedia/libav/distinfo

Modified: head/multimedia/libav/Makefile
==============================================================================
--- head/multimedia/libav/Makefile	Fri Apr  3 17:46:20 2015	(r383164)
+++ head/multimedia/libav/Makefile	Fri Apr  3 18:00:58 2015	(r383165)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libav
-PORTVERSION=	11.2
+PORTVERSION=	11.3
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 
@@ -55,7 +55,8 @@ AMR_WB_CONFIGURE_ENABLE=	libopencore-amr
 
 BZIP2_CONFIGURE_ENABLE=		bzlib
 
-CDIO_LIB_DEPENDS=		libcdio.so:${PORTSDIR}/sysutils/libcdio
+CDIO_LIB_DEPENDS=		libcdio.so:${PORTSDIR}/sysutils/libcdio \
+				libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
 CDIO_CONFIGURE_ENABLE=		libcdio
 
 # --enable-libdc1394

Modified: head/multimedia/libav/distinfo
==============================================================================
--- head/multimedia/libav/distinfo	Fri Apr  3 17:46:20 2015	(r383164)
+++ head/multimedia/libav/distinfo	Fri Apr  3 18:00:58 2015	(r383165)
@@ -1,2 +1,2 @@
-SHA256 (libav-11.2.tar.gz) = 1f1448e1245444a1fae2f077f6846fedb47dfb294bef797e6742c095a6b4d769
-SIZE (libav-11.2.tar.gz) = 6920866
+SHA256 (libav-11.3.tar.gz) = 5a6f6d5529d2074a5a9665bd3e048cbaefbfd88d57f0b59604baa0ce3602967e
+SIZE (libav-11.3.tar.gz) = 6924007

Added: head/multimedia/libav/files/patch-libavcodec-libilbc.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/libav/files/patch-libavcodec-libilbc.c	Fri Apr  3 18:00:58 2015	(r383165)
@@ -0,0 +1,30 @@
+--- libavcodec/libilbc.c.orig	2015-03-09 02:54:09.000000000 +0100
++++ libavcodec/libilbc.c	2015-04-03 19:12:02.210836254 +0200
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <ilbc.h>
++#include <stdint.h>
+ 
+ #include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+@@ -95,8 +96,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 +169,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;