Date: Tuesday, September 30, 2014 @ 01:55:11 Author: eric Revision: 223694
archrelease: copy trunk to extra-i686, extra-x86_64 Added: audacity/repos/extra-i686/PKGBUILD (from rev 223693, audacity/trunk/PKGBUILD) audacity/repos/extra-i686/audacity-ffmpeg.patch (from rev 223693, audacity/trunk/audacity-ffmpeg.patch) audacity/repos/extra-i686/audacity.install (from rev 223693, audacity/trunk/audacity.install) audacity/repos/extra-x86_64/PKGBUILD (from rev 223693, audacity/trunk/PKGBUILD) audacity/repos/extra-x86_64/audacity-ffmpeg.patch (from rev 223693, audacity/trunk/audacity-ffmpeg.patch) audacity/repos/extra-x86_64/audacity.install (from rev 223693, audacity/trunk/audacity.install) Deleted: audacity/repos/extra-i686/PKGBUILD audacity/repos/extra-i686/audacity.install audacity/repos/extra-x86_64/PKGBUILD audacity/repos/extra-x86_64/audacity.install ------------------------------------+ /PKGBUILD | 70 +++++++++++++++++++++++++++++++++++ /audacity.install | 26 +++++++++++++ extra-i686/PKGBUILD | 29 -------------- extra-i686/audacity-ffmpeg.patch | 30 +++++++++++++++ extra-i686/audacity.install | 13 ------ extra-x86_64/PKGBUILD | 29 -------------- extra-x86_64/audacity-ffmpeg.patch | 30 +++++++++++++++ extra-x86_64/audacity.install | 13 ------ 8 files changed, 156 insertions(+), 84 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-09-29 23:52:22 UTC (rev 223693) +++ extra-i686/PKGBUILD 2014-09-29 23:55:11 UTC (rev 223694) @@ -1,29 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=audacity -pkgver=2.0.5 -pkgrel=2 -pkgdesc="A program that lets you manipulate digital audio waveforms" -arch=('i686' 'x86_64') -url="http://audacity.sourceforge.net/" -license=('GPL') -depends=('libmad' 'libid3tag' 'wxgtk2.8' 'lame' 'hicolor-icon-theme' - 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg-compat') -makedepends=('cmake') -options=('!makeflags') -install=audacity.install -source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}.tar.xz) -sha1sums=('f63cafb81f29e7f3813dc9f80fb1dfdbcfe46b33') - -build() { - cd ${pkgname}-src-${pkgver} - WX_CONFIG=/usr/bin/wx-config-2.8 PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \ - ./configure --prefix=/usr - make -} - -package() { - cd ${pkgname}-src-${pkgver} - make DESTDIR="${pkgdir}" install -} Copied: audacity/repos/extra-i686/PKGBUILD (from rev 223693, audacity/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-09-29 23:55:11 UTC (rev 223694) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=audacity +pkgver=2.0.6 +pkgrel=1 +pkgdesc="A program that lets you manipulate digital audio waveforms" +arch=('i686' 'x86_64') +url="http://audacity.sourceforge.net/" +license=('GPL') +depends=('libmad' 'libid3tag' 'wxgtk2.8' 'lame' 'jack' 'soundtouch' + 'ffmpeg' 'desktop-file-utils') +makedepends=('cmake' 'python2') +options=('!makeflags') +install=audacity.install +source=(http://downloads.sourceforge.net/project/audacity/audacity/${pkgver}/${pkgname}-minsrc-${pkgver}.tar.xz + audacity-ffmpeg.patch) +sha1sums=('9fd664a71684e7e07472a48fa716f89c87b1929d' + '3fa0a06501ae525515f3e46ef9d20aa1a9ea8921') + +prepare() { + cd ${pkgname}-src-${pkgver} + patch -p1 -i "${srcdir}/audacity-ffmpeg.patch" +} + +build() { + cd ${pkgname}-src-${pkgver} + WX_CONFIG=/usr/bin/wx-config-2.8 ./configure --prefix=/usr + make +} + +package() { + cd ${pkgname}-src-${pkgver} + make DESTDIR="${pkgdir}" install +} Copied: audacity/repos/extra-i686/audacity-ffmpeg.patch (from rev 223693, audacity/trunk/audacity-ffmpeg.patch) =================================================================== --- extra-i686/audacity-ffmpeg.patch (rev 0) +++ extra-i686/audacity-ffmpeg.patch 2014-09-29 23:55:11 UTC (rev 223694) @@ -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), ++ (FF_CONST_AVUTIL53 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), ++ (FF_CONST_AVUTIL53 AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), + (m, key, prev, flags) + ); + FFMPEG_FUNCTION_WITH_RETURN( Deleted: extra-i686/audacity.install =================================================================== --- extra-i686/audacity.install 2014-09-29 23:52:22 UTC (rev 223693) +++ extra-i686/audacity.install 2014-09-29 23:55:11 UTC (rev 223694) @@ -1,13 +0,0 @@ -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() { - post_install -} - -post_remove() { - post_install -} Copied: audacity/repos/extra-i686/audacity.install (from rev 223693, audacity/trunk/audacity.install) =================================================================== --- extra-i686/audacity.install (rev 0) +++ extra-i686/audacity.install 2014-09-29 23:55:11 UTC (rev 223694) @@ -0,0 +1,13 @@ +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() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-09-29 23:52:22 UTC (rev 223693) +++ extra-x86_64/PKGBUILD 2014-09-29 23:55:11 UTC (rev 223694) @@ -1,29 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=audacity -pkgver=2.0.5 -pkgrel=2 -pkgdesc="A program that lets you manipulate digital audio waveforms" -arch=('i686' 'x86_64') -url="http://audacity.sourceforge.net/" -license=('GPL') -depends=('libmad' 'libid3tag' 'wxgtk2.8' 'lame' 'hicolor-icon-theme' - 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg-compat') -makedepends=('cmake') -options=('!makeflags') -install=audacity.install -source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}.tar.xz) -sha1sums=('f63cafb81f29e7f3813dc9f80fb1dfdbcfe46b33') - -build() { - cd ${pkgname}-src-${pkgver} - WX_CONFIG=/usr/bin/wx-config-2.8 PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \ - ./configure --prefix=/usr - make -} - -package() { - cd ${pkgname}-src-${pkgver} - make DESTDIR="${pkgdir}" install -} Copied: audacity/repos/extra-x86_64/PKGBUILD (from rev 223693, audacity/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-09-29 23:55:11 UTC (rev 223694) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=audacity +pkgver=2.0.6 +pkgrel=1 +pkgdesc="A program that lets you manipulate digital audio waveforms" +arch=('i686' 'x86_64') +url="http://audacity.sourceforge.net/" +license=('GPL') +depends=('libmad' 'libid3tag' 'wxgtk2.8' 'lame' 'jack' 'soundtouch' + 'ffmpeg' 'desktop-file-utils') +makedepends=('cmake' 'python2') +options=('!makeflags') +install=audacity.install +source=(http://downloads.sourceforge.net/project/audacity/audacity/${pkgver}/${pkgname}-minsrc-${pkgver}.tar.xz + audacity-ffmpeg.patch) +sha1sums=('9fd664a71684e7e07472a48fa716f89c87b1929d' + '3fa0a06501ae525515f3e46ef9d20aa1a9ea8921') + +prepare() { + cd ${pkgname}-src-${pkgver} + patch -p1 -i "${srcdir}/audacity-ffmpeg.patch" +} + +build() { + cd ${pkgname}-src-${pkgver} + WX_CONFIG=/usr/bin/wx-config-2.8 ./configure --prefix=/usr + make +} + +package() { + cd ${pkgname}-src-${pkgver} + make DESTDIR="${pkgdir}" install +} Copied: audacity/repos/extra-x86_64/audacity-ffmpeg.patch (from rev 223693, audacity/trunk/audacity-ffmpeg.patch) =================================================================== --- extra-x86_64/audacity-ffmpeg.patch (rev 0) +++ extra-x86_64/audacity-ffmpeg.patch 2014-09-29 23:55:11 UTC (rev 223694) @@ -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), ++ (FF_CONST_AVUTIL53 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), ++ (FF_CONST_AVUTIL53 AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), + (m, key, prev, flags) + ); + FFMPEG_FUNCTION_WITH_RETURN( Deleted: extra-x86_64/audacity.install =================================================================== --- extra-x86_64/audacity.install 2014-09-29 23:52:22 UTC (rev 223693) +++ extra-x86_64/audacity.install 2014-09-29 23:55:11 UTC (rev 223694) @@ -1,13 +0,0 @@ -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() { - post_install -} - -post_remove() { - post_install -} Copied: audacity/repos/extra-x86_64/audacity.install (from rev 223693, audacity/trunk/audacity.install) =================================================================== --- extra-x86_64/audacity.install (rev 0) +++ extra-x86_64/audacity.install 2014-09-29 23:55:11 UTC (rev 223694) @@ -0,0 +1,13 @@ +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() { + post_install +} + +post_remove() { + post_install +}