Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d889f023e95ce110de3bee86378a0c9b9a7ff570
commit d889f023e95ce110de3bee86378a0c9b9a7ff570 Author: Marius Cirsta <[email protected]> Date: Sun Dec 13 23:08:44 2015 +0200 audacity-2.1.1-1-x86_64 * version bump * build with wxWidgets 3 diff --git a/source/xapps-extra/audacity/FrugalBuild b/source/xapps-extra/audacity/FrugalBuild index 40b115e..bab6242 100644 --- a/source/xapps-extra/audacity/FrugalBuild +++ b/source/xapps-extra/audacity/FrugalBuild @@ -1,38 +1,39 @@ # Compiling Time: 4.89 SBU # Maintainer: Miklos Vajna <[email protected]> -options+=('asneeded') pkgname=audacity -pkgver=2.0.5 +pkgver=2.1.1 pkgrel=1 pkgdesc="A program that lets you manipulate digital audio waveforms" -_F_sourceforge_sep="-minsrc-" -_F_sourceforge_ext=".tar.xz" -_F_archive_grepv="beta" -Finclude sourceforge -url="http://audacity.sourceforge.net/"; -depends=('wxgtk28' 'libvorbis' 'libid3tag' 'libmad' 'libogg' \ +_F_archive_name='Audacity' +url="http://audacityteam.org"; +depends=('wxwidget' 'libvorbis' 'libid3tag' 'libmad' 'libogg' \ 'libsamplerate' 'flac>=1.1.3' 'soundtouch' 'alsa-lib' \ - 'taglib' 'portaudio') + 'taglib' 'portaudio' 'ffmpeg' 'twolame') # TODO: twolame -makedepends=('zip') +makedepends=('zip' 'cmake' 'x11-protos') groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') -sha1sums=('f63cafb81f29e7f3813dc9f80fb1dfdbcfe46b33') +#temp src for wx3 support +source=(https://github.com/audacity/audacity/archive/wx3-stable.tar.gz \ + audacity-ffmpeg.patch) +up2date="Flasttar https://github.com/audacity/audacity/releases"; +sha1sums=('394233ef4d999d24c7a9454973f6e264b1069f97' \ + '5f1733a3802bcec7d9b54cb3ec8d7d81fc38fc61') build() { export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" - Fcd $pkgname-src-$pkgver + Fcd audacity-wx3-stable Fpatchall - WX_CONFIG=/usr/bin/wx-config-2.8 Fconf \ + WX_CONFIG=/usr/bin/wx-config Fconf \ --enable-unicode \ --with-portaudio \ - --without-portmixer \ + --with-portmixer \ --with-libsamplerate=system \ --without-libresample \ --with-libmad=system \ @@ -41,7 +42,9 @@ build() --with-vorbis=system \ --with-libexpat=system \ --with-libsndfile=system \ - --with-taglib=system + --with-taglib=system \ + --with-ffmpeg=system \ + --with-twolame=system make || Fdie Fmakeinstall Ffilerel images/AudacityLogo48x48.xpm /usr/share/$pkgname/$pkgname.xpm diff --git a/source/xapps-extra/audacity/audacity-ffmpeg.patch b/source/xapps-extra/audacity/audacity-ffmpeg.patch new file mode 100644 index 0000000..d0b9935 --- /dev/null +++ b/source/xapps-extra/audacity/audacity-ffmpeg.patch @@ -0,0 +1,30 @@ +diff -Naur audacity-src-2.0.6-orig/src/FFmpeg.h audacity-src-2.0.6/src/FFmpeg.h +--- audacity-src-2.0.6-orig/src/FFmpeg.h 2014-09-28 21:54:55.159636208 -0400 ++++ audacity-src-2.0.6/src/FFmpeg.h 2014-09-28 21:55:11.246276766 -0400 +@@ -688,7 +688,7 @@ + FFMPEG_FUNCTION_WITH_RETURN( + AVOutputFormat*, + av_oformat_next, +- (AVOutputFormat *f), ++ (const AVOutputFormat *f), + (f) + ); + FFMPEG_FUNCTION_WITH_RETURN( +@@ -755,7 +755,7 @@ + FFMPEG_FUNCTION_WITH_RETURN( + int, + av_fifo_size, +- (AVFifoBuffer *f), ++ (const AVFifoBuffer *f), + (f) + ); + FFMPEG_FUNCTION_WITH_RETURN( +@@ -801,7 +801,7 @@ + FFMPEG_FUNCTION_WITH_RETURN( + AVDictionaryEntry *, + av_dict_get, +- (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), ++ (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), + (m, key, prev, flags) + ); + FFMPEG_FUNCTION_WITH_RETURN( _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
