svn commit: r412865 - in head/multimedia: mencoder mplayer mplayer/files
Thomas Zander
riggs at FreeBSD.org
Sat Apr 9 18:48:47 UTC 2016
Author: riggs
Date: Sat Apr 9 18:48:45 2016
New Revision: 412865
URL: https://svnweb.freebsd.org/changeset/ports/412865
Log:
Update to snapshots as of 2016-04-09 including bundled ffmpeg
Added:
head/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile (contents, props changed)
Modified:
head/multimedia/mencoder/Makefile
head/multimedia/mencoder/distinfo
head/multimedia/mplayer/Makefile
head/multimedia/mplayer/Makefile.common
head/multimedia/mplayer/distinfo
head/multimedia/mplayer/files/patch-libao2_ao__oss.c
Modified: head/multimedia/mencoder/Makefile
==============================================================================
--- head/multimedia/mencoder/Makefile Sat Apr 9 18:35:42 2016 (r412864)
+++ head/multimedia/mencoder/Makefile Sat Apr 9 18:48:45 2016 (r412865)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mencoder
-PORTVERSION= ${MPLAYER_PORT_VERSION}
-PORTREVISION= 1
+PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
CATEGORIES= multimedia audio
MAINTAINER= riggs at FreeBSD.org
Modified: head/multimedia/mencoder/distinfo
==============================================================================
--- head/multimedia/mencoder/distinfo Sat Apr 9 18:35:42 2016 (r412864)
+++ head/multimedia/mencoder/distinfo Sat Apr 9 18:48:45 2016 (r412865)
@@ -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
Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile Sat Apr 9 18:35:42 2016 (r412864)
+++ head/multimedia/mplayer/Makefile Sat Apr 9 18:48:45 2016 (r412865)
@@ -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 at FreeBSD.org
Modified: head/multimedia/mplayer/Makefile.common
==============================================================================
--- head/multimedia/mplayer/Makefile.common Sat Apr 9 18:35:42 2016 (r412864)
+++ head/multimedia/mplayer/Makefile.common Sat Apr 9 18:48:45 2016 (r412865)
@@ -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
Modified: head/multimedia/mplayer/distinfo
==============================================================================
--- head/multimedia/mplayer/distinfo Sat Apr 9 18:35:42 2016 (r412864)
+++ head/multimedia/mplayer/distinfo Sat Apr 9 18:48:45 2016 (r412865)
@@ -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
Added: head/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile Sat Apr 9 18:48:45 2016 (r412865)
@@ -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
Modified: head/multimedia/mplayer/files/patch-libao2_ao__oss.c
==============================================================================
--- head/multimedia/mplayer/files/patch-libao2_ao__oss.c Sat Apr 9 18:35:42 2016 (r412864)
+++ head/multimedia/mplayer/files/patch-libao2_ao__oss.c Sat Apr 9 18:48:45 2016 (r412865)
@@ -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);
}
More information about the svn-ports-all
mailing list