vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Wed May 16 12:21:34 2018 +0200| [454a9ef1263a13bc5a3df8ff0a7843e7e76e22bc] | committer: Hugo Beauzée-Luyssen
contrib: vpx: make sure we use pthreads-win32 on Windows (cherry picked from commit 2916292eb7c3a3b77d5aea677372a8725b52a18c) Signed-off-by: Hugo Beauzée-Luyssen <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=454a9ef1263a13bc5a3df8ff0a7843e7e76e22bc --- contrib/src/vpx/libvpx-pthread-w32.patch | 23 +++++++++++++++++++++++ contrib/src/vpx/rules.mak | 3 +++ 2 files changed, 26 insertions(+) diff --git a/contrib/src/vpx/libvpx-pthread-w32.patch b/contrib/src/vpx/libvpx-pthread-w32.patch new file mode 100644 index 0000000000..86dc243653 --- /dev/null +++ b/contrib/src/vpx/libvpx-pthread-w32.patch @@ -0,0 +1,23 @@ +--- libvpx.pthreads/libs.mk 2018-05-16 12:11:41.280953500 +0200 ++++ libvpx.pthreads/libs.mk.pthread-w32 2018-05-16 12:07:13.696740400 +0200 +@@ -334,7 +334,7 @@ vpx.pc: config.mk libs.mk + $(qexec)echo 'Conflicts:' >> $@ + $(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@ + ifeq ($(HAVE_PTHREAD_H),yes) +- $(qexec)echo 'Libs.private: -lm -lpthread' >> $@ ++ $(qexec)echo 'Libs.private: -lm -lpthreadGC2' >> $@ + else + $(qexec)echo 'Libs.private: -lm' >> $@ + endif +--- libvpx/build/make/configure.sh 2018-05-16 12:19:13.322985900 +0200 ++++ libvpx/build/make/configure.sh.pthread-w32 2018-05-16 12:17:34.221291100 +0200 +@@ -1343,6 +1343,9 @@ EOF + *-android-gcc) + # bionic includes basic pthread functionality, obviating -lpthread. + ;; ++ *-win*) ++ check_header pthread.h && add_extralibs -lpthreadGC2 ++ ;; + *) + check_header pthread.h && add_extralibs -lpthread + ;; diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak index 106288cd90..ae2f0ee77c 100644 --- a/contrib/src/vpx/rules.mak +++ b/contrib/src/vpx/rules.mak @@ -23,6 +23,9 @@ endif $(APPLY) $(SRC)/vpx/0001-ads2gas-Add-a-noelf-option.patch $(APPLY) $(SRC)/vpx/0002-configure-Add-an-armv7-win32-gcc-target.patch $(APPLY) $(SRC)/vpx/0003-configure-Add-an-arm64-win64-gcc-target.patch +ifdef HAVE_WIN32 + $(APPLY) $(SRC)/vpx/libvpx-pthread-w32.patch +endif $(MOVE) DEPS_vpx = _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
