[vlc-commits] contrib: move dxva2 to directx

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jun 28 23:45:28 2011 +0300| [0b898725de1244d4c756484c6895318db47cd66f] | committer: Rémi Denis-Courmont

contrib: move dxva2 to directx

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

 contrib/src/directx/SHA512SUMS |    1 +
 contrib/src/directx/rules.mak  |    9 +++++++--
 contrib/src/dshow/SHA512SUMS   |    1 -
 contrib/src/dshow/rules.mak    |    7 +------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/contrib/src/directx/SHA512SUMS b/contrib/src/directx/SHA512SUMS
index 5963889..dc244fa 100644
--- a/contrib/src/directx/SHA512SUMS
+++ b/contrib/src/directx/SHA512SUMS
@@ -1 +1,2 @@
 03620b89ed8f9e9e339be9f7024d1f9a71468cba0ac2389eabd68ed1f1aa0a2d6e67c42c93f9a91eb43cf06964112dc9942ae49f8b532ff5c69db53d6b03edf8  directx-oss.tar.bz2
+e62868480379fbb7bc7a433836c6884d51e35ca2d903b9b1f0944250a9d87814be087237240ce84e6d173ea84faed5ea834f2b38800e5ac2c2d8365726defb6a  dxva2api.h
diff --git a/contrib/src/directx/rules.mak b/contrib/src/directx/rules.mak
index 3d6c0df..654c8b2 100644
--- a/contrib/src/directx/rules.mak
+++ b/contrib/src/directx/rules.mak
@@ -1,6 +1,7 @@
 # DirectX headers
 
 DX_HEADERS_URL := $(CONTRIB_VIDEOLAN)/directx-oss.tar.bz2
+DXVA2_URL := $(CONTRIB_VIDEOLAN)/dxva2api.h
 
 ifdef HAVE_WIN32
 PKGS += directx
@@ -9,9 +10,13 @@ endif
 $(TARBALLS)/directx-oss.tar.bz2:
 	$(call download,$(DX_HEADERS_URL))
 
-.sum-directx: directx-oss.tar.bz2
+$(TARBALLS)/dxva2api.h:
+	$(call download,$(DXVA2_URL))
 
-.directx: directx-oss.tar.bz2 .sum-directx
+.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
index ffab58d..c399345 100644
--- a/contrib/src/dshow/SHA512SUMS
+++ b/contrib/src/dshow/SHA512SUMS
@@ -1,2 +1 @@
 779c4a36a4276c6e18017b898903cdf162c186b2f8de22ac12d995b316fe40d8277374eb88c695e8a760497239ad176a85ea4ecccd0df841283f95ff591997a7  dshow-headers-oss.tar.bz2
-e62868480379fbb7bc7a433836c6884d51e35ca2d903b9b1f0944250a9d87814be087237240ce84e6d173ea84faed5ea834f2b38800e5ac2c2d8365726defb6a  dxva2api.h
diff --git a/contrib/src/dshow/rules.mak b/contrib/src/dshow/rules.mak
index c8693cb..707f4e2 100644
--- a/contrib/src/dshow/rules.mak
+++ b/contrib/src/dshow/rules.mak
@@ -1,7 +1,6 @@
 # DirectX headers
 
 DSHOW_HEADERS_URL := $(CONTRIB_VIDEOLAN)/dshow-headers-oss.tar.bz2
-DXVA2_URL := $(CONTRIB_VIDEOLAN)/dxva2api.h
 D2D_HASH := b1affb70c021200b410eccd377ad5aeef2c5a85b
 D2D_URL := http://nodeload.github.com/2of1/d2d1headers/tarball/master
 # FIXME: ^ D2D not working
@@ -13,13 +12,10 @@ endif
 $(TARBALLS)/dshow-headers-oss.tar.bz2:
 	$(call download,$(DSHOW_HEADERS_URL))
 
-$(TARBALLS)/dxva2api.h:
-	$(call download,$(DXVA2_URL))
-
 $(TARBALLS)/d2d_headers.tar.gz:
 	$(call download,$(D2D_URL) -O $@)
 
-DSHOW_SOURCES := dshow-headers-oss.tar.bz2 dxva2api.h d2d_headers.tar.gz
+DSHOW_SOURCES := dshow-headers-oss.tar.bz2 d2d_headers.tar.gz
 
 .sum-dshow: $(DSHOW_SOURCES)
 
@@ -29,5 +25,4 @@ DSHOW_SOURCES := dshow-headers-oss.tar.bz2 dxva2api.h d2d_headers.tar.gz
 		--wildcards --no-anchored '*.h' --strip-components=1
 	tar xzf $(TARBALLS)/d2d_headers.tar.gz -C "$(PREFIX)/include" \
 		 --wildcards --no-anchored '*.h' --strip-components=1
-	cp $(TARBALLS)/dxva2api.h "$(PREFIX)/include"
 	touch $@