Add patch to fix build errors with recent versions of ffmpeg (bug #341927 by Sven E.).

Package-Manager: portage-2.2_rc98/cvs/Linux x86_64

4 files changed, 70 insertions, 7 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index d024b71a1e03..c0511e776d7b 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/audacity
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.142 2010/10/04 08:52:58 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.143 2010/10/26 21:22:53 radhermit Exp $
+
+  26 Oct 2010; Tim Harder <radhermit@gentoo.org> audacity-1.3.12.ebuild,
+  +files/audacity-1.3.12-ffmpeg.patch:
+  Add patch to fix build errors with recent versions of ffmpeg (bug #341927
+  by Sven E.).
 
   04 Oct 2010; Ryan Hill <dirtyepic@gentoo.org> audacity-1.3.12.ebuild,
   files/audacity-1.3.12-automagic.patch, +files/audacity-1.3.12-gcc45.patch:
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index e8df465b6c93..106cdbfdea2c 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -2,19 +2,24 @@
 Hash: SHA1
 
 AUX audacity-1.3.12-automagic.patch 2227 RMD160 be4438ab70efa46b638e8bcc29d9c6fa6de2998c SHA1 280564911fd67b19ca79c01af10cf396ce6fe405 SHA256 f1f106f0f1e57d91f74dd0a4466edc6efd861bff7909caa4cf0e596aea38b850
+AUX audacity-1.3.12-ffmpeg.patch 2247 RMD160 278ecc43b796dc272be6d70cd4d233d5e5704ddd SHA1 601b893304d359596919acd1429764910035692d SHA256 07d325b3a3aacb2b264327c4d57d5769dbab3dce13f32c91cafe8c64db7e8a08
 AUX audacity-1.3.12-gcc45.patch 3166 RMD160 173af2b6202e195b18b378855d5124b72b33b4c9 SHA1 415080721c40d871f4c3f4160c578e854ab8641c SHA256 31b220b43f611773d80af756323317f23c9d9009e10bcd1696d1fb9a26ece896
 AUX audacity-1.3.8-automagic.patch 2625 RMD160 af4edacf4d9d331b7daa56d20ee55da5ae7759dc SHA1 4e91de0cecde8a75f14830e9446d6fbb0fc3036a SHA256 a7cc0fd0566877d50d5c8d0568a26dc163f2db1b74314791ff0b4060dafdae81
 AUX audacity-1.3.8-gsocket-conflict.patch 410 RMD160 c5e2716c4a7e9df8d4ebf05a3f226c719c1715e0 SHA1 fe9a1c08399bad5d34839c78c023bd9fea9228fd SHA256 2b77e18c378696392d04e5e1e14285433ee9e904bc95bdd1ec245edfd31efb20
 DIST audacity-minsrc-1.3.12-beta.tar.bz2 6087920 RMD160 47dd021c24fb6ed05a845604db28056d981c28d3 SHA1 3df2187c9e869be6745fb1e1396586b9b0486485 SHA256 f0f55839ca3013d2e43e5114c73d195bc34503685aeab683eafca4d1bbf3b768
 DIST audacity-minsrc-1.3.8.tar.bz2 6734200 RMD160 3ae7ed409520b62f40e4c9fcd49ea5a25827b8a3 SHA1 8b8e5dbbf38546c08eb77005f77648d28836dfd4 SHA256 50132fead4de4382e603fa14f0a7ffe87c4db86ddcfda1a472b8fa0dc7fb41cf
-EBUILD audacity-1.3.12.ebuild 2660 RMD160 5953c7f89ee7afd1594513e9216ad8d1e407d507 SHA1 46d41740387bc1829b686a1780f79c53e17bb1e0 SHA256 0890c87d57e59966119fc3088fbbfffd96daa2109f7feb8a24af1a2118772028
+EBUILD audacity-1.3.12.ebuild 2708 RMD160 fab86b055b227bd172f0ed14a90f8662a1f5cac0 SHA1 051a85b7f2f058c8f5a10d3f2d280a8f3af83aac SHA256 e1fd07f51767654eb00d5c5ca19ac659228f88004cb712681e8ab5d0bb0fc8b7
 EBUILD audacity-1.3.8.ebuild 2645 RMD160 57193ede7b6070a39e273956454b3d1745400eff SHA1 4416347b21cfe056a3be4d5b8db69d5d1ebbf378 SHA256 f1be23f771d0ca552a85af52783a5ec14a9ec3818a624b7856273f98ab2c7cfb
-MISC ChangeLog 23737 RMD160 478176888831edb7afff27bf3d1146d1f7ed6bc3 SHA1 6e08800923e0c9e0809028c12bd5af206cc6e2c3 SHA256 64a76d52cde34981192d350b94bfe16fa5ba5e33f40070139d3bc85b3f1ad212
+MISC ChangeLog 23941 RMD160 91161efcec49d21dd72981b7e62e0391263d9791 SHA1 5c6301845e73f27d1cf805234f41a490f921a75c SHA256 9fb44738139c637dc027dbc7e9fbbce44bd44af18d6565c3f03632aecb29fd30
 MISC metadata.xml 727 RMD160 3306c64d261828fe7ef77a6b10b86bdef95a7e90 SHA1 037f78e7a8bcd2a9691ea7a09078941b385b6737 SHA256 43d8778afc3c468b262cddd50200c8b0c54674fda12b8d8e55b0ce0f8f1a6e85
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyplwQACgkQiqiDRvmkBmIfzQCfYuCfGhu7CuawTmmNijERSJIG
-qmoAoKFIkL7yscObnD8FbxeeBSIhPQvN
-=qHkb
+iQEcBAEBAgAGBQJMx0a2AAoJEEqz6FtPBkyjMF0IAKF9M0vfeh45DNwnQj2fqNwH
+m1//W3qbQ1hkyOs5x6yZjYrzWG+kgIBwmGQfQFXwel6Z0enoVwq3+A4ut80m88s2
+IDaEvtvutEQEaL+8RgYv5VZRVAM3aRG7hYp7gOUn1hEdHu8ODGO5lSQswci9wc5A
+bLl6vy3b2dK3NqQ+WVD9/TZ8Ntf8PHzevYhkuqEcUrLsMShYEnxtzg2Qq1qqSnqv
+zrm5H/A6WlRkakictX86ixmFhHcKAmJWDvU0/dBoy7XOLX45FkvU+0/ZPOMQmKwZ
+2fkNEZzMPiwlJSf3kJxu1TXa6GhzLtxWEu/X8spROjBSmpDQpjxcTSad8B8Np8o=
+=iUdZ
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.12.ebuild b/media-sound/audacity/audacity-1.3.12.ebuild
index 7182eba25e8a..0f5c0cde8059 100644
--- a/media-sound/audacity/audacity-1.3.12.ebuild
+++ b/media-sound/audacity/audacity-1.3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.12.ebuild,v 1.2 2010/10/04 08:52:58 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.12.ebuild,v 1.3 2010/10/26 21:22:53 radhermit Exp $
 
 EAPI=2
 
@@ -50,6 +50,7 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.3.12-automagic.patch"
 	epatch "${FILESDIR}/${PN}-1.3.12-gcc45.patch"
+	epatch "${FILESDIR}/${PN}-1.3.12-ffmpeg.patch"
 	AT_M4DIR="${S}/m4" eautoreconf
 }
 
diff --git a/media-sound/audacity/files/audacity-1.3.12-ffmpeg.patch b/media-sound/audacity/files/audacity-1.3.12-ffmpeg.patch
new file mode 100644
index 000000000000..22146bb1bbff
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.12-ffmpeg.patch
@@ -0,0 +1,52 @@
+--- audacity-src-1.3.12-beta.orig/src/FFmpeg.cpp	2010-03-30 04:28:54.000000000 -0700
++++ audacity-src-1.3.12-beta/src/FFmpeg.cpp	2010-10-26 12:22:02.145695409 -0700
+@@ -204,7 +204,11 @@
+    return ret;
+ }
+ 
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 68, 0)
++static int ufile_write(URLContext *h, const unsigned char *buf, int size)
++#else
+ static int ufile_write(URLContext *h, unsigned char *buf, int size)
++#endif
+ {
+    return (int) ((wxFile *) h->priv_data)->Write(buf, size);
+ }
+@@ -356,7 +360,11 @@
+          }
+          // Otherwize, resort to extension matching if available
+          else if (fmt1->extensions) {
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 60, 0)
++            if (FFmpegLibsInst->av_match_ext(filename, fmt1->extensions)) {
++#else
+             if (FFmpegLibsInst->match_ext(filename, fmt1->extensions)) {
++#endif
+                score = 50;
+             }
+          }
+@@ -829,7 +837,11 @@
+    INITDYN(avformat,av_open_input_file);
+    INITDYN(avformat,av_open_input_stream);
+    INITDYN(avformat,get_buffer);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 60, 0)
++   INITDYN(avformat,av_match_ext);
++#else
+    INITDYN(avformat,match_ext);
++#endif
+ 
+ #if FFMPEG_STABLE
+    INITDYN(avformat,av_init_packet);
+--- audacity-src-1.3.12-beta.orig/src/FFmpeg.h	2010-03-30 04:28:54.000000000 -0700
++++ audacity-src-1.3.12-beta/src/FFmpeg.h	2010-10-26 12:23:02.618168997 -0700
+@@ -224,7 +224,11 @@
+    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);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 60, 0)
++   int               (*av_match_ext)                  (const char *filename, const char *extensions);
++#else
+    int               (*match_ext)                     (const char *filename, const char *extensions);
++#endif
+    int               (*av_write_trailer)              (AVFormatContext *s);
+    int               (*av_interleaved_write_frame)    (AVFormatContext *s, AVPacket *pkt);
+    int               (*av_write_frame)                (AVFormatContext *s, AVPacket *pkt);