Wed Mar 19 21:31:09 2014 UTC ()
Fix build with freetype-2.5.


(wiz)
diff -r1.22 -r1.23 pkgsrc/multimedia/vlc2/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/vlc2/patches/patch-modules_text__renderer_freetype.c
cvs diff -r1.22 -r1.23 pkgsrc/multimedia/vlc2/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc2/Attic/distinfo 2013/12/04 11:30:45 1.22
+++ pkgsrc/multimedia/vlc2/Attic/distinfo 2014/03/19 21:31:09 1.23
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1$NetBSD: distinfo,v 1.22 2013/12/04 11:30:45 drochner Exp $ 1$NetBSD: distinfo,v 1.23 2014/03/19 21:31:09 wiz Exp $
2 2
3SHA1 (vlc-2.0.9.tar.xz) = d82131914023fff2a414859228a38fcc19ab59d9 3SHA1 (vlc-2.0.9.tar.xz) = d82131914023fff2a414859228a38fcc19ab59d9
4RMD160 (vlc-2.0.9.tar.xz) = cbdac7bfb9375c2d0de159d063cc27a6969da649 4RMD160 (vlc-2.0.9.tar.xz) = cbdac7bfb9375c2d0de159d063cc27a6969da649
5Size (vlc-2.0.9.tar.xz) = 18863020 bytes 5Size (vlc-2.0.9.tar.xz) = 18863020 bytes
6SHA1 (patch-aa) = 46003ac47b0b0ab97f481cbd755d48f624b0fa87 6SHA1 (patch-aa) = 46003ac47b0b0ab97f481cbd755d48f624b0fa87
7SHA1 (patch-ab) = 7833e9d1e023f53dd1125af5049eb9d74b733905 7SHA1 (patch-ab) = 7833e9d1e023f53dd1125af5049eb9d74b733905
8SHA1 (patch-ac) = 9cdb4bdad7f8e6a09e35b5a1142350d47d77f270 8SHA1 (patch-ac) = 9cdb4bdad7f8e6a09e35b5a1142350d47d77f270
9SHA1 (patch-ad) = bfcca3f794bc5dac7366210b4548ab45d23040d8 9SHA1 (patch-ad) = bfcca3f794bc5dac7366210b4548ab45d23040d8
10SHA1 (patch-ae) = 91cf64607a33dab18cd2d92464ab9731008f6a68 10SHA1 (patch-ae) = 91cf64607a33dab18cd2d92464ab9731008f6a68
11SHA1 (patch-af) = 8c9de1d74252ae3232bf2ac6755057ccef650228 11SHA1 (patch-af) = 8c9de1d74252ae3232bf2ac6755057ccef650228
12SHA1 (patch-ag) = 9fd4a1d0a43b7032b2db6597ac21fd609631733c 12SHA1 (patch-ag) = 9fd4a1d0a43b7032b2db6597ac21fd609631733c
13SHA1 (patch-ah) = 7eb1bb9ff4ab55317ca4c2ab3669208dce70a9e3 13SHA1 (patch-ah) = 7eb1bb9ff4ab55317ca4c2ab3669208dce70a9e3
14SHA1 (patch-ai) = 83d3aa9aa048aa81671640334b3b2c9d4f44a495 14SHA1 (patch-ai) = 83d3aa9aa048aa81671640334b3b2c9d4f44a495
15SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3 15SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3
16SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086 16SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
17SHA1 (patch-at) = bf48ded3571358d6b718af47b28804c3155d84ef 17SHA1 (patch-at) = bf48ded3571358d6b718af47b28804c3155d84ef
18SHA1 (patch-au) = 5ea53969efefe3d9a6e3121b5453b573c633124b 18SHA1 (patch-au) = 5ea53969efefe3d9a6e3121b5453b573c633124b
19SHA1 (patch-av) = c82b711947ea4bdca9b011e36af6c87d9b6f62a6 19SHA1 (patch-av) = c82b711947ea4bdca9b011e36af6c87d9b6f62a6
20SHA1 (patch-ba) = 1898a7a9bf6a45ab4915f1c46df325e6d41ada23 20SHA1 (patch-ba) = 1898a7a9bf6a45ab4915f1c46df325e6d41ada23
21SHA1 (patch-ca) = 6aa8487047b3b8d5417ba9e3195729980b2b6b9c 21SHA1 (patch-ca) = 6aa8487047b3b8d5417ba9e3195729980b2b6b9c
22SHA1 (patch-modules_access_directory.c) = e36df1da5b788e12e9fc7d94663dd69d86fe4f7a 22SHA1 (patch-modules_access_directory.c) = e36df1da5b788e12e9fc7d94663dd69d86fe4f7a
23SHA1 (patch-modules_access_rtp_Modules.am) = 14aea82ffab2fcfa5b0916ac2e86363d1efdcbf3 23SHA1 (patch-modules_access_rtp_Modules.am) = 14aea82ffab2fcfa5b0916ac2e86363d1efdcbf3
24SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf265b15 24SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf265b15
25SHA1 (patch-modules_misc_gnutls.c) = 7ab9df9f8b31ea7a7c8e302876d0e6c4e6882c30 25SHA1 (patch-modules_misc_gnutls.c) = 7ab9df9f8b31ea7a7c8e302876d0e6c4e6882c30
 26SHA1 (patch-modules_text__renderer_freetype.c) = 28d95587be3e2356b32bee21eb0612480b3bbd55
26SHA1 (patch-skins-aa) = 9477b095b3e0a1120397c6c9f7102a50c1a63d2b 27SHA1 (patch-skins-aa) = 9477b095b3e0a1120397c6c9f7102a50c1a63d2b
File Added: pkgsrc/multimedia/vlc2/patches/Attic/patch-modules_text__renderer_freetype.c
$NetBSD: patch-modules_text__renderer_freetype.c,v 1.1 2014/03/19 21:31:09 wiz Exp $

Fix build with freetype-2.5.

--- modules/text_renderer/freetype.c.orig	2014-03-19 21:17:25.000000000 +0000
+++ modules/text_renderer/freetype.c
@@ -64,10 +64,11 @@
 #endif
 
 /* Freetype */
-#include <freetype/ftsynth.h>
+#include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 #include FT_STROKER_H
+#include FT_SYNTHESIS_H
 
 #define FT_FLOOR(X)     ((X & -64) >> 6)
 #define FT_CEIL(X)      (((X + 63) & -64) >> 6)