From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-200471-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1NChv9-0007Oa-Jb
	for garchives@archives.gentoo.org; Mon, 23 Nov 2009 23:02:11 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id DABEDE076F;
	Mon, 23 Nov 2009 23:02:10 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id B7C83E076F
	for <gentoo-commits@lists.gentoo.org>; Mon, 23 Nov 2009 23:02:10 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id 6F317BC104
	for <gentoo-commits@lists.gentoo.org>; Mon, 23 Nov 2009 23:02:10 +0000 (UTC)
Received: from aballier by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <aballier@gentoo.org>)
	id 1NChv7-0006OO-R6
	for gentoo-commits@lists.gentoo.org; Mon, 23 Nov 2009 23:02:09 +0000
From: "Alexis Ballier (aballier)" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, aballier@gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/audacious-plugins/files: 2.2-jackcompat.patch
X-VCS-Repository: gentoo-x86
X-VCS-Files: 2.2-jackcompat.patch
X-VCS-Directories: media-plugins/audacious-plugins/files
X-VCS-Committer: aballier
X-VCS-Committer-Name: Alexis Ballier
Content-Type: text/plain; charset=utf8
Message-Id: <E1NChv7-0006OO-R6@stork.gentoo.org>
Sender: Alexis Ballier <aballier@stork.gentoo.org>
Date: Mon, 23 Nov 2009 23:02:09 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: af4d48bd-9c01-4ca8-9ff9-43cff8b8d100
X-Archives-Hash: 2fa86bcef63f1a3184e9d4aed43bb0ac

aballier    09/11/23 23:02:09

  Added:                2.2-jackcompat.patch
  Log:
  Fix build with latest jack, bug #294226
  (Portage version: 2.2_rc51/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-plugins/audacious-plugins/files/2.2-jackcompat=
.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/auda=
cious-plugins/files/2.2-jackcompat.patch?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/auda=
cious-plugins/files/2.2-jackcompat.patch?rev=3D1.1&content-type=3Dtext/pl=
ain

Index: 2.2-jackcompat.patch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
Index: audacious-plugins-2.2/src/jack/jack.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- audacious-plugins-2.2.orig/src/jack/jack.c
+++ audacious-plugins-2.2/src/jack/jack.c
@@ -236,7 +236,7 @@ static OutputPluginInitStatus jack_init(
=20
=20
 /* Return the amount of data that can be written to the device */
-static gint jack_free(void)
+static gint audacious_jack_free(void)
 {
   unsigned long return_val =3D JACK_GetBytesFreeSpace(driver);
   unsigned long tmp;
@@ -448,7 +448,7 @@ OutputPlugin jack_op =3D
     .close_audio =3D jack_close,
     .flush =3D jack_flush,
     .pause =3D jack_pause,
-    .buffer_free =3D jack_free,
+    .buffer_free =3D audacious_jack_free,
     .buffer_playing =3D jack_playing,
     .output_time =3D jack_get_output_time,
     .written_time =3D jack_get_written_time,