[Lunar-commits] <moonbase-other> sox: cleanup

[v4hn]

commit f61b93d073a3fd7eb932e24cb79ac7481f67f706
Author: v4hn <me at v4hn.de>
Date: Thu, 25 Sep 2014 12:54:48 +0200
URL: https://github.com/lunar-linux/moonbase-other/commit/f61b93d073a3fd7eb932e24cb79ac7481f67f706

sox: cleanup
---
  audio/sox/BUILD     | +1/-12    
  audio/sox/DEPENDS   | +3/-1     
  audio/sox/PRE_BUILD | +8/-7     
  3 files changed, 12 insertions(+), 20 deletions(-)

--- a/audio/sox/BUILD
+++ b/audio/sox/BUILD
@@ -1,14 +1,3 @@
-(
-
-  patch_it $SOURCE2 1 &&
-  patch_it $SOURCE3 1 &&
-
-  sed -i "15i #include <libavutil/mathematics.h>" src/ffmpeg.h &&
-
-  sedit "s:ftello:ftell:g" src/vorbis.c &&
-
-  OPTS+=" --with-distro=Lunar-Linux" &&
+  OPTS+=" --without-ffmpeg --with-distro=Lunar-Linux" &&
 
   default_build 
-
-) > $C_FIFO 2>&1
--- a/audio/sox/DEPENDS
+++ b/audio/sox/DEPENDS
@@ -1,6 +1,5 @@
 optional_depends alsa-utils  "--with-alsa"     "--without-alsa"     "for alsa support"
 optional_depends libpng      "--with-png"      "--without-png"      "for PNG support"
-optional_depends ffmpeg      "--with-ffmpeg"   "--without-ffmpeg"   "for FFMPEG support, ${PROBLEM_COLOR}Say NO due to recent ffmpeg bump${DEFAULT_COLOR}"
 optional_depends libsndfile  "--with-sndfile"  "--without-sndfile"  "for lame support"
 optional_depends libmad      "--with-mad"      "--without-mad"      "for mad support"
 optional_depends flac        "--with-flac"     "--without-flac"     "for flac support"
@@ -13,3 +12,6 @@ optional_depends ladspa_sdk  "--with-ladspa"   "--without-ladspa"   "for ladspa
 optional_depends wavpack     "--with-wavpack"  "--without-wavpack"  "for loseless encoding support"
 optional_depends libogg      "--with-oggvorbis" "--without-oggvorbis" "for OGG support"
 optional_depends pulseaudio  "--with-pulseaudio" "--without-pulseaudio" "for pulseaudio support"
+
+# broken with ffmpeg 2.4
+#optional_depends ffmpeg      "--with-ffmpeg"   "--without-ffmpeg"   "for FFMPEG support"
--- a/audio/sox/PRE_BUILD
+++ b/audio/sox/PRE_BUILD
@@ -1,7 +1,8 @@
-if [ -h /usr/bin/rec ] ;  then
-  rm /usr/bin/rec
-fi &&
-if [ -h /usr/share/man/man1/rec.1 ] ; then
-  rm /usr/share/man/man1/rec.1
-fi &&
-default_pre_build
+default_pre_build &&
+
+patch_it $SOURCE2 1 &&
+patch_it $SOURCE3 1 &&
+
+sed -i "15i #include <libavutil/mathematics.h>" src/ffmpeg.h &&
+
+sedit "s:ftello:ftell:g" src/vorbis.c