mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-29 01:13:08 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Thomas Zander 2016-04-09 18:48:45 +00:00
parent 89cbe9f41d
commit 9a3ec65015
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=412865
7 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multimedia/mencoder/Makefile
View File

@ -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@FreeBSD.org

4
multimedia/mencoder/distinfo
View File

@ -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

3
multimedia/mplayer/Makefile
View File

@ -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

7
multimedia/mplayer/Makefile.common
View File

@ -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

4
multimedia/mplayer/distinfo
View File

@ -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

19
multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile Normal file
View File

@ -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

18
multimedia/mplayer/files/patch-libao2_ao__oss.c
View File

@ -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);
}