Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (c5bde2d3423b0a8393332d67864503d9b7d3b36d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (c5bde2d3423b0a8393332d67864503d9b7d3b36d)
  • Date: Fri, 15 Feb 2013 14:08:55 -0600

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

telephony/mediastreamer/HISTORY | 3 +++
telephony/mediastreamer/PRE_BUILD | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit c5bde2d3423b0a8393332d67864503d9b7d3b36d
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

mediastreamer: fixed ffmpeg version check in PRE_BUILD

diff --git a/telephony/mediastreamer/HISTORY b/telephony/mediastreamer/HISTORY
index ce3581c..96858a6 100644
--- a/telephony/mediastreamer/HISTORY
+++ b/telephony/mediastreamer/HISTORY
@@ -1,3 +1,6 @@
+2013-02-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: fixed ffmpeg version check
+
2012-07-29 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD: apply ffmpeg 0.11 patch for ffmpeg-svn as well

diff --git a/telephony/mediastreamer/PRE_BUILD
b/telephony/mediastreamer/PRE_BUILD
index 880fd5e..d0795c9 100755
--- a/telephony/mediastreamer/PRE_BUILD
+++ b/telephony/mediastreamer/PRE_BUILD
@@ -1,10 +1,11 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+. "$GRIMOIRE/FUNCTIONS" &&
FFMPEG_VER=0
if is_depends_enabled $SPELL ffmpeg && spell_ok ffmpeg; then
- FFMPEG_VER=$(installed_version ffmpeg|cut -d. -f2)
+ FFMPEG_VER=$(installed_version ffmpeg)
fi
-if (( $FFMPEG_VER >= 11 )) || is_depends_enabled $SPELL ffmpeg-svn; then
+if is_version_less 0.11.0 $FFMPEG_VER || is_depends_enabled $SPELL
ffmpeg-svn; then
patch -p1 < $SPELL_DIRECTORY/mediastreamer-ffmpeg-0.11.patch
fi



  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (c5bde2d3423b0a8393332d67864503d9b7d3b36d), Sukneet Basuta, 02/15/2013

Archive powered by MHonArc 2.6.24.

Top of Page