[114384] trunk/dports/multimedia

[devans at macports.org]

Revision: 114384
          https://trac.macports.org/changeset/114384
Author:   devans at macports.org
Date:     2013-12-06 15:14:44 -0800 (Fri, 06 Dec 2013)
Log Message:
-----------
VLC, VLC-devel: apply upstream patch to fix build with freetype 2.5.1.

Modified Paths:
--------------
    trunk/dports/multimedia/VLC/Portfile
    trunk/dports/multimedia/VLC-devel/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/VLC/files/patch-freetype-2.5.1.diff
    trunk/dports/multimedia/VLC-devel/files/patch-freetype-2.5.1.diff

Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile	2013-12-06 19:19:24 UTC (rev 114383)
+++ trunk/dports/multimedia/VLC/Portfile	2013-12-06 23:14:44 UTC (rev 114384)
@@ -74,7 +74,8 @@
     class_struct.patch \
     qtkit.patch \
     static_assert.patch \
-    no-sparkle.patch
+    no-sparkle.patch \
+    patch-freetype-2.5.1.diff
 
 post-patch {
     reinplace "s:librsvg-2/librsvg:librsvg:" \

Added: trunk/dports/multimedia/VLC/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-freetype-2.5.1.diff	                        (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-freetype-2.5.1.diff	2013-12-06 23:14:44 UTC (rev 114384)
@@ -0,0 +1,30 @@
+From c5b2b0a284ba6b544646f3a205aa1a2e1117d431 Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Mon, 2 Dec 2013 17:32:07 +0100
+Subject: [PATCH 1/1] Freetype: fix compilation with 2.5.1
+
+Close #10019
+---
+ modules/text_renderer/freetype.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
+index bd78c0d..baeeb96 100644
+--- modules/text_renderer/freetype.c
++++ modules/text_renderer/freetype.c
+@@ -88,10 +88,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)
+-- 
+1.7.10.4
+

Modified: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================
--- trunk/dports/multimedia/VLC-devel/Portfile	2013-12-06 19:19:24 UTC (rev 114383)
+++ trunk/dports/multimedia/VLC-devel/Portfile	2013-12-06 23:14:44 UTC (rev 114384)
@@ -74,7 +74,8 @@
     PR-34741-no__clang_version__.patch \
     class_struct.patch \
     static_assert.patch \
-    no-sparkle.patch
+    no-sparkle.patch \
+    patch-freetype-2.5.1.diff
 
 post-patch {
     reinplace "s:librsvg-2/librsvg:librsvg:" \

Added: trunk/dports/multimedia/VLC-devel/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/patch-freetype-2.5.1.diff	                        (rev 0)
+++ trunk/dports/multimedia/VLC-devel/files/patch-freetype-2.5.1.diff	2013-12-06 23:14:44 UTC (rev 114384)
@@ -0,0 +1,30 @@
+From c5b2b0a284ba6b544646f3a205aa1a2e1117d431 Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Mon, 2 Dec 2013 17:32:07 +0100
+Subject: [PATCH 1/1] Freetype: fix compilation with 2.5.1
+
+Close #10019
+---
+ modules/text_renderer/freetype.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
+index bd78c0d..baeeb96 100644
+--- modules/text_renderer/freetype.c
++++ modules/text_renderer/freetype.c
+@@ -88,10 +88,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)
+-- 
+1.7.10.4
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131206/c4b850e0/attachment.html>