Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (bbbe4ab24d324df036fa6addefbbab1975064ea0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (bbbe4ab24d324df036fa6addefbbab1975064ea0)
  • Date: Fri, 24 Apr 2015 00:43:35 -0500

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

video/ffmpeg/CONFIGURE | 8 +++++---
video/ffmpeg/DEPENDS | 14 ++++++++------
video/ffmpeg/HISTORY | 7 +++++++
video/ffmpeg/PRE_BUILD | 4 ++++
video/ffmpeg/freetype.patch | 21 +++++++++++++++++++++
5 files changed, 45 insertions(+), 9 deletions(-)

New commits:
commit bbbe4ab24d324df036fa6addefbbab1975064ea0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ffmpeg: fixed build of legacy branch

diff --git a/video/ffmpeg/CONFIGURE b/video/ffmpeg/CONFIGURE
index 0ac2e1a..3a4339c 100755
--- a/video/ffmpeg/CONFIGURE
+++ b/video/ffmpeg/CONFIGURE
@@ -18,9 +18,11 @@ config_query_option FFMPEG_OPTS "Enable debugging
symbols?" y \
"--enable-debug" \
"--disable-debug" &&

-config_query_option FFMPEG_OPTS "Enable support for Blackmagick Decklink
output?" n \
- "--enable-decklink" \
- "--disable-decklink" &&
+if [[ $FFMPEG_RELEASE == stable ]]; then
+ config_query_option FFMPEG_OPTS "Enable support for Blackmagick Decklink
output?" n \
+ "--enable-decklink" \
+ "--disable-decklink"
+fi &&

persistent_add FFMPEG_PROGRAM_LIST &&
local FFMPEG_PROGRAM_LIST="ffmpeg ffprobe ffserver" &&
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index 3430ece..cd04eba 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -96,20 +96,22 @@ if [[ $FFMPEG_RELEASE == stable ]]; then
optional_depends pulseaudio \
"--enable-libpulse" \
"" \
- "for Pulseaudio input support"
-else
- optional_depends dirac \
- "--enable-libdirac" \
- "" \
- "for dirac encoder support via libdirac" &&
+ "for Pulseaudio input support" &&
+
optional_depends libwebp \
"--enable-libwebp" \
"" \
"for WebP encoding via libwebp" &&
+
optional_depends OPENGL \
"--enable-opengl" \
"" \
"for OpenGL rendering"
+else
+ optional_depends dirac \
+ "--enable-libdirac" \
+ "" \
+ "for dirac encoder support via libdirac"
fi &&

optional_depends schroedinger \
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index b7c2249..3b9e51e 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,10 @@
+2015-04-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: opengl/libwebp support is available only in stable branch
+ * CONFIGURE: decklink is available only in stable branch
+ * PRE_BUILD: apply freetype patch for legacy branch
+ * freetype.patch: added, to fix legacy branch build against recent
+ freetype2
+
2015-03-31 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: libcdio-paranoia is _optional_ -- see configure script

diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD
index b7a3542..db36624 100755
--- a/video/ffmpeg/PRE_BUILD
+++ b/video/ffmpeg/PRE_BUILD
@@ -1,6 +1,10 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+if [[ $FFMPEG_RELEASE == legacy ]]; then
+ patch -p0 < "$SPELL_DIRECTORY/freetype.patch"
+fi &&
+
#fix bad pkg-config files
sed -i \
-e '/^pkg.*{/,/^}/
s|\$libdir|\$\{prefix\}/lib|;s|\$incdir|\$\{prefix\}/include|'\
diff --git a/video/ffmpeg/freetype.patch b/video/ffmpeg/freetype.patch
new file mode 100644
index 0000000..5dc18f8
--- /dev/null
+++ b/video/ffmpeg/freetype.patch
@@ -0,0 +1,21 @@
+--- configure.orig 2015-04-24 07:48:32.000000000 +0300
++++ configure 2015-04-24 07:51:07.626025323 +0300
+@@ -2932,7 +2932,7 @@
+ "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h" \
+ "dirac_decoder_init dirac_encoder_init"
+ enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion
-lfaac
+-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 libgsm && require libgsm gsm/gsm.h gsm_create -lgsm
+ enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h
lame_set_VBR_quality -lmp3lame
+ enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
+--- libavfilter/vf_drawtext.c.orig 2013-10-06 20:18:09.000000000 +0400
++++ libavfilter/vf_drawtext.c 2015-04-24 08:00:29.846711104 +0300
+@@ -41,7 +41,6 @@
+ #undef time
+
+ #include <ft2build.h>
+-#include <freetype/config/ftheader.h>
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (bbbe4ab24d324df036fa6addefbbab1975064ea0), Vlad Glagolev, 04/24/2015

Archive powered by MHonArc 2.6.24.

Top of Page