svn commit: r411517 - in head/multimedia: mencoder mplayer

[Thomas Zander]

Author: riggs
Date: Sun Mar 20 20:40:34 2016
New Revision: 411517
URL: https://svnweb.freebsd.org/changeset/ports/411517

Log:
  Enable speex audio codec as non-default OPTION
  
  Proposed by:	Stefan Ehmann <shoesoft at gmx.net>

Modified:
  head/multimedia/mencoder/Makefile
  head/multimedia/mplayer/Makefile
  head/multimedia/mplayer/Makefile.common
  head/multimedia/mplayer/Makefile.optvars

Modified: head/multimedia/mencoder/Makefile
==============================================================================
--- head/multimedia/mencoder/Makefile	Sun Mar 20 20:20:13 2016	(r411516)
+++ head/multimedia/mencoder/Makefile	Sun Mar 20 20:40:34 2016	(r411517)
@@ -13,7 +13,7 @@ COMMENT=	Convenient video file and movie
 OPTIONS_DEFINE=	AMR_NB AMR_WB BLURAY CDIO DEBUG DV FAAC FONTCONFIG \
 		FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \
 		MAD NAS OCFLAGS OPENAL OPENJPEG OPUS PULSEAUDIO REAL \
-		RTMP SCHROEDINGER SMB THEORA TWOLAME V4L VPX \
+		RTMP SCHROEDINGER SMB SPEEX THEORA TWOLAME V4L VPX \
 		X264 XVID
 
 OPTIONS_DEFAULT=GIF GNUTLS IPV6 OCFLAGS X264 XVID

Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile	Sun Mar 20 20:20:13 2016	(r411516)
+++ head/multimedia/mplayer/Makefile	Sun Mar 20 20:40:34 2016	(r411517)
@@ -14,7 +14,7 @@ OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB BLUR
 		ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
 		LADSPA LIBMNG LIRC LZO NAS OCFLAGS OPENAL OPENGL \
 		OPENJPEG OPUS PULSEAUDIO REAL RTC RTMP \
-		SCHROEDINGER SDL SKINS SMB SVGALIB V4L VDPAU VPX \
+		SCHROEDINGER SDL SKINS SMB SPEEX SVGALIB V4L VDPAU VPX \
 		X11 X11DGA X11VM XINERAMA XVIDEO XVMC
 
 OPTIONS_DEFAULT=DVDNAV FONTCONFIG FRIBIDI GNUTLS IPV6 OCFLAGS OPENGL \

Modified: head/multimedia/mplayer/Makefile.common
==============================================================================
--- head/multimedia/mplayer/Makefile.common	Sun Mar 20 20:20:13 2016	(r411516)
+++ head/multimedia/mplayer/Makefile.common	Sun Mar 20 20:40:34 2016	(r411517)
@@ -41,7 +41,6 @@ CONFIGURE_ARGS=	--cc="${CC}" \
 		--disable-mad \
 		--disable-libmpeg2 \
 		--disable-nemesi \
-		--disable-speex \
 		--enable-ass-internal
 
 WANT_GNOME=	yes

Modified: head/multimedia/mplayer/Makefile.optvars
==============================================================================
--- head/multimedia/mplayer/Makefile.optvars	Sun Mar 20 20:20:13 2016	(r411516)
+++ head/multimedia/mplayer/Makefile.optvars	Sun Mar 20 20:40:34 2016	(r411517)
@@ -105,6 +105,9 @@ SDL_CONFIGURE_OFF=	--disable-sdl
 SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
 SMB_CONFIGURE_OFF=	--disable-smb
 
+SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_CONFIGURE_OFF=	--disable-speex
+
 SVGALIB_LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
 SVGALIB_CONFIGURE_OFF=	--disable-svga