[114100] trunk/dports/multimedia

[ryandesign at macports.org]

Revision: 114100
          https://trac.macports.org/changeset/114100
Author:   ryandesign at macports.org
Date:     2013-11-28 23:48:51 -0800 (Thu, 28 Nov 2013)
Log Message:
-----------
ffmpeg, ffmpeg-devel: fix build with freetype 2.5.1 (#41574)

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

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

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2013-11-29 07:48:09 UTC (rev 114099)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2013-11-29 07:48:51 UTC (rev 114100)
@@ -77,6 +77,8 @@
                 port:bzip2 \
                 port:zlib
 
+patchfiles-append   patch-freetype-2.5.1.diff
+
 build.cmd       ${prefix}/bin/gmake
 build.env-append V=1
 

Added: trunk/dports/multimedia/ffmpeg/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-freetype-2.5.1.diff	                        (rev 0)
+++ trunk/dports/multimedia/ffmpeg/files/patch-freetype-2.5.1.diff	2013-11-29 07:48:51 UTC (rev 114100)
@@ -0,0 +1,21 @@
+--- configure.orig	2013-11-19 20:29:07.000000000 -0600
++++ configure	2013-11-29 00:32:06.000000000 -0600
+@@ -4242,7 +4242,7 @@
+ enabled libfdk_aac        && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
+ flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
+ enabled libflite          && require2 libflite "flite/flite.h" flite_init $flite_libs
+-enabled libfreetype       && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
++enabled libfreetype       && require_pkg_config freetype2 "ft2build.h freetype.h" FT_Init_FreeType
+ enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme -lstdc++
+ enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
+                                    check_lib "${gsm_hdr}" gsm_create -lgsm && break;
+--- libavfilter/vf_drawtext.c.orig	2013-11-19 20:28:56.000000000 -0600
++++ libavfilter/vf_drawtext.c	2013-11-29 00:36:56.000000000 -0600
+@@ -48,7 +48,6 @@
+ #include "video.h"
+ 
+ #include <ft2build.h>
+-#include <freetype/config/ftheader.h>
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #if CONFIG_FONTCONFIG

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2013-11-29 07:48:09 UTC (rev 114099)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2013-11-29 07:48:51 UTC (rev 114100)
@@ -83,6 +83,8 @@
     error "git branch hash must be at least 7 characters long."
 }
 
+patchfiles-append   patch-freetype-2.5.1.diff
+
 build.cmd       ${prefix}/bin/gmake
 build.env-append V=1
 

Added: trunk/dports/multimedia/ffmpeg-devel/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/files/patch-freetype-2.5.1.diff	                        (rev 0)
+++ trunk/dports/multimedia/ffmpeg-devel/files/patch-freetype-2.5.1.diff	2013-11-29 07:48:51 UTC (rev 114100)
@@ -0,0 +1,21 @@
+--- configure.orig	2013-11-19 20:29:07.000000000 -0600
++++ configure	2013-11-29 00:32:06.000000000 -0600
+@@ -4242,7 +4242,7 @@
+ enabled libfdk_aac        && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
+ flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
+ enabled libflite          && require2 libflite "flite/flite.h" flite_init $flite_libs
+-enabled libfreetype       && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
++enabled libfreetype       && require_pkg_config freetype2 "ft2build.h freetype.h" FT_Init_FreeType
+ enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme -lstdc++
+ enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
+                                    check_lib "${gsm_hdr}" gsm_create -lgsm && break;
+--- libavfilter/vf_drawtext.c.orig	2013-11-19 20:28:56.000000000 -0600
++++ libavfilter/vf_drawtext.c	2013-11-29 00:36:56.000000000 -0600
+@@ -48,7 +48,6 @@
+ #include "video.h"
+ 
+ #include <ft2build.h>
+-#include <freetype/config/ftheader.h>
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #if CONFIG_FONTCONFIG
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131128/10b0d3ba/attachment.html>