vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Wed Jul 11 22:44:09 2018 +0200| [e9ed3a579bee9aa59c6c71fadedaf4822ca95b1e] | committer: Jean-Baptiste Kempf
Contribs: srt, don't link to pthreadGC2 on Mingw > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e9ed3a579bee9aa59c6c71fadedaf4822ca95b1e --- contrib/src/srt/0004-cmake-pthread-win32.patch | 11 +++++++++++ contrib/src/srt/rules.mak | 1 + 2 files changed, 12 insertions(+) diff --git a/contrib/src/srt/0004-cmake-pthread-win32.patch b/contrib/src/srt/0004-cmake-pthread-win32.patch new file mode 100644 index 0000000000..eff246761b --- /dev/null +++ b/contrib/src/srt/0004-cmake-pthread-win32.patch @@ -0,0 +1,11 @@ +--- srt/CMakeLists.txt.old 2018-07-11 22:41:30.169381997 +0200 ++++ srt/CMakeLists.txt 2018-07-11 22:41:40.324958847 +0200 +@@ -338,7 +338,7 @@ + endif() + + if (MINGW) +- set (PTHREAD_LIBRARY -lpthreadGC2) ++ set (PTHREAD_LIBRARY -lpthread) + # XXX CONSIDER THIS. It came from a merged previous master version + # and was under an if(NOT MINGW)...elseif(THREADS_FOUND) condition. + # Might be that the current form still suffices; resolve this and remove comment. diff --git a/contrib/src/srt/rules.mak b/contrib/src/srt/rules.mak index 0d04fc9218..635a2dd1c9 100644 --- a/contrib/src/srt/rules.mak +++ b/contrib/src/srt/rules.mak @@ -33,6 +33,7 @@ srt: srt-$(SRT_VERSION).tar.gz .sum-srt $(APPLY) $(SRC)/srt/0001-api-Don-t-use-inet_ntop.patch $(APPLY) $(SRC)/srt/0002-win32-Only-include-inttypes.h-with-MSVC.patch $(APPLY) $(SRC)/srt/0003-cmake-Only-install-Windows-headers-in-win-subdir.patch + $(APPLY) $(SRC)/srt/0004-cmake-pthread-win32.patch mv srt-$(SRT_VERSION) $@ && touch $@ .srt: srt toolchain.cmake _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
