[114184] trunk/dports/multimedia/ffmpeg-devel

[devans at macports.org]

Revision: 114184
          https://trac.macports.org/changeset/114184
Author:   devans at macports.org
Date:     2013-12-01 00:24:20 -0800 (Sun, 01 Dec 2013)
Log Message:
-----------
ffmpeg-devel: update to recent git master.

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

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2013-12-01 07:40:10 UTC (rev 114183)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2013-12-01 08:24:20 UTC (rev 114184)
@@ -8,8 +8,8 @@
 
 name            ffmpeg-devel
 conflicts       ffmpeg
-version         20131119
-set git_branch  bb7f3ddd42540f5e97efb44ad975dcb67c4e21e9
+version         20131129
+set git_branch  65f41b5c5cdb22e60a83321fe564ebb0155a35ce
 license         LGPL-2.1+
 categories      multimedia
 maintainers     devans jeremyhu openmaintainer
@@ -50,8 +50,8 @@
 master_sites    "http://git.videolan.org/gitweb.cgi?p=ffmpeg.git;a=snapshot;h=${git_branch};sf=tgz;dummy="
 dist_subdir     ffmpeg
 
-checksums       rmd160  0ce6e9375e53b67066a0c46c8c4242e0283df9e0 \
-                sha256  dc7a1f8bfb259beee66e28b41d7b350e973e0773485cd21abbb78def78fb07ad
+checksums       rmd160  cdec762e7848f20f197376d7fc002913df0d8808 \
+                sha256  ab1f8abb3e96d7b4d10d2cd28ddb817320066f9529d1ecb4e85bb25298228b09
 
 depends_build   port:pkgconfig \
                 port:gmake \

Modified: trunk/dports/multimedia/ffmpeg-devel/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/files/patch-freetype-2.5.1.diff	2013-12-01 07:40:10 UTC (rev 114183)
+++ trunk/dports/multimedia/ffmpeg-devel/files/patch-freetype-2.5.1.diff	2013-12-01 08:24:20 UTC (rev 114184)
@@ -1,14 +1,3 @@
---- 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 @@
@@ -19,3 +8,14 @@
  #include FT_FREETYPE_H
  #include FT_GLYPH_H
  #if CONFIG_FONTCONFIG
+--- configure.orig	2013-11-30 13:26:14.000000000 -0800
++++ configure	2013-11-30 23:58:55.000000000 -0800
+@@ -4316,7 +4316,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;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131201/59d462fa/attachment.html>