diff options
-rw-r--r-- | multimedia/mplayer/Makefile | 21 | ||||
-rw-r--r-- | multimedia/mplayer/distinfo | 2 | ||||
-rw-r--r-- | multimedia/mplayer/pkg-descr | 4 | ||||
-rw-r--r-- | multimedia/mplayer/pkg-message | 8 | ||||
-rw-r--r-- | multimedia/mplayer/pkg-plist | 2 |
5 files changed, 26 insertions, 11 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 99fd421524b3..9a6fa559b11c 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mplayer -PORTVERSION= 0.90.0.102 +PORTVERSION= 0.90.0.103 CATEGORIES= multimedia audio MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \ http://www2.mplayerhq.hu/MPlayer/releases/ \ @@ -16,13 +16,12 @@ 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.90rc2 +DISTNAME= MPlayer-0.90rc3 MAINTAINER= riggs@rrr.de LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - iconv.3:${PORTSDIR}/converters/libiconv \ - mp3lame.0:${PORTSDIR}/audio/lame + iconv.3:${PORTSDIR}/converters/libiconv USE_BZIP2= yes USE_GMAKE= yes @@ -42,7 +41,6 @@ CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \ USE_GNOMENG= yes WANT_GNOME= yes MAN1= mplayer.1 -MLINKS= mplayer.1 mencoder.1 MANCOMPRESSED= no CONFFILES= codecs.conf example.conf input.conf menu.conf @@ -176,6 +174,16 @@ CONFIGURE_ARGS+= --enable-mad \ CONFIGURE_ARGS+= --disable-mad .endif +.if !defined(WITHOUT_MENCODER) +LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame + +MLINKS+= mplayer.1 mencoder.1 +PLIST_SUB+= MENCODER="" +.else +CONFIGURE_ARGS+= --disable-mencoder +PLIST_SUB+= MENCODER="@comment " +.endif + .if defined(WITH_SVGALIB) LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib .endif @@ -256,8 +264,7 @@ RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT} CONFIGURE_ARGS+= --with-win32libdir=${LOCALBASE}/lib/win32 -#CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs -CODEC_PORT= ${.CURDIR}/../win32-codecs +CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE .else CONFIGURE_ARGS+= --disable-win32 \ diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo index 0c38756e3ae4..8ed19123d0f7 100644 --- a/multimedia/mplayer/distinfo +++ b/multimedia/mplayer/distinfo @@ -1 +1 @@ -MD5 (MPlayer-0.90rc2.tar.bz2) = b6b6d83276ac7086702ad62ead1bcfe5 +MD5 (MPlayer-0.90rc3.tar.bz2) = 47a298ccd8d788ff88333c553ca81d07 diff --git a/multimedia/mplayer/pkg-descr b/multimedia/mplayer/pkg-descr index ea53eb32e136..abbc421f0d18 100644 --- a/multimedia/mplayer/pkg-descr +++ b/multimedia/mplayer/pkg-descr @@ -1,10 +1,10 @@ This is the port of mplayer, a project which has the effort -to become a very stable and useful movie player. +to become a very stable and useful movie player and encoder. It is based on the windows codec compilation and provides the ability to play many formats in a very good quality without much CPU comsumption. -Support for ffmpeg and DVD are also included. +Support for ffmpeg, quicktime and DVD are also included. WWW: http://www.mplayerhq.hu/ diff --git a/multimedia/mplayer/pkg-message b/multimedia/mplayer/pkg-message index c4bca2bc9ab4..83a7ba2bd666 100644 --- a/multimedia/mplayer/pkg-message +++ b/multimedia/mplayer/pkg-message @@ -16,3 +16,11 @@ http://www.mplayerhq.hu/ In order to use DVD please make sure that your kernel and base system is newer than 2001-09-25, otherwise DVD play will not work! + +NOTE: Some users have ran into trouble when using mplayer on a +SSE-capable CPU but not having SSE enabled in the kernel config. + +This is only for SSE-capable CPUs. For 5.x systems, this should not +be necessary but 4.x users must recompile the kernel with + +options CPU_ENABLE_SSE diff --git a/multimedia/mplayer/pkg-plist b/multimedia/mplayer/pkg-plist index dcd27193e9ba..66bf3a34c99b 100644 --- a/multimedia/mplayer/pkg-plist +++ b/multimedia/mplayer/pkg-plist @@ -1,5 +1,5 @@ bin/mplayer -bin/mencoder +%%MENCODER%%bin/mencoder %%GMPLAYER%%bin/gmplayer %%PORTDOCS%%share/doc/mplayer/bugreports.html %%PORTDOCS%%share/doc/mplayer/cd-dvd.html |