mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00
Code Issues Releases Activity

- Update to new upstream snapshot as of 2015-04-03

Browse Source 
(included ffmpeg snapshot as of 2015-04-03)
- Fix vulnerabilities CVE-2014-8544 and CVE-2014-9604
  with bundled ffmpeg snapshot in the process

MFH:		2015Q2
This commit is contained in:
Thomas Zander 2015-04-04 07:07:20 +00:00
parent 0ded9634da
commit 14912f59d4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=383192
7 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
multimedia/mencoder/Makefile
View File

@ -3,7 +3,6 @@
PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION}
PORTREVISION= 2
COMMENT= Convenient video file and movie encoder

4
multimedia/mencoder/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mplayer-1.1.20141223.tar.xz) = 8d5ae2b77cdb6b86670a3741ea024b0ba8f7e4515221b224a10b690ee841d909
SIZE (mplayer-1.1.20141223.tar.xz) = 11408272
SHA256 (mplayer-1.1.20150403.tar.xz) = 910c2c6fda92f5883e09f34c39ca314aa5a815fa1c224e5c072bde82339f6db3
SIZE (mplayer-1.1.20150403.tar.xz) = 11552096

1
multimedia/mplayer/Makefile
View File

@ -3,7 +3,6 @@
PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION}
PORTREVISION= 2
COMMENT= High performance media player supporting many formats

2
multimedia/mplayer/Makefile.shared
View File

@ -4,7 +4,7 @@
#
# $FreeBSD$
MPLAYER_SNAPSHOT_DATE= 2014-12-23
MPLAYER_SNAPSHOT_DATE= 2015-04-03
MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
CATEGORIES?= multimedia audio
MASTER_SITES= ${MASTER_SITE_LOCAL}

4
multimedia/mplayer/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mplayer-1.1.20141223.tar.xz) = 8d5ae2b77cdb6b86670a3741ea024b0ba8f7e4515221b224a10b690ee841d909
SIZE (mplayer-1.1.20141223.tar.xz) = 11408272
SHA256 (mplayer-1.1.20150403.tar.xz) = 910c2c6fda92f5883e09f34c39ca314aa5a815fa1c224e5c072bde82339f6db3
SIZE (mplayer-1.1.20150403.tar.xz) = 11552096

12
multimedia/mplayer/files/patch-libavcodec-Makefile
View File

@ -1,11 +1,11 @@
--- ffmpeg/libavcodec/Makefile.orig 2012-07-20 19:20:04.000000000 +0200
+++ ffmpeg/libavcodec/Makefile 2012-07-21 18:25:12.582670118 +0200
@@ -788,7 +788,7 @@
codec_names.h \
fft-internal.h \
--- ffmpeg/libavcodec/Makefile.orig 2015-04-02 19:20:07.000000000 +0200
+++ ffmpeg/libavcodec/Makefile 2015-04-03 13:25:18.741269686 +0200
@@ -865,7 +865,7 @@
old_codec_ids.h \
tableprint.h \
tableprint_vlc.h \
- $(ARCH)/vp56_arith.h \
+ $(MPLAYER_ARCH)/vp56_arith.h \
+ $(MPLAYER_ARCH)/vp56_arith.h \
SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h
SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h

14
multimedia/mplayer/files/patch-libavformat-udp.c
View File

@ -1,11 +1,11 @@
--- ffmpeg/libavformat/udp.c.orig 2011-03-16 13:49:21.000000000 +0100
+++ ffmpeg/libavformat/udp.c 2011-03-18 17:18:12.884305376 +0100
@@ -42,6 +42,8 @@
#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
#endif
--- ffmpeg/libavformat/udp.c.orig 2015-03-30 19:20:06.000000000 +0200
+++ ffmpeg/libavformat/udp.c 2015-04-03 13:29:34.228251670 +0200
@@ -71,6 +71,8 @@
#define UDP_MAX_PKT_SIZE 65536
#define UDP_HEADER_SIZE 8
+#define IPPROTO_IPV6 41
+
typedef struct {
typedef struct UDPContext {
const AVClass *class;
int udp_fd;
int ttl;