From 002264e2fe7bc41de92278f5b65c201f7c871589 Mon Sep 17 00:00:00 2001 From: edd Date: Sat, 2 Jul 2011 23:10:25 +0000 Subject: [PATCH] Disable some more libs where the default FFmpeg implementations will suffice. Cleanups in README. From brad. OK sthen@ and dcoppa@ --- x11/mplayer/Makefile | 17 +++++++++++------ x11/mplayer/README | 28 ++++++++++++++-------------- x11/mplayer/pkg/README | 6 +++--- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/x11/mplayer/Makefile b/x11/mplayer/Makefile index 80d6665306e..c25ebd5e6cd 100644 --- a/x11/mplayer/Makefile +++ b/x11/mplayer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.191 2011/06/30 15:31:15 edd Exp $ +# $OpenBSD: Makefile,v 1.192 2011/07/02 23:10:25 edd Exp $ # May not be hard to add more. ONLY_FOR_ARCHS = alpha amd64 arm i386 mips64 mips64el powerpc sparc64 @@ -13,7 +13,7 @@ SUBST_VARS += PREFIX CONFDIR # Distfiles must be hand-rolled, see README N = mplayer DISTNAME = mplayer-${V} -REVISION = 7 +REVISION = 8 CATEGORIES = x11 multimedia @@ -31,7 +31,7 @@ WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \ m mng mp3lame ncurses ogg>=5 orc-0.4 png postproc \ pthread SDL schroedinger-1.0>=2.0 sndio speex stdc++ \ swscale theoradec theoraenc ungif util vpx x264>=5 \ - xvidcore z + z # we use a snapshot MASTER_SITES = http://theunixzoo.co.uk/distfiles/ @@ -47,7 +47,6 @@ LIB_DEPENDS = graphics/png \ audio/cdparanoia>=3.a9.8 \ audio/speex \ audio/libogg \ - multimedia/xvidcore \ audio/lame \ multimedia/libdv \ devel/fribidi \ @@ -96,7 +95,8 @@ CONFIGURE_ARGS += --disable-alsa \ --disable-sunaudio \ --disable-vidix \ --disable-select \ - --disable-libcdio + --disable-libcdio \ + --disable-libmpeg2-internal # seems stable dvdnav does not work with a new mplayer. # if they make a release in the future, maybe we can pull that in, # but for now we have to use the internal one. @@ -125,16 +125,21 @@ CONFIGURE_ARGS += --disable-smb \ --disable-openal \ --disable-libdca \ --disable-liba52 \ + --disable-libmpeg2 \ --disable-toolame \ --disable-win32dll \ --disable-ggi \ + --disable-libopencore_amrnb \ + --disable-libopencore_amrwb \ --disable-libopenjpeg \ --disable-mpg123 \ --disable-librtmp \ --disable-faac \ --disable-faac-lavc \ --disable-faad \ - --disable-theora + --disable-theora \ + --disable-xvid \ + --disable-xvid-lavc # internal tremor, external tremor, external libvorbis all conflict # we choose libvorbis to enable encoding to vorbis diff --git a/x11/mplayer/README b/x11/mplayer/README index 69f1e2d1411..1a93cef4e41 100644 --- a/x11/mplayer/README +++ b/x11/mplayer/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.2 2011/06/27 23:29:20 edd Exp $ +$OpenBSD: README,v 1.3 2011/07/02 23:10:25 edd Exp $ Porting notes for MPlayer ========================= @@ -6,48 +6,48 @@ Porting notes for MPlayer In addition to the comments in Makefile, porters should also read these notes: -FFMPEG Linkage +FFmpeg Linkage -------------- We link the shared libraries from the graphics/ffmpeg port. This is what ---disable-ffmpeg_a does, however we still need the ffmpeg sources in the -build dir for this to work, hence we depend upon ffmpeg as a build dependency. +--disable-ffmpeg_a does, however we still need the FFmpeg sources in the +build dir for this to work, hence we depend upon FFmpeg as a build dependency. -Ensure that ffmpeg was dynamically linked by using ldd on the mplayer -binary and searching for one of the ffmpeg libs in the listing (eg. +Ensure that FFmpeg was dynamically linked by using ldd on the MPlayer +binary and searching for one of the FFmpeg libs in the listing (eg. libavcodec). Selecting Codec Implementations ------------------------------- -As a general rule, we prefer to use FFMPEG implementations, but only if +As a general rule, we prefer to use FFmpeg implementations, but only if they are good quality. If this is the case, try not to pull in external codec libraries for the same codec. There is an exception to this rule, which is where an external library provides an encoder and decoder, and there is a decoder for the given -codec in FFMPEG, but no encoder; in such a case, go ahead and link the +codec in FFmpeg, but no encoder; in such a case, go ahead and link the external library so that users can encode with mencoder. Be aware that some hardware lacks a floating point unit (ARM for example). On these architectures, you should select integer decoders where possible. Eg. Tremor instead of Vorbis. -External FAAC linkage (and multimedia/ffmpeg's external FAAC linkage) -was disabled due to conflicting licenses. Only the FFMPEG's +External FAAC linkage (and graphics/ffmpeg's external FAAC linkage) +was disabled due to conflicting licenses. Only the FFmpeg's internal "ffaac" encoder remains for use with encoding AAC in mencoder. https://bugs.launchpad.net/ubuntu/+source/faac/+bug/374900 -FFMPEG OGG Demuxer Bug +FFmpeg Ogg Demuxer Bug ---------------------- -The pkg/README details a bug in the FFMPEG Ogg demuxer; You can test the +The pkg/README details a bug in the FFmpeg Ogg demuxer; You can test the existence of this bug with this URL: http://icecast.version6.net:8888/okul.ogg -When a song ends, mplayer will stall saying it cannot fill the cache. +When a song ends, MPlayer will stall saying it cannot fill the cache. -Bug reported upstream here (it's an ffmpeg bug): +Bug reported upstream here (it's an FFmpeg bug): https://roundup.ffmpeg.org/issue2337 Rolling a Distfile diff --git a/x11/mplayer/pkg/README b/x11/mplayer/pkg/README index 1dc744ad843..d0dd5e1311b 100644 --- a/x11/mplayer/pkg/README +++ b/x11/mplayer/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.3 2011/06/02 13:41:42 ajacoutot Exp $ +$OpenBSD: README,v 1.4 2011/07/02 23:10:25 edd Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -13,13 +13,13 @@ all arches: Mencoder is not expected to do a good job of multiplexing into container formats other than AVI or MPEG. - ffmpeg's ogg demuxer is broken for ogg streams. If mplayer says "cache + FFmpeg's Ogg demuxer is broken for Ogg streams. If MPlayer says "cache not filling" when a song changes, you have been bitten by this bug. You can try '-demuxer ogg' as a workaround (or try using ogg123 from the vorbis-tools package). i386: - win32 codecs were disabled in OpenBSD's build, as the open-source codecs + Win32 codecs were disabled in OpenBSD's build, as the open source codecs are now of decent quality. arm: