[Lunar-commits] <moonbase-other> audacity: version bump & fixup

[v4hn]

commit 3dad76763f84ab9e04d2a3d0b102039f5e273fd5
Author: v4hn <me at v4hn.de>
Date: Mon, 02 Sep 2013 07:00:06 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/3dad76763f84ab9e04d2a3d0b102039f5e273fd5

audacity: version bump & fixup
---
  audio/audacity/BUILD   | +9/-10    
  audio/audacity/DEPENDS | +31/-25   
  audio/audacity/DETAILS | +5/-5     
  3 files changed, 45 insertions(+), 40 deletions(-)

--- a/audio/audacity/BUILD
+++ b/audio/audacity/BUILD
@@ -1,15 +1,14 @@
-(
+  OPTS="--with-lib-preference='system' $OPTS" &&
 
-  unset CPP CXX CC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS  &&
-  OPTS+=" --with-libsndfile=system --with-libresample=no --with-libsamplerate=system --enable-unicode"  &&
+  OPTS+=" --with-libsndfile=system --with-expat=system --enable-unicode" &&
 
-  #see DEPENDS
-  OPTS+=" --without-soundtouch"
+  # use soxr for samplerate conversion
+  OPTS+=" --with-libresample=no --with-libsamplerate=no --with-libsoxr=system"  &&
 
-  if [ -d /proc/asound ];  then
-      OPTS+=" --with-portaudio"
-  fi  &&
+  # use bundled version because system lib misses audacity additions
+  OPTS+=" --with-portaudio=local --with-portmixer" &&
 
-  default_build
+  # ffmpeg is broken due to outdated API
+  OPTS+=" --without-ffmpeg" &&
 
-) > $C_FIFO 2>&1
+  default_build
--- a/audio/audacity/DEPENDS
+++ b/audio/audacity/DEPENDS
@@ -1,49 +1,55 @@
+depends  expat
 depends  wxGTK
 depends  libsndfile
-depends  libsamplerate
+depends  soxr
 
-#soundtouch 1.6.0 is not supported by audacity 2.0.1
-#optional_depends        "soundtouch"           \
-#                        "--with-soundtouch"    \
-#                        "--without-soundtouch" \
-#                        "for pitch and tempo changing"
+optional_depends        "soundtouch"           \
+                        "--with-soundtouch=system" \
+                        "--without-soundtouch" \
+                        "for pitch and tempo changing"
 
-optional_depends        "portaudio"          \
-                        "--with-portmixer"   \
-                        "--without-portmixer" \
-                        "for portaudio support"
+#audacity bundles a patched version of portaudio 19
+#optional_depends        "portaudio"          \
+#                        "--with-portaudio= --with-portmixer"   \
+#                        "--with-portaudio --without-portmixer" \
+#                        "for portaudio support"
 
-optional_depends        "ffmpeg"             \
-                        "--with-ffmpeg"      \
-                        "--without-ffmpeg"   \
-                        "for ffmpeg support"
+#optional_depends        "ffmpeg"             \
+#                        "--with-ffmpeg=system"      \
+#                        "--without-ffmpeg"   \
+#                        "for ffmpeg support"
 
 optional_depends        "libid3tag" \
-                        "--with-id3tag=system" \
-                        "" \
+                        "--with-libid3tag=system" \
+                        "--without-libid3tag" \
                         "enable id3 support"
 
 optional_depends        "lame" \
-                        "" \
-                        "" \
+                        "--with-lame=system" \
+                        "--without-lame" \
                         "enable mp3 support"
 
+optional_depends        "twolame" \
+                        "--with-libtwolame=system" \
+                        "--without-libtwolame" \
+                        "enable mp2 support"
+
 optional_depends        "libvorbis" \
-                        "--with-vorbis=system" \
-                        "" \
+                        "--with-libvorbis=system" \
+                        "--without-libvorbis" \
                         "enable ogg support"
 
 optional_depends        "libmad" \
                         "--with-libmad=system" \
-                        "" \
+                        "--without-libmad" \
                         "for fast mp3 decoding"
 
 optional_depends        "flac" \
-                        "--with-flac=system" \
-                        "" \
+                        "--with-libflac=system" \
+                        "--without-libflac" \
                         "for flac encoding"
 
 optional_depends        "ladspa_sdk" \
-                        "" \
-                        "" \
+                        "--enable-ladspa" \
+                        "--disable-ladspa" \
                         "for ladspa plugin support"
--- a/audio/audacity/DETAILS
+++ b/audio/audacity/DETAILS
@@ -1,13 +1,13 @@
           MODULE=audacity
-         VERSION=2.0.2
-          SOURCE=$MODULE-fullsrc-$VERSION.tar.bz2
+         VERSION=2.0.3
+          SOURCE=$MODULE-minsrc-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-src-$VERSION
-   SOURCE_URL[0]=$SFORGE_URL/$MODULE
+   SOURCE_URL[0]=$SFORGE_URL/$MODULE/$VERSION
    SOURCE_URL[1]=http://audacity.sourceforge.net/latest/audacity-src
-      SOURCE_VFY=sha1:c48d90c321d8c82cab5ae1657bd71fbd0b4dabcb
+      SOURCE_VFY=sha1:72e634711fb96aac9df445e75e16e12e00c047e6
         WEB_SITE=http://audacity.sourceforge.net
          ENTERED=20011217
-         UPDATED=20120824
+         UPDATED=20130822
            SHORT="A simple soundfile editor"
 
 cat << EOF