[vlc-commits] contrib:aom: don't use the old pthreadGC2 anymore

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Mar  4 10:02:29 2019 +0100| [76e1d37d070d7fe5f72a87a9d67e0ef1066a1b17] | committer: Steve Lhomme

contrib:aom: don't use the old pthreadGC2 anymore

(cherry picked from commit ba189e92f8ea393f6355dee1a0f7c2f6eb573bc6)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

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

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

diff --git a/contrib/src/aom/aom-pthreads-win32.patch b/contrib/src/aom/aom-pthreads-win32.patch
deleted file mode 100644
index 664643befa..0000000000
--- a/contrib/src/aom/aom-pthreads-win32.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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 ae33807c73..7143ab76b0 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -20,9 +20,6 @@ aom: aom-$(AOM_VERSION).tar.gz .sum-aom
 	mkdir -p $@-$(AOM_VERSION)
 	tar xvzfo "$<" -C $@-$(AOM_VERSION)
 	$(APPLY) $(SRC)/aom/aom-target-cpu.patch
-ifdef HAVE_WINSTORE
-	$(APPLY) $(SRC)/aom/aom-pthreads-win32.patch
-endif
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/aom/aom-android-pthreads.patch
 	$(APPLY) $(SRC)/aom/aom-android-cpufeatures.patch