ports/70959: Update of multimedia/mplayer

[Thomas E. Zander]

>Number:         70959
>Category:       ports
>Synopsis:       Update of multimedia/mplayer
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 25 22:00:45 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Thomas E. Zander
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD marvin.riggiland.au 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Mon Aug 2 13:00:46 CEST 2004 root at marvin.riggiland.au:/usr/obj/usr/src/sys/MARVIN i386


	
>Description:
This update (requested by Koop Mast <kwm at rainbow-runner.nl>) resolves
two problems:
o Correct detection of ogg theora codec
o Avoid accidently linking to libtremor if not explicitly forced by user
 (important, therefore PORTREVISION bump!)
>How-To-Repeat:
>Fix:

Please apply to multimedia/mplayer:


diff -ruN mplayer-old/Makefile mplayer/Makefile
--- mplayer-old/Makefile	Thu Aug 19 19:42:16 2004
+++ mplayer/Makefile	Wed Aug 25 23:38:40 2004
@@ -158,6 +158,14 @@
 # WITH_AALIB
 # default: autodetect
 #
+# WITH_THEORA
+# default: autodetect
+#
+# WITH_TREMOR
+# default: autodetect
+# By setting this option mplayer will use libtremor (integer only vorbis 
+# decoding lib) instead of libvorbis even if libvorbis is installed.
+#
 # WITH_SDL
 # default: autodetect
 # (implies WITH_AALIB)
@@ -219,7 +227,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	0.99.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio ipv6
 MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
 		http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -321,6 +329,10 @@
 WITH_SVGALIB=	yes
 .endif
 
+.if exists(${LOCALBASE}/lib/libtheora.so.0)
+WITH_THEORA=	yes
+.endif
+
 .if exists(${LOCALBASE}/lib/libaa.so.1)
 WITH_AALIB=	yes
 .endif
@@ -501,6 +513,17 @@
 
 .if defined(WITH_AALIB)
 LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
+.endif
+
+.if defined(WITH_THEORA)
+LIB_DEPENDS+=	theora.0:${PORTSDIR}/graphics/libtheora
+.endif
+
+.if defined(WITH_TREMOR)
+LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
+CONFIGURE_ARGS+=	--enable-tremor
+.else
+CONFIGURE_ARGS+=	--disable-tremor
 .endif
 
 .if defined(WITH_SDL)
>Release-Note:
>Audit-Trail:
>Unformatted: