Date: Tue, 11 Feb 2003 00:03:34 +0800 (WST) From: "Thomas E. Zander" <riggs@rrr.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/48152: Maintainer-update of multimedia/mplayer Message-ID: <200302101603.h1AG3Ylr011871@trillian.mugiri.au>
next in thread | raw e-mail | index | archive | help
>Number: 48152 >Category: ports >Synopsis: Maintainer-update of multimedia/mplayer >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Feb 10 08:10:09 PST 2003 >Closed-Date: >Last-Modified: >Originator: Thomas E. Zander >Release: FreeBSD 5.0-RELEASE i386 >Organization: >Environment: System: FreeBSD trillian.mugiri.au 5.0-RELEASE FreeBSD 5.0-RELEASE #0: Wed Jan 22 23:19:13 WST 2003 root@trillian.mugiri.au:/usr/obj/usr/src/sys/TRILLIAN i386 >Description: This update contains the following: o Update to use the 0.9-rc4 sources o Remove libfame from the possible dependency list because integrated libavcodec does the same job o Apply libdemux-mov patch suggested by lioux (will fix some quicktime movies) o Fix pkg-plist Thank you all for your suggestions in the last weeks! >How-To-Repeat: >Fix: Please apply this to multimedia/mplayer: diff -ruN mplayer-old/Makefile mplayer/Makefile --- mplayer-old/Makefile Tue Feb 4 03:17:46 2003 +++ mplayer/Makefile Mon Feb 10 23:40:50 2003 @@ -145,8 +145,7 @@ # to be installed. PORTNAME= mplayer -PORTVERSION= 0.90.0.103 -PORTREVISION= 1 +PORTVERSION= 0.90.0.104 CATEGORIES= multimedia audio MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \ http://www2.mplayerhq.hu/MPlayer/releases/ \ @@ -156,7 +155,7 @@ ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \ ftp://ftp.lug.udel.edu/MPlayer/releases/ \ http://www.rrr.de/~riggs/mplayer/ -DISTNAME= MPlayer-0.90rc3 +DISTNAME= MPlayer-0.90rc4 MAINTAINER= riggs@rrr.de @@ -175,6 +174,7 @@ --with-x11libdir=${X11BASE}/lib \ --with-x11incdir=${X11BASE}/include \ --enable-png \ + --disable-libfame \ --disable-tv-v4l USE_GNOMENG= yes @@ -186,7 +186,7 @@ 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 \ + codecs.html documentation.html faq.html skin.html \ encoding.html formats.html sound.html \ users_against_developers.html \ video.html @@ -313,14 +313,6 @@ 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) diff -ruN mplayer-old/distinfo mplayer/distinfo --- mplayer-old/distinfo Fri Jan 24 03:17:31 2003 +++ mplayer/distinfo Mon Feb 10 23:09:39 2003 @@ -1 +1 @@ -MD5 (MPlayer-0.90rc3.tar.bz2) = 47a298ccd8d788ff88333c553ca81d07 +MD5 (MPlayer-0.90rc4.tar.bz2) = 4976575433d5b0ad526ca1733f5cab26 diff -ruN mplayer-old/files/patch-ad mplayer/files/patch-ad --- mplayer-old/files/patch-ad Sat Jan 11 04:12:50 2003 +++ mplayer/files/patch-ad Mon Feb 10 23:21:20 2003 @@ -1,6 +1,6 @@ ---- configure.orig Sat Dec 7 07:54:02 2002 -+++ configure Mon Dec 16 21:02:31 2002 -@@ -276,7 +276,7 @@ +--- configure.orig Sun Feb 9 06:29:05 2003 ++++ configure Mon Feb 10 23:20:25 2003 +@@ -294,7 +294,7 @@ # 1st pass checking for vital options @@ -9,19 +9,19 @@ _ranlib=ranlib _cc=gcc test "$CC" && _cc="$CC" -@@ -512,19 +512,10 @@ +@@ -530,19 +530,10 @@ # Try to find the available options for the current CPU if x86 || ppc; then - if test -r /proc/cpuinfo ; then -- # linux with /proc mounted, extract cpu information from it +- # Linux with /proc mounted, extract CPU information from it - _cpuinfo="cat /proc/cpuinfo" - elif test -r /compat/linux/proc/cpuinfo ; then -- # FreeBSD with linux emulation /proc mounted, -- # extract cpu information from it +- # FreeBSD with Linux emulation /proc mounted, +- # extract CPU information from it - _cpuinfo="cat /compat/linux/proc/cpuinfo" - elif x86; then - # all other OS try to extract cpu information from a small helper + # all other OSes try to extract CPU information from a small helper # program TOOLS/cpuinfo instead $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c _cpuinfo="TOOLS/cpuinfo" @@ -29,7 +29,7 @@ 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` -@@ -1353,8 +1344,8 @@ +@@ -1394,8 +1385,8 @@ ;; *) @@ -40,7 +40,7 @@ ;; esac -@@ -1364,7 +1355,7 @@ +@@ -1405,7 +1396,7 @@ test -z "$_bindir" && _bindir="$_prefix/bin" test -z "$_datadir" && _datadir="$_prefix/share/mplayer" test -z "$_mandir" && _mandir="$_prefix/man" @@ -49,7 +49,7 @@ test -z "$_libdir" && _libdir="$_prefix/lib" test -z "$_mlibdir" && _mlibdir="$MLIBHOME" -@@ -1784,13 +1775,7 @@ +@@ -1836,13 +1827,7 @@ echocheck "memalign()" @@ -63,7 +63,7 @@ if test "$_memalign" = yes ; then _def_memalign='#define HAVE_MEMALIGN 1' else -@@ -1879,31 +1864,7 @@ +@@ -1931,31 +1916,7 @@ echocheck "pthread" @@ -96,7 +96,7 @@ echores "yes (using $_ld_pthread)" -@@ -4483,7 +4444,7 @@ +@@ -4694,7 +4655,7 @@ CFLAGS="$CFLAGS -D_REENTRANT" elif bsd ; then # FIXME bsd needs this so maybe other OS'es diff -ruN mplayer-old/files/patch-libmpdemux::demux_mov.c mplayer/files/patch-libmpdemux::demux_mov.c --- mplayer-old/files/patch-libmpdemux::demux_mov.c Thu Jan 1 08:00:00 1970 +++ mplayer/files/patch-libmpdemux::demux_mov.c Sun Feb 9 17:33:02 2003 @@ -0,0 +1,23 @@ +--- 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 -ruN mplayer-old/pkg-plist mplayer/pkg-plist --- mplayer-old/pkg-plist Tue Feb 4 03:17:46 2003 +++ mplayer/pkg-plist Mon Feb 10 23:40:58 2003 @@ -9,12 +9,12 @@ %%PORTDOCS%%share/doc/mplayer/encoding.html %%PORTDOCS%%share/doc/mplayer/faq.html %%PORTDOCS%%share/doc/mplayer/formats.html -%%PORTDOCS%%share/doc/mplayer/skin-en.html +%%PORTDOCS%%share/doc/mplayer/skin.html %%PORTDOCS%%share/doc/mplayer/sound.html %%PORTDOCS%%share/doc/mplayer/video.html %%PORTDOCS%%share/doc/mplayer/users_against_developers.html lib/libdha.so.0 -lib/libdha-1.so.0 +lib/libdha-0.so.1 lib/mplayer/vidix/cyberblade_vid.so lib/mplayer/vidix/mach64_vid.so lib/mplayer/vidix/mga_crtc2_vid.so >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302101603.h1AG3Ylr011871>