From 5cf1ea4c426e0b1e1551bf43f85584ab56846652 Mon Sep 17 00:00:00 2001
From: mark <mark@openbsd.org>
Date: Thu, 15 Aug 2002 19:00:40 +0000
Subject: [PATCH] added vorbis flavor

Prior to this patch, mplayer is incompatible of recognizing an AVI/MPEG4
(DivX) encoded with oggvorbis audio codec.  It will refuse to play the
movie, as it is unrecognized.  This patch allows these types of AVIs to
play.

ok maintainer, pvalchev@
---
 x11/mplayer/Makefile  | 12 +++++++++---
 x11/mplayer/pkg/DESCR | 10 ++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/x11/mplayer/Makefile b/x11/mplayer/Makefile
index 50dcfc40312..b32a5f675a9 100644
--- a/x11/mplayer/Makefile
+++ b/x11/mplayer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2002/06/29 11:51:22 espie Exp $
+# $OpenBSD: Makefile,v 1.26 2002/08/15 19:00:40 mark Exp $
 
 # May not be hard to add more.
 ONLY_FOR_ARCHS=		i386 macppc sparc64
@@ -45,7 +45,6 @@ USE_GMAKE=	Yes
 CONFIGURE_STYLE= simple
 CONFIGURE_ARGS+=--as=${LOCALBASE}/${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}/bin/as \
 		--disable-alsa \
-		--disable-vorbis \
 		--disable-aa \
 		--disable-ossaudio \
 		--disable-arts \
@@ -58,7 +57,7 @@ CONFIGURE_ARGS+=--as=${LOCALBASE}/${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}/bi
 CONFIGURE_ARGS+=--target=ppc-openbsd
 .endif
 
-FLAVORS=	sdl ggi debug mad win32 iconv no_x11
+FLAVORS=	sdl ggi debug mad vorbis win32 iconv no_x11
 FLAVOR?=
 
 .if ${FLAVOR:L:Mno_x11}
@@ -103,6 +102,13 @@ LIB_DEPENDS+=	mad::audio/mad
 CONFIGURE_ARGS+=--disable-mad
 .endif
 
+.if ${FLAVOR:L:Mvorbis}
+CONFIGURE_ARGS+=--enable-vorbis
+LIB_DEPENDS+=	vorbis.0,vorbisfile.1::audio/libvorbis
+.else
+CONFIGURE_ARGS+=--disable-vorbis
+.endif
+
 .if ${FLAVOR:L:Miconv}
 CONFIGURE_ARGS+=--enable-iconv
 LIB_DEPENDS+=	iconv::converters/libiconv
diff --git a/x11/mplayer/pkg/DESCR b/x11/mplayer/pkg/DESCR
index 83e2dab58c7..61e9ff2fd9b 100644
--- a/x11/mplayer/pkg/DESCR
+++ b/x11/mplayer/pkg/DESCR
@@ -18,6 +18,11 @@ antialiased shaded subtitles (9 supported types!!!) with european/ISO
 8859-1,2 (hungarian, english, czech, etc), cyrillic, korean fonts, and
 OSD?
 
+MPlayer might fail due to lack of shared memory, eg when using gui mode under
+KDE.  You can use config to change the shared memory limits without needing to
+recompile the kernel, e.g., "config -e -o bsd2 bsd".  On i386 it should be
+sufficient to add 8 to shmseg and 2048 to shmmaxpgs. 
+
 Flavors:
 
   sdl: enables sdl, requires devel/sdl
@@ -33,4 +38,9 @@ Flavors:
   win32: enables win32 codecs (i386-only)  To use this flavor, your
          kernel must be rebuilt with option USER_LDT
 
+  vorbis: enables vorbis, requires audio/libvorbis. There is a hack
+          that allows AVI files to contain an Ogg Vorbis audio stream,
+          but makes them incompatible with standard AVI. You need this
+          to play those AVIs
+
 WWW: ${HOMEPAGE}