[vlc-commits] Contribs: replace dshow headers by free ones

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Feb 22 22:42:32 2011 +0100| [3759bee802342c0204b1104fc1aa9832147c00c7] | committer: Jean-Baptiste Kempf

Contribs: replace dshow headers by free ones

This replace with a set of headers from the Wine project, modified by
Jean-Baptiste Kempf

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

 extras/contrib/src/contrib-src.mak |    8 ++++----
 extras/contrib/src/packages.mak    |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 87675f5..57833d1 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -2143,7 +2143,7 @@ DISTCLEAN_PKG += win32-dx7headers.tgz
 # *************************************************************************
 # DirectShow headers
 # *************************************************************************
-dshow-headers.tgz:
+dshow-headers-oss.tar.bz2:
 	$(WGET) $(DSHOW_HEADERS_URL)
 
 dxva2api.h:
@@ -2154,15 +2154,15 @@ CLEAN_FILE += dxva2api.h
 d2d_headers.tar.gz:
 	$(WGET) $(D2D_URL) -O $@
 
-.dshow_headers: dshow-headers.tgz dxva2api.h d2d_headers.tar.gz
+.dshow_headers: dshow-headers-oss.tar.bz2 dxva2api.h d2d_headers.tar.gz
 	mkdir -p $(PREFIX)/include
-	tar xzf $< -C $(PREFIX)/include
+	tar xjf $< -C $(PREFIX)/include
 	tar xzf d2d_headers.tar.gz -C $(PREFIX)/include --wildcards --no-anchored '*.h' --strip-components=1
 	cp dxva2api.h $(PREFIX)/include
 	touch $@
 
 CLEAN_FILE += .dshow_headers
-DISTCLEAN_PKG += dshow-headers.tgz dxva2api.h
+DISTCLEAN_PKG += dshow-headers-oss.tar.bz2 dxva2api.h
 
 # ***************************************************************************
 # libexpat
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 703d23d..0a8cf0c 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -184,7 +184,7 @@ XML_URL=http://xmlsoft.org/sources/libxml2-$(XML_VERSION).tar.gz
 DIRAC_VERSION=1.0.2
 DIRAC_URL=$(SF)/dirac/dirac-$(DIRAC_VERSION).tar.gz
 DX_HEADERS_URL=$(CONTRIB_VIDEOLAN)/win32-dx7headers.tgz
-DSHOW_HEADERS_URL=$(VIDEOLAN)/contrib/dshow-headers.tgz
+DSHOW_HEADERS_URL=$(VIDEOLAN)/contrib/dshow-headers-oss.tar.bz2
 PORTAUDIO_VERSION=19
 PORTAUDIO_URL=http://www.portaudio.com/archives/pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz
 CLINKCC_VERSION=171