[vlc-commits] contribs: harfbuzz: Fix compilation with clang on win64

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Thu Dec 21 23:57:43 2017 +0200| [8dd6e48c6ea5efc2e576f94f845f2a296b5652e2] | committer: Hugo Beauzée-Luyssen

contribs: harfbuzz: Fix compilation with clang on win64

Clang errors out on casting from a pointer to a smaller integer
type.

This is an adapted backport of a newer upstream harfbuzz
commit 03b7a221f701a9b003890878e730ad175c3fdd86.

Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

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

 contrib/src/harfbuzz/rules.mak   |  1 +
 contrib/src/harfbuzz/win64.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index b37cdef99b..ba447b49ce 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -24,6 +24,7 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
 	$(APPLY) $(SRC)/harfbuzz/harfbuzz-aarch64.patch
 	$(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch
 	$(APPLY) $(SRC)/harfbuzz/harfbuzz-coretext.patch
+	$(APPLY) $(SRC)/harfbuzz/win64.patch
 	$(MOVE)
 
 DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
diff --git a/contrib/src/harfbuzz/win64.patch b/contrib/src/harfbuzz/win64.patch
new file mode 100644
index 0000000000..17c13193da
--- /dev/null
+++ b/contrib/src/harfbuzz/win64.patch
@@ -0,0 +1,12 @@
+diff -urN harfbuzz-orig/src/hb-private.hh harfbuzz/src/hb-private.hh
+--- harfbuzz-orig/src/hb-private.hh	2017-01-10 06:18:28.000000000 +0000
++++ harfbuzz/src/hb-private.hh	2017-12-21 21:46:12.254147419 +0000
+@@ -684,7 +684,7 @@
+   fprintf (stderr, "%-10s", what ? what : "");
+ 
+   if (obj)
+-    fprintf (stderr, "(%0*lx) ", (unsigned int) (2 * sizeof (void *)), (unsigned long) obj);
++    fprintf (stderr, "(%0*p) ", (unsigned int) (2 * sizeof (void *)), obj);
+   else
+     fprintf (stderr, " %*s  ", (unsigned int) (2 * sizeof (void *)), "");
+