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

(cherry picked from commit ba189e92f8) (edited)
edited:
* 3.0 has different android patches

Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>

contrib/src/aom/aom-pthreads-win32.patch

@@ -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 ()

contrib/src/aom/rules.mak

@@ -21,9 +21,6 @@ aom: aom-$(AOM_VERSION).tar.gz .sum-aom
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/aom/aom-android-pthreads.patch
 	$(APPLY) $(SRC)/aom/aom-android-cpufeatures.patch
-endif
-ifdef HAVE_WINSTORE
-	$(APPLY) $(SRC)/aom/aom-pthreads-win32.patch
 endif
 	$(MOVE)
 ifdef HAVE_ANDROID