Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (1a241b6c35147b1f1b7b89132b92314b62297064)

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 master grimoire by Vlad Glagolev (1a241b6c35147b1f1b7b89132b92314b62297064)
  • Date: Sun, 25 Nov 2012 06:10:17 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

audio-soft/sox/HISTORY | 3 +++
audio-soft/sox/PRE_BUILD | 7 ++++++-
2 files changed, 9 insertions(+), 1 deletion(-)

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

sox: apply ffmpeg 0.11 patch only for ffmpeg >=0.11

diff --git a/audio-soft/sox/HISTORY b/audio-soft/sox/HISTORY
index f77f9c2..89152db 100644
--- a/audio-soft/sox/HISTORY
+++ b/audio-soft/sox/HISTORY
@@ -1,3 +1,6 @@
+2012-11-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply ffmpeg 0.11 patch only for ffmpeg >=0.11
+
2012-06-20 Arjan Bouter <abouter AT sourcemage.org>
* ffmpeg-0.11-arch.patch: added patch from arch to fix
building against ffmpeg 0.11
diff --git a/audio-soft/sox/PRE_BUILD b/audio-soft/sox/PRE_BUILD
index af4ad33..bc5bec1 100755
--- a/audio-soft/sox/PRE_BUILD
+++ b/audio-soft/sox/PRE_BUILD
@@ -1,5 +1,10 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/file-5.0.patch" &&
-patch -p1 < "${SPELL_DIRECTORY}/ffmpeg-0.11-arch.patch"
+
+if spell_ok ffmpeg && is_version_less 0.10 $(installed_version ffmpeg); then
+ patch -p1 < "${SPELL_DIRECTORY}/ffmpeg-0.11-arch.patch"
+fi



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (1a241b6c35147b1f1b7b89132b92314b62297064), Vlad Glagolev, 11/25/2012

Archive powered by MHonArc 2.6.24.

Top of Page