Date: Tuesday, April 12, 2011 @ 16:51:50 Author: eric Revision: 119629
upgpkg: audacity 1.3.13-1 Upstream update, Added hicolor-icon-theme depends, Cleaned up makedepends, Removed old patch and ChangeLog Modified: audacity/trunk/PKGBUILD audacity/trunk/audacity.install Deleted: audacity/trunk/ChangeLog audacity/trunk/audacity-ffmpeg.patch -----------------------+ ChangeLog | 45 --------------------------------------------- PKGBUILD | 48 +++++++++++++++++++----------------------------- audacity-ffmpeg.patch | 31 ------------------------------- audacity.install | 1 + 4 files changed, 20 insertions(+), 105 deletions(-) Deleted: ChangeLog =================================================================== --- ChangeLog 2011-04-12 20:37:10 UTC (rev 119628) +++ ChangeLog 2011-04-12 20:51:50 UTC (rev 119629) @@ -1,45 +0,0 @@ -2010-04-10 Andrea Scarpino <and...@archlinux.org> - - * audacity 1.3.12-2 - * fixed soundtouch dependence - -2010-04-10 Andrea Scarpino <and...@archlinux.org> - - * audacity 1.3.12-1 - * Upstream update - -2010-01-23 Eric Belanger <e...@archlinux.org> - - * audacity 1.3.11-1 - * Upstream update - -2009-12-03 Eric Belanger <e...@archlinux.org> - - * audacity 1.3.10-1 - * Upstream update - -2009-09-02 Eric Belanger <e...@archlinux.org> - - * audacity 1.3.9-1 - * Upstream update - * Fixed icon location - -2009-07-17 Eric Belanger <e...@archlinux.org> - - * audacity 1.3.8-1 - * Upstream update - * Updated source url - * Improved description - -2009-01-30 Eric Belanger <e...@archlinux.org> - - * audacity 1.3.7-1 - * Upstream update - * Updated source url - -2008-12-07 Eric Belanger <e...@archlinux.org> - - * audacity 1.3.6-2 - * Added install scriptlet to update mime database (close FS#11398) - * Added soundtouch support (close FS#9056) - * Added ChangeLog Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-04-12 20:37:10 UTC (rev 119628) +++ PKGBUILD 2011-04-12 20:51:50 UTC (rev 119629) @@ -1,44 +1,34 @@ # $Id$ -# Contributor: Eric Belanger <e...@archlinux.org> -# Contributor: Tom Newsom <jeeps...@gmx.co.uk> -# Contributor: dorphell <dorph...@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1...@archlinux.us> +# Maintainer: Eric Bélanger <e...@archlinux.org> pkgname=audacity -pkgver=1.3.12 -pkgrel=3 +pkgver=1.3.13 +pkgrel=1 pkgdesc="A program that lets you manipulate digital audio waveforms" arch=('i686' 'x86_64') url="http://audacity.sourceforge.net/" license=('GPL') -depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' +depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' 'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils' 'redland' 'jack' 'soundtouch') -makedepends=('zip' 'python' 'pkgconfig') +makedepends=('zip') options=('!makeflags') -install=${pkgname}.install -source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}-beta.tar.bz2 - audacity-ffmpeg.patch) -md5sums=('76996fec67181ca82ba191e012518b57' - '52cd58c39078d78a96e972df4c3c41f6') +install=audacity.install +source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}-beta.tar.bz2) +md5sums=('57be7fadb8c8dd17b8462c7ac1561d03') build() { - cd ${srcdir}/${pkgname}-src-${pkgver}-beta - - patch -p0 < ${srcdir}/audacity-ffmpeg.patch || return 1 - - WX_CONFIG=/usr/bin/wx-config \ - ./configure --prefix=/usr \ - --with-portaudio=v19 --with-libsamplerate=system \ - --without-libresample --with-libmad=system \ - --with-id3tag=system --with-flac=system \ - --with-vorbis=system --with-libexpat=system \ - --with-libsndfile=system --with-soundtouch \ - --enable-unicode --without-taglib || return 1 - make || return 1 + cd "${srcdir}/${pkgname}-src-${pkgver}-beta" + WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \ + --with-portaudio --with-libsamplerate \ + --without-libresample --with-libmad \ + --with-id3tag --with-libflac \ + --with-vorbis --with-libexpat \ + --with-libsndfile --with-soundtouch \ + --enable-unicode --without-taglib + make } package() { - cd ${srcdir}/${pkgname}-src-${pkgver}-beta - - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}/${pkgname}-src-${pkgver}-beta" + make DESTDIR="${pkgdir}" install } Deleted: audacity-ffmpeg.patch =================================================================== --- audacity-ffmpeg.patch 2011-04-12 20:37:10 UTC (rev 119628) +++ audacity-ffmpeg.patch 2011-04-12 20:51:50 UTC (rev 119629) @@ -1,31 +0,0 @@ ---- src/FFmpeg.cpp.original 2010-04-14 14:59:48.000000000 +0200 -+++ src/FFmpeg.cpp 2010-04-14 15:25:52.136755669 +0200 -@@ -341,7 +341,7 @@ - } - // Otherwize, resort to extension matching if available - else if (fmt1->extensions) { -- if (FFmpegLibsInst->match_ext(filename, fmt1->extensions)) { -+ if (FFmpegLibsInst->av_match_ext(filename, fmt1->extensions)) { - score = 50; - } - } -@@ -814,7 +814,7 @@ - INITDYN(avformat,av_open_input_file); - INITDYN(avformat,av_open_input_stream); - INITDYN(avformat,get_buffer); -- INITDYN(avformat,match_ext); -+ INITDYN(avformat,av_match_ext); - - #if FFMPEG_STABLE - INITDYN(avformat,av_init_packet); ---- src/FFmpeg.h.original 2010-04-14 14:59:48.000000000 +0200 -+++ src/FFmpeg.h 2010-04-14 15:26:39.932590241 +0200 -@@ -222,7 +222,7 @@ - AVStream* (*av_new_stream) (AVFormatContext *s, int id); - AVFormatContext* (*av_alloc_format_context) (void); - AVOutputFormat* (*guess_format) (const char *short_name, const char *filename, const char *mime_type); -- int (*match_ext) (const char *filename, const char *extensions); -+ int (*av_match_ext) (const char *filename, const char *extensions); - int (*av_write_trailer) (AVFormatContext *s); - int (*av_interleaved_write_frame) (AVFormatContext *s, AVPacket *pkt); - int (*av_write_frame) (AVFormatContext *s, AVPacket *pkt); Modified: audacity.install =================================================================== --- audacity.install 2011-04-12 20:37:10 UTC (rev 119628) +++ audacity.install 2011-04-12 20:51:50 UTC (rev 119629) @@ -1,6 +1,7 @@ post_install() { update-desktop-database -q update-mime-database usr/share/mime &> /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() {