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

[Daniel Griffiths]

    Date: Wednesday, April 14, 2010 @ 20:21:38
  Author: dgriffiths
Revision: 77505

FS#19105

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

-----------------------+
 PKGBUILD              |   10 +++++++---
 audacity-ffmpeg.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-14 21:25:41 UTC (rev 77504)
+++ PKGBUILD	2010-04-15 00:21:38 UTC (rev 77505)
@@ -6,7 +6,7 @@
 
 pkgname=audacity
 pkgver=1.3.12
-pkgrel=2
+pkgrel=3
 pkgdesc="A program that lets you manipulate digital audio waveforms"
 arch=('i686' 'x86_64')
 url="http://audacity.sourceforge.net/"
@@ -16,12 +16,16 @@
 makedepends=('zip' 'python' 'pkgconfig')
 options=('!makeflags')
 install=${pkgname}.install
-source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}-beta.tar.bz2)
-md5sums=('76996fec67181ca82ba191e012518b57')
+source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}-beta.tar.bz2
+	audacity-ffmpeg.patch)
+md5sums=('76996fec67181ca82ba191e012518b57'
+	 '52cd58c39078d78a96e972df4c3c41f6')
 
 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 \

Added: audacity-ffmpeg.patch
===================================================================
--- audacity-ffmpeg.patch	                        (rev 0)
+++ audacity-ffmpeg.patch	2010-04-15 00:21:38 UTC (rev 77505)
@@ -0,0 +1,31 @@
+--- 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);