vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Mon May 9 17:43:29 2016 +0200| [b05d1181bdc38cb62eb887aa68b4bdd875a68cd0] | committer: Hugo Beauzée-Luyssen
contribs: ssh2: Disable agent code for winrt > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b05d1181bdc38cb62eb887aa68b4bdd875a68cd0 --- contrib/src/ssh2/rules.mak | 1 + contrib/src/ssh2/winrt-no-agent.patch | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/contrib/src/ssh2/rules.mak b/contrib/src/ssh2/rules.mak index 2efa554..a11b53e 100644 --- a/contrib/src/ssh2/rules.mak +++ b/contrib/src/ssh2/rules.mak @@ -20,6 +20,7 @@ ssh2: libssh2-$(LIBSSH2_VERSION).tar.gz .sum-ssh2 $(APPLY) $(SRC)/ssh2/no-tests.patch $(APPLY) $(SRC)/ssh2/configure-zlib.patch $(APPLY) $(SRC)/ssh2/gpg-error-pc.patch + $(APPLY) $(SRC)/ssh2/winrt-no-agent.patch $(MOVE) DEPS_ssh2 = gcrypt $(DEPS_gcrypt) diff --git a/contrib/src/ssh2/winrt-no-agent.patch b/contrib/src/ssh2/winrt-no-agent.patch new file mode 100644 index 0000000..e1b30bf --- /dev/null +++ b/contrib/src/ssh2/winrt-no-agent.patch @@ -0,0 +1,20 @@ +--- ssh2/src/agent.c.orig 2016-05-09 17:39:46.474593275 +0200 ++++ ssh2/src/agent.c 2016-05-09 17:40:03.058578212 +0200 +@@ -251,7 +251,7 @@ + }; + #endif /* PF_UNIX */ + +-#ifdef WIN32 ++#if defined(WIN32) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) + /* Code to talk to Pageant was taken from PuTTY. + * + * Portions copyright Robert de Bath, Joris van Rantwijk, Delian +@@ -353,7 +353,7 @@ + const char *name; + struct agent_ops *ops; + } supported_backends[] = { +-#ifdef WIN32 ++#if defined(WIN32) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) + {"Pageant", &agent_ops_pageant}, + #endif /* WIN32 */ + #ifdef PF_UNIX _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
