From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Tue, 9 Apr 2013 14:34:15 +0000 (+0200)
Subject: Contribs: update D2D1 headers extraction
X-Git-Tag: 2.1.0-git~746
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=311a7a8d734e854e31ae06607fddb99f37dd006f;p=vlc

Contribs: update D2D1 headers extraction
---

diff --git a/contrib/src/dshow/SHA512SUMS b/contrib/src/dshow/SHA512SUMS
index 9d7779a48e..22470a02b6 100644
--- a/contrib/src/dshow/SHA512SUMS
+++ b/contrib/src/dshow/SHA512SUMS
@@ -1,2 +1,2 @@
 779c4a36a4276c6e18017b898903cdf162c186b2f8de22ac12d995b316fe40d8277374eb88c695e8a760497239ad176a85ea4ecccd0df841283f95ff591997a7  dshow-headers-oss.tar.bz2
-90258b440b3ee1be13a274d5ce29d8f3bf22ad5540310e33b5f862cb8e802fc9aa7060973d066861c8236592791a666c98d8e29a4462d548cc3b9380ab2340b9  d2d_headers.tar.gz
+889260dfeaf07be92bba389ab0cca5a9e6049a36cd91f9e24ae767cd1720f22992b8ca32d6effb8505d61331442c018b28ae935c86334c98b37c1552f7a3044e  d2d_headers.zip
diff --git a/contrib/src/dshow/rules.mak b/contrib/src/dshow/rules.mak
index ef2312f894..816b1c9ece 100644
--- a/contrib/src/dshow/rules.mak
+++ b/contrib/src/dshow/rules.mak
@@ -2,7 +2,7 @@
 
 DSHOW_HEADERS_URL := $(CONTRIB_VIDEOLAN)/dshow-headers-oss.tar.bz2
 D2D_HASH := b1affb70c021200b410eccd377ad5aeef2c5a85b
-D2D_URL := http://nodeload.github.com/2of1/d2d1headers/tarball/master
+D2D_URL := http://github.com/2of1/d2d1headers/archive/master.zip
 # FIXME: ^ D2D not working
 
 ifdef HAVE_WIN32
@@ -14,10 +14,10 @@ endif
 $(TARBALLS)/dshow-headers-oss.tar.bz2:
 	$(call download,$(DSHOW_HEADERS_URL))
 
-$(TARBALLS)/d2d_headers.tar.gz:
+$(TARBALLS)/d2d_headers.zip:
 	$(call download,$(D2D_URL))
 
-DSHOW_SOURCES := dshow-headers-oss.tar.bz2 d2d_headers.tar.gz
+DSHOW_SOURCES := dshow-headers-oss.tar.bz2 d2d_headers.zip
 
 .sum-dshow: $(DSHOW_SOURCES)
 
@@ -25,6 +25,5 @@ DSHOW_SOURCES := dshow-headers-oss.tar.bz2 d2d_headers.tar.gz
 	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
+	unzip -jf $(TARBALLS)/d2d_headers.zip -d "$(PREFIX)/include"
 	touch $@