Re: [PATCH v2] configure: Add support for OpenSSL
Lauri Kasanen <[email protected]>
| Newsgroups | gmane.comp.video.mplayer.devel |
|---|---|
| Message-ID | <[email protected]> |
> > --enable-openssl-nondistributable? > > Seems fine. > Maybe good to write in the explanation something like > "due to conflicting MPlayer and OpenSSL licenses the > resulting binary may be non-distributable" > Not sure really, it's also kind of long, but it just > might be better to write some explanation though... Attaching v2. - Lauri _______________________________________________ MPlayer-dev-eng mailing list [email protected] https://lists.mplayerhq.hu/mailman/listinfo/mplayer-dev-eng
openssl_v2.patch
(text/plain, 2.2 KB)
Index: configure =================================================================== --- configure (revision 37699) +++ configure (working copy) @@ -385,6 +385,9 @@ --disable-ass disable SSA/ASS subtitle support [autodetect] --enable-rpath enable runtime linker path for extra libs [disabled] --disable-gnutls disable GnuTLS [autodetect] + --enable-openssl-nondistributable enable OpenSSL [disable] + due to conflicting MPlayer and OpenSSL licenses, the + resulting binary may be non-distributable. Codecs: --enable-gif enable GIF support [autodetect] @@ -848,6 +851,7 @@ _sctp=auto _gethostbyname2=auto _gnutls=auto +_openssl=no _ftp=auto _musepack=no _vstream=auto @@ -1345,6 +1349,7 @@ --disable-rpath) _rpath=no ;; --enable-gnutls) _gnutls=yes ;; --disable-gnutls) _gnutls=no ;; + --enable-openssl-nondistributable) _openssl=yes ;; --enable-fribidi) _fribidi=yes ;; --disable-fribidi) _fribidi=no ;; @@ -4399,6 +4404,17 @@ fi echores "$_gnutls" +echocheck "OpenSSL" +if test "$_openssl" = yes ; then + def_openssl='#define CONFIG_OPENSSL 1' + libavprotocols="$libavprotocols HTTPS_PROTOCOL TLS_PROTOCOL TLS_OPENSSL_PROTOCOL" + extra_cflags="$extra_cflags $($_pkg_config --cflags openssl)" + extra_ldflags="$extra_ldflags $($_pkg_config --libs openssl)" +else + def_openssl='#define CONFIG_OPENSSL 0' +fi +echores "$_openssl" + echocheck "Samba support (libsmbclient)" if test "$_smb" = yes; then extra_ldflags="$extra_ldflags -lsmbclient" @@ -8685,6 +8701,7 @@ CONFIG_CRYSTALHD= $crystalhd CONFIG_ENCODERS = yes CONFIG_GNUTLS = $_gnutls +CONFIG_OPENSSL = $_openssl CONFIG_GPL = yes CONFIG_ICONV = $_iconv CONFIG_MLIB = $_mlib @@ -9230,12 +9247,12 @@ #define CONFIG_FFSERVER 0 #define CONFIG_FTRAPV 0 $def_gnutls +$def_openssl #define CONFIG_GPL 1 #define CONFIG_GRAY 0 #define CONFIG_LIBMODPLUG 0 #define CONFIG_LIBVORBIS 0 #define CONFIG_MEMORY_POISONING 0 -#define CONFIG_OPENSSL 0 #define CONFIG_POWERPC_PERF 0 /* For now prefer speed over avoiding potential invalid reads */ #define CONFIG_SAFE_BITSTREAM_READER 0