Merge remote-tracking branch 'origin/master'

lunar-linux · Feb 5, 2015 · e8085c3 · e8085c3
2 parents 28feebd + 7677e6b
commit e8085c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/audio/sox/DETAILS b/audio/sox/DETAILS
@@ -1,14 +1,11 @@
           MODULE=sox
          VERSION=14.4.1
           SOURCE=$MODULE-$VERSION.tar.gz
-         SOURCE2=sox-ffmpeg-0.11-arch.patch
-         SOURCE3=sox-ffmpeg.patch
+         SOURCE2=sox-ffmpeg.patch
       SOURCE_URL=$SFORGE_URL/$MODULE
-     SOURCE2_URL=$PATCH_URL
-     SOURCE3_URL=https://raw.githubusercontent.com/pld-linux/sox/master/
+     SOURCE2_URL=https://raw.githubusercontent.com/pld-linux/sox/master/
       SOURCE_VFY=sha1:71f05afc51e3d9b03376b2f98fd452d3a274d595
-     SOURCE2_VFY=sha1:6c860138bbceddf9df726c7891024bcc6b8fae55
-     SOURCE3_VFY=sha1:55c8016e4070d1bf5b674219ffa2becabd37c91c
+     SOURCE2_VFY=sha1:aff8cefbb15b8acbf9f600614df7e8dcec7ba562
         WEB_SITE=http://sox.sourceforge.net
          ENTERED=20010922
          UPDATED=20130215

diff --git a/audio/sox/PRE_BUILD b/audio/sox/PRE_BUILD
@@ -1,7 +1,6 @@
 default_pre_build &&
 
 patch_it $SOURCE2 1 &&
-patch_it $SOURCE3 1 &&
 
 sed -i "15i #include <libavutil/mathematics.h>" src/ffmpeg.h &&