svn commit: r411632 - in head/multimedia/mplayer2: . files

[Carlos J. Puga Medina]

Author: cpm
Date: Tue Mar 22 02:07:32 2016
New Revision: 411632
URL: https://svnweb.freebsd.org/changeset/ports/411632

Log:
  - Convert to USES=python:3,build
  - Fix SIGSEGV with FFmpeg (reported by soralx at cydem.org)
  - Update MAINTAINER to my @FreeBSD.org address
  - Bump PORTREVISION
  
  PR:		208080
  Approved by:	junovitch (mentor)

Added:
  head/multimedia/mplayer2/files/patch-libmpdemux_demux__lavf.c   (contents, props changed)
Modified:
  head/multimedia/mplayer2/Makefile

Modified: head/multimedia/mplayer2/Makefile
==============================================================================
--- head/multimedia/mplayer2/Makefile	Tue Mar 22 01:49:01 2016	(r411631)
+++ head/multimedia/mplayer2/Makefile	Tue Mar 22 02:07:32 2016	(r411632)
@@ -2,11 +2,11 @@
 
 PORTNAME=	mplayer2
 PORTVERSION=	${MPLAYER2_PORT_VERSION}
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	multimedia audio
 MASTER_SITES=	LOCAL/gblach/
 
-MAINTAINER=	cpm at fbsd.es
+MAINTAINER=	cpm at FreeBSD.org
 COMMENT=	Advanced general-purpose video player
 
 LICENSE=	GPLv2
@@ -14,10 +14,9 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-BUILD_DEPENDS=	python3:${PORTSDIR}/lang/python3 \
-		rst2man:${PORTSDIR}/textproc/py-docutils
+BUILD_DEPENDS=	rst2man:${PORTSDIR}/textproc/py-docutils
 
-USES=		cpe gmake iconv ncurses pkgconfig tar:xz
+USES=		cpe gmake iconv ncurses pkgconfig python:3,build tar:xz
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	TMPDIR="${WRKSRC}"
 CONFIGURE_ARGS=	--cc=${CC} \

Added: head/multimedia/mplayer2/files/patch-libmpdemux_demux__lavf.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mplayer2/files/patch-libmpdemux_demux__lavf.c	Tue Mar 22 02:07:32 2016	(r411632)
@@ -0,0 +1,18 @@
+--- libmpdemux/demux_lavf.c.orig	2016-03-16 10:57:42 UTC
++++ libmpdemux/demux_lavf.c
+@@ -159,6 +159,7 @@ static int lavf_check_file(demuxer_t *de
+     int probe_data_size = 0;
+     int read_size = INITIAL_PROBE_SIZE;
+     int score;
++    char mime[] = "";
+ 
+     if (!demuxer->priv)
+         demuxer->priv = calloc(sizeof(lavf_priv_t), 1);
+@@ -203,6 +204,7 @@ static int lavf_check_file(demuxer_t *de
+         avpd.buf_size = probe_data_size;
+ 
+         score = 0;
++        avpd.mime_type = mime;
+         priv->avif = av_probe_input_format2(&avpd, probe_data_size > 0, &score);
+         read_size = FFMIN(2 * read_size, PROBE_BUF_SIZE - probe_data_size);
+     } while ((demuxer->desc->type != DEMUXER_TYPE_LAVF_PREFERRED ||