diff options
author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-03-26 16:17:59 +0000 |
---|---|---|
committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-03-26 16:17:59 +0000 |
commit | 57ffe5056b02ba277bd76ee897ce21be3e957886 (patch) | |
tree | 7e9a6f1df1c996754d955e5906ebb10b7a13dc04 /multimedia/mplayer | |
parent | upgrade to 2.8.6 (diff) |
o Update to 0.90 rc5 [1]
o Add WITH_FAAD knob [1] [2]
PR: 50188 [1],
50246 [2]
Submitted by: maintainer [1],
David Yeske <dyeske@yahoo.com> [2]
Notes
Notes:
svn path=/head/; revision=77488
Diffstat (limited to 'multimedia/mplayer')
-rw-r--r-- | multimedia/mplayer/Makefile | 26 | ||||
-rw-r--r-- | multimedia/mplayer/distinfo | 2 | ||||
-rw-r--r-- | multimedia/mplayer/files/patch-libmpdemux::demux_mov | 23 | ||||
-rw-r--r-- | multimedia/mplayer/pkg-plist | 10 |
4 files changed, 34 insertions, 27 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 654196d799dd..38e8f88bb47d 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -127,6 +127,9 @@ # WITH_XVID # default: autodetect # +# WITH_FAAD +# default: autodetect +# # WITHOUT_WIN32_CODECS # default: undefined # By default, mplayer depends on and uses the win32-codecs collection. @@ -145,8 +148,7 @@ # to be installed. PORTNAME= mplayer -PORTVERSION= 0.90.0.104 -PORTREVISION= 2 +PORTVERSION= 0.90.0.105 CATEGORIES= multimedia audio MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \ http://www2.mplayerhq.hu/MPlayer/releases/ \ @@ -156,7 +158,7 @@ MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \ ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \ ftp://ftp.lug.udel.edu/MPlayer/releases/ \ http://www.rrr.de/~riggs/mplayer/ -DISTNAME= MPlayer-0.90rc4 +DISTNAME= MPlayer-0.90rc5 MAINTAINER= riggs@rrr.de COMMENT= High performance media player/encoder supporting many formats @@ -192,6 +194,10 @@ DOCFILES= bugreports.html cd-dvd.html codecs-in.html \ encoding.html formats.html sound.html \ users_against_developers.html \ video.html +TOOLFILES= calcbpp.pl countquant.pl \ + dvd2divxscript.pl menc2pass \ + mencvcd mp.pl sws-test w32codec_dl.pl \ + x2mpsub.sh .include <bsd.port.pre.mk> @@ -251,6 +257,10 @@ WITH_LIVEMEDIA= yes WITH_XVID= yes .endif +.if exists(${LOCALBASE}/lib/libfaad.so) +WITH_FAAD= yes +.endif + .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O3 -ffast-math -fomit-frame-pointer .endif @@ -367,6 +377,11 @@ CONFIGURE_ARGS+= --enable-xvid \ LIB_DEPENDS+= xvidcore.0:${PORTSDIR}/graphics/xvid .endif +.if defined(WITH_FAAD) +CONFIGURE_ARGS+= --enable-faad +LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad +.endif + .if defined(WITH_FREETYPE) CONFIGURE_ARGS+= --with-extraincdir=${LOCALBASE}/include/freetype2 \ --enable-freetype @@ -445,9 +460,14 @@ pre-configure: post-install: @${MKDIR} ${DATADIR} @${CHMOD} 755 ${DATADIR} + @${MKDIR} ${DATADIR}/tools + @${CHMOD} 755 ${DATADIR}/tools .for conf in ${CONFFILES} ${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${DATADIR} .endfor +.for tool in ${TOOLFILES} + ${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${DATADIR}/tools +.endfor .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${CHMOD} 755 ${DOCSDIR} diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo index 4df2d51718e3..4e3b383905bc 100644 --- a/multimedia/mplayer/distinfo +++ b/multimedia/mplayer/distinfo @@ -1 +1 @@ -MD5 (MPlayer-0.90rc4.tar.bz2) = 4976575433d5b0ad526ca1733f5cab26 +MD5 (MPlayer-0.90rc5.tar.bz2) = 056c2cd23286ca5464a70defd4649134 diff --git a/multimedia/mplayer/files/patch-libmpdemux::demux_mov b/multimedia/mplayer/files/patch-libmpdemux::demux_mov deleted file mode 100644 index 5e866b571544..000000000000 --- a/multimedia/mplayer/files/patch-libmpdemux::demux_mov +++ /dev/null @@ -1,23 +0,0 @@ ---- libmpdemux/demux_mov.c.orig Sat Feb 8 11:31:57 2003 -+++ libmpdemux/demux_mov.c Sat Feb 8 11:32:29 2003 -@@ -597,7 +597,10 @@ - unsigned int fourcc=stream_read_dword_le(demuxer->stream); - if(len<8) break; // error - mp_msg(MSGT_DEMUX,MSGL_V,"MOV: %*s desc #%d: %.4s (%d bytes)\n",level,"",i,&fourcc,len-16); -- if(!i){ -+ if(fourcc!=trak->fourcc && i) -+ mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_MOVvariableFourCC); -+ //if(!i) -+ { - trak->fourcc=fourcc; - // read type specific (audio/video/time/text etc) header - // NOTE: trak type is not yet known at this point :((( -@@ -605,8 +608,6 @@ - trak->stdata=malloc(trak->stdata_len); - stream_read(demuxer->stream,trak->stdata,trak->stdata_len); - } -- if(fourcc!=trak->fourcc && i) -- mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_MOVvariableFourCC); - if(!stream_seek(demuxer->stream,pos+len)) break; - } - break; diff --git a/multimedia/mplayer/pkg-plist b/multimedia/mplayer/pkg-plist index 53487bcc6bb5..1e1c6ece95eb 100644 --- a/multimedia/mplayer/pkg-plist +++ b/multimedia/mplayer/pkg-plist @@ -22,10 +22,20 @@ lib/mplayer/vidix/mga_vid.so lib/mplayer/vidix/pm3_vid.so lib/mplayer/vidix/radeon_vid.so lib/mplayer/vidix/rage128_vid.so +share/mplayer/tools/calcbpp.pl +share/mplayer/tools/countquant.pl +share/mplayer/tools/dvd2divxscript.pl +share/mplayer/tools/menc2pass +share/mplayer/tools/mencvcd +share/mplayer/tools/mp.pl +share/mplayer/tools/sws-test +share/mplayer/tools/w32codec_dl.pl +share/mplayer/tools/x2mpsub.sh share/mplayer/codecs.conf share/mplayer/example.conf share/mplayer/input.conf share/mplayer/menu.conf +@dirrm share/mplayer/tools @unexec rmdir %D/share/mplayer 2>/dev/null || true %%PORTDOCS%%@dirrm share/doc/mplayer @dirrm lib/mplayer/vidix |