Fix Ogg demuxing by using internal Tremor implementation.
Remove pointless "mad" flavor. On arm, we now default to the internal ffmp3 integer decoder. Clean up README and DESCR. Various contributions from edd@, jakemsr@, sthen@
This commit is contained in:
parent
5287edd5ce
commit
b409cc53fb
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.169 2010/07/14 18:15:37 edd Exp $
|
||||
# $OpenBSD: Makefile,v 1.170 2010/08/06 20:05:18 naddy Exp $
|
||||
|
||||
# May not be hard to add more.
|
||||
ONLY_FOR_ARCHS= amd64 i386 powerpc sparc64 arm mips64 mips64el
|
||||
@ -13,7 +13,7 @@ SUBST_VARS+= PREFIX CONFDIR
|
||||
N= mplayer
|
||||
DISTNAME= mplayer-export-snapshot-${V}
|
||||
PKGNAME= ${N}-${V}
|
||||
REVISION= 2
|
||||
REVISION= 3
|
||||
CATEGORIES= x11 multimedia
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
@ -30,7 +30,7 @@ WANTLIB= a52 bz2 c cdda_interface cdda_paranoia crypto dca \
|
||||
dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
|
||||
m mng mp3lame mpcdec ncurses ogg.>=5 oil-0.3 png \
|
||||
pthread schroedinger-1.0 sndio speex stdc++ theora \
|
||||
ungif util vorbisidec x264.>=3 xvidcore z
|
||||
ungif util x264.>=3 xvidcore z
|
||||
|
||||
# we use a snapshot
|
||||
MASTER_SITES= http://theunixzoo.co.uk/distfiles/
|
||||
@ -57,7 +57,6 @@ LIB_DEPENDS= ::graphics/png \
|
||||
::devel/fribidi \
|
||||
::graphics/lcms \
|
||||
::graphics/libmng \
|
||||
::audio/tremor \
|
||||
::audio/libdca \
|
||||
::archivers/bzip2 \
|
||||
::multimedia/schroedinger \
|
||||
@ -95,12 +94,13 @@ CONFIGURE_ARGS+=--disable-alsa \
|
||||
--disable-langinfo \
|
||||
--disable-openal \
|
||||
--disable-libvorbis \
|
||||
--disable-tremor \
|
||||
--disable-mad \
|
||||
--disable-libcdio \
|
||||
--disable-toolame \
|
||||
--disable-dvdread-internal \
|
||||
--disable-libdvdcss-internal \
|
||||
--disable-faad-internal \
|
||||
--disable-tremor-internal \
|
||||
--disable-gui \
|
||||
--disable-win32dll \
|
||||
--disable-ggi \
|
||||
@ -126,14 +126,13 @@ CONFIGURE_ARGS+=--disable-altivec
|
||||
CONFIGURE_ARGS+=--enable-runtime-cpudetection
|
||||
.endif
|
||||
|
||||
FLAVORS= sdl debug mad no_x11 aa jack
|
||||
FLAVORS= sdl debug no_x11 aa jack
|
||||
FLAVOR?=
|
||||
|
||||
# again old binutils...
|
||||
.if ${MACHINE_ARCH:Marm}
|
||||
CONFIGURE_ARGS+=--disable-mp3lib
|
||||
CONFIGURE_ARGS+=--target=generic-openbsd
|
||||
FLAVOR+= mad
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:L:Mno_x11}
|
||||
@ -161,13 +160,6 @@ CONFIGURE_ARGS+=--disable-sdl
|
||||
CONFIGURE_ARGS+=--enable-debug=3
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:L:Mmad}
|
||||
LIB_DEPENDS+= ::audio/libmad
|
||||
WANTLIB+= mad.>=2
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-mad
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:L:Maa}
|
||||
.if ${FLAVOR:L:Mno_x11}
|
||||
LIB_DEPENDS+= :aalib-*-no_x11:graphics/aalib,no_x11
|
||||
|
@ -1,13 +1,6 @@
|
||||
Possible issues with using MPlayer on OpenBSD:
|
||||
|
||||
all arches:
|
||||
MPlayer might fail due to lack of shared memory, e.g. when using gui
|
||||
mode under KDE. Starting with OpenBSD 3.3, sysctl(8) can modify the
|
||||
shared memory parameters. In particular kern.shminfo.shmall might need
|
||||
to be raised, e.g.
|
||||
|
||||
# sysctl kern.shminfo.shmall=32768
|
||||
|
||||
The GUI is deprecated so we stripped it from the build. You can use
|
||||
x11/gnome-mplayer or x11/smplayer instead.
|
||||
|
||||
@ -21,9 +14,7 @@ arm:
|
||||
video you are playing you may want to pass the -framedrop or the
|
||||
-hardframedrop option to mplayer.
|
||||
|
||||
The internal mp3lib (mpg123) is disabled because it relies on the
|
||||
FPU. Instead of using mp3lib the mad flavor is enabled by default.
|
||||
If you want to use libmad as an audio decoder please pass the
|
||||
'-ac mad' option to mplayer.
|
||||
In order to improve vorbis performance on ARM, try using the tremor codec.
|
||||
This can be achieved using '-ac tremor'.
|
||||
|
||||
See the package description for a list of FLAVORs and their meaning.
|
||||
|
@ -1,17 +1,16 @@
|
||||
MPlayer is a media player. It plays most MPEG, VOB, AVI, VIVO, ASF/WMV,
|
||||
QT/MOV, FLI, NuppelVideo, yuv4mpeg, FILM, RoQ, and some RealMedia files,
|
||||
supported by many native, XAnim, and Win32 DLL codecs. You can watch
|
||||
VideoCD, SVCD, DVD, 3ivx, FLI, and even DivX movies too.
|
||||
MPlayer is a media player. It plays most MPEG/VOB, AVI, ASF/WMA/WMV,
|
||||
FLV, RM, QT/MOV/MP4, Ogg/OGM, MKV, VIVO, FLI, NuppelVideo, yuv4mpeg,
|
||||
FILM and RoQ files. You can watch VCD, SVCD, DVD, 3ivx, DivX 3/4/5,
|
||||
WMV, and even H.264 movies, too.
|
||||
|
||||
MPlayer supports a wide range of video output drivers. It works with
|
||||
X11, Xv, DGA, OpenGL and optionally AAlib or SDL (and this way all
|
||||
MPlayer supports a wide range of video output drivers. It works
|
||||
with X11, Xv, OpenGL and optionally AAlib or SDL (and this way all
|
||||
drivers of SDL). Most of them support software or hardware scaling,
|
||||
so you can enjoy movies in fullscreen.
|
||||
|
||||
Flavors:
|
||||
sdl: enables sdl, requires devel/sdl
|
||||
debug: enables debugging information
|
||||
mad: enables mad, requires audio/libmad
|
||||
no_x11: disables gui and most video output.
|
||||
aa: enables ascii art, requires graphics/aalib
|
||||
jack: enables jack, requires audio/jack
|
||||
|
@ -1,4 +1,7 @@
|
||||
@comment $OpenBSD: PLIST,v 1.25 2010/05/26 21:29:56 jakemsr Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.26 2010/08/06 20:05:18 naddy Exp $
|
||||
@pkgpath x11/mplayer,mad
|
||||
@pkgpath x11/mplayer,mad,no_x11
|
||||
@pkgpath x11/mplayer,sdl,mad
|
||||
@bin bin/mencoder
|
||||
@bin bin/mplayer
|
||||
@man man/man1/mencoder.1
|
||||
|
Loading…
Reference in New Issue
Block a user