[vlc-devel] [3.0 PATCH v2 10/20] contrib: aom: update pthreads-win32 patch

[Steve Lhomme]

Needed after version update in b3f4f81d81d48742eb284658788e345e0c06a22b
---
 contrib/src/aom/aom-pthreads-win32.patch | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/contrib/src/aom/aom-pthreads-win32.patch b/contrib/src/aom/aom-pthreads-win32.patch
index 664643befae..e069f08263f 100644
--- a/contrib/src/aom/aom-pthreads-win32.patch
+++ b/contrib/src/aom/aom-pthreads-win32.patch
@@ -1,15 +1,18 @@
---- 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
+--- aom-v1.0.0.errata.1/build/cmake/pkg_config.cmake.pthreads-w32	2020-03-31 14:44:21.501850000 +0200
++++ aom-v1.0.0.errata.1/build/cmake/pkg_config.cmake	2020-03-31 14:48:34.855999900 +0200
+@@ -48,9 +48,15 @@ file(APPEND "${pkgconfig_file}" "Version
+ file(APPEND "${pkgconfig_file}" "Requires:\n")
  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(CONFIG_MULTITHREAD AND HAVE_PTHREAD_H)
 +  if(WIN32)
++    file(APPEND "${pkgconfig_file}"
++              "Libs: -L\${prefix}/lib -l${pkg_name} -lm -lpthreadGC2\n")
 +    file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthreadGC2\n")
 +  else ()
-+    file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n")
+   file(APPEND "${pkgconfig_file}"
+               "Libs: -L\${prefix}/lib -l${pkg_name} -lm -lpthread\n")
+   file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n")
 +  endif ()
- else ()
+ else()
+   file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/lib -l${pkg_name} -lm\n")
    file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n")
- endif ()
-- 
2.17.1