[vlc-devel] [PATCH] contrib: remove directx and directshow headers

[Rafaël Carré]

As part of the Windows SDK, they must be provided by the dev environment
mingw-64, for example provide them

bug reports should be addressed to mingw32 and/or distributions
---
 contrib/src/README             |    4 ++--
 contrib/src/directx/SHA512SUMS |    2 --
 contrib/src/directx/rules.mak  |   22 ----------------------
 contrib/src/dshow/SHA512SUMS   |    2 --
 contrib/src/dshow/rules.mak    |   28 ----------------------------
 contrib/src/ffmpeg/rules.mak   |    1 -
 6 files changed, 2 insertions(+), 57 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/README b/contrib/src/README
index 5d3752c..d900f98 100644
--- a/contrib/src/README
+++ b/contrib/src/README
@@ -58,9 +58,9 @@ should be listed in the PKGS special variable. See some examples:
 	# FFmpeg is always useful
 	PKGS += ffmpeg
 
-	# DirectX headers are useful only on Windows
+	# pthreads is only needed on Windows
 	ifdef HAVE_WIN32
-	PKGS += directx
+	PKGS += pthreads
 	endif
 
 	# x264 is only useful when stream output is enabled
diff --git a/contrib/src/directx/SHA512SUMS b/contrib/src/directx/SHA512SUMS
deleted file mode 100644
index dc244fa..0000000
--- a/contrib/src/directx/SHA512SUMS
+++ /dev/null
@@ -1,2 +0,0 @@
-03620b89ed8f9e9e339be9f7024d1f9a71468cba0ac2389eabd68ed1f1aa0a2d6e67c42c93f9a91eb43cf06964112dc9942ae49f8b532ff5c69db53d6b03edf8  directx-oss.tar.bz2
-e62868480379fbb7bc7a433836c6884d51e35ca2d903b9b1f0944250a9d87814be087237240ce84e6d173ea84faed5ea834f2b38800e5ac2c2d8365726defb6a  dxva2api.h
diff --git a/contrib/src/directx/rules.mak b/contrib/src/directx/rules.mak
deleted file mode 100644
index 1739994..0000000
--- a/contrib/src/directx/rules.mak
+++ /dev/null
@@ -1,22 +0,0 @@
-# DirectX headers
-
-DX_HEADERS_URL := $(CONTRIB_VIDEOLAN)/directx-oss.tar.bz2
-DXVA2_URL := $(CONTRIB_VIDEOLAN)/dxva2api.h
-
-ifdef HAVE_WIN32
-PKGS += directx
-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 xvjf $< -C "$(PREFIX)/include"
-	cp $(TARBALLS)/dxva2api.h "$(PREFIX)/include/"
-	touch $@
diff --git a/contrib/src/dshow/SHA512SUMS b/contrib/src/dshow/SHA512SUMS
deleted file mode 100644
index 9d7779a..0000000
--- a/contrib/src/dshow/SHA512SUMS
+++ /dev/null
@@ -1,2 +0,0 @@
-779c4a36a4276c6e18017b898903cdf162c186b2f8de22ac12d995b316fe40d8277374eb88c695e8a760497239ad176a85ea4ecccd0df841283f95ff591997a7  dshow-headers-oss.tar.bz2
-90258b440b3ee1be13a274d5ce29d8f3bf22ad5540310e33b5f862cb8e802fc9aa7060973d066861c8236592791a666c98d8e29a4462d548cc3b9380ab2340b9  d2d_headers.tar.gz
diff --git a/contrib/src/dshow/rules.mak b/contrib/src/dshow/rules.mak
deleted file mode 100644
index 1ce4324..0000000
--- a/contrib/src/dshow/rules.mak
+++ /dev/null
@@ -1,28 +0,0 @@
-# DirectX headers
-
-DSHOW_HEADERS_URL := $(CONTRIB_VIDEOLAN)/dshow-headers-oss.tar.bz2
-D2D_HASH := b1affb70c021200b410eccd377ad5aeef2c5a85b
-D2D_URL := http://nodeload.github.com/2of1/d2d1headers/tarball/master
-# FIXME: ^ D2D not working
-
-ifdef HAVE_WIN32
-PKGS += dshow
-endif
-
-$(TARBALLS)/dshow-headers-oss.tar.bz2:
-	$(call download,$(DSHOW_HEADERS_URL))
-
-$(TARBALLS)/d2d_headers.tar.gz:
-	$(call download,$(D2D_URL))
-
-DSHOW_SOURCES := dshow-headers-oss.tar.bz2 d2d_headers.tar.gz
-
-.sum-dshow: $(DSHOW_SOURCES)
-
-.dshow: $(DSHOW_SOURCES) .sum-dshow
-	mkdir -p -- "$(PREFIX)/include"
-	tar xjf $< -C "$(PREFIX)/include" \
-		--wildcards --no-anchored '*.h' --strip-components=1
-	tar xzf $(TARBALLS)/d2d_headers.tar.gz -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 a4ca133..efd7d46 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -71,7 +71,6 @@ endif
 
 # Windows
 ifdef HAVE_WIN32
-DEPS_ffmpeg += directx
 FFMPEGCONF += --target-os=mingw32 --enable-memalign-hack
 FFMPEGCONF += --enable-w32threads \
 	--disable-bzlib --disable-bsfs \
-- 
1.7.7.3