[vlc-commits] Contribs: update crystalHD to the latest headers

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jan  8 01:15:17 2012 +0100| [0bce87068194ed1a06e6e81daa9dfca9c578a953] | committer: Jean-Baptiste Kempf

Contribs: update crystalHD to the latest headers

And removed our patch that has been applied upstream.
Close #5795

Pointed by Mangled Deutz

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

 contrib/src/crystalhd/SHA512SUMS  |    2 +-
 contrib/src/crystalhd/mingw.patch |   27 ---------------------------
 contrib/src/crystalhd/rules.mak   |    7 +++----
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/contrib/src/crystalhd/SHA512SUMS b/contrib/src/crystalhd/SHA512SUMS
index 5ec8285..44fcb76 100644
--- a/contrib/src/crystalhd/SHA512SUMS
+++ b/contrib/src/crystalhd/SHA512SUMS
@@ -1 +1 @@
-da996732b1a4ff86f9bb36ca70cd203c0456d613b0ebdcddf4a2e33c2dd6dd9c3211bf6f3df5dd4c6e6c4a5a53d2ba1f7cd00eff2b2bd247195b8870ebc73bcd  crystalhd_lgpl_includes.zip
+26a7443b8f3867742b519fac13552e0b4e7b8d5310223b5c73160a679ed777d7917b6d9ac0ed5629f23baa7d9db98425dd1d90c2893f9640c7890aebab4867db  crystalhd_lgpl_includes_v1.zip
diff --git a/contrib/src/crystalhd/mingw.patch b/contrib/src/crystalhd/mingw.patch
deleted file mode 100644
index 539a1e7..0000000
--- a/contrib/src/crystalhd/mingw.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- bc_dts_types.h.old	2011-11-30 03:20:14.715875756 +0100
-+++ bc_dts_types.h	2011-11-30 03:21:25.692227718 +0100
-@@ -38,7 +38,7 @@
- typedef int	BOOL;
- #endif
- 
--#ifdef WIN32
-+#ifdef _MSC_VER
-     typedef unsigned __int64  	U64;
- #else
-     typedef unsigned long long  U64;
-@@ -81,6 +81,7 @@
- 
- #else
- 
-+#ifndef HAVE_STDINT_H
- #ifndef uint64_t
- typedef struct _uint64_t {
- 	unsigned long low_dw;
-@@ -103,6 +104,7 @@
- #ifndef uint8_t
- typedef unsigned char	uint8_t;
- #endif
-+#endif /* STDINT_H */
- #endif
- 
- #endif
diff --git a/contrib/src/crystalhd/rules.mak b/contrib/src/crystalhd/rules.mak
index 29b0223..407489c 100644
--- a/contrib/src/crystalhd/rules.mak
+++ b/contrib/src/crystalhd/rules.mak
@@ -1,11 +1,11 @@
 # CrystalHD headers
 
-CRYSTAL_HEADERS_URL := http://www.broadcom.com/docs/support/crystalhd/crystalhd_lgpl_includes.zip
+CRYSTAL_HEADERS_URL := http://www.broadcom.com/docs/support/crystalhd/crystalhd_lgpl_includes_v1.zip
 
-$(TARBALLS)/crystalhd_lgpl_includes.zip:
+$(TARBALLS)/crystalhd_lgpl_includes_v1.zip:
 	$(call download,$(CRYSTAL_HEADERS_URL))
 
-CRYSTAL_SOURCES := crystalhd_lgpl_includes.zip
+CRYSTAL_SOURCES := crystalhd_lgpl_includes_v1.zip
 
 .sum-crystalhd: $(CRYSTAL_SOURCES)
 
@@ -15,5 +15,4 @@ CRYSTAL_SOURCES := crystalhd_lgpl_includes.zip
 ifdef HAVE_WIN32 # we want dlopening on win32
 	rm -rf $(PREFIX)/include/libcrystalhd/bc_drv_if.h
 endif
-	patch -p0 -f -d $(PREFIX)/include/libcrystalhd < ../src/crystalhd/mingw.patch
 	touch $@