diff options
| author | riggs <riggs@FreeBSD.org> | 2015-04-04 02:00:58 +0800 |
|---|---|---|
| committer | riggs <riggs@FreeBSD.org> | 2015-04-04 02:00:58 +0800 |
| commit | e98548b16dd6b7c7f759e6b308f3f0db740b1d5c (patch) | |
| tree | f064a6e67b5f0bcd42c57edccd0d0d2fb8003340 /multimedia | |
| parent | 827f53bbcb07bf39d1cd183412e669eb37de39f6 (diff) | |
| download | freebsd-ports-gnome-e98548b16dd6b7c7f759e6b308f3f0db740b1d5c.tar.gz freebsd-ports-gnome-e98548b16dd6b7c7f759e6b308f3f0db740b1d5c.tar.zst freebsd-ports-gnome-e98548b16dd6b7c7f759e6b308f3f0db740b1d5c.zip | |
- 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
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/libav/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/libav/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/libav/files/patch-libavcodec-libilbc.c | 30 |
3 files changed, 35 insertions, 4 deletions
diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile index 7b33f16785f8..4aeb08a0305a 100644 --- a/multimedia/libav/Makefile +++ b/multimedia/libav/Makefile @@ -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-amrwb 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 diff --git a/multimedia/libav/distinfo b/multimedia/libav/distinfo index 44b7dfa13c2a..1b96011b9b7d 100644 --- a/multimedia/libav/distinfo +++ b/multimedia/libav/distinfo @@ -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 diff --git a/multimedia/libav/files/patch-libavcodec-libilbc.c b/multimedia/libav/files/patch-libavcodec-libilbc.c new file mode 100644 index 000000000000..18bb2726311a --- /dev/null +++ b/multimedia/libav/files/patch-libavcodec-libilbc.c @@ -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; |