[vlc-devel] [PATCH 01/10] contrib: remove contribs needed for old versions on mingw-w64

[Steve Lhomme]

We require mingw 5.0 in configure.ac so there's no need to support contribs for
older versions.
---
 contrib/src/directx/SHA512SUMS |  2 --
 contrib/src/directx/rules.mak  | 24 ------------------------
 contrib/src/dshow/SHA512SUMS   |  1 -
 contrib/src/dshow/rules.mak    | 22 ----------------------
 contrib/src/ffmpeg/rules.mak   |  3 ---
 5 files changed, 52 deletions(-)
 delete mode 100644 contrib/src/directx/SHA512SUMS
 delete mode 100644 contrib/src/directx/rules.mak
 delete mode 100644 contrib/src/dshow/SHA512SUMS
 delete mode 100644 contrib/src/dshow/rules.mak

diff --git a/contrib/src/directx/SHA512SUMS b/contrib/src/directx/SHA512SUMS
deleted file mode 100644
index cc789e16cb7..00000000000
--- a/contrib/src/directx/SHA512SUMS
+++ /dev/null
@@ -1,2 +0,0 @@
-03620b89ed8f9e9e339be9f7024d1f9a71468cba0ac2389eabd68ed1f1aa0a2d6e67c42c93f9a91eb43cf06964112dc9942ae49f8b532ff5c69db53d6b03edf8  directx-oss.tar.bz2
-b3702640c8dc5beeee13413ea4ef897e9842b8c0d07f972007c8aeb282c6f752f1570c2c3b9b81e695c4dc46e2e22d78ac05289e723487c0386cc3e58bce3190  dxva2api.h
diff --git a/contrib/src/directx/rules.mak b/contrib/src/directx/rules.mak
deleted file mode 100644
index 18fcce14ffa..00000000000
--- a/contrib/src/directx/rules.mak
+++ /dev/null
@@ -1,24 +0,0 @@
-# DirectX headers, missing from mingw32
-
-DX_HEADERS_URL := $(CONTRIB_VIDEOLAN)/directx-oss.tar.bz2
-DXVA2_URL := $(CONTRIB_VIDEOLAN)/dxva2api.h
-
-ifdef HAVE_WIN32
-ifndef HAVE_MINGW_W64
-PKGS += directx
-endif
-endif
-
-$(TARBALLS)/directx-oss.tar.bz2:
-	$(call download,$(DX_HEADERS_URL))
-
-$(TARBALLS)/dxva2api.h:
-	$(call download,$(DXVA2_URL))
-
-.sum-directx: directx-oss.tar.bz2 dxva2api.h
-
-.directx: directx-oss.tar.bz2 dxva2api.h .sum-directx
-	mkdir -p -- "$(PREFIX)/include"
-	tar xvjfo $< -C "$(PREFIX)/include"
-	$(CC) -E -include dxva2api.h - < /dev/null > /dev/null 2>&1 || cp $(TARBALLS)/dxva2api.h "$(PREFIX)/include/"
-	touch $@
diff --git a/contrib/src/dshow/SHA512SUMS b/contrib/src/dshow/SHA512SUMS
deleted file mode 100644
index c3993459fa9..00000000000
--- a/contrib/src/dshow/SHA512SUMS
+++ /dev/null
@@ -1 +0,0 @@
-779c4a36a4276c6e18017b898903cdf162c186b2f8de22ac12d995b316fe40d8277374eb88c695e8a760497239ad176a85ea4ecccd0df841283f95ff591997a7  dshow-headers-oss.tar.bz2
diff --git a/contrib/src/dshow/rules.mak b/contrib/src/dshow/rules.mak
deleted file mode 100644
index c8e3acf0593..00000000000
--- a/contrib/src/dshow/rules.mak
+++ /dev/null
@@ -1,22 +0,0 @@
-# DirectX headers, missing from mingw32
-
-DSHOW_HEADERS_URL := $(CONTRIB_VIDEOLAN)/dshow-headers-oss.tar.bz2
-
-ifdef HAVE_WIN32
-ifndef HAVE_MINGW_W64
-PKGS += dshow
-endif
-endif
-
-$(TARBALLS)/dshow-headers-oss.tar.bz2:
-	$(call download,$(DSHOW_HEADERS_URL))
-
-DSHOW_SOURCES := dshow-headers-oss.tar.bz2
-
-.sum-dshow: $(DSHOW_SOURCES)
-
-.dshow: $(DSHOW_SOURCES) .sum-dshow
-	mkdir -p -- "$(PREFIX)/include"
-	tar xjfo $< -C "$(PREFIX)/include" \
-		--wildcards --no-anchored '*.h' --strip-components=1
-	touch $@
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index d80956da40a..a61adfbb3bc 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -176,9 +176,6 @@ endif
 ifdef HAVE_WIN32
 ifndef HAVE_VISUALSTUDIO
 DEPS_ffmpeg += wine-headers
-ifndef HAVE_MINGW_W64
-DEPS_ffmpeg += directx
-endif
 endif
 FFMPEGCONF += --target-os=mingw32
 FFMPEGCONF += --enable-w32threads
-- 
2.26.2