From a7139a80bf37b73841c701a72af1b4cd2a4302cb Mon Sep 17 00:00:00 2001 From: xmj Date: Wed, 13 May 2015 17:36:54 +0000 Subject: multimedia/ffmpeg{,26}: make GNUTLS and OPENSSL mutually exclusive - make GNUTLS and OPENSSL mutually exclusive Differential Revision: https://reviews.freebsd.org/D2533 Reviewed by: riggs --- multimedia/ffmpeg26/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'multimedia/ffmpeg26') diff --git a/multimedia/ffmpeg26/Makefile b/multimedia/ffmpeg26/Makefile index 878043a4ddff..ca7d25842cf5 100644 --- a/multimedia/ffmpeg26/Makefile +++ b/multimedia/ffmpeg26/Makefile @@ -32,8 +32,8 @@ CONFIGURE_ENV+= EXESUF="${FFMPEG_SUFFIX}" MAKE_ARGS+= EXESUF="${FFMPEG_SUFFIX}" OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG DOCS FAAC \ - FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM ICONV \ - JACK LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG OPENSSL \ + FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GSM ICONV \ + JACK LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG \ OPTIMIZED_CFLAGS OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \ THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \ X11GRAB X264 X265 XVID @@ -41,6 +41,9 @@ OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG DOCS FAAC \ OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \ OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID +OPTIONS_SINGLE= SSL +OPTIONS_SINGLE_SSL= GNUTLS OPENSSL + ASS_DESC= Subtitles rendering via libass CDIO_DESC= Audio CD grabbing with libcdio FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK -- cgit