diff options
author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-01-10 20:12:50 +0000 |
---|---|---|
committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-01-10 20:12:50 +0000 |
commit | e70444ae5feaf75004e462ebf83821ed0ae6aecf (patch) | |
tree | 91c9557a8c8537bd6b876b71905c2cd3e4c60d17 /multimedia/mplayer | |
parent | o PORTVERSION change: (diff) |
Update to 0.90 RC2: this release supports both WM9 and Quicktime(TM)
files using latest win32-codecs port.
Submitted by: maintainer et al
Reviewed by: freebsd-multimedia mailing list
Notes
Notes:
svn path=/head/; revision=72859
Diffstat (limited to 'multimedia/mplayer')
-rw-r--r-- | multimedia/mplayer/Makefile | 118 | ||||
-rw-r--r-- | multimedia/mplayer/distinfo | 2 | ||||
-rw-r--r-- | multimedia/mplayer/files/install-user | 18 | ||||
-rw-r--r-- | multimedia/mplayer/files/patch-ad | 27 | ||||
-rw-r--r-- | multimedia/mplayer/files/patch-ae | 25 | ||||
-rw-r--r-- | multimedia/mplayer/files/patch-libmpdemux::demux_rtp.cpp | 14 | ||||
-rw-r--r-- | multimedia/mplayer/pkg-message | 10 | ||||
-rw-r--r-- | multimedia/mplayer/pkg-plist | 2 |
8 files changed, 151 insertions, 65 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 9bc2638c27b5..28c588ed8775 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -6,17 +6,17 @@ # PORTNAME= mplayer -PORTVERSION= 0.90.0.10 -PORTREVISION= 1 +PORTVERSION= 0.90.0.102 CATEGORIES= multimedia audio -MASTER_SITES= http://ftp.mplayerhq.hu/MPlayer/releases/ \ - http://www.mplayerhq.hu/MPlayer/releases/ \ +MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \ http://www2.mplayerhq.hu/MPlayer/releases/ \ http://ftp.lug.udel.edu/MPlayer/releases/ \ - ftp://ftp.mplayerhq.hu/MPlayer/releases/ \ + http://www4.mplayerhq.hu/MPlayer/releases/ \ + ftp://ftp1.mplayerhq.hu/MPlayer/releases/ \ ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \ - ftp://ftp.lug.udel.edu/MPlayer/releases/ -DISTNAME= MPlayer-0.90pre10 + ftp://ftp.lug.udel.edu/MPlayer/releases/ \ + http://www.rrr.de/~riggs/mplayer/ +DISTNAME= MPlayer-0.90rc2 MAINTAINER= riggs@rrr.de @@ -31,8 +31,12 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS=${PTHREAD_LIBS} \ TMPDIR="${WRKSRC}" -CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \ +CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \ --with-extraincdir=${LOCALBASE}/include \ + --with-x11libdir=${X11BASE}/lib \ + --with-x11incdir=${X11BASE}/include \ + --enable-png \ + --disable-tv-v4l \ --disable-vidix USE_GNOMENG= yes @@ -41,8 +45,8 @@ MAN1= mplayer.1 MLINKS= mplayer.1 mencoder.1 MANCOMPRESSED= no -CONFFILES= codecs.conf example.conf input.conf -DOCFILES= bugreports.html cd-dvd.html codecs-in.html \ +CONFFILES= codecs.conf example.conf input.conf menu.conf +DOCFILES= bugreports.html cd-dvd.html codecs-in.html \ codecs.html documentation.html faq.html skin-en.html \ encoding.html formats.html sound.html \ users_against_developers.html \ @@ -50,10 +54,26 @@ DOCFILES= bugreports.html cd-dvd.html codecs-in.html \ .include <bsd.port.pre.mk> +.if exists(${LOCALBASE}/lib/libartsc.so.0) +WITH_ARTS= yes +.endif + +.if exists(${LOCALBASE}/lib/libdv.so.2) +WITH_LIBDV= yes +.endif + .if exists(${LOCALBASE}/lib/libdvdcss.so.2) WITH_DVD= yes .endif +.if exists(${LOCALBASE}/lib/libdvdnav.so.1) +WITH_LIBDVDNAV= yes +.endif + +.if exists(${LOCALBASE}/lib/libmad.so.1) +WITH_MAD= yes +.endif + .if exists(${LOCALBASE}/lib/libvga.so.1) WITH_SVGALIB= yes .endif @@ -82,8 +102,12 @@ WITH_REALPLAYER= yes WITH_LIVEMEDIA= yes .endif +.if exists(${LOCALBASE}/lib/libxvidcore.so) +WITH_XVID= yes +.endif + .if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS+= -O3 -ffast-math -fomit-frame-pointer +CFLAGS+= -O3 -ffast-math -fomit-frame-pointer .endif .if ${HAVE_GNOME:Mgtk12}!="" @@ -99,12 +123,57 @@ PKGNAMESUFFIX= -gtk CONFIGURE_ARGS+= --enable-gui .endif +.if defined(WITH_ARTS) +LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts + +CONFIGURE_ARGS+= --enable-arts +.else +CONFIGURE_ARGS+= --disable-arts +.endif + .if defined(WITH_DVD) .if !defined(WITH_LIBDVDREAD) LIB_DEPENDS+= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss .else LIB_DEPENDS+= dvdread.2:${PORTSDIR}/multimedia/libdvdread .endif +.if defined(WITH_LIBDVDNAV) +LIB_DEPENDS+= dvdnav.1:${PORTSDIR}/graphics/libdvdnav + +CONFIGURE_ARGS+= --enable-dvdnav +.else +CONFIGURE_ARGS+= --disable-dvdnav +.endif + +CONFIGURE_ARGS+= --enable-css \ + --with-csslibdir=${LOCALBASE}/lib +.else +CONFIGURE_ARGS+= --disable-css +.endif + +.if defined(WITH_LIBDV) +LIB_DEPENDS+= dv.2:${PORTSDIR}/multimedia/libdv + +CONFIGURE_ARGS+= --enable-libdv +.else +CONFIGURE_ARGS+= --disable-libdv +.endif + +.if defined(WITH_LIBFAME) +LIB_DEPENDS+= fame-0.9.0:${PORTSDIR}/graphics/libfame + +CONFIGURE_ARGS+= --enable-libfame +.else +CONFIGURE_ARGS+= --disable-libfame +.endif + +.if defined(WITH_MAD) +LIB_DEPENDS+= mad.1:${PORTSDIR}/audio/mad + +CONFIGURE_ARGS+= --enable-mad \ + --with-madlibdir=${LOCALBASE}/lib +.else +CONFIGURE_ARGS+= --disable-mad .endif .if defined(WITH_SVGALIB) @@ -133,6 +202,12 @@ RUN_DEPENDS+= ${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMe BUILD_DEPENDS+= ${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia .endif +.if defined(WITH_XVID) +CONFIGURE_ARGS+= --enable-xvid \ + --with-xvidcore=${LOCALBASE}/lib/libxvidcore.so +LIB_DEPENDS+= xvidcore.0:${PORTSDIR}/graphics/xvid +.endif + .if defined(WITH_FREETYPE) CONFIGURE_ARGS+= --with-extraincdir=${LOCALBASE}/include/freetype2 \ --enable-freetype @@ -181,8 +256,12 @@ RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT} CONFIGURE_ARGS+= --with-win32libdir=${LOCALBASE}/lib/win32 -CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs +#CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs +CODEC_PORT= ${.CURDIR}/../win32-codecs CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE +.else +CONFIGURE_ARGS+= --disable-win32 \ + -disable-qtx-codecs .endif .endif # ARCH == i386 @@ -200,11 +279,23 @@ pre-everything:: .endif .if !defined(WITH_DVD) @${ECHO_MSG} "You can enable DVD support by defining WITH_DVD." +.if !defined(WITH_LIBDVDNAV) + @${ECHO_MSG} "You can enable libdvdnav support by defining WITH_LIBDVDNAV." +.endif .endif .if defined(WITH_DVD) && !defined(WITH_LIBDVDREAD) @${ECHO_MSG} "You can replace mplayer internal DVD routines with libdvdread" @${ECHO_MSG} "support by defining WITH_LIBDVDREAD." .endif +.if !defined(WITH_LIBDV) + @${ECHO_MSG} "You can enable libdv support by defining WITH_LIBDV." +.endif +.if !defined(WITH_LIBFAME) + @${ECHO_MSG} "You can enable libfame support by defining WITH_LIBFAME." +.endif +.if !defined(WITH_MAD) + @${ECHO_MSG} "You can enable mad support by defining WITH_MAD." +.endif .if !defined(WITH_SVGALIB) @${ECHO_MSG} "You can enable SVGALIB support by defining WITH_SVGALIB." .endif @@ -220,6 +311,9 @@ pre-everything:: .if !defined(WITH_LIVEMEDIA) @${ECHO_MSG} "You can enable liveMedia support by defining WITH_LIVEMEDIA." .endif +.if !defined(WITH_XVID) + @${ECHO_MSG} "You can enable XviD support by defining WITH_XVID." +.endif .if !defined(WITH_FREETYPE) @${ECHO_MSG} "You can enable truetype font support by defining WITH_FREETYPE." @${ECHO_MSG} " But use with caution. mplayer won't use the standard fonts anymore." diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo index e7c16cce02df..0c38756e3ae4 100644 --- a/multimedia/mplayer/distinfo +++ b/multimedia/mplayer/distinfo @@ -1 +1 @@ -MD5 (MPlayer-0.90pre10.tar.bz2) = cd972417e29cc7ca692dc7dd214a2cd0 +MD5 (MPlayer-0.90rc2.tar.bz2) = b6b6d83276ac7086702ad62ead1bcfe5 diff --git a/multimedia/mplayer/files/install-user b/multimedia/mplayer/files/install-user index deef2d700fa8..75e8002181c4 100644 --- a/multimedia/mplayer/files/install-user +++ b/multimedia/mplayer/files/install-user @@ -1,10 +1,10 @@ #This perl script links the codec config file #and the fonts dir to the user's home dir. -#Last touched: 2002-05-04 riggs +#Last touched: 2002-12-16 riggs -if (-e "$ENV{HOME}/.mplayer/") +if (-e "$ENV{HOME}/.mplayer/font") { - print "Sorry, you should execute this target without having a .mplayer directory in your homedir.\n"; + print "Sorry, font link is already existing.\n"; exit 1; } @@ -16,6 +16,12 @@ $prefix=$pkg[3]; $prefix=~ s/(.+mplayer).*/$1/; chop $prefix; +if ($1 eq "") +{ + print "You have no mplayer-fonts installed.\n"; + exit 1; +} + print "You may choose any of the available language sets:\n\n"; print "ISO-8859-1 Font : 1\n"; print "ISO-8859-2 Font : 2\n"; @@ -34,8 +40,8 @@ if ($lang eq "1" || $lang eq "2") if ($size ne "14" && $size ne "18" && $size ne "24" && $size ne "28") {$size=14;} } +unless (-e "$ENV{HOME}/.mplayer") {system "mkdir $ENV{HOME}/.mplayer";} -system "mkdir $ENV{HOME}/.mplayer"; if ($lang eq "c") { system "ln -sv $prefix/fonts/cyrillic/ $ENV{HOME}/.mplayer/font"; @@ -49,7 +55,3 @@ elsif ($lang eq "2") system "ln -sv $prefix/fonts/iso-8859-2/arial-$size/ $ENV{HOME}/.mplayer/font"; } else {system "ln -sv $prefix/fonts/iso-8859-1/arial-$size/ $ENV{HOME}/.mplayer/font"}; - -system "ln -sv $prefix/codecs.conf $ENV{HOME}/.mplayer/codecs.conf"; -system "cp -pv $prefix/example.conf $ENV{HOME}/.mplayer/example.conf"; -system "cp -pv $prefix/input.conf $ENV{HOME}/.mplayer/input.conf"; diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad index cfd8603b66f5..4588426a277a 100644 --- a/multimedia/mplayer/files/patch-ad +++ b/multimedia/mplayer/files/patch-ad @@ -1,6 +1,15 @@ ---- configure.orig Thu Oct 24 20:12:40 2002 -+++ configure Fri Nov 1 12:46:36 2002 -@@ -495,19 +495,10 @@ +--- configure.orig Sat Dec 7 07:54:02 2002 ++++ configure Mon Dec 16 21:02:31 2002 +@@ -276,7 +276,7 @@ + + + # 1st pass checking for vital options +-_install=install ++_install=@${BSD_INSTALL_PROGRAM} + _ranlib=ranlib + _cc=gcc + test "$CC" && _cc="$CC" +@@ -512,19 +512,10 @@ # Try to find the available options for the current CPU if x86 || ppc; then @@ -20,18 +29,18 @@ pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1` pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1` -@@ -1302,8 +1293,8 @@ +@@ -1353,8 +1344,8 @@ ;; *) - echo "Unknown parameter: $ac_option" -- exit +- exit 1 + echo -n "Unknown parameter: $ac_option" + echo " (ignoring)" ;; esac -@@ -1313,7 +1304,7 @@ +@@ -1364,7 +1355,7 @@ test -z "$_bindir" && _bindir="$_prefix/bin" test -z "$_datadir" && _datadir="$_prefix/share/mplayer" test -z "$_mandir" && _mandir="$_prefix/man" @@ -40,7 +49,7 @@ test -z "$_libdir" && _libdir="$_prefix/lib" test -z "$_mlibdir" && _mlibdir="$MLIBHOME" -@@ -1702,13 +1693,7 @@ +@@ -1784,13 +1775,7 @@ echocheck "memalign()" @@ -54,7 +63,7 @@ if test "$_memalign" = yes ; then _def_memalign='#define HAVE_MEMALIGN 1' else -@@ -1785,31 +1770,7 @@ +@@ -1879,31 +1864,7 @@ echocheck "pthread" @@ -87,7 +96,7 @@ echores "yes (using $_ld_pthread)" -@@ -4277,7 +4238,7 @@ +@@ -4483,7 +4444,7 @@ CFLAGS="$CFLAGS -D_REENTRANT" elif bsd ; then # FIXME bsd needs this so maybe other OS'es diff --git a/multimedia/mplayer/files/patch-ae b/multimedia/mplayer/files/patch-ae index b9d7a7e3daba..cbaaba34a7d8 100644 --- a/multimedia/mplayer/files/patch-ae +++ b/multimedia/mplayer/files/patch-ae @@ -1,28 +1,21 @@ ---- Makefile.orig Wed Oct 23 19:20:59 2002 -+++ Makefile Fri Nov 1 12:31:48 2002 -@@ -24,7 +24,7 @@ - endif - - # a BSD compatible 'install' program --INSTALL = install -+INSTALL = @${BSD_INSTALL_PROGRAM} - - SRCS_COMMON = cpudetect.c codec-cfg.c cfgparser.c my_profile.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c subreader.c sub_cc.c find_sub.c - SRCS_MENCODER = mencoder.c mp_msg-mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c libvo/font_load_ft.c xvid_vbr.c -@@ -201,49 +201,11 @@ - ifeq ($(VIDIX),yes) - $(DO_MAKE) +--- Makefile.orig Thu Dec 5 07:29:26 2002 ++++ Makefile Tue Dec 17 09:53:32 2002 +@@ -241,49 +241,11 @@ + ifeq ($(SHARED_PP),yes) + $(MAKE) install -C postproc endif - if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi - $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG) +- $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG) -ifeq ($(GUI),yes) - -ln -sf $(PRG) $(BINDIR)/gmplayer -endif - if test ! -d $(MANDIR)/man1 ; then mkdir -p $(MANDIR)/man1; fi - $(INSTALL) -c -m 644 DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1 ++ @${BSD_INSTALL_PROGRAM} $(PRG) $(BINDIR)/$(PRG) + @${BSD_INSTALL_MAN} DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1 ifeq ($(MENCODER),yes) - $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER) +- $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER) ++ @${BSD_INSTALL_PROGRAM} $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER) -ln -sf mplayer.1 $(MANDIR)/man1/mencoder.1 -endif - @if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi diff --git a/multimedia/mplayer/files/patch-libmpdemux::demux_rtp.cpp b/multimedia/mplayer/files/patch-libmpdemux::demux_rtp.cpp deleted file mode 100644 index 0d22a5695dba..000000000000 --- a/multimedia/mplayer/files/patch-libmpdemux::demux_rtp.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- libmpdemux/demux_rtp.cpp.orig Thu Oct 17 00:15:43 2002 -+++ libmpdemux/demux_rtp.cpp Sat Dec 14 19:17:10 2002 -@@ -314,7 +314,11 @@ - // block myself until one comes available: - TaskScheduler& scheduler - = bufferQueue->readSource()->envir().taskScheduler(); -+#if USAGEENVIRONMENT_LIBRARY_VERSION_INT >= 1038614400 -+ scheduler.doEventLoop(&bufferQueue->blockingFlag); -+#else - scheduler.blockMyself(&bufferQueue->blockingFlag); -+#endif - } - - if (demuxer->stream->eof) return 0; // source stream has closed down diff --git a/multimedia/mplayer/pkg-message b/multimedia/mplayer/pkg-message index cec7bbd056f3..c4bca2bc9ab4 100644 --- a/multimedia/mplayer/pkg-message +++ b/multimedia/mplayer/pkg-message @@ -1,12 +1,12 @@ This port provides a simple and easy to use -possibility for any user to make mplayer ready -to run with a working codecs.conf and the -right font by logging in with the username, -then cd to the mplayer port directory and -enter: +tool to provide fonts in OSD. +Just cd to the ports directory and type make install-user +Note: This is only for the bitmap fonts! If you've compiled +mplayer with truetype supprt, this won't work. + Please take a look at docs in /usr/local/share/doc/mplayer diff --git a/multimedia/mplayer/pkg-plist b/multimedia/mplayer/pkg-plist index 9e56a14f12c5..dcd27193e9ba 100644 --- a/multimedia/mplayer/pkg-plist +++ b/multimedia/mplayer/pkg-plist @@ -16,4 +16,6 @@ bin/mencoder share/mplayer/codecs.conf share/mplayer/example.conf share/mplayer/input.conf +share/mplayer/menu.conf +@unexec rmdir %D/share/mplayer 2>/dev/null || true %%PORTDOCS%%@dirrm share/doc/mplayer |