aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zander <riggs@FreeBSD.org>2016-03-20 20:40:34 +0000
committerThomas Zander <riggs@FreeBSD.org>2016-03-20 20:40:34 +0000
commit0e760209bac4d6adfde0e19d0229409cffcccea2 (patch)
tree29942824e2392c76874e0bf7a9b73a50947fa749
parenta30d6e77afe6ad0b7573e16aa819b08355439224 (diff)
downloadports-0e760209bac4d6adfde0e19d0229409cffcccea2.tar.gz
ports-0e760209bac4d6adfde0e19d0229409cffcccea2.zip
Notes
-rw-r--r--multimedia/mencoder/Makefile2
-rw-r--r--multimedia/mplayer/Makefile2
-rw-r--r--multimedia/mplayer/Makefile.common1
-rw-r--r--multimedia/mplayer/Makefile.optvars3
4 files changed, 5 insertions, 3 deletions
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 60a11ac80c00..735decd95ba6 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -13,7 +13,7 @@ COMMENT= Convenient video file and movie encoder
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
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 7de466a9daff..6b03d65f2a56 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -14,7 +14,7 @@ OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV DVDNAV \
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 \
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index ed325ff6ca36..6d771f0728cb 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -41,7 +41,6 @@ CONFIGURE_ARGS= --cc="${CC}" \
--disable-mad \
--disable-libmpeg2 \
--disable-nemesi \
- --disable-speex \
--enable-ass-internal
WANT_GNOME= yes
diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars
index 902da2b6684c..3c8e91f5279e 100644
--- a/multimedia/mplayer/Makefile.optvars
+++ b/multimedia/mplayer/Makefile.optvars
@@ -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