Source Mage code commit list

[Ladislav Hagara <scm AT sourcemage.org>]

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

 video/ffmpeg/DETAILS                      |    2 
 video/ffmpeg/HISTORY                      |    4 +
 video/ffmpeg/PRE_BUILD                    |    4 +
 video/ffmpeg/ffmpeg-2.1.1-freetype2.patch |   73 
++++++++++++++++++++++++++++++
 4 files changed, 82 insertions(+), 1 deletion(-)

New commits:
commit 36e1fa1657b4beac55d34e10516b648c5494c227
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    ffmpeg 2.1.1

diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 0374680..e5c27b9 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ffmpeg
 if [[ $FFMPEG_RELEASE == stable ]]; then
-         VERSION=1.2.4
+         VERSION=2.1.1
   SECURITY_PATCH=14
 else
          VERSION=0.7.16
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index c8e47a4..5aceeb5 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,7 @@
+2013-12-12 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.1.1
+       * PRE_BUILD, ffmpeg-2.1.1-freetype2.patch: patch from Arch added
+
 2013-10-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: legacy version 0.7.16
 
diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD
index b7a3542..78ef8c1 100755
--- a/video/ffmpeg/PRE_BUILD
+++ b/video/ffmpeg/PRE_BUILD
@@ -1,6 +1,10 @@
 default_pre_build          &&
 cd $SOURCE_DIRECTORY       &&
 
+if [[ $FFMPEG_RELEASE == stable ]]; then
+  patch -p1 < $SPELL_DIRECTORY/ffmpeg-2.1.1-freetype2.patch
+fi &&
+
 #fix bad pkg-config files
 sed -i \
 -e '/^pkg.*{/,/^}/ 
s|\$libdir|\$\{prefix\}/lib|;s|\$incdir|\$\{prefix\}/include|'\
diff --git a/video/ffmpeg/ffmpeg-2.1.1-freetype2.patch 
b/video/ffmpeg/ffmpeg-2.1.1-freetype2.patch
new file mode 100644
index 0000000..2ff9f87
--- /dev/null
+++ b/video/ffmpeg/ffmpeg-2.1.1-freetype2.patch
@@ -0,0 +1,73 @@
+From cea5812fa723c08b89d929eeba73462e05de2973 Mon Sep 17 00:00:00 2001
+From: Alexander Strasser <eclipse7 AT gmx.net>
+Date: Fri, 6 Dec 2013 17:20:26 +0100
+Subject: [PATCH] configure: Special case libfreetype test
+
+Include the freetype header, in-directly through a macro, like it
+is done in the drawtext filter. Do not break if the header is moved.
+
+Unfortunately the drawtext filter included the file where the include
+macros are defined in a wrong way. This is not needed and breaks the
+build. Remove that #include line too.
+
+Signed-off-by: Alexander Strasser <eclipse7 AT gmx.net>
+---
+ configure                 |   22 +++++++++++++++++++++-
+ libavfilter/vf_drawtext.c |    1 -
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 205cfc9..0b00684 100755
+--- a/configure
++++ b/configure
+@@ -1128,6 +1128,26 @@ require_pkg_config(){
+     add_extralibs $(get_safe ${pkg}_libs)
+ }
+ 
++require_libfreetype(){
++    log require_libfreetype "$@"
++    pkg="freetype2"
++    check_cmd $pkg_config --exists --print-errors $pkg \
++      || die "ERROR: $pkg not found"
++    pkg_cflags=$($pkg_config --cflags $pkg)
++    pkg_libs=$($pkg_config --libs $pkg)
++    {
++        echo "#include <ft2build.h>"
++        echo "#include FT_FREETYPE_H"
++        echo "long check_func(void) { return (long) FT_Init_FreeType; }"
++        echo "int main(void) { return 0; }"
++    } | check_ld "cc" $pkg_cflags $pkg_libs \
++      && set_safe ${pkg}_cflags $pkg_cflags \
++      && set_safe ${pkg}_libs   $pkg_libs \
++      || die "ERROR: $pkg not found"
++    add_cflags    $(get_safe ${pkg}_cflags)
++    add_extralibs $(get_safe ${pkg}_libs)
++}
++
+ hostcc_o(){
+     eval printf '%s\\n' $HOSTCC_O
+ }
+@@ -4322,7 +4342,7 @@ enabled libfaac           && require2 libfaac 
"stdint.h faac.h" faacEncGetVersio
+ 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_libfreetype
+ 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;
+diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
+index dde3b0a..91b8218 100644
+--- a/libavfilter/vf_drawtext.c
++++ b/libavfilter/vf_drawtext.c
+@@ -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
+-- 
+1.7.10.4
+