Contribs: DxVA2 headers are now port of out dshow headers

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 67c3a453aabfc5e59bc7a7885ae2bb8a2b4d87c8..9d55274ff5f04d525645dcfc1db836c57aa4661d 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2171,11 +2171,17 @@ DISTCLEAN_PKG += win32-dx7headers.tgz
 # *************************************************************************
 dshow-headers.tgz:
        $(WGET) $(DSHOW_HEADERS_URL)
-.dshow_headers: dshow-headers.tgz
+
+dxva2api.h:
+       $(WGET) $(DXVA2_URL)
+
+.dshow_headers: dshow-headers.tgz dxva2api.h
        (cd ../include ; tar xzf ../src/$<)
+       (cp dxva2api.h ../include)
        touch $@
+
 CLEAN_FILE += .dshow_headers
-DISTCLEAN_PKG += dshow-headers.tgz
+DISTCLEAN_PKG += dshow-headers.tgz dxva2api.h
 
 # ***************************************************************************
 # libexpat

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index bd435b3395caf4b0b39498a06d694990f8446e00..dd8849b6b3e4993fb4aa810425fbc0955e9aa9e1 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -28,6 +28,7 @@ PENGUIN=http://ftp.penguin.cz/pub/users/utx/amr
 GNU=ftp://ftp.gnu.org/gnu
 SF=http://heanet.dl.sourceforge.net/sourceforge
 VIDEOLAN=http://downloads.videolan.org/pub/videolan
+CONTRIB_VIDEOLAN=http://downloads.videolan.org/pub/videolan/testing/contrib
 LIBAMR_NB_VERSION=7.0.0.0
 LIBAMR_NB=$(PENGUIN)/amrnb-$(LIBAMR_NB_VERSION).tar.bz2
 LIBAMR_WB_VERSION=7.0.0.2
@@ -243,6 +244,7 @@ XCB_UTIL_URL=$(XCB_URL)
 LIBPROJECTM_VERSION=1.2.0
 LIBPROJECTM_URL=$(SF)/projectm/libprojectM/libprojectM-$(LIBPROJECTM_VERSION)/libprojectM-$(LIBPROJECTM_VERSION).tar.bz2
 LIBPROJECTM_SVN=https://projectm.svn.sourceforge.net/svnroot/projectm/trunk
-PEFLAGS_URL=http://altair.videolan.org/~geal
+PEFLAGS_URL=$(CONTRIB_VIDEOLAN)
 SQLITE_VERSION=3.6.20
 SQLITE_URL=http://www.sqlite.org/sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
+DXVA2_URL=$(CONTRIB_VIDEOLAN)/dxva2api.h