Date: Tue, 28 Apr 2015 14:14:47 +0300 From: Johannes Meixner <xmj@freebsd.org> To: multimedia@FreeBSD.org Subject: ffmpeg's multiple SSL options. Message-ID: <20150428111446.GA1340@mx12.chaot.net>
next in thread | raw e-mail | index | archive | help
--xXmbgvnjoT4axfJE Content-Type: multipart/mixed; boundary="cWoXeonUoKmBZSoM" Content-Disposition: inline --cWoXeonUoKmBZSoM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I've tried to build ffmpeg earlier and noticed that both GNUTLS and OPENSSL were enabled on my poudriere portstree, which made it error out as they're obviously mutually exclusive. Attached a diff to have the multimedia/ffmpeg Makefile reflect this. Best, -xmj --=20 Johannes Meixner | FreeBSD Committer xmj@FreeBSD.org | http://people.freebsd.org/~xmj --cWoXeonUoKmBZSoM Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="ffmpeg_options_single.diff" Content-Transfer-Encoding: quoted-printable Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Makefile (revision 384889) +++ Makefile (working copy) @@ -26,8 +26,8 @@ WANT_SDL=3D yes =20 OPTIONS_DEFINE=3D 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 @@ -35,6 +35,9 @@ OPTIONS_DEFAULT=3D FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \ OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID =20 +OPTIONS_SINGLE=3D SSL +OPTIONS_SINGLE_SSL=3D GNUTLS OPENSSL + ASS_DESC=3D Subtitles rendering via libass CDIO_DESC=3D Audio CD grabbing with libcdio FDK_AAC_DESC=3D AAC audio encoding via Fraunhofer FDK --cWoXeonUoKmBZSoM-- --xXmbgvnjoT4axfJE Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABCAAGBQJVP2uiAAoJEPyeKTcbGw0LGG4H/iDzUf0StUGzA4L6SaUJyqT1 am8UR8vKH8FG3/0E/04swQxc2J+oqvG40t4blsurNEvGqRBqcJ4jmcBUSPPBZrWY LU8r95pxTqv9On8ALsjPAMSVahy4TnjB8R1NQs/wfv3gi5JNEMy2ELue112xX81p IX1xkl9MgJ55Vxl0PHivo81WEsc2ji0SYNmgcoqNH3te0iKHiQcRmhtk4Zo7hzdh RGBhLmcUiZRy1mE32h/YG/JQzlTIXwP+avM0xdBjd2964RJBCKbZN+nn7stERMTV VnrEzmnR7U79uL68UC7QekKW6mMQWCwo4z+XnEGo+XKqmr/YBSiUbQ1PKZqzw6g= =1gbz -----END PGP SIGNATURE----- --xXmbgvnjoT4axfJE--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150428111446.GA1340>