[vlc-commits] contrib: aom: make sur we use pthreads-win32 on Windows

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed May 16 15:30:11 2018 +0200| [a3fdf0193a63d4abf7b094b44805644dc061e428] | committer: Tristan Matthews

contrib: aom: make sur we use pthreads-win32 on Windows

(cherry picked from commit b7bbf72878edfd230bd17d799a198c9bed395058)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a3fdf0193a63d4abf7b094b44805644dc061e428
---

 contrib/src/aom/aom-pthreads-win32.patch | 15 +++++++++++++++
 contrib/src/aom/rules.mak                |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/contrib/src/aom/aom-pthreads-win32.patch b/contrib/src/aom/aom-pthreads-win32.patch
new file mode 100644
index 0000000000..664643befa
--- /dev/null
+++ b/contrib/src/aom/aom-pthreads-win32.patch
@@ -0,0 +1,15 @@
+--- aom/build/cmake/pkg_config.cmake	2018-05-16 15:23:45.271012500 +0200
++++ aom/build/cmake/pkg_config.cmake.pthreads-w32	2018-05-16 15:22:46.304363700 +0200
+@@ -50,7 +50,11 @@ file(APPEND "${pkgconfig_file}" "Require
+ file(APPEND "${pkgconfig_file}" "Conflicts:\n")
+ file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/lib -l${pkg_name} -lm\n")
+ if (CONFIG_MULTITHREAD AND HAVE_PTHREAD_H)
+-  file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n")
++  if(WIN32)
++    file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthreadGC2\n")
++  else ()
++    file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n")
++  endif ()
+ else ()
+   file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n")
+ endif ()
diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak
index e362477812..f6ab887dee 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -19,6 +19,9 @@ aom: aom-$(AOM_VERSION).tar.gz .sum-aom
 	rm -Rf $@-$(AOM_VERSION) $@
 	mkdir -p $@-$(AOM_VERSION)
 	tar xvzf "$<" -C $@-$(AOM_VERSION)
+ifdef HAVE_WINSTORE
+	$(APPLY) $(SRC)/aom/aom-pthreads-win32.patch
+endif
 	$(MOVE)
 
 DEPS_aom =