diff --git a/multimedia/sound/audacity/actions.py b/multimedia/sound/audacity/actions.py
index 27ddda0dc4..eee57eebf9 100644
--- a/multimedia/sound/audacity/actions.py
+++ b/multimedia/sound/audacity/actions.py
@@ -8,49 +8,46 @@ from pisi.actionsapi import get
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
+from pisi.actionsapi import cmaketools
#WorkDir = "audacity-minsrc-%s" % get.srcVERSION()
def setup():
- autotools.autoreconf("-vfi")
- shelltools.cd("lib-src/portmixer")
- shelltools.cd("../..")
+ #autotools.autoreconf("-vfi")
+ #shelltools.cd("lib-src/portmixer")
+ #shelltools.cd("../..")
- autotools.aclocal("-I m4")
- autotools.autoconf()
- shelltools.export("LIBS", "-lavcodec")
+ #autotools.aclocal("-I m4")
+ #autotools.autoconf()
+ #shelltools.export("LIBS", "-lavcodec")
#shelltools.export("WX_CONFIG=wx-config-gtk3 ./configure", "/usr/bin/wxconfig")
# suppress compiler warnings
- pisitools.cxxflags.add("-Wno-unused-result -Wno-implicit-int -Wno-format-overflow -Wno-return-type -Wno-format-truncation -Wno-deprecated-declarations -Wno-unknown-pragmas -Wno-maybe-uninitialized -Wno-strict-prototypes -Wno-comment -Wno-implicit-function-declaration -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -Wno-enum-compare -Wno-aligned-new -Wno-class-memaccess -Wno-unused-but-set-variable -Wno-misleading-indentation -Wno-unused-variable -Wno-reorder -Wno-unused-function -Wno-sign-compare -Wno-unused-value -Wno-pessimizing-move -Wno-reorder -Wno-switch")
- autotools.configure("--enable-unicode \
- --with-midi \
- --with-sbsms \
- --prefix=/usr \
- --with-libmad \
- --with-taglib \
- --without-lv2 \
- --with-libvamp \
- --with-libflac \
- --enable-ladspa \
- --enable-nyquist \
- --with-libvorbis \
- --with-libid3tag \
- --with-soundtouch \
- --with-libtwolame \
- --with-lame=system \
- --with-expat=system \
- --with-libsamplerate \
- --with-ffmpeg=system \
- --with-libsndfile=system \
- --docdir=/usr/share/doc/audacity \
- WX_CONFIG=/usr/bin/wx-config-gtk3 \
- --with-lib-preference='system local' \
- --with-portmixer")
+ #pisitools.cxxflags.add("-Wno-unused-result -Wno-implicit-int -Wno-format-overflow -Wno-return-type -Wno-format-truncation -Wno-deprecated-declarations -Wno-unknown-pragmas -Wno-maybe-uninitialized -Wno-strict-prototypes -Wno-comment -Wno-implicit-function-declaration -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -Wno-enum-compare -Wno-aligned-new -Wno-class-memaccess -Wno-unused-but-set-variable -Wno-misleading-indentation -Wno-unused-variable -Wno-reorder -Wno-unused-function -Wno-sign-compare -Wno-unused-value -Wno-pessimizing-move -Wno-reorder -Wno-switch")
+
+ shelltools.makedirs("build")
+ shelltools.cd("build")
+
+ cmaketools.configure("-D CMAKE_INSTALL_PREFIX=/usr \
+ -D audacity_conan_enabled=OFF \
+ -D audacity_has_networking=OFF \
+ -D audacity_has_crashreports=OFF \
+ -D audacity_has_updates_check=OFF \
+ -D audacity_has_sentry_reporting=OFF \
+ -D audacity_lib_preference=system \
+ -D audacity_use_lv2:STRING=local \
+ -D audacity_use_portsmf:STRING=local \
+ -Daudacity_use_sbsms:STRING=local \
+ -D wxWidgets_CONFIG_EXECUTABLE:FILEPATH=/usr/bin/wx-config-gtk3 \
+ -D audacity_obey_system_dependencies=ON", sourceDir="..")
def build():
- autotools.make()
+ shelltools.cd("build")
+ cmaketools.make()
def install():
- autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+ shelltools.cd("build")
+ cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
- pisitools.dodir("/usr/share/audacity/help/manual")
\ No newline at end of file
+ pisitools.remove("/usr/audacity")
+
+ pisitools.dodir("/usr/share/audacity/help/manual")
diff --git a/multimedia/sound/audacity/pspec.xml b/multimedia/sound/audacity/pspec.xml
index c371856c8c..4f265515b2 100755
--- a/multimedia/sound/audacity/pspec.xml
+++ b/multimedia/sound/audacity/pspec.xml
@@ -11,7 +11,7 @@
multimedia.sound
GPLv2
app:gui
- Audacity
+ audacity
Multi-track audio editor and recorder
With Audacity, you can cut, copy, splice or mix sounds together; change the speed or pitch of a recording and much more. Editing is very fast and provides unlimited undo/redo. There are digital effects and spectrum analysis tools. Supported file formats include Ogg Vorbis, MP3, WAV, AIFF, and AU..
https://github.com/audacity/audacity/archive/Audacity-3.1.3.tar.gz
@@ -21,6 +21,7 @@
lv2-devel
flac-devel
gtk3-devel
+ gtk2-devel
lame-devel
expat-devel
glib2-devel
@@ -31,7 +32,9 @@
libogg-devel
taglib-devel
twolame-devel
+ libsoxr-devel
alsa-lib-devel
+ portmidi-devel
libid3tag-devel
libvorbis-devel
libsndfile-devel
@@ -41,6 +44,9 @@
libsamplerate-devel
vamp-plugin-sdk-devel
jack-audio-connection-kit-devel
+
+ lv2-devel
+ portaudio-devel
342c4b588f2f069a2df2157ac166237a54277b3a.patch
@@ -54,6 +60,7 @@
lv2
flac
+ gtk2
gtk3
expat
glib2
@@ -63,10 +70,14 @@
libgcc
wxBase
wxGTK3
+ libX11
twolame
+ libsoxr
alsa-lib
+ portmidi
libid3tag
libvorbis
+ portaudio
libsndfile
soundtouch
gdk-pixbuf
@@ -81,6 +92,7 @@
/usr/share/man
/usr/bin
+ /usr/lib
/usr/share/mime
/usr/share/icons
/usr/share/pixmaps
@@ -89,6 +101,7 @@
/usr/share/doc/audacity
/usr/share/locale
/usr/share/applications
+ /usr/share/metainfo/audacity.appdata.xml