svn commit: r383192 - in head/multimedia: mencoder mplayer mplayer/files

[Thomas Zander]

Author: riggs
Date: Sat Apr  4 07:07:20 2015
New Revision: 383192
URL: https://svnweb.freebsd.org/changeset/ports/383192

Log:
  - Update to new upstream snapshot as of 2015-04-03
    (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

Modified:
  head/multimedia/mencoder/Makefile
  head/multimedia/mencoder/distinfo
  head/multimedia/mplayer/Makefile
  head/multimedia/mplayer/Makefile.shared
  head/multimedia/mplayer/distinfo
  head/multimedia/mplayer/files/patch-libavcodec-Makefile
  head/multimedia/mplayer/files/patch-libavformat-udp.c

Modified: head/multimedia/mencoder/Makefile
==============================================================================
--- head/multimedia/mencoder/Makefile	Sat Apr  4 05:35:19 2015	(r383191)
+++ head/multimedia/mencoder/Makefile	Sat Apr  4 07:07:20 2015	(r383192)
@@ -3,7 +3,6 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	2
 
 COMMENT=	Convenient video file and movie encoder
 

Modified: head/multimedia/mencoder/distinfo
==============================================================================
--- head/multimedia/mencoder/distinfo	Sat Apr  4 05:35:19 2015	(r383191)
+++ head/multimedia/mencoder/distinfo	Sat Apr  4 07:07:20 2015	(r383192)
@@ -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

Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile	Sat Apr  4 05:35:19 2015	(r383191)
+++ head/multimedia/mplayer/Makefile	Sat Apr  4 07:07:20 2015	(r383192)
@@ -3,7 +3,6 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	2
 
 COMMENT=	High performance media player supporting many formats
 

Modified: head/multimedia/mplayer/Makefile.shared
==============================================================================
--- head/multimedia/mplayer/Makefile.shared	Sat Apr  4 05:35:19 2015	(r383191)
+++ head/multimedia/mplayer/Makefile.shared	Sat Apr  4 07:07:20 2015	(r383192)
@@ -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}

Modified: head/multimedia/mplayer/distinfo
==============================================================================
--- head/multimedia/mplayer/distinfo	Sat Apr  4 05:35:19 2015	(r383191)
+++ head/multimedia/mplayer/distinfo	Sat Apr  4 07:07:20 2015	(r383192)
@@ -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

Modified: head/multimedia/mplayer/files/patch-libavcodec-Makefile
==============================================================================
--- head/multimedia/mplayer/files/patch-libavcodec-Makefile	Sat Apr  4 05:35:19 2015	(r383191)
+++ head/multimedia/mplayer/files/patch-libavcodec-Makefile	Sat Apr  4 07:07:20 2015	(r383192)
@@ -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

Modified: head/multimedia/mplayer/files/patch-libavformat-udp.c
==============================================================================
--- head/multimedia/mplayer/files/patch-libavformat-udp.c	Sat Apr  4 05:35:19 2015	(r383191)
+++ head/multimedia/mplayer/files/patch-libavformat-udp.c	Sat Apr  4 07:07:20 2015	(r383192)
@@ -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;