Date: Wed, 13 May 2015 17:36:55 +0000 (UTC) From: Johannes Jost Meixner <xmj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386232 - in head/multimedia: ffmpeg ffmpeg26 Message-ID: <201505131736.t4DHataL007447@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: xmj Date: Wed May 13 17:36:54 2015 New Revision: 386232 URL: https://svnweb.freebsd.org/changeset/ports/386232 Log: 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 Modified: head/multimedia/ffmpeg/Makefile head/multimedia/ffmpeg26/Makefile Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Wed May 13 17:34:09 2015 (r386231) +++ head/multimedia/ffmpeg/Makefile Wed May 13 17:36:54 2015 (r386232) @@ -25,8 +25,8 @@ USE_PERL5= build WANT_SDL= yes 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 @@ -34,6 +34,9 @@ OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_ 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 Modified: head/multimedia/ffmpeg26/Makefile ============================================================================== --- head/multimedia/ffmpeg26/Makefile Wed May 13 17:34:09 2015 (r386231) +++ head/multimedia/ffmpeg26/Makefile Wed May 13 17:36:54 2015 (r386232) @@ -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_ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505131736.t4DHataL007447>