Update to snapshots as of 2016-04-09 including bundled ffmpeg

5 files changed, 36 insertions, 15 deletions

diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 4904f335d577..fe0ece1730c1 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mplayer
-PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	1
+PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index 534d91de89a1..90d0c97852bc 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -5,9 +5,10 @@
 # $FreeBSD$
 
 MPLAYER_PORT_VERSION=	1.3.0
-MASTER_SITES=	http://www.mplayerhq.hu/MPlayer/releases/ \
-		ftp://ftp.mplayerhq.hu/MPlayer/releases/
-DISTNAME=	MPlayer-${MPLAYER_PORT_VERSION}
+MPLAYER_SNAPSHOT_DATE=	2016-04-09
+MASTER_SITES=	LOCAL/riggs/mplayer
+DISTNAME=	mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
+WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index a9d8c005c16b..c1168d25b900 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (MPlayer-1.3.0.tar.xz) = 3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843
-SIZE (MPlayer-1.3.0.tar.xz) = 13278984
+SHA256 (mplayer-1.3.0.20160409.tar.xz) = 1f9c8776a2f851d964b70475df269f26c9a5ca847cd75ef40ef098bdbc61be93
+SIZE (mplayer-1.3.0.20160409.tar.xz) = 12422412
diff --git a/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile b/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile
new file mode 100644
index 000000000000..8df33e613da6
--- /dev/null
+++ b/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile
@@ -0,0 +1,19 @@
+--- ffmpeg/tests/checkasm/Makefile.orig	2016-04-09 14:32:47 UTC
++++ ffmpeg/tests/checkasm/Makefile
+@@ -20,7 +20,7 @@ AVFILTEROBJS-$(CONFIG_BLEND_FILTER) += v
+ CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
+ 
+ 
+--include $(SRC_PATH)/tests/checkasm/$(ARCH)/Makefile
++-include $(SRC_PATH)/tests/checkasm/$(MPLAYER_ARCH)/Makefile
+ 
+ CHECKASMOBJS += $(CHECKASMOBJS-yes) checkasm.o
+ CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))
+@@ -43,6 +43,6 @@ checkasm: $(CHECKASM)
+ testclean:: checkasmclean
+ 
+ checkasmclean:
+-	$(RM) $(CHECKASM) $(CLEANSUFFIXES:%=tests/checkasm/%) $(CLEANSUFFIXES:%=tests/checkasm/$(ARCH)/%)
++	$(RM) $(CHECKASM) $(CLEANSUFFIXES:%=tests/checkasm/%) $(CLEANSUFFIXES:%=tests/checkasm/$(MPLAYER_ARCH)/%)
+ 
+ .PHONY: checkasm
diff --git a/multimedia/mplayer/files/patch-libao2_ao__oss.c b/multimedia/mplayer/files/patch-libao2_ao__oss.c
index 5fb37646be38..2fdb9fc632a7 100644
--- a/multimedia/mplayer/files/patch-libao2_ao__oss.c
+++ b/multimedia/mplayer/files/patch-libao2_ao__oss.c
@@ -1,4 +1,4 @@
---- libao2/ao_oss.c.orig	2013-03-17 22:47:17 UTC
+--- libao2/ao_oss.c.orig	2016-02-26 20:47:16 UTC
 +++ libao2/ao_oss.c
 @@ -57,6 +57,8 @@ static const ao_info_t info =
  	""
@@ -33,7 +33,7 @@
  #endif
  #ifdef AFMT_U32_LE
      case AFMT_U32_LE: return AF_FORMAT_U32_LE;
-@@ -435,9 +447,29 @@ static void uninit(int immed){
+@@ -441,10 +453,30 @@ static void uninit(int immed){
      audio_fd = -1;
  }
  
@@ -58,32 +58,34 @@
 +
  // stop playing and empty buffers (for seeking/pause)
  static void reset(void){
+   int fail = 0;
    int oss_format;
 +    savevol();
      uninit(1);
      audio_fd=open(dsp, O_WRONLY);
      if(audio_fd < 0){
-@@ -449,6 +481,7 @@ static void reset(void){
+@@ -456,6 +488,7 @@ static void reset(void){
    fcntl(audio_fd, F_SETFD, FD_CLOEXEC);
  #endif
  
 +  ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
    oss_format = format2oss(ao_data.format);
    if(AF_FORMAT_IS_AC3(ao_data.format))
-     ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
-@@ -460,13 +493,14 @@ static void reset(void){
+     fail |= ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate) == -1;
+@@ -467,14 +500,14 @@ static void reset(void){
        int c = ao_data.channels-1;
-       ioctl (audio_fd, SNDCTL_DSP_STEREO, &c);
+       fail |= ioctl (audio_fd, SNDCTL_DSP_STEREO, &c) == -1;
      }
--    ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
+-    fail |= ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate) == -1;
    }
+-  mp_msg(MSGT_AO,MSGL_WARN, "OSS: Reset failed\n");
 +  restorevol();
  }
  
  // stop playing, keep buffers (for pause)
  static void audio_pause(void)
  {
-+	savevol();
++    savevol();
      prepause_space = get_space();
      uninit(1);
  }