vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Sun Jul 6 00:59:01 2014 +0200| [cd4d3a09b37e65b95e553657a7c616cbc0fd2f7e] | committer: Rafaël Carré
Contribs: apply OSX patch only on OSX Else, it conflicts with Win32 patch and fails to compile (cherry picked from commit f836a94d9c4a78a03cc412d5559d274dc2df459b) Signed-off-by: Rafaël Carré <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=cd4d3a09b37e65b95e553657a7c616cbc0fd2f7e --- contrib/src/gnutls/rules.mak | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak index e185881..dfe9219 100644 --- a/contrib/src/gnutls/rules.mak +++ b/contrib/src/gnutls/rules.mak @@ -28,7 +28,9 @@ endif $(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch $(APPLY) $(SRC)/gnutls/read-file-limits.h.patch $(APPLY) $(SRC)/gnutls/mac-keychain-lookup.patch +ifdef HAVE_MACOSX $(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-osx.patch +endif $(call pkg_static,"lib/gnutls.pc.in") $(UPDATE_AUTOCONFIG) $(MOVE) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
