[Lunar-commits] <moonbase-other> audacity: version bump to 2.0.6

[Stefan Wold]

commit 362a091a012f910bb941ba649b04801d19920f16
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Wed, 22 Oct 2014 21:32:09 +0200
URL: https://github.com/lunar-linux/moonbase-other/commit/362a091a012f910bb941ba649b04801d19920f16

audacity: version bump to 2.0.6

Fixed up the BUILD file and added a patch for ffmpeg api change.
---
  audio/audacity/BUILD     | +12/-12   
  audio/audacity/DEPENDS   | +6/-1     
  audio/audacity/DETAILS   | +6/-3     
  audio/audacity/PRE_BUILD | +2/-0     
  4 files changed, 26 insertions(+), 16 deletions(-)

--- a/audio/audacity/BUILD
+++ b/audio/audacity/BUILD
@@ -1,14 +1,14 @@
-OPTS="--with-lib-preference='system' $OPTS" &&
-
-OPTS+=" --with-libsndfile=system --with-expat=system --enable-unicode" &&
-
-# use soxr for samplerate conversion
-OPTS+=" --with-libresample=no --with-libsamplerate=no --with-libsoxr=system"  &&
-
-# use bundled version because system lib misses audacity additions
-OPTS+=" --with-portaudio=local --with-portmixer" &&
-
-# ffmpeg is broken due to outdated API
-OPTS+=" --without-ffmpeg" &&
+OPTS+=" --with-lib-preference=system \
+        --with-libsndfile=system \
+        --with-expat=system \
+        --enable-unicode \
+        --with-libresample=no \
+        --with-libsamplerate=no \
+        --with-libsoxr=system \
+        --with-portaudio=local \
+        --with-widgetextra=local \
+        --with-portmixer"
+
+export WX_CONFIG=/usr/bin/wx-config-2.8
 
 default_build
--- a/audio/audacity/DEPENDS
+++ b/audio/audacity/DEPENDS
@@ -1,5 +1,5 @@
 depends  expat
-depends  wxGTK
+depends  wxgtk28
 depends  libsndfile
 depends  soxr
 
@@ -53,3 +53,8 @@ optional_depends        "ladspa_sdk" \
                         "--enable-ladspa" \
                         "--disable-ladspa" \
                         "for ladspa plugin support"
+
+optional_depends        "ffmpeg" \
+                        "--with-ffmpeg" \
+                        "--without-ffmpeg" \
+                        "for ffmpeg support"
--- a/audio/audacity/DETAILS
+++ b/audio/audacity/DETAILS
@@ -1,13 +1,16 @@
           MODULE=audacity
-         VERSION=2.0.5
+         VERSION=2.0.6
           SOURCE=$MODULE-minsrc-$VERSION.tar.xz
+         SOURCE2=audacity-2.0.6-ffmpeg-fix.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-src-$VERSION
    SOURCE_URL[0]=$SFORGE_URL/$MODULE/$VERSION
    SOURCE_URL[1]=http://audacity.sourceforge.net/latest/audacity-src
-      SOURCE_VFY=sha1:f63cafb81f29e7f3813dc9f80fb1dfdbcfe46b33
+     SOURCE2_URL=$PATCH_URL
+      SOURCE_VFY=sha256:3080c190e678e0d682961a36c6e990c572dacd6b5ce499e5cec7362e9fa37d7b
+     SOURCE2_VFY=sha256:afee9ff0103cb2c251f70bfc9724a0958a7f79a62c48de1125f3030c6e93ff49
         WEB_SITE=http://audacity.sourceforge.net
          ENTERED=20011217
-         UPDATED=20131022
+         UPDATED=20141022
            SHORT="A simple soundfile editor"
 
 cat << EOF
--- /dev/null
+++ b/audio/audacity/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+patch_it $SOURCE2 1