[vlc-commits] Contribs: new directx headers

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Feb 24 00:28:26 2011 +0100| [95183eb74f117a9c4be324245c2f38277ce4a45b] | committer: Jean-Baptiste Kempf

Contribs: new directx headers

>From the wine project, modified by Jean-Baptiste Kempf

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

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

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 57833d1..38e0ec2 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -178,7 +178,7 @@ endef
 # bundle. For instance if you're building a library named libtoto.dylib,
 # which depends on the contrib library libtata.dylib, you should have the
 # following entry :
-# .toto: toto_directory .tata
+# .toto: toto_.tata
 #	cd $< ; ./configure --prefix=$(PREFIX)
 #	$(MAKE) -C $<
 #	$(MAKE) -C $< install
@@ -2131,14 +2131,14 @@ DISTCLEAN_PKG += dirac-$(DIRAC_VERSION).tar.gz
 # *************************************************************************
 # DirectX headers
 # *************************************************************************
-win32-dx7headers.tgz:
+directx-oss.tar.bz2:
 	$(WGET) $(DX_HEADERS_URL)
-.dx_headers: win32-dx7headers.tgz
+.dx_headers: directx-oss.tar.bz2
 	mkdir -p $(PREFIX)/include
-	tar xzf $< -C $(PREFIX)/include
+	tar xjf $< -C $(PREFIX)/include
 	touch $@
 CLEAN_FILE += .dx_headers
-DISTCLEAN_PKG += win32-dx7headers.tgz
+DISTCLEAN_PKG += directx-oss.tar.bz2
 
 # *************************************************************************
 # DirectShow headers
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 0a8cf0c..063db57 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -183,7 +183,7 @@ XML_VERSION=2.7.8
 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
+DX_HEADERS_URL=$(CONTRIB_VIDEOLAN)/directx-oss.tar.bz2
 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