Version bump and include patch to support Audacious 1.5.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc6 x86_64

4 files changed, 151 insertions, 2 deletions

diff --git a/media-plugins/audacious-g15-spectrum/ChangeLog b/media-plugins/audacious-g15-spectrum/ChangeLog
index 18a48a9ac2e2..a899440f4f01 100644
--- a/media-plugins/audacious-g15-spectrum/ChangeLog
+++ b/media-plugins/audacious-g15-spectrum/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/audacious-g15-spectrum
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-g15-spectrum/ChangeLog,v 1.7 2008/01/18 11:56:42 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-g15-spectrum/ChangeLog,v 1.8 2008/09/13 23:07:11 robbat2 Exp $
+
+*audacious-g15-spectrum-2.5.5 (13 Sep 2008)
+
+  13 Sep 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/audacious-g15-spectrum-2.5.5-audacious-1.5.patch,
+  +audacious-g15-spectrum-2.5.5.ebuild:
+  Version bump and include patch to support Audacious 1.5.
 
   31 Dec 2007; Markus Ullmann <jokey@gentoo.org>
   +files/audacious-g15-spectrum-2.5.2-audacious-1.4.patch,
diff --git a/media-plugins/audacious-g15-spectrum/Manifest b/media-plugins/audacious-g15-spectrum/Manifest
index b5c906bc75c5..1c9ff12b841f 100644
--- a/media-plugins/audacious-g15-spectrum/Manifest
+++ b/media-plugins/audacious-g15-spectrum/Manifest
@@ -1,8 +1,11 @@
 AUX audacious-g15-spectrum-1.0_pre-audacious-1.3.patch 975 RMD160 cb3dd26ea3ccaa3165a14078a8da9b97e1725bfe SHA1 6f09b42788818cb076d81d996c2eb7713ac360e0 SHA256 d1496ced831da91952881b3451f51370e65baf30eb0c94e41bf37dc034830c3b
 AUX audacious-g15-spectrum-2.5.2-audacious-1.4.patch 6241 RMD160 ba585c930fa43d9608d21e3590b3cc5a47e47ef9 SHA1 7eb62e426e75d4bbf6d4b7c7d05f91fc10106d8c SHA256 af81edd6730764bcb9612f50e8790268692ba080aeda98ccd98d3a8732285878
+AUX audacious-g15-spectrum-2.5.5-audacious-1.5.patch 6431 RMD160 531b522c3da3ed6772df667a98be51bcaa7753c2 SHA1 2ebb41253adc749e812c8a64d01b8a1441b5e52e SHA256 8afe2caf66ceed902cafb1fe40800ae578aa69cb789594e210e2546f1c134a81
 DIST g15daemon-audacious-2.5.2.tar.bz2 234010 RMD160 9effb50b03ed7e4652cdff46dd48a979fce1a1ee SHA1 6c2be4e7c70a30d8270ef8ed989dadd19c66e53e SHA256 be2065b2fded807632e1ca3f0b19de70d8beebf38bad8a88cd9b44e4e8a6f956
+DIST g15daemon-audacious-2.5.5.tar.bz2 238143 RMD160 89fe5762a752efbfc8297887c49dfd00c2323ecb SHA1 c4a2566bab6c47b54c75376356a014be111b7d54 SHA256 438ad6c766855ab2ce3abaf995a1649e466cd6a15afa213197db86cfea6d9ab8
 DIST g15daemon_audacious_spectrum-1.0pre.tar.bz2 222311 RMD160 1b714dc3ccef503e1b66de12b8b03b0085e0e11d SHA1 b25b92bdf6c99c8984ae1569028c67d3f1405738 SHA256 738ee693da0b7dfdd9bbc337ffe4173a05fda2cac2b8bfde5cc7b098f461eb5b
 EBUILD audacious-g15-spectrum-1.0_pre.ebuild 1002 RMD160 78934b38c0f0c5e336004a0bb06e4cac36173e2d SHA1 149aaabae034d7e5053d48dfeabaf2b19c3b368e SHA256 bf99da937906d27e80849dd6626ae9fd4529709b5dcf5c07b5462816cd2f6420
 EBUILD audacious-g15-spectrum-2.5.2.ebuild 1004 RMD160 42d6970746b5045d02a09a8772552e64e27e1e75 SHA1 c1b82f057f96a09b7f2314560361252e02740354 SHA256 635c303fc0628667373efde132f1bc5c39b54c0f3c2a793a7af3383b8a3cc7d8
-MISC ChangeLog 1145 RMD160 df42cf1dcaf979b0c40d49f51b022333ccedd75f SHA1 509a71dffd4cd05641990ce050d6866248c51bc4 SHA256 311eba0895e1eed01301d41cc0d0fefd80233380c96ee38375eb6e1c4f179c40
+EBUILD audacious-g15-spectrum-2.5.5.ebuild 946 RMD160 25de4d55b5e2f9395c50fd2d28235f88cfcd688d SHA1 03c1be792d0043014865bdefefca59fda2fa21b3 SHA256 0588769dc26d2b4a98c3c0c17e566e2b8cc86ef297f7dc119e0b4df0613653bf
+MISC ChangeLog 1401 RMD160 2b79c0e14ca28611f1116aa1e535e99988d4039d SHA1 db3154e8d9a0d4aa7bf89387f0024090dcbaf895 SHA256 1e62896a11dc2239cf98328aa7d48b156081dda8435a9ddf58e3b2df9f3a8150
 MISC metadata.xml 249 RMD160 f108edee61c95c42d98726b435b75d03cbbd4aac SHA1 48461481dfc5a9d1f5b4726a5e9882a2fb966ede SHA256 1dc990d64e5b42c9b17d7358c9f0af7d26702f575957482d93c8fd12a556cc11
diff --git a/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-2.5.5.ebuild b/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-2.5.5.ebuild
new file mode 100644
index 000000000000..4c00aeef6041
--- /dev/null
+++ b/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-2.5.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-g15-spectrum/audacious-g15-spectrum-2.5.5.ebuild,v 1.1 2008/09/13 23:07:11 robbat2 Exp $
+
+inherit eutils versionator
+
+MY_PN="g15daemon-audacious"
+DESCRIPTION="Audacious Spectrum plugin to G15daemon"
+HOMEPAGE="http://g15daemon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/g15daemon/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=app-misc/g15daemon-1.9.0
+	dev-libs/libg15
+	>=dev-libs/libg15render-1.2
+	>=media-sound/audacious-1.5
+	>=x11-libs/gtk+-2.6.0
+	dev-libs/glib
+	x11-libs/pango"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-audacious-1.5.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS README
+}
diff --git a/media-plugins/audacious-g15-spectrum/files/audacious-g15-spectrum-2.5.5-audacious-1.5.patch b/media-plugins/audacious-g15-spectrum/files/audacious-g15-spectrum-2.5.5-audacious-1.5.patch
new file mode 100644
index 000000000000..3f07d28b8678
--- /dev/null
+++ b/media-plugins/audacious-g15-spectrum/files/audacious-g15-spectrum-2.5.5-audacious-1.5.patch
@@ -0,0 +1,101 @@
+As of Audacious-1.5, the old bmp_cfg* functions all have new names, leading to
+undefined symbols or compile failures.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude '*~' g15daemon-audacious-2.5.5.orig/g15daemon_audacious_spectrum.c g15daemon-audacious-2.5.5/g15daemon_audacious_spectrum.c
+--- g15daemon-audacious-2.5.5.orig/g15daemon_audacious_spectrum.c	2008-05-24 05:58:01.000000000 -0700
++++ g15daemon-audacious-2.5.5/g15daemon_audacious_spectrum.c	2008-09-13 15:50:50.635729491 -0700
+@@ -287,28 +287,28 @@
+ {
+   ConfigDb *cfg;
+   
+-  cfg = bmp_cfg_db_open();
++  cfg = aud_cfg_db_open();
+   pthread_mutex_lock (&g15buf_mutex);
+   if (cfg)
+     {
+-      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "visualisation_type", (int*)&vis_type);
+-      bmp_cfg_db_get_float(cfg, "G15Daemon Spectrum", "linearity", (float*)&linearity);
+-      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "amplification", (int*)&amplification);
+-      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "bars_limit", (int*)&limit);
+-      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "num_bars", (int*)&num_bars);
+-      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "enable_peak", (int*)&enable_peak);
+-      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "detached_peak", (int*)&detached_peak);
+-      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "line_mode", (int*)&line_mode);
+-      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "analog_mode", (int*)&analog_mode);
+-      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "analog_step", (int*)&analog_step);
+-      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "enable_keybindings", (int*)&enable_keybindings);
+-      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_title", (int*)&show_title);
+-      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_pbar", (int*)&show_pbar);
+-      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_time", (int*)&show_time);
+-      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "rownum", (int*)&rownum);
+-      bmp_cfg_db_get_int(cfg, "G15Daemon Spectrum", "title_overlay", (int*)&title_overlay);
++      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "visualisation_type", (int*)&vis_type);
++      aud_cfg_db_get_float(cfg, "G15Daemon Spectrum", "linearity", (float*)&linearity);
++      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "amplification", (int*)&amplification);
++      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "bars_limit", (int*)&limit);
++      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "num_bars", (int*)&num_bars);
++      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "enable_peak", (int*)&enable_peak);
++      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "detached_peak", (int*)&detached_peak);
++      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "line_mode", (int*)&line_mode);
++      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "analog_mode", (int*)&analog_mode);
++      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "analog_step", (int*)&analog_step);
++      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "enable_keybindings", (int*)&enable_keybindings);
++      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_title", (int*)&show_title);
++      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_pbar", (int*)&show_pbar);
++      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "show_time", (int*)&show_time);
++      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "rownum", (int*)&rownum);
++      aud_cfg_db_get_int(cfg, "G15Daemon Spectrum", "title_overlay", (int*)&title_overlay);
+       
+-      bmp_cfg_db_close(cfg);
++      aud_cfg_db_close(cfg);
+       
+     }
+   /* check conf integrity */
+@@ -351,27 +351,27 @@
+ {
+   ConfigDb *cfg;
+   
+-  cfg = bmp_cfg_db_open();
++  cfg = aud_cfg_db_open();
+   
+   if (cfg)
+     {
+-      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "visualisation_type", vis_type);
+-      bmp_cfg_db_set_float(cfg, "G15Daemon Spectrum", "linearity", linearity);
+-      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "amplification", amplification);
+-      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "bars_limit", limit);
+-      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "num_bars", num_bars);
+-      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "enable_peak", enable_peak);
+-      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "detached_peak", detached_peak);
+-      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "analog_mode", analog_mode);
+-      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "line_mode", line_mode);
+-      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "analog_step", analog_step);
+-      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "enable_keybindings", enable_keybindings);
+-      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_title", show_title);
+-      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_pbar", show_pbar);
+-      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_time", show_time);
+-      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "rownum", rownum);
+-      bmp_cfg_db_set_int(cfg, "G15Daemon Spectrum", "title_overlay", title_overlay);
+-      bmp_cfg_db_close(cfg);
++      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "visualisation_type", vis_type);
++      aud_cfg_db_set_float(cfg, "G15Daemon Spectrum", "linearity", linearity);
++      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "amplification", amplification);
++      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "bars_limit", limit);
++      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "num_bars", num_bars);
++      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "enable_peak", enable_peak);
++      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "detached_peak", detached_peak);
++      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "analog_mode", analog_mode);
++      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "line_mode", line_mode);
++      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "analog_step", analog_step);
++      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "enable_keybindings", enable_keybindings);
++      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_title", show_title);
++      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_pbar", show_pbar);
++      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "show_time", show_time);
++      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "rownum", rownum);
++      aud_cfg_db_set_int(cfg, "G15Daemon Spectrum", "title_overlay", title_overlay);
++      aud_cfg_db_close(cfg);
+     }
+   
+ }