[arch-commits] Commit in audacity/trunk (PKGBUILD audacity-ffmpeg.patch)

[Eric Bélanger]

    Date: Sunday, April 12, 2015 @ 21:23:39
  Author: eric
Revision: 236316

upgpkg: audacity 2.1.0-1

Upstream update, Update ffmpeg patch, Use system libraries instead of bundled ones (close FS#42699)

Modified:
  audacity/trunk/PKGBUILD
  audacity/trunk/audacity-ffmpeg.patch

-----------------------+
 PKGBUILD              |   18 +++++++++---------
 audacity-ffmpeg.patch |    4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-12 18:22:53 UTC (rev 236315)
+++ PKGBUILD	2015-04-12 19:23:39 UTC (rev 236316)
@@ -2,34 +2,34 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=audacity
-pkgver=2.0.6
+pkgver=2.1.0
 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')
+depends=('libmad' 'libid3tag' 'wxgtk2.8' 'lame' 'lilv' 'soundtouch'
+	 'ffmpeg' 'vamp-plugin-sdk' 'sbsms' 'portsmf' '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')
+sha1sums=('a53bce0276240bb56f2e3fd1bf235a4ef688caa3'
+          '5f1733a3802bcec7d9b54cb3ec8d7d81fc38fc61')
 
 prepare() {
-  cd ${pkgname}-src-${pkgver}
+  cd ${pkgname}-minsrc-${pkgver}
   patch -p1 -i "${srcdir}/audacity-ffmpeg.patch"
 }
 
 build() {
-  cd ${pkgname}-src-${pkgver}
-  WX_CONFIG=/usr/bin/wx-config-2.8 ./configure --prefix=/usr
+  cd ${pkgname}-minsrc-${pkgver}
+  WX_CONFIG=/usr/bin/wx-config-2.8 ./configure --prefix=/usr --with-libsamplerate
   make
 }
 
 package() {
-  cd ${pkgname}-src-${pkgver}
+  cd ${pkgname}-minsrc-${pkgver}
   make DESTDIR="${pkgdir}" install
 }

Modified: audacity-ffmpeg.patch
===================================================================
--- audacity-ffmpeg.patch	2015-04-12 18:22:53 UTC (rev 236315)
+++ audacity-ffmpeg.patch	2015-04-12 19:23:39 UTC (rev 236316)
@@ -15,7 +15,7 @@
        int,
        av_fifo_size,
 -      (AVFifoBuffer *f),
-+      (FF_CONST_AVUTIL53 AVFifoBuffer *f),
++      (const AVFifoBuffer *f),
        (f)
     );
     FFMPEG_FUNCTION_WITH_RETURN(
@@ -24,7 +24,7 @@
        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),
++      (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
        (m, key, prev, flags)
     );
     FFMPEG_FUNCTION_WITH_RETURN(