[vlc-commits] contrib: vpx: Remove a leftover patch for pthread-w32

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Sun Jul  1 23:27:24 2018 +0300| [d942c7a0d4f840a93c074c774ea16226517c8865] | committer: Martin Storsjö

contrib: vpx: Remove a leftover patch for pthread-w32

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

 contrib/src/vpx/libvpx-pthread-w32.patch | 23 -----------------------
 contrib/src/vpx/rules.mak                |  3 ---
 2 files changed, 26 deletions(-)

diff --git a/contrib/src/vpx/libvpx-pthread-w32.patch b/contrib/src/vpx/libvpx-pthread-w32.patch
deleted file mode 100644
index 86dc243653..0000000000
--- a/contrib/src/vpx/libvpx-pthread-w32.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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 73b2a7143d..9b441d7f4e 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -23,9 +23,6 @@ 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_WINSTORE
-	$(APPLY) $(SRC)/vpx/libvpx-pthread-w32.patch
-endif
 	$(MOVE)
 
 DEPS_vpx =