vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Tue Feb 24 10:17:27 2015 +0100| [e16703e298280f131fde043f574e681a504dd85f] | committer: Jean-Baptiste Kempf
Contribs: ssh2, gcrypt needs gpg-error (cherry picked from commit 8e51ef1527ff8c23d6bc98bce3a8b87fef83c9f9) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=e16703e298280f131fde043f574e681a504dd85f --- contrib/src/ssh2/gpg-error-pc.patch | 11 +++++++++++ contrib/src/ssh2/rules.mak | 1 + 2 files changed, 12 insertions(+) diff --git a/contrib/src/ssh2/gpg-error-pc.patch b/contrib/src/ssh2/gpg-error-pc.patch new file mode 100644 index 0000000..94a731b --- /dev/null +++ b/contrib/src/ssh2/gpg-error-pc.patch @@ -0,0 +1,11 @@ +--- ssh2/configure.ac 2015-02-24 10:15:45.581842131 +0100 ++++ ssh2/configure.ac.new 2015-02-24 10:15:34.948332253 +0100 +@@ -102,7 +102,7 @@ + # Look for libgcrypt + if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then + AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>]) +- LIBS="$LIBS -lgcrypt" ++ LIBS="$LIBS -lgcrypt -lgpg-error" + fi + + AC_SUBST(LIBSREQUIRED) diff --git a/contrib/src/ssh2/rules.mak b/contrib/src/ssh2/rules.mak index 1a05fe8..2efa554 100644 --- a/contrib/src/ssh2/rules.mak +++ b/contrib/src/ssh2/rules.mak @@ -19,6 +19,7 @@ ssh2: libssh2-$(LIBSSH2_VERSION).tar.gz .sum-ssh2 $(UNPACK) $(APPLY) $(SRC)/ssh2/no-tests.patch $(APPLY) $(SRC)/ssh2/configure-zlib.patch + $(APPLY) $(SRC)/ssh2/gpg-error-pc.patch $(MOVE) DEPS_ssh2 = gcrypt $(DEPS_gcrypt) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
