pkg/40499: multimedia/mplayer fixes

[mm_lists%pulsar-zone.net@localhost]

>Number:         40499
>Category:       pkg
>Synopsis:       mplayer autodetects libraries which should be options
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jan 28 07:50:00 +0000 2009
>Originator:     Matthew Mondor
>Release:        NetBSD 5.0_BETA
>Organization:
>Environment:
NetBSD hal.xisop 5.0_BETA NetBSD 5.0_BETA (GENERIC_MM) #3: Sun Jan 25 06:29:47 
EST 2009  root%hal.xisop@localhost:/usr/obj/sys/arch/i386/compile/GENERIC_MM 
i386
Architecture: i386
Machine: i386
>Description:

        mplayer supports speex and lzo and its configure script will attempt
        to use them if they're installed.  These therefore should be options.

>How-To-Repeat:

        Attempt to build mplayer when lzo or speex are installed.
        Notice that it detects those but fails to use them because of the
        missing buildlink includes.

>Fix:

The following diff is suggested:

Index: multimedia/mplayer-share/options.mk
===================================================================
RCS file: 
/nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/multimedia/mplayer-share/options.mk,v
retrieving revision 1.35
diff -u -r1.35 options.mk
--- multimedia/mplayer-share/options.mk 3 Jan 2009 15:18:18 -0000       1.35
+++ multimedia/mplayer-share/options.mk 11 Jan 2009 05:46:40 -0000
@@ -14,7 +14,7 @@
 
 # Options supported by both mplayer* or mencoder*.
 
-PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv dvdread png theora vorbis x264 debug
+PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv dvdread png theora vorbis x264 
speex lzo ncurses debug
 .if ${OSS_TYPE} != "none"
 PKG_SUPPORTED_OPTIONS+=        oss
 .endif
@@ -76,7 +76,7 @@
 .for _o_ in aalib arts cdparanoia dv dvdread esound gif jpeg \
            lame mad mplayer-menu mplayer-real \
            mplayer-default-cflags mplayer-runtime-cpudetection mplayer-win32 \
-           nas oss pulseaudio png sdl theora vorbis x264 xvid
+           nas oss pulseaudio png sdl theora vorbis x264 xvid speex lzo ncurses
 .  if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
 PKG_SUGGESTED_OPTIONS+=        ${_o_}
 .  endif
@@ -278,6 +278,24 @@
 CONFIGURE_ARGS+=       --disable-theora
 .endif
 
+.if !empty(PKG_OPTIONS:Mspeex)
+CONFIGURE_ARGS+=       --enable-speex
+.  include "../../audio/speex/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-speex
+.endif
+
+.if !empty(PKG_OPTIONS:Mlzo)
+#CONFIGURE_ARGS+=      --enable-lzo   configure script broken
+.  include "../../archivers/lzo/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-lzo
+.endif
+
+.if !empty(PKG_OPTIONS:Mncurses)
+.  include "../../devel/ncurses/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mv4l2)
 CONFIGURE_ARGS+=       --enable-tv-v4l2
 .else